1
0
mirror of https://github.com/php/php-src.git synced 2026-04-29 19:23:22 +02:00
Commit Graph

82111 Commits

Author SHA1 Message Date
Dmitry Stogov 21acbd5b75 Avoid useless check 2014-07-07 21:33:53 +04:00
Dmitry Stogov 7d0b21d3bc Function can't be "interactive" 2014-07-07 21:33:09 +04:00
Dmitry Stogov 2ed8a17045 Refactored run_time_cache usage in object handlers 2014-07-07 20:54:31 +04:00
Dmitry Stogov bce6a36c8a Merge branch 'master' into test
* master: (48 commits)
  change locale - looks like not everybody has sl_SI
  Fix bug #66921 - Wrong argument type hint for function intltz_from_date_time_zone
  fix format
  Fix bug #67052 (NumberFormatter::parse() resets LC_NUMERIC setting)
  Make sure the generator script also creates a newline at the end of file
  Add newline at end of file to prevent compilation warning
  Fix handling of session user module custom handlers.
  Reference bug report instead of github issue in NEWS file
  add more exts for Travis
  Update NEWS
  Fix phpdbg.1 man page installation when build != src directory
  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
  Update NEWS
  Fixed bug #67215 (php-cgi work with opcache, may be segmentation fault happen)
  ...

Conflicts:
	ext/opcache/zend_accelerator_util_funcs.c
	ext/session/mod_user.c
	ext/spl/spl_array.c
	ext/spl/spl_dllist.c
	ext/standard/file.c
	ext/standard/streamsfuncs.c
	ext/standard/string.c
	main/streams/memory.c
