clones/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2024-09-21 18:07:23 +00:00
Code Issues Packages Projects Releases Wiki Activity
99,145 Commits 491 Branches 1,363 Tags 836 MiB
04500f1fe0
Commit Graph

99145 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Dmitry Stogov
04500f1fe0 Merge branch 'PHP-7.0' into PHP-7.1 
* PHP-7.0:
  Fixed possible memory leak in &=, |=, ^=.
 2016-12-02 12:35:44 +03:00
Dmitry Stogov
67d90a4870 Fixed possible memory leak in &=, |=, ^=. 2016-12-02 12:34:46 +03:00
Bob Weinand
ad5038bfee Merge branch 'PHP-7.0' into PHP-7.1 2016-12-01 15:21:49 +01:00
Bob Weinand
fcaccbaa22 Fix valgrind issue when throwing due to yield from aborted generator 2016-12-01 15:21:28 +01:00
Anatol Belski
1c2333009f Merge branch 'PHP-7.0' into PHP-7.1 
* PHP-7.0:
  fork tests
 2016-12-01 14:53:22 +01:00
Anatol Belski
2252d4e59d fork tests 2016-12-01 14:52:18 +01:00
Dmitry Stogov
96655ad01e Merge branch 'PHP-7.0' into PHP-7.1 
* PHP-7.0:
  Fixed bad merge
 2016-12-01 16:22:23 +03:00
Dmitry Stogov
7f22e3c879 Fixed bad merge 2016-12-01 16:21:57 +03:00
Dmitry Stogov
d149ba217f Merge branch 'PHP-7.0' into PHP-7.1 
* PHP-7.0:
  Workaround for GCC-4.9.2 bug
  oops, changed in wrong place
 2016-12-01 15:50:19 +03:00
Dmitry Stogov
b7b7dd8cea Merge branch 'PHP-5.6' into PHP-7.0 
* PHP-5.6:
  Workaround for GCC-4.9.2 bug
  oops, changed in wrong place
 2016-12-01 15:50:05 +03:00
Dmitry Stogov
1cd566e13f Workaround for GCC-4.9.2 bug 2016-12-01 15:46:52 +03:00
Anatol Belski
9c7540d357 Merge branch 'PHP-7.0' into PHP-7.1 
* PHP-7.0:
  improve skipif
 2016-12-01 13:33:42 +01:00
Anatol Belski
615c9bfe5a fix condition 2016-12-01 13:33:27 +01:00
Anatol Belski
043d8e2fe1 improve skipif 2016-12-01 13:32:10 +01:00
Anatol Belski
8ecbb660d0 improve skipif 2016-12-01 13:25:28 +01:00
Dmitry Stogov
54244ba565 Fixed access to uninitialized value 2016-12-01 13:25:50 +03:00
Dmitry Stogov
54f7abfe7d Merge branch 'PHP-7.0' into PHP-7.1 
* PHP-7.0:
  Simpler overflow check
  fix gcov coverage
 2016-12-01 10:34:09 +03:00
Dmitry Stogov
003346c450 Simpler overflow check 2016-12-01 10:30:02 +03:00
Anatol Belski
60c875b072 fix dir separator 2016-12-01 01:36:29 +01:00
Davey Shafik
db456d91f4 Update NEWS for the build 2016-11-30 15:14:38 -08:00
Nuno Lopes
d5a2af6d1c Merge branch 'PHP-7.0' of https://git.php.net/push/php-src into PHP-7.0 2016-11-30 14:41:26 -05:00
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
c8778eb293 oops, changed in wrong place 2016-11-27 16:11:41 -08: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