View | Details | Raw Unified | Return to bug 220532 | Differences between
and this patch

Collapse All | Expand All

(-)devel/php71-readline/Makefile (-1 lines)
Lines 1-6 Link Here
1
# $FreeBSD$
1
# $FreeBSD$
2
2
3
PORTREVISION=	1
4
CATEGORIES=	devel
3
CATEGORIES=	devel
5
4
6
MASTERDIR=	${.CURDIR}/../../lang/php71
5
MASTERDIR=	${.CURDIR}/../../lang/php71
(-)lang/php71/Makefile (-2 / +2 lines)
Lines 2-9 Link Here
2
# $FreeBSD$
2
# $FreeBSD$
3
3
4
PORTNAME=	php71
4
PORTNAME=	php71
5
PORTVERSION=	7.1.6
5
PORTVERSION=	7.1.7
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}
(-)lang/php71/distinfo (-3 / +3 lines)
Lines 1-3 Link Here
1
TIMESTAMP = 1497260087
1
TIMESTAMP = 1499413811
2
SHA256 (php-7.1.6.tar.xz) = 01584dc521ab7ec84b502b61952f573652fe6aa00c18d6d844fb9209f14b245b
2
SHA256 (php-7.1.7.tar.xz) = 0d42089729be7b2bb0308cbe189c2782f9cb4b07078c8a235495be5874fff729
3
SIZE (php-7.1.6.tar.xz) = 12808680
3
SIZE (php-7.1.7.tar.xz) = 12831708
(-)lang/php71/files/patch-main_php__ini.c (-40 lines)
Lines 1-40 Link Here
1
--- main/php_ini.c.orig	2017-06-14 13:23:49 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;
32
@@ -638,7 +640,7 @@ int php_init_config(void)
33
 			}
34
 			if (!debpath[0]) {
35
 				/* empty string means default builtin value
36
-				   to allow "/foo/php.d:" or ":/foo/php.d" */
37
+				   to allow "/foo/phd.d:" or ":/foo/php.d" */
38
 				debpath = PHP_CONFIG_FILE_SCAN_DIR;
39
 			}
40
 			lenpath = (int)strlen(debpath);
(-)www/php71-opcache/Makefile (-1 lines)
Lines 1-7 Link Here
1
# $FreeBSD$
1
# $FreeBSD$
2
2
3
CATEGORIES=	www
3
CATEGORIES=	www
4
PORTREVISION=	1
5
4
6
MASTERDIR=	${.CURDIR}/../../lang/php71
5
MASTERDIR=	${.CURDIR}/../../lang/php71
7
6

Return to bug 220532