clones/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2024-09-24 03:17:26 +00:00
Code Issues Packages Projects Releases Wiki Activity
80,431 Commits 491 Branches 1,363 Tags 846 MiB
3d9f460313
Commit Graph

80431 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Matteo Beccati
72c9b0e12b Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  Fixed test with freetype >= 2.4.12
 2014-09-03 09:44:59 +02:00
Matteo Beccati
592df89027 Fixed test with freetype >= 2.4.12 2014-09-03 09:43:29 +02:00
Stanislav Malyshev
3e7d11b632 Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  5.4.34 is next
 2014-09-02 15:04:00 -07:00
Stanislav Malyshev
a734acd439 Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  5.4.34 is next

Conflicts:
	configure.in
	main/php_version.h
 2014-09-02 15:03:54 -07:00
Stanislav Malyshev
5e95b61639 5.4.34 is next 2014-09-02 15:03:04 -07:00
Stanislav Malyshev
0c6e2b5219 Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  Revert "Fix bug #67644 - Memory corruption & crash during ob_start function callback"
 2014-09-02 14:19:03 -07:00
Stanislav Malyshev
70f92aa97e Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  Revert "Fix bug #67644 - Memory corruption & crash during ob_start function callback"
 2014-09-02 14:18:05 -07:00
Stanislav Malyshev
fe551c089a Revert "Fix bug #67644 - Memory corruption & crash during ob_start function callback" 
This reverts commit 53fa6c5b6b.
The change breaks tests, so not putting it into 5.4.
 2014-09-02 14:15:39 -07:00
Stanislav Malyshev
63f42adbb2 Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  Fix bug #67644 - Memory corruption & crash during ob_start function callback
 2014-09-02 12:32:40 -07:00
Stanislav Malyshev
af85eff5b6 Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  Fix bug #67644 - Memory corruption & crash during ob_start function callback
 2014-09-02 12:32:03 -07:00
Stanislav Malyshev
53fa6c5b6b Fix bug #67644 - Memory corruption & crash during ob_start function callback 2014-09-02 12:31:03 -07:00
Nikita Popov
834daa455b Fixed bug #50175 
0x and 0b prefix is now only handled if either no base is given
or if the base is 16 (0x) or 2 (0b). Always handling it is incorrect
because 0x and 0b are perfectly valid numbers in other bases.
 2014-09-02 19:04:55 +02:00
Nikita Popov
7533243f0c Fix C89 build and small cleanup 2014-09-02 18:52:13 +02:00
Leigh
47d630e7f0 Implement gmp_import() and gmp_export() 2014-09-02 14:19:18 +02:00
Tjerk Meesters
f54451cf39 Make DOMNode::textContent writeable 2014-09-02 06:34:18 +08:00
Tjerk Meesters
8da58e36b4 Updated UPGRADING 2014-09-02 06:32:56 +08:00
Tjerk Meesters
83bacd2fe0 Updated NEWS 2014-09-02 06:32:56 +08:00
Stanislav Malyshev
57f82819e9 Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  update NEWS
  Only destruct if EG(active) in zend_shutdown(). (bug #65463, #66036)
  Fix typo from commit 32314f6b6
  Fix destruction order in zend_shutdown (bug #65463, #66036)
 2014-09-01 12:20:34 -07:00
Stanislav Malyshev
4b9fcc01d4 Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  update NEWS
  Only destruct if EG(active) in zend_shutdown(). (bug #65463, #66036)
  Fix typo from commit 32314f6b6
  Fix destruction order in zend_shutdown (bug #65463, #66036)
 2014-09-01 12:15:54 -07:00
Stanislav Malyshev
30aceaf1a7 update NEWS 2014-09-01 12:13:43 -07:00
Stanislav Malyshev
197095c29e Merge branch 'pull-request/770' into PHP-5.4 
* pull-request/770:
  Only destruct if EG(active) in zend_shutdown(). (bug #65463, #66036)
  Fix typo from commit 32314f6b6
  Fix destruction order in zend_shutdown (bug #65463, #66036)
 2014-09-01 12:11:42 -07:00
Derick Rethans
f89b7ec389 Merge branch 'PHP-5.5' into PHP-5.6 2014-09-01 16:40:54 +01:00
Derick Rethans
21446cd7b6 Merge branch 'PHP-5.4' into PHP-5.5 2014-09-01 16:40:50 +01:00
Derick Rethans
e665a07ab9 - Updated to version 2014.7 (2014g) 2014-09-01 16:40:49 +01:00
Tjerk Meesters
f0ba3e265a Updated UPGRADING for #38409 2014-09-01 22:15:53 +08:00
Tjerk Meesters
65c1e14cb9 Updated NEWS for #38409 2014-09-01 22:13:38 +08:00
Tjerk Meesters
1bf996b324 Added test case 2014-09-01 22:04:25 +08:00
Tjerk Meesters
5270ee1aef Making ini parser typed 
- Added ZEND_INI_SCANNER_TYPED mode for parse_ini_string() and parse_ini_file()
- Added NULL_NULL token to separate it from BOOL_FALSE and BOOL_TRUE
- Added zend_ini_copy_typed_value() function for zval initialisation
- Updated RETURN_TOKEN() to observe scanner_mode
 2014-09-01 22:04:06 +08:00
Nikita Popov
d7368c2531 Fix bug #67938: Segfault when extending interface method with variadic 
We only want to check extra optional args if the proto function is
variadic, not when we're adding extra variadic args.
 2014-08-30 20:43:34 +02:00
Anatol Belski
daefca44b5 updated NEWS 2014-08-30 04:06:00 +02:00
Anatol Belski
c301467f9b Fixed bug #67731 finfo::file() returns invalid mime type for binary files 2014-08-30 04:04:42 +02:00
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