Commit Graph

84382 Commits

Author SHA1 Message Date
Dmitry Stogov
f2b0370193 Use 'const' qualifier for pointrs to code used at run-time (the code must not be changed) 2014-08-28 02:44:06 +04:00
Anatol Belski
ca0069bc33 fix remaining 's' args for pgsql 2014-08-28 00:21:12 +02:00
Johannes Schlüter
dadbbf8945 Fix compilation on systems without ecdh_curve 2014-08-28 00:12:48 +02:00
Anatol Belski
7d6c3e01c9 fix remaining 's' args for openssl 2014-08-28 00:05:29 +02:00
Anatol Belski
734e11cca7 fixed remaining 's' args for ftp 2014-08-27 23:56:19 +02:00
Lior Kaplan
d3fd3a0b66 Merge branch 'PHP-5.6'
* PHP-5.6:
  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:50:31 +03: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
Anatol Belski
cf430b9a6f fix linkinfo() 2014-08-27 23:44:28 +02: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
Anatol Belski
e6dcd19aed restore the old part of ezmlm_hash() 2014-08-27 23:14:54 +02:00
Anatol Belski
0e41927ca0 fixed UConverter::convert() 2014-08-27 23:03:58 +02:00
Anatol Belski
a1a4a6101c fix typo 2014-08-27 22:47:13 +02:00
Anatol Belski
2ee3ec999b fixed php_wddx_packet_start signature 2014-08-27 22:45:19 +02:00
Nikita Popov
f099c3f2ec Merge branch 'PHP-5.6' 2014-08-27 22:18:55 +02:00
Anatol Belski
60373b2ac2 fix signature 2014-08-27 22:17:16 +02:00
Nikita Popov
fc5f931663 Fix bug #67917 (gmp compound assignment operator leak) 2014-08-27 22:16:20 +02:00
Anatol Belski
232459efd0 fix signature 2014-08-27 22:13:01 +02:00
Anatol Belski
074c68e9ce fix signature 2014-08-27 22:05:26 +02:00
Anatol Belski
039f512289 fix signature 2014-08-27 22:01:43 +02:00
Anatol Belski
1e3e9e0bbb 's' and size_t - fix some invalid pointers and the remaining ext/mcrypt parts 2014-08-27 21:53:06 +02:00
Anatol Belski
bf96ee95ce 's' works with size_t round 4 2014-08-27 20:49:37 +02:00
Anatol Belski
6db8d4f829 's' works with size_t round 3 2014-08-27 20:49:36 +02:00
Anatol Belski
bdc4f23517 updated UPGRADING.INTERNALS 2014-08-27 20:49:34 +02:00
Anatol Belski
257ed4061a 's' works with size_t round 2 2014-08-27 20:49:33 +02:00
Anatol Belski
5882446b8b revert an accident 2014-08-27 20:49:32 +02:00
Anatol Belski
3234480827 first show to make 's' work with size_t 2014-08-27 20:49:31 +02:00
Dmitry Stogov
ee552b628c Reorder fields for better nenory consumtion and data locality on 64-bit systems 2014-08-27 22:45:27 +04:00
Dmitry Stogov
b1f53ca415 Use efree_size() instead of efree() where posible 2014-08-27 20:49:56 +04:00
Chris Wright
0a1df74895 Merge branch 'PHP-5.6'
* PHP-5.6:
  Fix stream_select() issue with OpenSSL buffer
2014-08-27 16:35:28 +01:00
Dmitry Stogov
8ec40397cd Cleanup IS_VAR handling 2014-08-27 19:10:29 +04: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
Tjerk Meesters
a79b933384 Fixed corruption of execute_data when ZEND_STRLEN has to cast an object to string. 2014-08-27 23:00:11 +08: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
a831bd40d0 Merge branch 'PHP-5.6'
* PHP-5.6:
  fixed DBG_INF macro name
  reworked NEWS for 5.6.0GA
2014-08-27 12:11:59 +02: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
Dmitry Stogov
37f9f10f01 Improved performance of json_encode() 2014-08-27 13:37:54 +04:00
Julien Pauli
1d6e9e8fb7 reworked NEWS for 5.6.0GA 2014-08-27 10:47:44 +02:00
Anatol Belski
316705c7ed add note about 'l' and zend_long 2014-08-27 09:26:25 +02:00
Xinchen Hui
24ab7b53f2 It should be int 2014-08-27 12:14:57 +08:00
Xinchen Hui
8b87534468 Fixed folder mark 2014-08-27 12:13:17 +08:00
Ferenc Kovacs
bed26ae569 Merge branch 'PHP-5.6'
* PHP-5.6:
  fix the NEWS
2014-08-27 04:53:22 +02:00
Ferenc Kovacs
f39ff29366 fix the NEWS 2014-08-27 04:51:24 +02:00
Tjerk Meesters
18b1c4373d Merge PHP RFC: Closure::call
Commits:
  NEWS, UPGRADING
  Fixed Closure::apply() for int64
  Just return, no need for RETURN_NULL()
  Revert "Fixed closure::bindTo bad args test"
  Accuracy
  Fixed issues spotted by code review
  Comment clarification
  Old comment, whitespace
  Don't allow unbound scoped closures; make ->call used passed object as scope
  Removed unused variable
  Fixed and cleaned up implementaton of Closure::call() for phpng
  Fixed closure::bindTo bad args test
  Fixed unbound scoped closure edge cases and added tests for them
  Rename ::apply to ::call for the sake of JS consistency
  Added test for unbound_scoped
  Added optional bool param $unbound_scoped to Closure::bind and ::bindTo
  Implemented Closure::apply
2014-08-27 10:28:16 +08:00
Ferenc Kovacs
014563fe1c Merge branch 'PHP-5.6'
* PHP-5.6:
  add the NEWS entries from the last stable release
2014-08-27 04:24:26 +02:00
Ferenc Kovacs
bd3e758cf8 add the NEWS entries from the last stable release 2014-08-27 04:23:55 +02:00
Ferenc Kovacs
384bcc54b3 Merge branch 'PHP-5.6'
* PHP-5.6:
  almost forgot to bump this
  from now on, this should be 5.6.1-dev
2014-08-27 04:19:04 +02:00
Ferenc Kovacs
7ec03b481a almost forgot to bump this 2014-08-27 04:18:23 +02:00