Commit Graph

79916 Commits

Author SHA1 Message Date
Bob Weinand
33699a4dab Messed up syntax of tests 2014-07-02 12:43:27 +02:00
Bob Weinand
09d1a8aaab Add tests for constant expression arrays
Adding one failing (!) test for now about circular constant references embedded in a constant AST, must be fixed before PHP 5.6 release.
2014-07-02 12:33:46 +02:00
Xinchen Hui
05cc46a96b Update NEWs 2014-07-02 17:58:37 +08:00
Xinchen Hui
f48f311533 Merge branch 'PHP-5.5' into PHP-5.6 2014-07-02 17:58:11 +08:00
Xinchen Hui
22882a9d89 Fixed bug #67539 (ArrayIterator use-after-free due to object change during sorting) 2014-07-02 17:57:42 +08:00
Xinchen Hui
df78c48354 Fixed Bug #67538 (SPL Iterators use-after-free) 2014-07-02 17:45:09 +08:00
Anatol Belski
9e2d08923f Merge branch 'PHP-5.5' into PHP-5.6 2014-07-02 11:36:00 +02:00
Anatol Belski
131e60ce56 Merge branch 'PHP-5.4' into PHP-5.5 2014-07-02 11:35:42 +02:00
Anatol Belski
5efda71e54 bundle deplister.exe with releases 2014-07-02 11:34:37 +02:00
Anatol Belski
b69f369d3d Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
  backported the VC12 fix for ARG_MAX
2014-07-02 11:12:32 +02:00
Anatol Belski
49e175be42 backported the VC12 fix for ARG_MAX 2014-07-02 11:11:39 +02:00
Michael Wallner
122ee0a1cf Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
  fix integer overflow in {stream,file}_{get,put}_contents()
2014-07-02 09:56:05 +02:00
Michael Wallner
1e06c73192 Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
  fix integer overflow in {stream,file}_{get,put}_contents()
2014-07-02 09:55:15 +02:00
Michael Wallner
34e686c556 fix integer overflow in {stream,file}_{get,put}_contents() 2014-07-02 09:53:03 +02:00
Ferenc Kovacs
d5d95f8935 add some missing NEWS entries 2014-07-02 02:18:48 +02:00
Ferenc Kovacs
996fc57515 NEWS block for 5.6.0RC3 2014-07-02 01:39:26 +02:00
Adam Harvey
d1adf55c15 Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
  Fix ext/pgsql builds with libpq < 7.3.
2014-07-01 13:25:55 -07:00
Adam Harvey
2e02f18b15 Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
  Fix ext/pgsql builds with libpq < 7.3.
2014-07-01 13:23:11 -07:00
Adam Harvey
899fe3d8af Fix ext/pgsql builds with libpq < 7.3.
Fixes bug #67550 (Error in code "form" instead of "from", pgsql.c, line 756).
2014-07-01 13:19:22 -07:00
Anatol Belski
765b0ee715 Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
  updated libs_version.txt
  updated libs_version.txt
2014-07-01 10:34:55 +02:00
Anatol Belski
5d687afa89 updated libs_version.txt 2014-07-01 10:34:25 +02:00
Anatol Belski
f326713e42 Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
  updated libs_version.txt
2014-07-01 10:34:00 +02:00
Anatol Belski
6081dd781a updated libs_version.txt 2014-07-01 10:33:09 +02:00
Anatol Belski
3fd792b3b9 updated libmagic.patch in 5.6+ 2014-07-01 10:28:43 +02:00
Anatol Belski
48746387b3 Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
  updated libmagic.patch
2014-07-01 10:28:20 +02:00
Anatol Belski
4965d1c2ce Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
  updated libmagic.patch
2014-07-01 10:27:38 +02:00
Anatol Belski
af5f997a5d updated libmagic.patch 2014-07-01 10:25:20 +02:00
Dmitry Stogov
2330be5641 Fixed possible crash because of race conditions on modifying constants in shared memory 2014-07-01 00:13:34 +04:00
Ferenc Kovacs
023d53fea5 remove the NEWS entry for the reverted fpm fix 2014-06-30 18:39:06 +02:00
Ferenc Kovacs
d810c2139f Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
  remove the NEWS entry for the reverted fpm fix
  remove the NEWS entry for the reverted fpm fix
  Revert "Fix Bug #67530 	error_log=syslog ignored"
2014-06-30 18:38:54 +02:00
Ferenc Kovacs
e5fdb5b3f0 remove the NEWS entry for the reverted fpm fix 2014-06-30 18:38:31 +02:00
Ferenc Kovacs
af9ce6e650 Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
  remove the NEWS entry for the reverted fpm fix
  Revert "Fix Bug #67530 	error_log=syslog ignored"
2014-06-30 18:38:15 +02:00
Ferenc Kovacs
48df4464ea remove the NEWS entry for the reverted fpm fix 2014-06-30 18:37:56 +02:00
Ferenc Kovacs
9c8b42960d Revert "Fix Bug #67530 error_log=syslog ignored"
This reverts commit a0ecb3794f.
2014-06-30 18:37:23 +02:00
Ferenc Kovacs
3ec93ee19f Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
  --enable-fpm for the travis build
2014-06-30 12:30:49 +02:00
Ferenc Kovacs
803cfe32e6 --enable-fpm for the travis build 2014-06-30 12:30:24 +02:00
Ferenc Kovacs
6d8d5e9310 fix the last fpm NEWS entry, the other bug is related, but not the same what we fixed here 2014-06-30 02:32:06 +02:00
Ferenc Kovacs
e7c88637c2 NEWS 2014-06-30 01:35:02 +02:00
Ferenc Kovacs
d1fb869e78 Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
  NEWS
  Fix bug #67091: make install fails to install libphp5.so on FreeBSD 10.0
2014-06-30 01:34:47 +02:00
Ferenc Kovacs
12885ef489 NEWS 2014-06-30 01:34:29 +02:00
Ferenc Kovacs
a52616b759 Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
  Fix bug #67091: make install fails to install libphp5.so on FreeBSD 10.0
2014-06-30 01:34:05 +02:00
Ferenc Kovacs
a7d1656b96 Fix bug #67091: make install fails to install libphp5.so on FreeBSD 10.0
Simplest fix is to remove the specific checks for freebsd1* as it also matches freebsd10,
and nobody should be using >=PHP 5.4 with freebsd 1.x(if it is even possible to make it
to compile there).
2014-06-30 01:31:10 +02:00
Ferenc Kovacs
19e5852ad8 adding NEWS entry for the fix for bug #65641 2014-06-30 01:02:22 +02:00
Ferenc Kovacs
d96de86b5b Merge branch 'pull-request/694' into PHP-5.6
* pull-request/694:
  Fix SetHandler proxy:fcgi:// incompatibilities
2014-06-30 00:51:59 +02:00
Felipe Pena
82f0b934a9 - CS 2014-06-29 09:57:57 -03:00
Bob Weinand
b1e32a4f7a Updated NEWS file for recent phpdbg fixes 2014-06-29 12:54:33 +02:00
Bob Weinand
1dd3bab1df Merge sapi/phpdbg into PHP-5.6 2014-06-29 12:49:10 +02:00
Bob Weinand
58c69746e5 Fixed issue krakjoe/phpdbg#94 - List behavior is inconsistent 2014-06-29 12:43:51 +02:00
Bob Weinand
4fde0c258e Fix issue krakjoe/phpdbg#97 - list now appends a newline if there is none
The prompt should always ensure it is on a newline
2014-06-29 12:18:39 +02:00
Xinchen Hui
959a006d61 Fixed test 2014-06-29 18:00:31 +08:00