]> granicus.if.org Git - php/log
php
11 years agoFixed usage after free()
Dmitry Stogov [Thu, 10 Jul 2014 17:45:09 +0000 (21:45 +0400)]
Fixed usage after free()

11 years agoFixed delayed closure destruction and reference support
Dmitry Stogov [Thu, 10 Jul 2014 14:36:11 +0000 (18:36 +0400)]
Fixed delayed closure destruction and reference support

11 years agoImporoved EXPECTED/UNEXPECTED macros to support not boolean expressions.
Dmitry Stogov [Wed, 9 Jul 2014 15:32:09 +0000 (19:32 +0400)]
Imporoved EXPECTED/UNEXPECTED macros to support not boolean expressions.
Fixed invalid EXPECTED() usage.

11 years agoUse data stored in current call frame instead of EG() if possible
Dmitry Stogov [Wed, 9 Jul 2014 13:07:41 +0000 (17:07 +0400)]
Use data stored in current call frame instead of EG() if possible

11 years agoChanged zend_make_printable_zval() to return "use_copy" instead of additional referen...
Dmitry Stogov [Wed, 9 Jul 2014 12:05:55 +0000 (16:05 +0400)]
Changed zend_make_printable_zval() to return "use_copy" instead of additional reference argument.
Improved branch prediction.

11 years agoMerge branch 'phpng' of https://git.php.net/repository/php-src into phpng
Xinchen Hui [Wed, 9 Jul 2014 10:37:49 +0000 (18:37 +0800)]
Merge branch 'phpng' of https://git.php.net/repository/php-src into phpng

11 years agoMerge branch 'master' into phpng
Xinchen Hui [Wed, 9 Jul 2014 10:35:30 +0000 (18:35 +0800)]
Merge branch 'master' into phpng

11 years agoMerge branch 'PHP-5.6'
Xinchen Hui [Wed, 9 Jul 2014 10:35:13 +0000 (18:35 +0800)]
Merge branch 'PHP-5.6'

11 years agoMerge branch 'PHP-5.5' into PHP-5.6
Xinchen Hui [Wed, 9 Jul 2014 10:35:01 +0000 (18:35 +0800)]
Merge branch 'PHP-5.5' into PHP-5.6

11 years agoFixed tests affect by local ini
Xinchen Hui [Wed, 9 Jul 2014 10:34:40 +0000 (18:34 +0800)]
Fixed tests affect by local ini

11 years agoMerge branch 'master' into phpng
Dmitry Stogov [Wed, 9 Jul 2014 10:07:37 +0000 (14:07 +0400)]
Merge branch 'master' into phpng

* master:
  5.4.31
  update NEWS
  fix unstable test
  5.5.16 now
  fix unstable test
  Fix bug #67587: Redirection loop on nginx with FPM
  Fix bug #67587: Redirection loop on nginx with FPM
  Fix bug #67587: Redirection loop on nginx with FPM
  updated NEWS
  updated NEWS
  updated NEWS
  Backported the patch from bug #67407 into 5.5+
  Backported the patch from bug #67407 into 5.4
  NEWS
  5.6 have fpm_globals.force_stderr
  Fix Bug #67530  error_log=syslog ignored
  NEWS
  NEWS
  Fix Bug #67530  error_log=syslog ignored
  Update info.c

11 years agoAdded missed warning (ext/spl/tests/iterator_035.phpt)
Dmitry Stogov [Wed, 9 Jul 2014 09:30:47 +0000 (13:30 +0400)]
Added missed warning (ext/spl/tests/iterator_035.phpt)

11 years agoPartial fix that allows internal constructors to set $this to null.
Dmitry Stogov [Wed, 9 Jul 2014 07:57:42 +0000 (11:57 +0400)]
Partial fix that allows internal constructors to set $this to null.
The address of $this passed to drectly called internal constructor in execute_data->return_value.
Internal constructors should use ZEND_CTOR_MAKE_NULL() macro (insted of previous ZEND_NULL(EG(This))) to do the work.

This patch doesn't fix the problem for indirectly called constructors. e.g. parant::__construct().

11 years agoUse ZEND_HASH_FOREACH_* macros
Xinchen Hui [Wed, 9 Jul 2014 07:13:56 +0000 (15:13 +0800)]
Use ZEND_HASH_FOREACH_* macros

