diff options
| author | Anatol Belski <ab@php.net> | 2014-12-16 08:04:51 +0100 |
|---|---|---|
| committer | Anatol Belski <ab@php.net> | 2014-12-16 08:04:51 +0100 |
| commit | 209a7a27a5a9a9dc4e32ffa39a2ef971a97d2878 (patch) | |
| tree | c771f55eff806654798b1a7a49ac0d368db94a85 /ext | |
| parent | 64b423d6ed298d4859e85dfe8059f4789c3f7117 (diff) | |
| parent | caf55214165ed32014aae7863bce621d1cb19a9e (diff) | |
| download | php-git-209a7a27a5a9a9dc4e32ffa39a2ef971a97d2878.tar.gz | |
Merge remote-tracking branch 'origin/master' into native-tls
* origin/master:
Revert "Removed useless local variable"
Fix the fix for bug #55415
add BC breaks from PHPNG RFC
add include for definition of php_url_encode
Diffstat (limited to 'ext')
| -rw-r--r-- | ext/standard/info.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/ext/standard/info.c b/ext/standard/info.c index 912ac51601..cc332721a4 100644 --- a/ext/standard/info.c +++ b/ext/standard/info.c @@ -37,7 +37,8 @@ #ifdef HAVE_SYS_UTSNAME_H #include <sys/utsname.h> #endif - +#include "url.h" +#include "php_string.h" #ifdef PHP_WIN32 typedef void (WINAPI *PGNSI)(LPSYSTEM_INFO); @@ -143,8 +144,7 @@ PHPAPI void php_info_print_module(zend_module_entry *zend_module) /* {{{ */ { if (zend_module->info_func || zend_module->version) { if (!sapi_module.phpinfo_as_text) { - int len = 0; - zend_string *url_name = php_url_encode(zend_module->name, strlen(zend_module->name), &len); + zend_string *url_name = php_url_encode(zend_module->name, strlen(zend_module->name)); php_strtolower(url_name->val, url_name->len); php_info_printf("<h2><a name=\"module_%s\">%s</a></h2>\n", url_name->val, zend_module->name); |