clones/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2024-09-22 02:17:32 +00:00
Code Issues Packages Projects Releases Wiki Activity
99,122 Commits 491 Branches 1,363 Tags 837 MiB
e37412e19c
Commit Graph

99122 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Bob Weinand
e37412e19c Merge branch 'PHP-7.0' into PHP-7.1 2016-11-30 11:45:18 +01:00
Bob Weinand
344ef050aa Fix run-tests.php to always include TEST_PHPDBG_EXECUTABLE if phpdbg available 2016-11-30 11:44:10 +01:00
Bob Weinand
7aaa1a876e Merge branch 'PHP-7.0' into PHP-7.1 2016-11-30 02:57:16 +01:00
Bob Weinand
b73a3afff3 Fixed bug #73615 (phpdbg without option never load .phpdbginit at startup) 2016-11-30 02:56:47 +01:00
Dmitry Stogov
cabcf8971f Merge branch 'PHP-7.0' into PHP-7.1 
* PHP-7.0:
  Fixed bug #73586 (php_user_filter::$stream is not set to the stream the filter is working on).
 2016-11-28 12:57:02 +03:00
Dmitry Stogov
9a9ad56af0 Fixed bug #73586 (php_user_filter::$stream is not set to the stream the filter is working on). 2016-11-28 12:54:47 +03:00
Dmitry Stogov
458c732ed4 Merge branch 'PHP-7.0' into PHP-7.1 
* PHP-7.0:
  Fixed calling generators through magic __call()
 2016-11-28 12:30:01 +03:00
Dmitry Stogov
970f21be97 Fixed calling generators through magic __call() 2016-11-28 12:20:19 +03:00
Stanislav Malyshev
53655c5af1 Merge branch 'PHP-7.0' into PHP-7.1 
* PHP-7.0:
  add NEWS
  Fix #68447: grapheme_extract take an extra trailing character
 2016-11-27 15:38:33 -08:00
Stanislav Malyshev
fe04f5494a Merge branch 'PHP-5.6' into PHP-7.0 
* PHP-5.6:
  add NEWS
 2016-11-27 15:38:22 -08:00
Stanislav Malyshev
36d02a36ae add NEWS 2016-11-27 15:38:09 -08:00
Stanislav Malyshev
f1a9851c3e Merge branch 'PHP-5.6' into PHP-7.0 
* PHP-5.6:
  Fix #68447: grapheme_extract take an extra trailing character
 2016-11-27 15:36:29 -08:00
Stanislav Malyshev
8856b3a63c Merge branch 'pull-request/1974' into PHP-5.6 
* pull-request/1974:
  Fix #68447: grapheme_extract take an extra trailing character
 2016-11-27 15:34:58 -08:00
Stanislav Malyshev
8cc42537d2 Merge branch 'PHP-7.0' into PHP-7.1 
* PHP-7.0:
  Fix #73549: Use after free when stream is passed to imagepng
 2016-11-27 14:53:39 -08:00
Stanislav Malyshev
1cb58ead70 Merge branch 'PHP-5.6' into PHP-7.0 
* PHP-5.6:
  Fix #73549: Use after free when stream is passed to imagepng
 2016-11-27 14:53:27 -08:00
Christoph M. Becker
5049ef2f1c Fix #73549: Use after free when stream is passed to imagepng 
If a stream is passed to imagepng() or other image output functions,
opposed to a filename, we must not close this stream.
 2016-11-27 14:51:02 -08:00
Jakub Zelenka
02cecc0fb5 Update UPGRADING with info about AEAD changes in openssl_(en|de)crypt 2016-11-27 19:05:49 +00:00
Jakub Zelenka
0ebdf3625e Do not add extra timeval entropy when OpenSSL 1.1 used 
It is already added by OpenSSL so it is not needed
 2016-11-27 19:00:05 +00:00
Jakub Zelenka
0f4216298f Clean up and fix php_openssl_dh_pub_from_priv 2016-11-27 18:54:28 +00:00
Matteo Beccati
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
Matteo Beccati
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
Matteo Beccati
2a80758fd5 Fix occasionaly failing test 2016-11-27 10:20:13 +01:00
Matteo Beccati
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
Matteo Beccati
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
Matteo Beccati
28cf42568b Added missing array key to $JUNIT 2016-11-27 10:07:05 +01:00
Stanislav Malyshev
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
Stanislav Malyshev
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
Michael Orlitzky
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
Stanislav Malyshev
bc85678df3 Add more mbfl string size checks (bug #73505) 2016-11-26 14:49:48 -08:00
Stanislav Malyshev
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
Stanislav Malyshev
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
Stanislav Malyshev
5ee02b207d Add more mbfl string size checks (bug #73505) 2016-11-26 14:47:58 -08:00
Christoph M. Becker
09085ac02c Merge branch 'PHP-7.0' into PHP-7.1 2016-11-26 16:09:45 +01:00
Christoph M. Becker
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
Stanislav Malyshev
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
Stanislav Malyshev
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
Stanislav Malyshev
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
Stanislav Malyshev
bcc913fa8b Fix int/size_t confusion in isValidPharFilename (bug #73580) 2016-11-25 15:31:50 -08:00
Stanislav Malyshev
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
Stanislav Malyshev
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
Christoph M. Becker
51ba53ed0f Merge branch 'PHP-7.0' into PHP-7.1 2016-11-25 23:27:13 +01:00
Christoph M. Becker
bc979aee6d Merge branch 'PHP-5.6' into PHP-7.0 2016-11-25 23:16:18 +01:00
Christoph M. Becker
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
Stanislav Malyshev
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
Stanislav Malyshev
cb6bcaa61f Fix int/size_t confusion in isValidPharFilename (bug #73580) 2016-11-25 13:42:35 -08:00
Anatol Belski
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
Anatol Belski
a36dd1dfd8 add test for bug #57547 2016-11-24 19:25:47 +01:00
Derick Rethans
ec366eac5f Updated to version 2016.10 (2016j) 2016-11-24 10:40:15 +00:00
Derick Rethans
54b9cd5443 Empty merge 2016-11-24 10:40:15 +00:00
Derick Rethans
c38f2c2a6b Updated to version 2016.10 (2016j) 2016-11-24 10:40:14 +00:00