11 years agoMerge branch 'PHP-5.6'
Stanislav Malyshev [Wed, 9 Jul 2014 04:42:38 +0000 (21:42 -0700)]
Merge branch 'PHP-5.6'

* PHP-5.6:
  5.4.31
  fix unstable test
  5.5.16 now

11 years agoMerge branch 'PHP-5.5' into PHP-5.6
Stanislav Malyshev [Wed, 9 Jul 2014 04:42:20 +0000 (21:42 -0700)]
Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
  5.4.31
  fix unstable test
  5.5.16 now

11 years agoMerge branch 'PHP-5.4' into PHP-5.5
Stanislav Malyshev [Wed, 9 Jul 2014 04:41:06 +0000 (21:41 -0700)]
Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  5.4.31
  fix unstable test

Conflicts:
configure.in
main/php_version.h

11 years ago5.4.31
Stanislav Malyshev [Wed, 9 Jul 2014 04:26:39 +0000 (21:26 -0700)]
5.4.31

11 years agoMerge branch 'PHP-5.6'
Stanislav Malyshev [Tue, 8 Jul 2014 22:05:24 +0000 (15:05 -0700)]
Merge branch 'PHP-5.6'

* PHP-5.6:
  update NEWS

11 years agoupdate NEWS
Stanislav Malyshev [Tue, 8 Jul 2014 22:04:42 +0000 (15:04 -0700)]
update NEWS

11 years agofix unstable test
Stanislav Malyshev [Tue, 8 Jul 2014 21:13:46 +0000 (14:13 -0700)]
fix unstable test

11 years ago5.5.16 now
Julien Pauli [Tue, 8 Jul 2014 21:54:19 +0000 (23:54 +0200)]
5.5.16 now

11 years agoMerge branch 'PHP-5.6'
Stanislav Malyshev [Tue, 8 Jul 2014 21:32:45 +0000 (14:32 -0700)]
Merge branch 'PHP-5.6'

* PHP-5.6:
  fix unstable test

11 years agoMerge branch 'PHP-5.5' into PHP-5.6
Stanislav Malyshev [Tue, 8 Jul 2014 21:32:27 +0000 (14:32 -0700)]
Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
  fix unstable test

11 years agoMerge branch 'PHP-5.4' into PHP-5.5
Stanislav Malyshev [Tue, 8 Jul 2014 21:31:40 +0000 (14:31 -0700)]
Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  fix unstable test

11 years agofix unstable test
Stanislav Malyshev [Tue, 8 Jul 2014 21:13:46 +0000 (14:13 -0700)]
fix unstable test

11 years agoTypo
Dmitry Stogov [Tue, 8 Jul 2014 20:15:27 +0000 (00:15 +0400)]
Typo

11 years agoMerge branch 'pull-request/712'
Stanislav Malyshev [Tue, 8 Jul 2014 19:55:53 +0000 (12:55 -0700)]
Merge branch 'pull-request/712'

* pull-request/712:
  Fix bug #67587: Redirection loop on nginx with FPM

11 years agoMerge branch 'PHP-5.6'
Stanislav Malyshev [Tue, 8 Jul 2014 19:55:35 +0000 (12:55 -0700)]
Merge branch 'PHP-5.6'

* PHP-5.6:
  Fix bug #67587: Redirection loop on nginx with FPM
  Fix bug #67587: Redirection loop on nginx with FPM

11 years agoMerge branch 'PHP-5.5' into PHP-5.6
Stanislav Malyshev [Tue, 8 Jul 2014 19:55:02 +0000 (12:55 -0700)]
Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
  Fix bug #67587: Redirection loop on nginx with FPM

11 years agoFix bug #67587: Redirection loop on nginx with FPM
Christian Weiske [Tue, 8 Jul 2014 16:59:30 +0000 (18:59 +0200)]
Fix bug #67587: Redirection loop on nginx with FPM

Redirection will work correctly as long as PATH_INFO is available,
e.g. via the following nginx configuration:

    set $path_info $fastcgi_path_info;
    fastcgi_param PATH_INFO $path_info;

