clones/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2024-09-30 14:26:12 +00:00
Code Issues Packages Projects Releases Wiki Activity
80,195 Commits 494 Branches 1,367 Tags 793 MiB
13b45a36f0
Commit Graph

80195 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Lior Kaplan
13b45a36f0 Add missing CVE IDs for 5.6.0 2014-08-29 11:42:12 +03:00
Lior Kaplan
210e35a2fa Align entiries format to "Fixed bug #..." 2014-08-29 11:42:12 +03:00
Lior Kaplan
49d6472f9f Use #66356 instead of #66714, as the latter is only a regression fix from the former. 2014-08-29 11:42:12 +03:00
Lior Kaplan
cd38d72eee Add an entry for bug#66060 (fixed in 5.5.8) 2014-08-29 11:42:12 +03:00
Stanislav Malyshev
08c63e2a56 Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  fix NEWS for fcgi fix merge
  restore FPM compatibility with mod_fastcgi broken since #694 / 67541, fixes bug 67606
 2014-08-28 23:12:41 -07:00
Stanislav Malyshev
e55c641792 Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  fix NEWS for fcgi fix merge
  restore FPM compatibility with mod_fastcgi broken since #694 / 67541, fixes bug 67606
 2014-08-28 23:11:55 -07:00
Stanislav Malyshev
b206b0e29d fix NEWS for fcgi fix merge 2014-08-28 23:10:32 -07:00
David Zuelke
ee275e34c8 restore FPM compatibility with mod_fastcgi broken since #694 / 67541, fixes bug 67606 2014-08-28 23:06:00 -07:00
Lior Kaplan
a8b97086d7 Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  config.guess: add ppc64le / ppcle support by Anton Blanchard <anton@samba.org>
  libtool: powerpc*le-linux support by Alan Modra <amodra@bigpond.net.au>
 2014-08-28 00:48:28 +03:00
Lior Kaplan
b38ca3adee config.guess: add ppc64le / ppcle support by Anton Blanchard <anton@samba.org> 
Based on http://git.savannah.gnu.org/cgit/config.git/commit/?id=29900d3b
 2014-08-28 00:44:31 +03:00
Lior Kaplan
302ccc195b libtool: powerpc*le-linux support by Alan Modra <amodra@bigpond.net.au> 
Patch created using the following changes in libtool:
http://git.savannah.gnu.org/cgit/libtool.git/commit/?id=75ffb257
http://git.savannah.gnu.org/cgit/libtool.git/commit/?id=056889b8
http://git.savannah.gnu.org/cgit/libtool.git/commit/?id=bd998a7e
http://git.savannah.gnu.org/cgit/libtool.git/commit/?id=429d40a0
http://git.savannah.gnu.org/cgit/libtool.git/commit/?id=8a8dfaec
 2014-08-28 00:37:01 +03:00
Nikita Popov
fc5f931663 Fix bug #67917 (gmp compound assignment operator leak) 2014-08-27 22:16:20 +02:00
Chris Wright
db03216e62 Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  Fix stream_select() issue with OpenSSL buffer
 2014-08-27 16:06:28 +01:00
Chris Wright
30a73658c6 Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  Fix stream_select() issue with OpenSSL buffer

Conflicts:
	ext/openssl/xp_ssl.c
 2014-08-27 16:01:18 +01:00
Chris Wright
32be79dcfa Fix stream_select() issue with OpenSSL buffer 
Ensure data from OpenSSL internal buffer has been
transfered to PHP stream buffer before a select()
emulation operation is performed

Addresses bug #65137
https://bugs.php.net/bug.php?id=65137

Conflicts:
	ext/openssl/xp_ssl.c
 2014-08-27 13:25:50 +01:00
Anatol Belski
4d667eeaf3 Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  fixed DBG_INF macro name
 2014-08-27 12:11:35 +02:00
Anatol Belski
7fac56e072 fixed DBG_INF macro name 2014-08-27 12:10:35 +02:00
Julien Pauli
1d6e9e8fb7 reworked NEWS for 5.6.0GA 2014-08-27 10:47:44 +02:00
Ferenc Kovacs
f39ff29366 fix the NEWS 2014-08-27 04:51:24 +02:00
Ferenc Kovacs
bd3e758cf8 add the NEWS entries from the last stable release 2014-08-27 04:23:55 +02:00
Ferenc Kovacs
7ec03b481a almost forgot to bump this 2014-08-27 04:18:23 +02:00
Ferenc Kovacs
b165be9ae1 from now on, this should be 5.6.1-dev 2014-08-27 04:14:23 +02:00
Ferenc Kovacs
f7b7c14594 update NEWS to reflect what makes into 5.6.0 final 2014-08-27 04:07:37 +02:00
Ferenc Kovacs
86b2d7b523 remove the -dev suffix from the Zend version 2014-08-27 03:52:46 +02:00
Ferenc Kovacs
e0a177d676 Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  update the GIT-RULES with the 5.6 and the release branches
 2014-08-27 00:47:57 +02:00
