mirrors/php-src
0
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2024-12-15 12:54:57 +08:00
Code Issues Packages Projects Releases Wiki Activity
84,355 Commits 503 Branches 1,384 Tags 820 MiB
ee552b628c
Commit Graph

84355 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Ferenc Kovacs
b165be9ae1 from now on, this should be 5.6.1-dev 2014-08-27 04:14:23 +02:00
Ferenc Kovacs
0ad18975db Merge branch 'PHP-5.6' 
* PHP-5.6:
  update NEWS to reflect what makes into 5.6.0 final
 2014-08-27 04:08:25 +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
4c9eb92856 Merge branch 'PHP-5.6' 
* PHP-5.6:
  remove the -dev suffix from the Zend version

Conflicts:
	Zend/zend.h
 2014-08-27 03:54:06 +02:00
Ferenc Kovacs
86b2d7b523 remove the -dev suffix from the Zend version 2014-08-27 03:52:46 +02:00
Andrea Faulds
2cdd5ba586 NEWS, UPGRADING 2014-08-27 02:07:59 +01:00
Andrea Faulds
7379abba8f Fixed Closure::apply() for int64 2014-08-27 02:05:50 +01:00
Andrea Faulds
17c5e82816 Merge branch 'master' into Closure_apply 2014-08-27 01:53:26 +01:00
Nikita Popov
1984a49b71 Fix zend_highlight functionality I broke 
Magic consts are not supposed to be highlighted as keywords.
 2014-08-27 01:26:57 +02:00
Nikita Popov
f719b9ddcf Fix mbstring overloads in zts 2014-08-27 01:26:57 +02:00
Ferenc Kovacs
2788a718aa Merge branch 'PHP-5.6' 
* PHP-5.6:
  update the GIT-RULES with the 5.6 and the release branches
 2014-08-27 00:48:26 +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
Nikita Popov
694824f302 Fix test with opcache/zts dependent output 
Refcount depends on whether array is immutablized and string is
interned.
 2014-08-27 00:31:20 +02:00
Nikita Popov
95fac3cee3 Fix session handlers in zts 
Also use ZEND_HASH_FOREACH API.
 2014-08-27 00:26:21 +02:00
Dmitry Stogov
614bc31635 Fixed incorrect ZEND_INIT_FCALL_BY_NAME -> ZEND_INIT_FCALL conversion 2014-08-27 01:39:39 +04:00
Nikita Popov
f3b629c982 Move =&new deprecation message into compiler 2014-08-26 23:36:53 +02:00
Nikita Popov
e7f252652f Fix tokenizer test to not depend on specific token numbers 2014-08-26 23:36:53 +02:00
Nikita Popov
f8abb9a462 Handle remaining magic constants in parser as well 
As far as I can see the !filename case cannot occur, so I dropped
it.
 2014-08-26 23:36:52 +02:00
Dmitry Stogov
219794e1cd Split and optimize loop 2014-08-27 00:52:50 +04:00
Nikita Popov
49b4e12e54 Add backup_doc_comment production 
Bison can't detect the type of a mid-rule action, even if it accesses
$<str>$, so need to create a separate rule for this.
 2014-08-26 22:31:58 +02:00
Nikita Popov
b7876e734a eval() with parse error uses clean shutdown now 2014-08-26 22:31:58 +02:00
Nikita Popov
6c687e0d9b Add type annotations to parser 
Conflicts:

	Zend/zend_language_parser.y
 2014-08-26 22:31:58 +02:00
Nikita Popov
c71ab607ff Don't alloc empty jmp opnum list for single-branch if 2014-08-26 22:31:57 +02:00
Anatol Belski
cd8bbfa149 fixed bitset computing on win64 build 2014-08-26 20:43:33 +02:00
Dmitry Stogov
cb37fe1aae Fixed zero-size allocation in debug build 2014-08-26 21:32:20 +04:00