11 years agoMerge branch 'PHP-5.4' into PHP-5.5
Stanislav Malyshev [Tue, 8 Jul 2014 19:54:02 +0000 (12:54 -0700)]
Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  Fix bug #67587: Redirection loop on nginx with FPM

11 years agoFix bug #67587: Redirection loop on nginx with FPM
Christian Weiske [Tue, 8 Jul 2014 16:59:30 +0000 (18:59 +0200)]
Fix bug #67587: Redirection loop on nginx with FPM

Redirection will work correctly as long as PATH_INFO is available,
e.g. via the following nginx configuration:

    set $path_info $fastcgi_path_info;
    fastcgi_param PATH_INFO $path_info;

11 years agoFix bug #67587: Redirection loop on nginx with FPM
Christian Weiske [Tue, 8 Jul 2014 16:59:30 +0000 (18:59 +0200)]
Fix bug #67587: Redirection loop on nginx with FPM

Redirection will work correctly as long as PATH_INFO is available,
e.g. via the following nginx configuration:

    set $path_info $fastcgi_path_info;
    fastcgi_param PATH_INFO $path_info;

11 years agoMake gdb dumpbt work again (at least partially)
Nikita Popov [Tue, 8 Jul 2014 11:09:01 +0000 (13:09 +0200)]
Make gdb dumpbt work again (at least partially)

11 years agoFixed IntlCalendar::toDateTime()
Dmitry Stogov [Tue, 8 Jul 2014 13:28:09 +0000 (17:28 +0400)]
Fixed IntlCalendar::toDateTime()

11 years agoSeparate argument passed by reference
Dmitry Stogov [Tue, 8 Jul 2014 12:40:26 +0000 (16:40 +0400)]
Separate argument passed by reference

11 years agoSeparate argument
Dmitry Stogov [Tue, 8 Jul 2014 11:43:48 +0000 (15:43 +0400)]
Separate argument

11 years agoFixed attempt to modify immutable array
Dmitry Stogov [Tue, 8 Jul 2014 11:24:08 +0000 (15:24 +0400)]
Fixed attempt to modify immutable array

11 years agoMismatched folder marks
Xinchen Hui [Tue, 8 Jul 2014 09:53:13 +0000 (17:53 +0800)]
Mismatched folder marks

11 years agoSpecify HashTable size and optimize inserts that may not conflict
Dmitry Stogov [Tue, 8 Jul 2014 09:46:03 +0000 (13:46 +0400)]
Specify HashTable size and optimize inserts that may not conflict

11 years agocode cleanup
Dmitry Stogov [Tue, 8 Jul 2014 09:24:23 +0000 (13:24 +0400)]
code cleanup

11 years agoAnother fix for uninitialized execute_data->symbol_table
Dmitry Stogov [Tue, 8 Jul 2014 08:17:52 +0000 (12:17 +0400)]
Another fix for uninitialized execute_data->symbol_table

11 years agoMerge branch 'PHP-5.6'
Anatol Belski [Tue, 8 Jul 2014 08:08:40 +0000 (10:08 +0200)]
Merge branch 'PHP-5.6'

* PHP-5.6:
  updated NEWS
  updated NEWS
  updated NEWS

11 years agoMerge branch 'PHP-5.5' into PHP-5.6
Anatol Belski [Tue, 8 Jul 2014 08:08:24 +0000 (10:08 +0200)]
Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
  updated NEWS
  updated NEWS

11 years agoupdated NEWS
Anatol Belski [Tue, 8 Jul 2014 08:08:10 +0000 (10:08 +0200)]
updated NEWS

11 years agoMerge branch 'PHP-5.4' into PHP-5.5
Anatol Belski [Tue, 8 Jul 2014 08:07:31 +0000 (10:07 +0200)]
Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  updated NEWS

11 years agoupdated NEWS
Anatol Belski [Tue, 8 Jul 2014 08:07:18 +0000 (10:07 +0200)]
updated NEWS

11 years agoupdated NEWS
Anatol Belski [Tue, 8 Jul 2014 08:06:35 +0000 (10:06 +0200)]
updated NEWS

11 years agoMerge branch 'PHP-5.6'
Anatol Belski [Tue, 8 Jul 2014 07:57:56 +0000 (09:57 +0200)]
Merge branch 'PHP-5.6'

