Merge branch 'PHP-5.4' into PHP-5.5

m6w6 · m6w6 · commit 618194859205 · 2013-08-21T19:18:11.000+02:00
* PHP-5.4:
  Fix pointer sign warning showing up in EVERY build
diff --git a/ext/standard/info.c b/ext/standard/info.c
@@ -287,7 +287,7 @@ void php_info_print_style(TSRMLS_D)
 PHPAPI char *php_info_html_esc(char *string TSRMLS_DC)
 {
 	size_t new_len;
-	return php_escape_html_entities(string, strlen(string), &new_len, 0, ENT_QUOTES, NULL TSRMLS_CC);
+	return php_escape_html_entities((unsigned char *) string, strlen(string), &new_len, 0, ENT_QUOTES, NULL TSRMLS_CC);
 }
 /* }}} */
 

Original file line number	Diff line number	Diff line change
`@@ -287,7 +287,7 @@ void php_info_print_style(TSRMLS_D)`
`287`	`287`	`PHPAPI char php_info_html_esc(char string TSRMLS_DC)`
`288`	`288`	`{`
`289`	`289`	`size_t new_len;`
`290`		`- return php_escape_html_entities(string, strlen(string), &new_len, 0, ENT_QUOTES, NULL TSRMLS_CC);`
	`290`	`+ return php_escape_html_entities((unsigned char *) string, strlen(string), &new_len, 0, ENT_QUOTES, NULL TSRMLS_CC);`
`291`	`291`	`}`
`292`	`292`	`/* }}} */`
`293`	`293`