Attachment #184151 for bug #220531

View | Details | Raw Unified | Return to bug 220531
Collapse All | Expand All

Lines 1-7 Link Here

(-)devel/php70-readline/Makefile (-1 lines)
1	# Created by: Alex Dupre <ale@FreeBSD.org>	1	# Created by: Alex Dupre <ale@FreeBSD.org>
2	# $FreeBSD$	2	# $FreeBSD$
3		3
4	PORTREVISION= 1
5	CATEGORIES= devel	4	CATEGORIES= devel
6		5
7	MASTERDIR= ${.CURDIR}/../../lang/php70	6	MASTERDIR= ${.CURDIR}/../../lang/php70




# $FreeBSD$

PORTNAME=	php70
PORTVERSION=	7.0.21
PORTREVISION?=	0
CATEGORIES?=	lang devel www
MASTER_SITES=	PHP/distributions
DISTNAME=	php-${PORTVERSION}

PLIST_SUB+=	SAPI_INC="@comment "
.endif

.if !defined(WITH_REGEX_TYPE) || ${WITH_REGEX_TYPE} == "php"
CONFIGURE_ARGS+=--with-regex=php
.elif defined(WITH_REGEX_TYPE) && ${WITH_REGEX_TYPE} == "system"
CONFIGURE_ARGS+=--with-regex=system
.endif

.if !defined(WITH_ZEND_VM) || ${WITH_ZEND_VM} == "CALL"
CONFIGURE_ARGS+=--with-zend-vm=CALL
.elif defined(WITH_ZEND_VM) && ${WITH_ZEND_VM} == "SWITCH"
CONFIGURE_ARGS+=--with-zend-vm=SWITCH
.elif defined(WITH_ZEND_VM) && ${WITH_ZEND_VM} == "GOTO"
CONFIGURE_ARGS+=--with-zend-vm=GOTO
.endif

CONFIGURE_ENV+=	ac_cv_decimal_fp_supported="no" \
		lt_cv_path_SED="sed"


Lines 1-3 Link Here

(-)lang/php70/distinfo (-3 / +3 lines)
1	TIMESTAMP = 1497260078	1	TIMESTAMP = 1499413282
2	SHA256 (php-7.0.20.tar.xz) = 31b9cf1fb83fe3cd82c2f6603a0ae81ae6abacb5286827e362d8f85e68908e0a	2	SHA256 (php-7.0.21.tar.xz) = 6713fe3024365d661593235b525235045ef81f18d0043654658c9de1bcb8b9e3
3	SIZE (php-7.0.20.tar.xz) = 12604260	3	SIZE (php-7.0.21.tar.xz) = 12626276