* PHP-5.6:
  Backported the patch from bug #67407 into 5.5+
  Backported the patch from bug #67407 into 5.4
  NEWS
  NEWS
  Fix Bug #67530  error_log=syslog ignored

11 years agoMerge branch 'PHP-5.5' into PHP-5.6
Anatol Belski [Tue, 8 Jul 2014 07:57:36 +0000 (09:57 +0200)]
Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
  Backported the patch from bug #67407 into 5.5+
  Backported the patch from bug #67407 into 5.4
  NEWS
  NEWS
  Fix Bug #67530  error_log=syslog ignored

Conflicts:
sapi/fpm/fpm/fpm_stdio.c

11 years agoBackported the patch from bug #67407 into 5.5+
Anatol Belski [Tue, 8 Jul 2014 07:54:36 +0000 (09:54 +0200)]
Backported the patch from bug #67407 into 5.5+

11 years agoMerge branch 'PHP-5.4' into PHP-5.5
Anatol Belski [Tue, 8 Jul 2014 07:54:12 +0000 (09:54 +0200)]
Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  Backported the patch from bug #67407 into 5.4

11 years agoBackported the patch from bug #67407 into 5.4
Anatol Belski [Tue, 8 Jul 2014 07:52:35 +0000 (09:52 +0200)]
Backported the patch from bug #67407 into 5.4

11 years agoMerge branch 'pull-request/691'
Anatol Belski [Tue, 8 Jul 2014 07:48:59 +0000 (09:48 +0200)]
Merge branch 'pull-request/691'

11 years agoMerge branch 'phpng' of git.php.net:php-src into phpng
Dmitry Stogov [Tue, 8 Jul 2014 07:33:18 +0000 (11:33 +0400)]
Merge branch 'phpng' of git.php.net:php-src into phpng

* 'phpng' of git.php.net:php-src:
  Fixed uninitialized symbol_table

11 years agoMerge branch 'master' into phpng
Dmitry Stogov [Tue, 8 Jul 2014 07:32:29 +0000 (11:32 +0400)]
Merge branch 'master' into phpng

* master:
  Fix still broken session test.  Only return true/false.
  Fixed bug #66830 (Empty header causes PHP built-in web server to hang).
  Followup fix to custom session save handlers
  create locales and re-add test
  rm test for now

Conflicts:
ext/session/tests/session_set_save_handler_class_012.phpt

11 years agoFixed uninitialized symbol_table
Xinchen Hui [Tue, 8 Jul 2014 06:43:20 +0000 (14:43 +0800)]
Fixed uninitialized symbol_table

11 years agoMerge branch 'PHP-5.6'
Remi Collet [Tue, 8 Jul 2014 06:34:15 +0000 (08:34 +0200)]
Merge branch 'PHP-5.6'

* PHP-5.6:
  NEWS
  5.6 have fpm_globals.force_stderr
  Fix Bug #67530  error_log=syslog ignored

11 years agoNEWS
Remi Collet [Tue, 8 Jul 2014 06:33:39 +0000 (08:33 +0200)]
NEWS

11 years ago5.6 have fpm_globals.force_stderr
Remi Collet [Tue, 8 Jul 2014 06:32:56 +0000 (08:32 +0200)]
5.6 have fpm_globals.force_stderr

11 years agoFix Bug #67530 error_log=syslog ignored
Remi Collet [Tue, 8 Jul 2014 06:29:24 +0000 (08:29 +0200)]
Fix Bug #67530  error_log=syslog ignored

As for Bug #64915
Systemd use --nodaemonize but need to error_log to file or syslog to be honoured

11 years agoNEWS
Remi Collet [Tue, 8 Jul 2014 06:31:15 +0000 (08:31 +0200)]
NEWS

11 years agoMerge branch 'PHP-5.4' into PHP-5.5
Remi Collet [Tue, 8 Jul 2014 06:30:44 +0000 (08:30 +0200)]
Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  NEWS
  Fix Bug #67530  error_log=syslog ignored

11 years agoNEWS
Remi Collet [Tue, 8 Jul 2014 06:30:15 +0000 (08:30 +0200)]
NEWS

11 years agoFix Bug #67530 error_log=syslog ignored
Remi Collet [Tue, 8 Jul 2014 06:29:24 +0000 (08:29 +0200)]
Fix Bug #67530  error_log=syslog ignored