Ferenc Kovacs
1e1b7c74fb Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  update the GIT-RULES with the 5.6 and the release branches
 2014-08-27 00:47:37 +02:00
Ferenc Kovacs
52f35b984c update the GIT-RULES with the 5.6 and the release branches 2014-08-27 00:47:09 +02:00
Ferenc Kovacs
dbe8c37476 better heading for UPGRADING.INTERNALS 2014-08-26 00:31:36 +02:00
Daniel Lowrey
ffab52ad7d Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  Update NEWS
 2014-08-25 19:50:02 +02:00
Daniel Lowrey
f463523cda Update NEWS 2014-08-25 19:47:35 +02:00
Daniel Lowrey
546a32e2b3 Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  Bug #67850: Build when OpenSSL compiled without SSLv3 support

Conflicts:
	ext/openssl/xp_ssl.c
 2014-08-25 18:16:38 +02:00
Daniel Lowrey
640214701c Bug #67850: Build when OpenSSL compiled without SSLv3 support 2014-08-25 17:28:09 +02:00
Lior Kaplan
6e87b01e95 Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  Bug #67730: Add tests by Ryan Mauger <ryan@rmauger.co.uk>
 2014-08-25 00:30:40 +03:00
Lior Kaplan
c8b3bce407 Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  Bug #67730: Add tests by Ryan Mauger <ryan@rmauger.co.uk>
 2014-08-25 00:30:01 +03:00
Lior Kaplan
bda1cc6946 Bug #67730: Add tests by Ryan Mauger <ryan@rmauger.co.uk> 2014-08-25 00:29:05 +03:00
Ferenc Kovacs
86966a092b Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  this test depends on the simplexml ext, not just on xml
 2014-08-24 00:09:31 +02:00
Ferenc Kovacs
a90d05a430 Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  this test depends on the simplexml ext, not just on xml
 2014-08-24 00:09:00 +02:00
Ferenc Kovacs
cb41a7bad1 this test depends on the simplexml ext, not just on xml 2014-08-24 00:08:09 +02:00
Tjerk Meesters
ce9bdae33f Fixed #67694: Regression in session_regenerate_id() 2014-08-23 09:18:02 +08:00
Michael Wallner
3b82c4e520 Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  fix bug #67865
  updated NEWS to fit last release
  NEWS
  Fix bug #67878 program_prefix not honoured in man pages
 2014-08-21 22:45:33 +02:00
Michael Wallner
c4fb183b9f Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  fix bug #67865
 2014-08-21 22:43:25 +02:00
Michael Wallner
54fbbded37 fix bug #67865 2014-08-21 22:41:36 +02:00
Julien Pauli
dbbf1c2a3c updated NEWS to fit last release 2014-08-21 11:34:38 +02:00
Remi Collet
76c2a9f4f4 NEWS 2014-08-21 09:14:39 +02:00
Remi Collet
e02616866f Fix bug #67878 program_prefix not honoured in man pages 
- add @program_prefix@ in php, phpize and php-config man pages
- set date to 2014
- fix "SEE ALSO" alignment
 2014-08-21 09:14:38 +02:00
Remi Collet
43ed561222 NEWS 2014-08-21 09:14:16 +02:00
Remi Collet
e9166fec62 Fix bug #67878 program_prefix not honoured in man pages 
- add @program_prefix@ in php, phpize and php-config man pages
- set date to 2014
- fix "SEE ALSO" alignment
 2014-08-21 09:14:16 +02:00
Anatol Belski
d3ca974ff5 Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  avoid clash when stdint.h was included after win32/php_stdint.h
 2014-08-21 09:09:29 +02:00
Anatol Belski
713e9a7eaa avoid clash when stdint.h was included after win32/php_stdint.h 2014-08-21 09:08:44 +02:00
Stanislav Malyshev
89d3a356d1 Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  fix test
 2014-08-20 14:44:33 -07:00