aboutsummaryrefslogtreecommitdiff
path: root/lang
diff options
context:
space:
mode:
authorFlorian Smeets <flo@FreeBSD.org>2014-07-06 14:42:15 +0000
committerFlorian Smeets <flo@FreeBSD.org>2014-07-06 14:42:15 +0000
commit041923401e3a1073db5b89f678389a5b5957dd5d (patch)
treee23dfb0655cde2b89811beb2d3a63acab6634464 /lang
parentcbfea8568de91277630eeb1dd4fa32ccb7e26a7f (diff)
downloadports-041923401e3a1073db5b89f678389a5b5957dd5d.tar.gz
ports-041923401e3a1073db5b89f678389a5b5957dd5d.zip
Notes
Diffstat (limited to 'lang')
-rw-r--r--lang/php53/Makefile2
-rw-r--r--lang/php53/files/patch-ext_standard_info.c23
2 files changed, 24 insertions, 1 deletions
diff --git a/lang/php53/Makefile b/lang/php53/Makefile
index ec8597209fa0..e782ed165a76 100644
--- a/lang/php53/Makefile
+++ b/lang/php53/Makefile
@@ -3,7 +3,7 @@
PORTNAME= php53
PORTVERSION= 5.3.28
-PORTREVISION?= 2
+PORTREVISION?= 3
CATEGORIES?= lang devel www
MASTER_SITES= ${MASTER_SITE_PHP}
MASTER_SITE_SUBDIR= distributions
diff --git a/lang/php53/files/patch-ext_standard_info.c b/lang/php53/files/patch-ext_standard_info.c
new file mode 100644
index 000000000000..6fdaa803c25b
--- /dev/null
+++ b/lang/php53/files/patch-ext_standard_info.c
@@ -0,0 +1,23 @@
+--- ext/standard/info.c.orig 2014-07-06 14:16:21.785793323 +0200
++++ ext/standard/info.c 2014-07-06 14:20:20.630549152 +0200
+@@ -999,16 +999,16 @@
+
+ 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("_REQUEST", sizeof("_REQUEST")-1 TSRMLS_CC);