As for Bug #64915
Systemd use --nodaemonize but need to error_log to file or syslog to be honoured

11 years agoZEND_SEND_VAR and ZEND_SEND_VAL specialization
Dmitry Stogov [Mon, 7 Jul 2014 22:13:53 +0000 (02:13 +0400)]
ZEND_SEND_VAR and ZEND_SEND_VAL specialization

11 years agoFix still broken session test. Only return true/false.
Sara Golemon [Mon, 7 Jul 2014 21:30:28 +0000 (14:30 -0700)]
Fix still broken session test.  Only return true/false.

11 years agoMerge branch 'PHP-5.6'
Adam Harvey [Mon, 7 Jul 2014 20:49:00 +0000 (20:49 +0000)]
Merge branch 'PHP-5.6'

* PHP-5.6:
  Fixed bug #66830 (Empty header causes PHP built-in web server to hang).

11 years agoMerge branch 'PHP-5.5' into PHP-5.6
Adam Harvey [Mon, 7 Jul 2014 20:45:01 +0000 (20:45 +0000)]
Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
  Fixed bug #66830 (Empty header causes PHP built-in web server to hang).

11 years agoMerge branch 'PHP-5.4' into PHP-5.5
Adam Harvey [Mon, 7 Jul 2014 20:40:47 +0000 (20:40 +0000)]
Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  Fixed bug #66830 (Empty header causes PHP built-in web server to hang).

11 years agoFixed bug #66830 (Empty header causes PHP built-in web server to hang).
Adam Harvey [Mon, 7 Jul 2014 20:36:06 +0000 (20:36 +0000)]
Fixed bug #66830 (Empty header causes PHP built-in web server to hang).

We had an infinite loop in sapi_cli_server_send_headers(): while iterating over
the linked list of headers, when an empty header was hit, continue would go to
the next iteration of the loop without updating h to be the next value in the
linked list. Updating it to always increment regardless of whether the header
is actually valid or not fixes the issue.

11 years agoFollowup fix to custom session save handlers
Sara Golemon [Mon, 7 Jul 2014 19:19:11 +0000 (12:19 -0700)]
Followup fix to custom session save handlers

2d9885c introduced some regressions.  This addresses those.

  * Don't throw return type notice or session write failure when in an exception
  * Fix tests to properly return true/false since null is no longer falsy/successy
  * Rerecord a few tests to accomodate difference in raised warnings

11 years agoSkip useless ZEND_RECV opcodes
Dmitry Stogov [Mon, 7 Jul 2014 18:18:48 +0000 (22:18 +0400)]
Skip useless ZEND_RECV opcodes

11 years agoMerge branch 'PHP-5.6'
Stanislav Malyshev [Mon, 7 Jul 2014 17:42:36 +0000 (10:42 -0700)]
Merge branch 'PHP-5.6'

* PHP-5.6:
  create locales and re-add test

11 years agoMerge branch 'PHP-5.5' into PHP-5.6
Stanislav Malyshev [Mon, 7 Jul 2014 17:42:13 +0000 (10:42 -0700)]
Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
  create locales and re-add test

Conflicts:
.travis.yml

11 years agocreate locales and re-add test
Stanislav Malyshev [Mon, 7 Jul 2014 16:35:37 +0000 (09:35 -0700)]
create locales and re-add test

11 years agoAvoid useless check
Dmitry Stogov [Mon, 7 Jul 2014 17:33:53 +0000 (21:33 +0400)]
Avoid useless check

11 years agoFunction can't be "interactive"
Dmitry Stogov [Mon, 7 Jul 2014 17:33:09 +0000 (21:33 +0400)]
Function can't be "interactive"

11 years agoRefactored run_time_cache usage in object handlers
Dmitry Stogov [Mon, 7 Jul 2014 16:54:31 +0000 (20:54 +0400)]
Refactored run_time_cache usage in object handlers

11 years agoMerge branch 'PHP-5.6'
Stanislav Malyshev [Mon, 7 Jul 2014 16:34:03 +0000 (09:34 -0700)]
Merge branch 'PHP-5.6'

* PHP-5.6:
  rm test for now