2014-07-07 19:21:23 +04:00
Dmitry Stogov 477bd49cca Wrong expectation in tests (for some reason backtraces contained invlalid extra frame at the top) 2014-07-07 18:09:17 +04:00
Dmitry Stogov 4dd7c63d1e Wrong expectation in test (The error "Non-static method A::A_ftk() should not be called statically" is reported on caller side, so backtrace shouldn't include call to A::A_ftk()). 2014-07-07 17:27:16 +04:00
Dmitry Stogov e4450cddd4 Wrong expectation in test (for some reason error messages didn't refer to right functions) 2014-07-07 17:22:19 +04:00
Dmitry Stogov 2f316a775d Wrong expectation in test (for some reason backtrace misses gc_collect_cycles() call) 2014-07-07 17:17:42 +04:00
Dmitry Stogov 70a112e51b Wrong expectation in test (wrong line number in backtrace) 2014-07-07 16:57:05 +04:00
Dmitry Stogov 7ce2d59ad2 Merge branch 'call-frame' into phpng
* call-frame:
  Simplify call-frame handling
  Removed EG(active_symbol_table) and use corresponding value from EG(current_execute_data)
  Use values from current_execute_data instead of globals where possible
  Removed EG(called_scope) and use corresponding value from EG(current_execute_data)
  Removed EG(in_execution). If EG(currentent_execute_data) is not NULL we are executing something.
  Removed EG(opline_ptr) and use corresponding value from EG(current_execute_data)
  Removed EG(active_op_array) and use corresponding value from EG(current_execute_data)
  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.
  Fixed cleanup of incompleytely passed parameters
  Prohibited parameter redefinition
  Fixed support for extra arguments in conjunction with variadiv argument. Use compile time flags to check if we call constructor and result of ZEND_NEW is used or not.
  Fixed uninitialized variables
  Optimization
  Changed zend_execute_data layout to reduce memory overhead
  Help C compilet to do the better job optimizing target code
  Use fast comparison for (func->type == ZEND_USER_FUNCTION || func->type == ZEND_EVAL_CODE)
  Keep extra args in the same VM stack segment (after all CV and TMP vars)
  Refactoring: merge call_frame and end_execute_data into single data structure. Keep only single copy of each argument on VM stack (previously ZE kept two copies of each arguments for user functions)
  Refactoring: use call_frames instead of call_slots

Conflicts:
	Zend/zend_vm_def.h
	Zend/zend_vm_execute.h
2014-07-07 16:19:24 +04:00
Dmitry Stogov 5aa91be509 Simplify call-frame handling 2014-07-07 15:50:44 +04:00
Stanislav Malyshev f0499b86a8 Merge branch 'PHP-5.6'
* PHP-5.6:
  change locale - looks like not everybody has sl_SI
2014-07-07 01:38:04 -07:00
Stanislav Malyshev 432bb7abe5 Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
  change locale - looks like not everybody has sl_SI
2014-07-07 01:36:24 -07:00
Stanislav Malyshev c402956178 Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
  change locale - looks like not everybody has sl_SI
2014-07-07 01:36:03 -07:00
Stanislav Malyshev a7d1cad4c3 change locale - looks like not everybody has sl_SI 2014-07-07 01:35:25 -07:00
Stanislav Malyshev 70c0410d3d Merge branch 'PHP-5.6'
* PHP-5.6:
  Fix bug #66921 - Wrong argument type hint for function intltz_from_date_time_zone
  fix format
2014-07-07 00:50:15 -07:00
Stanislav Malyshev 04a227dd16 Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
  Fix bug #66921 - Wrong argument type hint for function intltz_from_date_time_zone
  fix format
2014-07-07 00:50:07 -07:00
Stanislav Malyshev 96c9cc315d Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
  fix format
2014-07-07 00:49:15 -07:00
Stanislav Malyshev 8ba240a70b Fix bug #66921 - Wrong argument type hint for function intltz_from_date_time_zone 2014-07-07 00:48:44 -07:00
Stanislav Malyshev 897b7b68cc fix format 2014-07-07 00:48:32 -07:00
Stanislav Malyshev ff52eac5f0 Merge branch 'PHP-5.6'
* PHP-5.6:
  Fix bug #67052 (NumberFormatter::parse() resets LC_NUMERIC setting)
  Make sure the generator script also creates a newline at the end of file
  Add newline at end of file to prevent compilation warning
2014-07-07 00:38:50 -07:00
Stanislav Malyshev effb2b7a13 Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
  Fix bug #67052 (NumberFormatter::parse() resets LC_NUMERIC setting)
  Make sure the generator script also creates a newline at the end of file
  Add newline at end of file to prevent compilation warning
2014-07-07 00:38:38 -07:00
Stanislav Malyshev 8ddf9a2dc4 Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
  Fix bug #67052 (NumberFormatter::parse() resets LC_NUMERIC setting)
2014-07-07 00:37:59 -07:00
Stanislav Malyshev 6c8a570a96 Fix bug #67052 (NumberFormatter::parse() resets LC_NUMERIC setting) 2014-07-07 00:36:57 -07:00
Stanislav Malyshev b3d8f4b24d Merge branch 'PHP-5.6'
* PHP-5.6:
  Reference bug report instead of github issue in NEWS file
2014-07-06 22:16:27 -07:00
Stanislav Malyshev c291033469 Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
  Make sure the generator script also creates a newline at the end of file
  Add newline at end of file to prevent compilation warning
2014-07-06 22:15:35 -07:00
Lior Kaplan 716d2a3937 Make sure the generator script also creates a newline at the end of file
Similar to commit d6713f39 in master
2014-07-06 22:15:09 -07:00
Lior Kaplan c5fec9e09d Add newline at end of file to prevent compilation warning
The newline was removed at commit 50d50c2f
2014-07-06 22:15:00 -07:00
Sara Golemon 2d9885c8cb Fix handling of session user module custom handlers.
According to the documentation, returning TRUE from
user based session handlers should indicate success,
while returning FALSE should indicate failure.

The existing logic relied on casting the return value
to an integer and returning that from the function.
However, the internal handlers use SUCCESS/FAILURE
where SUCCESS == 0, and FAILURE == -1, so the following
behavior map occurs:

  return false; => return 0; => return SUCCESS
  return true; => return 1; => return <undefined>

Since the session API checks against FAILURE,
both boolean responses wind up appearing like "not FAILURE".

This diff reasserts boolean responses to behave as
documented and introduces some special handling
for integer responses of 0 and -1 so that code can be
written for older and newer versions of PHP.
2014-07-06 09:40:35 -07:00
Bob Weinand 0378b4caac Reference bug report instead of github issue in NEWS file 2014-07-06 13:34:03 +02:00
Xinchen Hui edf2f715e6 Let's rename it 2014-07-06 17:54:38 +08:00
Xinchen Hui d759ead04f Fixed convert (ext/intl finished) 2014-07-06 17:48:16 +08:00
Stanislav Malyshev 5b925824ed Merge branch 'PHP-5.6'
* PHP-5.6:
  add more exts for Travis
2014-07-05 22:34:57 -07:00
Stanislav Malyshev 7bb86f8a6b add more exts for Travis 2014-07-05 19:59:26 -07:00
Bob Weinand 2c525b0881 Merge branch 'PHP-5.6' 2014-07-06 01:21:24 +02:00
Bob Weinand 715aea43e4 Update NEWS 2014-07-06 01:20:46 +02:00
Bob Weinand 17658fa7b8 Merge sapi/phpdbg into PHP-5.6 2014-07-06 01:17:50 +02:00
Bob Weinand ba65286fa4 Merge pull request #104 from andytson/feature/rpm-build-fix
Fix phpdbg.1 man page installation when build != src directory
2014-07-06 01:16:03 +02:00
Nikita Popov 439a95908b Fix leak when generator return value is not used 2014-07-05 15:07:25 +02:00
Nikita Popov 2d4c962c61 Fix ZTS build 2014-07-05 14:12:20 +02:00
Andy Thompson 07d2272297 Fix phpdbg.1 man page installation when build != src directory 2014-07-05 13:05:05 +01:00
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