461add8adf
Merge branch 'PHP-7.0' into PHP-7.1
...
* PHP-7.0:
Fix occasionaly failing test
2016-11-27 10:20:50 +01:00
54c04befc2
Merge branch 'PHP-5.6' into PHP-7.0
...
* PHP-5.6:
Fix occasionaly failing test
2016-11-27 10:20:38 +01:00
2a80758fd5
Fix occasionaly failing test
2016-11-27 10:20:13 +01:00
8101024ad4
Merge branch 'PHP-7.0' into PHP-7.1
...
* PHP-7.0:
Added missing array key to $JUNIT
2016-11-27 10:08:14 +01:00
f9b158df07
Merge branch 'PHP-5.6' into PHP-7.0
...
* PHP-5.6:
Added missing array key to $JUNIT
2016-11-27 10:08:04 +01:00
28cf42568b
Added missing array key to $JUNIT
2016-11-27 10:07:05 +01:00
8c61bd2e9a
Merge branch 'PHP-7.0' into PHP-7.1
...
* PHP-7.0:
acinclude.m4: fix krb5-config detection and usage in PHP_SETUP_KERBEROS.
Add more mbfl string size checks (bug #73505 )
2016-11-26 15:37:06 -08:00
343c056772
Merge branch 'PHP-5.6' into PHP-7.0
...
* PHP-5.6:
acinclude.m4: fix krb5-config detection and usage in PHP_SETUP_KERBEROS.
Add more mbfl string size checks (bug #73505 )
2016-11-26 15:36:57 -08:00
114277ed45
acinclude.m4: fix krb5-config detection and usage in PHP_SETUP_KERBEROS.
...
When building with kerberos support (--with-kerberos), a few libraries
and flags need to be added to various parts of the build system. The
most reliable way to get those flags is through the krb5-config
program that ships with both major implementations of kerberos. The
PHP_SETUP_KERBEROS macro in acinclude.m4 attempts to detect
krb5-config, and use it.
However, there's a bug in that macro. The --with-kerberos parameter
accepts a directory where the kerberos libraries can be found. When a
directory is given, it is stored in the PHP_KERBEROS variable. The
following test,
if test "$PHP_KERBEROS" = "yes" && test -x "$KRB5_CONFIG"; then
thus fails whenever a directory is passed to --with-kerberos, since it
compares a directory name against the string "yes". This causes
krb5-config to go unused, and some unreliable fallback logic is
attempted instead. One consequence of this is that the Heimdal
kerberos implementation cannot be substituted for the MIT one, at
least when a directory is passed to --with-kerberos.
This commit reverses the logic and checks for "$PHP_KERBEROS" != "no".
To confirm that this fixes the issue, one can inspect the "-l" library
flags that get appended to the command-line. On a machine with Heimdal
and the unmodified acinclude.m4, running
./configure --with-openssl --with-kerberos=/usr
will log (for example) to config.log,
configure:18082: checking for krb5-config
configure:18101: found /usr/bin/krb5-config
configure:18114: result: /usr/bin/krb5-config
configure:18450: checking for RAND_egd
configure:18450: cc ... conftest.c ... -lgssapi_krb5 -lkrb5 ...
which are the library names for the MIT implementation. After patching
acinclude.m4 to negate the logic, the same command on the same machine
outputs (to config.log):
configure:18450: cc ... conftest.c -lgssapi -lheimntlm ...
These are the correct library names for the Heimdal implementation.
PHP-Bug: 73214
2016-11-26 15:36:49 -08:00
bc85678df3
Add more mbfl string size checks (bug #73505 )
2016-11-26 14:49:48 -08:00
dd7eee0609
Merge branch 'PHP-7.0' into PHP-7.1
...
* PHP-7.0:
Add more mbfl string size checks (bug #73505 )
2016-11-26 14:48:50 -08:00
58cdd03d92
Merge branch 'PHP-5.6' into PHP-7.0
...
* PHP-5.6:
Add more mbfl string size checks (bug #73505 )
2016-11-26 14:48:40 -08:00
5ee02b207d
Add more mbfl string size checks (bug #73505 )
2016-11-26 14:47:58 -08:00
09085ac02c
Merge branch 'PHP-7.0' into PHP-7.1
2016-11-26 16:09:45 +01:00
003727d851
Fix #73612 : preg_*() may leak memory
...
We have to make sure that collectible zvals end up in the GC root
buffer, to avoid memory leaks.
2016-11-26 15:34:27 +01:00
1229b2be26
Merge branch 'PHP-7.0' into PHP-7.1
...
* PHP-7.0:
Fix more size_t/int implicit conversions
Fix int/size_t confusion in isValidPharFilename (bug #73580 )
2016-11-25 18:57:06 -08:00
f9a80a0a29
Merge branch 'PHP-7.0' into PHP-7.1
...
* PHP-7.0:
Fix more size_t/int implicit conversions
2016-11-25 15:32:59 -08:00
8be94d46f8
Fix more size_t/int implicit conversions
...
Now the conversions are explicit and do checks. Not sure it's
the best way but at least we can see them now in the open.
2016-11-25 15:31:50 -08:00
bcc913fa8b
Fix int/size_t confusion in isValidPharFilename (bug #73580 )
2016-11-25 15:31:50 -08:00
ffb65ba833
Merge branch 'PHP-7.1' of git.php.net:php-src into PHP-7.1
...
* 'PHP-7.1' of git.php.net:php-src:
Fix #73582 : Failing ext/gd/tests/imagettftext_charmap_order.phpt
2016-11-25 15:31:22 -08:00
7010547c4e
Fix more size_t/int implicit conversions
...
Now the conversions are explicit and do checks. Not sure it's
the best way but at least we can see them now in the open.
2016-11-25 15:30:20 -08:00
51ba53ed0f
Merge branch 'PHP-7.0' into PHP-7.1
2016-11-25 23:27:13 +01:00
bc979aee6d
Merge branch 'PHP-5.6' into PHP-7.0
2016-11-25 23:16:18 +01:00
7f529e3dee
Fix #73582 : Failing ext/gd/tests/imagettftext_charmap_order.phpt
...
This test is not supposed to work with JIS-mapped Japanese font support
enabled.
2016-11-25 23:14:08 +01:00
2cc3df3252
Merge branch 'PHP-7.0' into PHP-7.1
...
* PHP-7.0:
Fix int/size_t confusion in isValidPharFilename (bug #73580 )
2016-11-25 13:43:59 -08:00
cb6bcaa61f
Fix int/size_t confusion in isValidPharFilename (bug #73580 )
2016-11-25 13:42:35 -08:00
c26e96a05d
Merge branch 'PHP-7.0' into PHP-7.1
...
* PHP-7.0:
add test for bug #57547
2016-11-24 19:27:50 +01:00
a36dd1dfd8
add test for bug #57547
2016-11-24 19:25:47 +01:00
ec366eac5f
Updated to version 2016.10 (2016j)
2016-11-24 10:40:15 +00:00
54b9cd5443
Empty merge
2016-11-24 10:40:15 +00:00
c38f2c2a6b
Updated to version 2016.10 (2016j)
2016-11-24 10:40:14 +00:00
0fcb39dbaa
Empty merge
2016-11-24 10:40:13 +00:00
6785ea2340
Updated to version 2016.10 (2016j)
2016-11-24 10:40:11 +00:00
f6bbeab67f
Update NEWS
2016-11-24 12:04:03 +08:00
c1c91c95a6
Merge branch 'PHP-7.0' into PHP-7.1
...
* PHP-7.0:
Fixed bug #73585 (Logging of "Internal Zend error - Missing class information" missing class name)
2016-11-24 12:03:44 +08:00
e19d263d81
Fixed bug #73585 (Logging of "Internal Zend error - Missing class information" missing class name)
...
Actually, I doubt how thing bug could be triggered
2016-11-24 12:02:02 +08:00
0880f2d2f3
Merge branch 'PHP-7.0' into PHP-7.1
2016-11-24 01:58:46 +01:00
f8a7676fc8
Merge branch 'PHP-5.6' into PHP-7.0
2016-11-24 01:57:42 +01:00
e715dafae0
5.6.30 will be next
2016-11-24 01:54:23 +01:00
b9f4100291
CS (no leading space in comment for config option)
2016-11-23 14:56:39 +01:00
a0b28434cc
Fixed bug #73583 (Segfaults when conditionally declared class and function have the same name)
...
bug was introduced in rev 88eae43f
2016-11-23 14:24:46 +08:00
1c733a345f
Merge branch 'PHP-7.0' into PHP-7.1
2016-11-22 19:25:53 +01:00
5b88c61580
Merge branch 'PHP-5.6' into PHP-7.0
2016-11-22 19:25:31 +01:00
2d19c92fc2
Make php_url_parse_ex() respect length argument
...
This should fix all out-of-bounds reads that could previously
occur if the string passed to php_url_parse_ex() is not NUL
terminated.
2016-11-22 19:24:24 +01:00
f0f68c7274
Cleanup parse_url() query/fragment handling
...
The query/fragment handling was pretty convoluted, with many parts
being duplicated. Simplify by checking for fragment, then for query,
then for path.
2016-11-22 19:24:23 +01:00
9befad6fc2
Cleanup parse_url() gotos
...
Simplify some unnecessarily complicated code. In particular the
length updates are unnecessary (length is only used at the very
start) and we're goto'ing around a bit too much.
2016-11-22 19:24:21 +01:00
1208acfa1b
Merge branch 'PHP-7.0' into PHP-7.1
...
* PHP-7.0:
update libs_versions.txt
update libs versions.txt
2016-11-22 12:44:06 +01:00
13c45021dc
update libs_versions.txt
2016-11-22 12:42:57 +01:00
189deb9fa3
Merge branch 'PHP-5.6' into PHP-7.0
...
* PHP-5.6:
update libs versions.txt
2016-11-22 12:42:20 +01:00
3e45385903
update libs versions.txt
2016-11-22 12:36:51 +01:00
Matteo Beccati