11 years agoMerge branch 'PHP-5.5' into PHP-5.6
Stanislav Malyshev [Mon, 7 Jul 2014 16:33:05 +0000 (09:33 -0700)]
Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
  rm test for now

11 years agorm test for now
Stanislav Malyshev [Mon, 7 Jul 2014 16:32:26 +0000 (09:32 -0700)]
rm test for now

11 years agoMerge branch 'master' into test
Dmitry Stogov [Mon, 7 Jul 2014 15:21:23 +0000 (19:21 +0400)]
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

11 years agoWrong expectation in tests (for some reason backtraces contained invlalid extra frame...
Dmitry Stogov [Mon, 7 Jul 2014 14:09:17 +0000 (18:09 +0400)]
Wrong expectation in tests (for some reason backtraces contained invlalid extra frame at the top)

11 years agoWrong expectation in test (The error "Non-static method A::A_ftk() should not be...
Dmitry Stogov [Mon, 7 Jul 2014 13:27:16 +0000 (17:27 +0400)]
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()).

11 years agoWrong expectation in test (for some reason error messages didn't refer to right funct...
Dmitry Stogov [Mon, 7 Jul 2014 13:22:19 +0000 (17:22 +0400)]
Wrong expectation in test (for some reason error messages didn't refer to right functions)

11 years agoWrong expectation in test (for some reason backtrace misses gc_collect_cycles() call)
Dmitry Stogov [Mon, 7 Jul 2014 13:17:42 +0000 (17:17 +0400)]
Wrong expectation in test (for some reason backtrace misses gc_collect_cycles() call)

11 years agoWrong expectation in test (wrong line number in backtrace)
Dmitry Stogov [Mon, 7 Jul 2014 12:57:05 +0000 (16:57 +0400)]
Wrong expectation in test (wrong line number in backtrace)

11 years agoMerge branch 'call-frame' into phpng
Dmitry Stogov [Mon, 7 Jul 2014 12:19:24 +0000 (16:19 +0400)]
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

11 years agoSimplify call-frame handling
Dmitry Stogov [Mon, 7 Jul 2014 11:50:44 +0000 (15:50 +0400)]
Simplify call-frame handling

11 years agoMerge branch 'PHP-5.6'
Stanislav Malyshev [Mon, 7 Jul 2014 08:38:04 +0000 (01:38 -0700)]
Merge branch 'PHP-5.6'

* PHP-5.6:
  change locale - looks like not everybody has sl_SI

11 years agoMerge branch 'PHP-5.5' into PHP-5.6
Stanislav Malyshev [Mon, 7 Jul 2014 08:36:24 +0000 (01:36 -0700)]
Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
  change locale - looks like not everybody has sl_SI

11 years agoMerge branch 'PHP-5.4' into PHP-5.5
Stanislav Malyshev [Mon, 7 Jul 2014 08:36:03 +0000 (01:36 -0700)]
Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  change locale - looks like not everybody has sl_SI

11 years agochange locale - looks like not everybody has sl_SI
Stanislav Malyshev [Mon, 7 Jul 2014 08:35:25 +0000 (01:35 -0700)]
change locale - looks like not everybody has sl_SI

11 years agoMerge branch 'PHP-5.6'
Stanislav Malyshev [Mon, 7 Jul 2014 07:50:15 +0000 (00:50 -0700)]
Merge branch 'PHP-5.6'

* PHP-5.6:
  Fix bug #66921 - Wrong argument type hint for function intltz_from_date_time_zone
  fix format

11 years agoMerge branch 'PHP-5.5' into PHP-5.6
Stanislav Malyshev [Mon, 7 Jul 2014 07:49:33 +0000 (00:49 -0700)]
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

11 years agoMerge branch 'PHP-5.4' into PHP-5.5
Stanislav Malyshev [Mon, 7 Jul 2014 07:49:15 +0000 (00:49 -0700)]
Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  fix format

11 years agoFix bug #66921 - Wrong argument type hint for function intltz_from_date_time_zone
Stanislav Malyshev [Mon, 7 Jul 2014 07:48:44 +0000 (00:48 -0700)]
Fix bug #66921 - Wrong argument type hint for function intltz_from_date_time_zone

11 years agofix format
Stanislav Malyshev [Mon, 7 Jul 2014 07:48:32 +0000 (00:48 -0700)]
fix format