clones/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2024-09-22 10:27:25 +00:00
Code Issues Packages Projects Releases Wiki Activity
82,271 Commits 491 Branches 1,363 Tags 838 MiB
b4c2bd2277
Commit Graph

82271 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Dmitry Stogov
6bf24f4dd0 Removed EG(active_symbol_table) and use corresponding value from EG(current_execute_data) 2014-07-04 18:03:45 +04:00
Dmitry Stogov
d2890963e4 Use values from current_execute_data instead of globals where possible 2014-07-04 17:03:44 +04:00
Michael Wallner
f9fda21667 Merge branch 'PHP-5.6' 
* PHP-5.6:
  BFN for bug #67551 (php://input temp file will be located in sys_temp_dir instead of upload_tmp_dir)
  reorder
  restore API compatibility
  finish
  refactor php_stream_temp_create{,_ex} and use it for the php://input stream
  refactor _php_stream_fopen_{temporary_,tmp}file()
  fix length overflow of HTTP_RAW_POST_DATA

Conflicts:
	main/php_content_types.c
 2014-07-03 20:43:12 +02:00
Michael Wallner
88c1ce3203 BFN for bug #67551 (php://input temp file will be located in sys_temp_dir instead of upload_tmp_dir) 2014-07-03 20:40:41 +02:00
Michael Wallner
155b5d1725 reorder 2014-07-03 20:40:41 +02:00
Michael Wallner
deee0011e1 restore API compatibility 2014-07-03 20:40:41 +02:00
Michael Wallner
438b6c5258 finish 2014-07-03 20:40:40 +02:00
Michael Wallner
40bcd909d8 refactor php_stream_temp_create{,_ex} and use it for the php://input stream 2014-07-03 20:40:40 +02:00
Michael Wallner
11e401ab59 refactor _php_stream_fopen_{temporary_,tmp}file() 2014-07-03 20:40:40 +02:00
Michael Wallner
04c6a5b377 fix length overflow of HTTP_RAW_POST_DATA 2014-07-03 20:40:40 +02:00
Xinchen Hui
21ccbbad7d Fixed segfault if empty POST 2014-07-03 23:58:21 +08:00
Xinchen Hui
a99e7eeab9 Merge branch 'PHP-5.6' 2014-07-03 14:59:24 +08:00
Xinchen Hui
989cdabe25 Update NEWS 2014-07-03 14:59:14 +08:00
Xinchen Hui
4e16054b7a Merge branch 'PHP-5.5' into PHP-5.6 2014-07-03 14:58:53 +08:00
Xinchen Hui
2034ace052 Fixed bug #67215 (php-cgi work with opcache, may be segmentation fault happen) 2014-07-03 14:58:37 +08:00
Xinchen Hui
533b1df732 Add test for bug #67215 
bjori> writing a testcase making sure you get a fatal error and does not
segfault after that... is difficult
 2014-07-03 13:48:59 +08:00
Xinchen Hui
4ef8a44359 Merge branch 'PHP-5.6' 2014-07-03 10:52:03 +08:00
Xinchen Hui
1f6b877f7a Fixed section 2014-07-03 10:51:24 +08:00
Xinchen Hui
1ffd32b952 Merge branch 'PHP-5.5' into PHP-5.6 2014-07-03 10:51:10 +08:00
Xinchen Hui
e17bfb472e Add CVE ID 2014-07-03 10:50:56 +08:00
Dmitry Stogov
c4d99ec982 Removed EG(called_scope) and use corresponding value from EG(current_execute_data) 2014-07-03 02:34:43 +04:00
Ferenc Kovacs
a1c63413cd Merge branch 'PHP-5.6' 
* PHP-5.6:
  also add Remi to the QA credits
  add Stas and Julient to the QA credits
 2014-07-02 23:36:00 +02:00