--- main/php_ini.c.orig	2017-06-14 13:27:29 UTC
+++ main/php_ini.c
@@ -280,7 +280,7 @@ static void php_ini_parser_cb(zval *arg1
 				size_t key_len;
 
 				/* PATH sections */
-				if (zend_string_equals_literal_ci(Z_STR_P(arg1), "PATH")) {
+				if (!zend_binary_strncasecmp(Z_STRVAL_P(arg1), Z_STRLEN_P(arg1), "PATH", sizeof("PATH") - 1, sizeof("PATH") - 1)) {
 					key = Z_STRVAL_P(arg1);
 					key = key + sizeof("PATH") - 1;
 					key_len = Z_STRLEN_P(arg1) - sizeof("PATH") + 1;
@@ -291,7 +291,7 @@ static void php_ini_parser_cb(zval *arg1
 					TRANSLATE_SLASHES_LOWER(key);
 
 				/* HOST sections */
-				} else if (zend_string_equals_literal_ci(Z_STR_P(arg1), "HOST")) {
+				} else if (!zend_binary_strncasecmp(Z_STRVAL_P(arg1), Z_STRLEN_P(arg1), "HOST", sizeof("HOST") - 1, sizeof("HOST") - 1)) {
 					key = Z_STRVAL_P(arg1);
 					key = key + sizeof("HOST") - 1;
 					key_len = Z_STRLEN_P(arg1) - sizeof("HOST") + 1;
@@ -328,7 +328,9 @@ static void php_ini_parser_cb(zval *arg1
 						zend_hash_init(Z_ARRVAL(section_arr), 8, NULL, (dtor_func_t) config_zval_dtor, 1);
 						entry = zend_hash_str_update(target_hash, key, key_len, &section_arr);
 					}
-					active_ini_hash = Z_ARRVAL_P(entry);
+					if (Z_TYPE_P(entry) == IS_ARRAY) {
+						active_ini_hash = Z_ARRVAL_P(entry);
+					}
 				}
 			}
 			break;

Return to bug 220531

Lines 2-9 Link Here

(-)lang/php70/Makefile (-16 / +2 lines)
2	# $FreeBSD$	2	# $FreeBSD$
3		3
4	PORTNAME= php70	4	PORTNAME= php70
5	PORTVERSION= 7.0.20	5	PORTVERSION= 7.0.21
6	PORTREVISION?= 1	6	PORTREVISION?= 0
7	CATEGORIES?= lang devel www	7	CATEGORIES?= lang devel www
8	MASTER_SITES= PHP/distributions	8	MASTER_SITES= PHP/distributions
9	DISTNAME= php-${PORTVERSION}	9	DISTNAME= php-${PORTVERSION}
Lines 120-139 PLIST_SUB+= SAPI_INC="" Link Here
120	PLIST_SUB+= SAPI_INC="@comment "	120	PLIST_SUB+= SAPI_INC="@comment "
121	.endif	121	.endif
122		122
123	.if !defined(WITH_REGEX_TYPE) \|\| ${WITH_REGEX_TYPE} == "php"
124	CONFIGURE_ARGS+=--with-regex=php
125	.elif defined(WITH_REGEX_TYPE) && ${WITH_REGEX_TYPE} == "system"
126	CONFIGURE_ARGS+=--with-regex=system
127	.endif
128
129	.if !defined(WITH_ZEND_VM) \|\| ${WITH_ZEND_VM} == "CALL"
130	CONFIGURE_ARGS+=--with-zend-vm=CALL
131	.elif defined(WITH_ZEND_VM) && ${WITH_ZEND_VM} == "SWITCH"
132	CONFIGURE_ARGS+=--with-zend-vm=SWITCH
133	.elif defined(WITH_ZEND_VM) && ${WITH_ZEND_VM} == "GOTO"
134	CONFIGURE_ARGS+=--with-zend-vm=GOTO
135	.endif
136
137	CONFIGURE_ENV+= ac_cv_decimal_fp_supported="no" \	123	CONFIGURE_ENV+= ac_cv_decimal_fp_supported="no" \
138	lt_cv_path_SED="sed"	124	lt_cv_path_SED="sed"
139		125

Lines 1-31 Link Here

(-)lang/php70/files/patch-main_php__ini.c (-31 lines)
1	--- main/php_ini.c.orig 2017-06-14 13:27:29 UTC
2	+++ main/php_ini.c
3	@@ -280,7 +280,7 @@ static void php_ini_parser_cb(zval *arg1
4	size_t key_len;
5
6	/* PATH sections */
7	- if (zend_string_equals_literal_ci(Z_STR_P(arg1), "PATH")) {
8	+ if (!zend_binary_strncasecmp(Z_STRVAL_P(arg1), Z_STRLEN_P(arg1), "PATH", sizeof("PATH") - 1, sizeof("PATH") - 1)) {
9	key = Z_STRVAL_P(arg1);
10	key = key + sizeof("PATH") - 1;
11	key_len = Z_STRLEN_P(arg1) - sizeof("PATH") + 1;
12	@@ -291,7 +291,7 @@ static void php_ini_parser_cb(zval *arg1
13	TRANSLATE_SLASHES_LOWER(key);
14
15	/* HOST sections */
16	- } else if (zend_string_equals_literal_ci(Z_STR_P(arg1), "HOST")) {
17	+ } else if (!zend_binary_strncasecmp(Z_STRVAL_P(arg1), Z_STRLEN_P(arg1), "HOST", sizeof("HOST") - 1, sizeof("HOST") - 1)) {
18	key = Z_STRVAL_P(arg1);
19	key = key + sizeof("HOST") - 1;
20	key_len = Z_STRLEN_P(arg1) - sizeof("HOST") + 1;
21	@@ -328,7 +328,9 @@ static void php_ini_parser_cb(zval *arg1
22	zend_hash_init(Z_ARRVAL(section_arr), 8, NULL, (dtor_func_t) config_zval_dtor, 1);
23	entry = zend_hash_str_update(target_hash, key, key_len, &section_arr);
24	}
25	- active_ini_hash = Z_ARRVAL_P(entry);
26	+ if (Z_TYPE_P(entry) == IS_ARRAY) {
27	+ active_ini_hash = Z_ARRVAL_P(entry);
28	+ }
29	}
30	}
31	break;