Attachment 144433 Details for Bug 191638 – Fix adapted from upstream patch

[patch] Fix adapted from upstream patch

file_191638.txt (text/plain), 2.26 KB, created by logan on 2014-07-05 20:07:24 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: logan

Created: 2014-07-05 20:07:24 UTC

Size: 2.26 KB

patch

obsolete

>Index: lang/php5/files/patch-ext_standard_info.c
>===================================================================
>--- lang/php5/files/patch-ext_standard_info.c	(revision 0)
>+++ lang/php5/files/patch-ext_standard_info.c	(working copy)
>@@ -0,0 +1,23 @@
>+--- ext/standard/info.c.orig	2014-07-05 19:42:26.000000000 +0400
>++++ ext/standard/info.c	2014-07-05 19:43:42.000000000 +0400
>+@@ -875,16 +875,16 @@ PHPAPI void php_print_info(int flag TSRM
>+ 
>+ 		php_info_print_table_start();
>+ 		php_info_print_table_header(2, "Variable", "Value");
>+-		if (zend_hash_find(&EG(symbol_table), "PHP_SELF", sizeof("PHP_SELF"), (void **) &data) != FAILURE) {
>++		if (zend_hash_find(&EG(symbol_table), "PHP_SELF", sizeof("PHP_SELF"), (void **) &data) != FAILURE && Z_TYPE_PP(data) == IS_STRING) {
>+ 			php_info_print_table_row(2, "PHP_SELF", Z_STRVAL_PP(data));
>+ 		}
>+-		if (zend_hash_find(&EG(symbol_table), "PHP_AUTH_TYPE", sizeof("PHP_AUTH_TYPE"), (void **) &data) != FAILURE) {
>++		if (zend_hash_find(&EG(symbol_table), "PHP_AUTH_TYPE", sizeof("PHP_AUTH_TYPE"), (void **) &data) != FAILURE && Z_TYPE_PP(data) == IS_STRING) {
>+ 			php_info_print_table_row(2, "PHP_AUTH_TYPE", Z_STRVAL_PP(data));
>+ 		}
>+-		if (zend_hash_find(&EG(symbol_table), "PHP_AUTH_USER", sizeof("PHP_AUTH_USER"), (void **) &data) != FAILURE) {
>++		if (zend_hash_find(&EG(symbol_table), "PHP_AUTH_USER", sizeof("PHP_AUTH_USER"), (void **) &data) != FAILURE && Z_TYPE_PP(data) == IS_STRING) {
>+ 			php_info_print_table_row(2, "PHP_AUTH_USER", Z_STRVAL_PP(data));
>+ 		}
>+-		if (zend_hash_find(&EG(symbol_table), "PHP_AUTH_PW", sizeof("PHP_AUTH_PW"), (void **) &data) != FAILURE) {
>++		if (zend_hash_find(&EG(symbol_table), "PHP_AUTH_PW", sizeof("PHP_AUTH_PW"), (void **) &data) != FAILURE && Z_TYPE_PP(data) == IS_STRING) {
>+ 			php_info_print_table_row(2, "PHP_AUTH_PW", Z_STRVAL_PP(data));
>+ 		}
>+ 		php_print_gpcse_array(ZEND_STRL("_REQUEST") TSRMLS_CC);
>
>Property changes on: lang/php5/files/patch-ext_standard_info.c
>___________________________________________________________________
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property
>Added: fbsd:nokeywords
>## -0,0 +1 ##
>+yes
>\ No newline at end of property
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property

Actions: View | Diff

Attachments on bug 191638: 144433 | 144436