Ferenc Kovacs
6ca71b451e also add Remi to the QA credits 2014-07-02 23:35:31 +02:00
Ferenc Kovacs
58598ead2c add Stas and Julient to the QA credits 2014-07-02 23:32:50 +02:00
Ferenc Kovacs
f9b3494d99 Merge branch 'PHP-5.6' 
* PHP-5.6:
  update the credits
 2014-07-02 23:27:54 +02:00
Ferenc Kovacs
3be6f0dc79 update the credits 2014-07-02 23:26:41 +02:00
Dmitry Stogov
0a77dcd4b9 Removed EG(in_execution). If EG(currentent_execute_data) is not NULL we are executing something. 2014-07-03 01:02:25 +04:00
Nikita Popov
99b95f3eb2 Merge branch 'PHP-5.6' 2014-07-02 22:41:04 +02:00
Nikita Popov
a91d1bb9a3 Merge branch 'PHP-5.5' into PHP-5.6 2014-07-02 22:40:45 +02:00
Nikita Popov
213e9a0a3c Merge branch 'PHP-5.4' into PHP-5.5 2014-07-02 22:40:33 +02:00
Nikita Popov
18989420b6 Add test for bug #67151 2014-07-02 22:39:54 +02:00
Ferenc Kovacs
f574e69889 Merge branch 'PHP-5.6' 
* PHP-5.6:
  adding a reproduce script for bug #49184
 2014-07-02 22:39:19 +02:00
Ferenc Kovacs
1ef67b8486 Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  adding a reproduce script for bug #49184
 2014-07-02 22:38:53 +02:00
Ferenc Kovacs
c66a4e84bb Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  adding a reproduce script for bug #49184
 2014-07-02 22:38:27 +02:00
Ferenc Kovacs
37a13d2df7 adding a reproduce script for bug #49184 2014-07-02 22:37:58 +02:00
Nikita Popov
2d4d36d2a0 Merge branch 'PHP-5.6' 2014-07-02 22:35:19 +02:00
Nikita Popov
4827806b9e Merge branch 'PHP-5.5' into PHP-5.6 2014-07-02 22:35:00 +02:00
Nikita Popov
8c4156ed28 Merge branch 'PHP-5.4' into PHP-5.5 2014-07-02 22:34:32 +02:00
Nikita Popov
3cc6bd10ac Fix bug #67151: strtr with empty array crashes 2014-07-02 22:33:20 +02:00
Adam Harvey
46055f8e99 Merge branch 'PHP-5.6' 
* PHP-5.6:
  Fix ext/pgsql builds against libpq 7.3.
 2014-07-02 12:30:51 -07:00
Adam Harvey
c580d9b69c Fix ext/pgsql builds against libpq 7.3. 
Fixes bug #67555 (Cannot build against libpq 7.3).
 2014-07-02 12:30:06 -07:00
Dmitry Stogov
63c057e331 Removed EG(opline_ptr) and use corresponding value from EG(current_execute_data) 2014-07-02 23:29:53 +04:00
Dmitry Stogov
4b09dd69e6 Removed EG(active_op_array) and use corresponding value from EG(current_execute_data) 2014-07-02 22:03:21 +04:00
Dmitry Stogov
412ad4b254 Uinified call frame handling for user and internal functions. 
Now EG(current_execute_data) always point to the call frame of the currently executed function.
 2014-07-02 22:01:25 +04:00
Nikita Popov
ac552cccc1 Merge branch 'PHP-5.6' 2014-07-02 17:37:25 +02:00
Nikita Popov
1ea4b17af2 Merge branch 'PHP-5.5' into PHP-5.6 2014-07-02 17:36:27 +02:00
Nikita Popov
d9ebd0f3d6 Fix bug #67497: eval with parse error causes segfault in generator 2014-07-02 17:33:31 +02:00
Bob Weinand
6b0beb9df1 Merge branch 'PHP-5.6' 2014-07-02 17:26:44 +02:00
Bob Weinand
1163a7ce24 Mark test as XFAIL until fixed 2014-07-02 17:25:47 +02:00
Bob Weinand
c01dcd325d Merge branch 'PHP-5.6' 2014-07-02 12:44:30 +02:00