]>
granicus.if.org Git - php/log
Dmitry Stogov [Thu, 17 Jul 2014 07:18:44 +0000 (11:18 +0400)]
Micro optimization for the main interpreter loop
Dmitry Stogov [Tue, 15 Jul 2014 11:51:40 +0000 (15:51 +0400)]
Fixed compilation warnings
Dmitry Stogov [Tue, 15 Jul 2014 11:50:42 +0000 (15:50 +0400)]
Fixed compilation on Windows
Dmitry Stogov [Mon, 14 Jul 2014 11:46:09 +0000 (15:46 +0400)]
Fixed ZTS build
Dmitry Stogov [Mon, 14 Jul 2014 11:43:11 +0000 (15:43 +0400)]
Implemented builtin instruction for strlen()
Dmitry Stogov [Mon, 14 Jul 2014 10:25:04 +0000 (14:25 +0400)]
Fixed ZTS build
Dmitry Stogov [Mon, 14 Jul 2014 07:44:53 +0000 (11:44 +0400)]
Merge branch 'master' into phpng
* master: (40 commits)
Bug #67609: TLS connections fail behind HTTP proxy
Updated NEWS for #67594
Updated NEWS for #67594
Fix #67594 - invisible colon should be stripped off header name
Updated NEWS for 34407
Updated NEWS for 34407
Updated NEWS for 34407
Fix for bug #34407 - ucwords and title case
fixed broken merged code
Fixed a bug that cannot access custom request header stored in apache_request_headers() though array index.
fixed broken merged code
Fixed a bug that cannot access custom request header stored in apache_request_headers() though array index.
Fixed a bug that cannot access custom request header stored in apache_request_headers() though array index.
Fixed a bug that cannot access custom request header stored in apache_request_headers() though array index.
Test output relies on expose_php being on
1.2 is a problematic float to print out Lower the default display precision for this test
The test output is dependent on expose_php ini
fix makefile in phpize mode
fixe output_as_table() when no ext was enabled
fix end of stream exception when generating makefile
...
Conflicts:
ext/standard/http_fopen_wrapper.c
ext/standard/string.c
sapi/cli/php_cli_server.c
Xinchen Hui [Mon, 14 Jul 2014 06:34:51 +0000 (14:34 +0800)]
Merge branch 'phpng' of https://git.php.net/repository/php-src into phpng
Dmitry Stogov [Mon, 14 Jul 2014 06:33:11 +0000 (10:33 +0400)]
Implemented builtin instruction for type check functions - is_*()
Xinchen Hui [Mon, 14 Jul 2014 04:31:55 +0000 (12:31 +0800)]
Temporary fixed the invalid read warning
Daniel Lowrey [Sat, 12 Jul 2014 14:56:57 +0000 (10:56 -0400)]
Merge branch 'PHP-5.6'
Daniel Lowrey [Sat, 12 Jul 2014 14:49:42 +0000 (10:49 -0400)]
Bug #67609: TLS connections fail behind HTTP proxy
Tjerk Meesters [Sat, 12 Jul 2014 07:11:18 +0000 (15:11 +0800)]
Merge branch 'PHP-5.6'
Tjerk Meesters [Sat, 12 Jul 2014 07:11:05 +0000 (15:11 +0800)]
Updated NEWS for #67594
Tjerk Meesters [Sat, 12 Jul 2014 07:09:47 +0000 (15:09 +0800)]
Merge branch 'PHP-5.5' into PHP-5.6
Tjerk Meesters [Sat, 12 Jul 2014 07:09:32 +0000 (15:09 +0800)]
Updated NEWS for #67594
Tjerk Meesters [Sat, 12 Jul 2014 04:45:50 +0000 (12:45 +0800)]
Fix #67594 - invisible colon should be stripped off header name
Tjerk Meesters [Sat, 12 Jul 2014 03:15:03 +0000 (11:15 +0800)]
Merge branch 'PHP-5.6'
Tjerk Meesters [Sat, 12 Jul 2014 03:14:18 +0000 (11:14 +0800)]
Updated NEWS for 34407
Tjerk Meesters [Sat, 12 Jul 2014 03:10:15 +0000 (11:10 +0800)]
Merge branch 'PHP-5.5' into PHP-5.6
Tjerk Meesters [Sat, 12 Jul 2014 03:09:35 +0000 (11:09 +0800)]
Updated NEWS for 34407
Tjerk Meesters [Sat, 12 Jul 2014 03:08:50 +0000 (11:08 +0800)]
Merge branch 'PHP-5.4' into PHP-5.5
Tjerk Meesters [Sat, 12 Jul 2014 03:07:06 +0000 (11:07 +0800)]
Updated NEWS for 34407
Tjerk Meesters [Wed, 2 Jul 2014 14:22:11 +0000 (22:22 +0800)]
Fix for bug #34407 - ucwords and title case
Added support for ranges like trim() has
George Wang [Fri, 11 Jul 2014 19:02:02 +0000 (15:02 -0400)]
fixed broken merged code
George Wang [Fri, 11 Jul 2014 18:31:59 +0000 (14:31 -0400)]
Fixed a bug that cannot access custom request header stored in apache_request_headers() though array index.
George Wang [Fri, 11 Jul 2014 18:57:55 +0000 (14:57 -0400)]
fixed broken merged code
George Wang [Fri, 11 Jul 2014 18:40:54 +0000 (14:40 -0400)]
Merge branch 'PHP-5.6' of git.php.net:php-src into PHP-5.6
George Wang [Fri, 11 Jul 2014 18:39:03 +0000 (14:39 -0400)]
Merge branch 'PHP-5.5' of git.php.net:php-src into PHP-5.5
George Wang [Fri, 11 Jul 2014 18:31:59 +0000 (14:31 -0400)]
Fixed a bug that cannot access custom request header stored in apache_request_headers() though array index.
George Wang [Fri, 11 Jul 2014 18:31:59 +0000 (14:31 -0400)]
Fixed a bug that cannot access custom request header stored in apache_request_headers() though array index.
George Wang [Fri, 11 Jul 2014 18:31:59 +0000 (14:31 -0400)]
Fixed a bug that cannot access custom request header stored in apache_request_headers() though array index.
Rasmus Lerdorf [Fri, 11 Jul 2014 17:59:02 +0000 (10:59 -0700)]
Test output relies on expose_php being on
Rasmus Lerdorf [Fri, 11 Jul 2014 17:29:40 +0000 (10:29 -0700)]
1.2 is a problematic float to print out
Lower the default display precision for this test
Rasmus Lerdorf [Fri, 11 Jul 2014 16:12:32 +0000 (09:12 -0700)]
The test output is dependent on expose_php ini
Dmitry Stogov [Fri, 11 Jul 2014 14:52:27 +0000 (18:52 +0400)]
Implemented builtin instruction for strlen()
Anatol Belski [Fri, 11 Jul 2014 13:07:39 +0000 (15:07 +0200)]
Merge branch 'PHP-5.6'
* PHP-5.6:
fix makefile in phpize mode
Anatol Belski [Fri, 11 Jul 2014 13:07:22 +0000 (15:07 +0200)]
Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
fix makefile in phpize mode
Anatol Belski [Fri, 11 Jul 2014 13:06:56 +0000 (15:06 +0200)]
Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
fix makefile in phpize mode
Anatol Belski [Fri, 11 Jul 2014 13:05:01 +0000 (15:05 +0200)]
fix makefile in phpize mode
- extend LDFLAGS with dynamically generated ones
- prevend dynamically generated CFLAGS to be overridden by hardcoded ones
Dmitry Stogov [Fri, 11 Jul 2014 12:32:20 +0000 (16:32 +0400)]
Fast parameter parsing API
This API is experemental. It may be changed or removed.
It should be used only for really often used functions.
(Keep the original parsing code and wrap usage with #ifndef FAST_ZPP)
Dmitry Stogov [Fri, 11 Jul 2014 08:28:36 +0000 (12:28 +0400)]
Optimized array_map() and array_combine()
Anatol Belski [Fri, 11 Jul 2014 07:38:59 +0000 (09:38 +0200)]
Merge branch 'PHP-5.6'
* PHP-5.6:
fixe output_as_table() when no ext was enabled
Anatol Belski [Fri, 11 Jul 2014 07:38:44 +0000 (09:38 +0200)]
Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
fixe output_as_table() when no ext was enabled
Anatol Belski [Fri, 11 Jul 2014 07:37:19 +0000 (09:37 +0200)]
Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
fixe output_as_table() when no ext was enabled
Anatol Belski [Fri, 11 Jul 2014 07:36:44 +0000 (09:36 +0200)]
fixe output_as_table() when no ext was enabled
Anatol Belski [Thu, 10 Jul 2014 20:35:41 +0000 (22:35 +0200)]
Merge branch 'PHP-5.6'
* PHP-5.6:
fix end of stream exception when generating makefile
Anatol Belski [Thu, 10 Jul 2014 20:35:23 +0000 (22:35 +0200)]
Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
fix end of stream exception when generating makefile
Anatol Belski [Thu, 10 Jul 2014 20:34:55 +0000 (22:34 +0200)]
Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
fix end of stream exception when generating makefile
Anatol Belski [Thu, 10 Jul 2014 20:33:55 +0000 (22:33 +0200)]
fix end of stream exception when generating makefile
Dmitry Stogov [Thu, 10 Jul 2014 20:32:18 +0000 (00:32 +0400)]
Implement call_user_func() and call_user_func_array() using special opcodes.
In some rare cases it leads to insignificant changes in error messages.
Anatol Belski [Thu, 10 Jul 2014 20:17:46 +0000 (22:17 +0200)]
Merge branch 'PHP-5.6'
* PHP-5.6:
cleanup file headers.
Do not kill children process in pre-fork mode when parent process quit.
update to LSAPI 6.6
Anatol Belski [Thu, 10 Jul 2014 20:15:52 +0000 (22:15 +0200)]
Merge branch 'PHP-5.6' of git.php.net:php-src into PHP-5.6
Conflicts:
sapi/litespeed/lsapilib.h
Anatol Belski [Thu, 10 Jul 2014 20:05:15 +0000 (22:05 +0200)]
Merge branch 'PHP-5.6'
* PHP-5.6:
force ext_dep.js prepend to configure.js in phpize mode
cleanup file headers.
Do not kill children process in pre-fork mode when parent process quit.
update to LSAPI 6.6
Update LiteSpeed SAPI code to V6.4
cleanup file headers.
Do not kill children process in pre-fork mode when parent process quit.
update to LSAPI 6.6
Update LiteSpeed SAPI code to V6.4
update year & copyright
Conflicts:
sapi/litespeed/lsapilib.h
Anatol Belski [Thu, 10 Jul 2014 20:03:45 +0000 (22:03 +0200)]
Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
force ext_dep.js prepend to configure.js in phpize mode
cleanup file headers.
Do not kill children process in pre-fork mode when parent process quit.
update to LSAPI 6.6
Update LiteSpeed SAPI code to V6.4
cleanup file headers.
Do not kill children process in pre-fork mode when parent process quit.
update to LSAPI 6.6
Update LiteSpeed SAPI code to V6.4
Conflicts:
sapi/litespeed/lsapi_main.c
sapi/litespeed/lsapilib.c
George Wang [Thu, 10 Jul 2014 19:12:43 +0000 (15:12 -0400)]
cleanup file headers.
George Wang [Thu, 10 Jul 2014 18:59:25 +0000 (14:59 -0400)]
Do not kill children process in pre-fork mode when parent process quit.
George Wang [Tue, 26 Nov 2013 23:53:35 +0000 (18:53 -0500)]
update to LSAPI 6.6
Conflicts:
sapi/litespeed/lsapi_main.c
Anatol Belski [Thu, 10 Jul 2014 19:51:32 +0000 (21:51 +0200)]
Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
force ext_dep.js prepend to configure.js in phpize mode
cleanup file headers.
Do not kill children process in pre-fork mode when parent process quit.
update to LSAPI 6.6
Update LiteSpeed SAPI code to V6.4
Anatol Belski [Thu, 10 Jul 2014 19:50:37 +0000 (21:50 +0200)]
force ext_dep.js prepend to configure.js in phpize mode
George Wang [Thu, 10 Jul 2014 19:12:43 +0000 (15:12 -0400)]
cleanup file headers.
George Wang [Thu, 10 Jul 2014 18:59:25 +0000 (14:59 -0400)]
Do not kill children process in pre-fork mode when parent process quit.
George Wang [Tue, 26 Nov 2013 23:53:35 +0000 (18:53 -0500)]
update to LSAPI 6.6
Conflicts:
sapi/litespeed/lsapi_main.c
George Wang [Tue, 5 Nov 2013 21:14:49 +0000 (16:14 -0500)]
Update LiteSpeed SAPI code to V6.4
Conflicts:
sapi/litespeed/lsapi_main.c
sapi/litespeed/lsapidef.h
sapi/litespeed/lsapilib.c
sapi/litespeed/lsapilib.h
Conflicts:
sapi/litespeed/lsapi_main.c
sapi/litespeed/lsapilib.c
sapi/litespeed/lsapilib.h
George Wang [Thu, 10 Jul 2014 19:12:43 +0000 (15:12 -0400)]
cleanup file headers.
George Wang [Thu, 10 Jul 2014 18:59:25 +0000 (14:59 -0400)]
Do not kill children process in pre-fork mode when parent process quit.
George Wang [Thu, 10 Jul 2014 19:12:43 +0000 (15:12 -0400)]
cleanup file headers.
George Wang [Thu, 10 Jul 2014 18:59:25 +0000 (14:59 -0400)]
Do not kill children process in pre-fork mode when parent process quit.
George Wang [Tue, 26 Nov 2013 23:53:35 +0000 (18:53 -0500)]
update to LSAPI 6.6
Conflicts:
sapi/litespeed/lsapi_main.c
George Wang [Tue, 5 Nov 2013 21:14:49 +0000 (16:14 -0500)]
Update LiteSpeed SAPI code to V6.4
Conflicts:
sapi/litespeed/lsapi_main.c
sapi/litespeed/lsapidef.h
sapi/litespeed/lsapilib.c
sapi/litespeed/lsapilib.h
George Wang [Thu, 10 Jul 2014 18:14:11 +0000 (14:14 -0400)]
update year & copyright
Conflicts:
sapi/litespeed/lsapi_main.c
George Wang [Thu, 10 Jul 2014 18:14:38 +0000 (14:14 -0400)]
Merge branch 'PHP-5.6' of git.php.net:php-src into PHP-5.6
George Wang [Thu, 10 Jul 2014 18:14:11 +0000 (14:14 -0400)]
update year & copyright
Dmitry Stogov [Thu, 10 Jul 2014 17:45:09 +0000 (21:45 +0400)]
Fixed usage after free()
Anatol Belski [Thu, 10 Jul 2014 17:37:36 +0000 (19:37 +0200)]
Merge branch 'PHP-5.6'
* PHP-5.6:
turn off PGO in phpize mode
Fixed typo in Makefile.frag
Fixed typo in Makefile.frag
Anatol Belski [Thu, 10 Jul 2014 17:37:12 +0000 (19:37 +0200)]
Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
turn off PGO in phpize mode
Fixed typo in Makefile.frag
Fixed typo in Makefile.frag
Anatol Belski [Thu, 10 Jul 2014 17:36:04 +0000 (19:36 +0200)]
Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
turn off PGO in phpize mode
Fixed typo in Makefile.frag
Anatol Belski [Thu, 10 Jul 2014 17:35:26 +0000 (19:35 +0200)]
turn off PGO in phpize mode
George Wang [Tue, 5 Nov 2013 20:38:08 +0000 (15:38 -0500)]
Fixed typo in Makefile.frag
George Wang [Tue, 5 Nov 2013 20:38:08 +0000 (15:38 -0500)]
Fixed typo in Makefile.frag
Dmitry Stogov [Thu, 10 Jul 2014 14:36:11 +0000 (18:36 +0400)]
Fixed delayed closure destruction and reference support
Anatol Belski [Thu, 10 Jul 2014 13:21:24 +0000 (15:21 +0200)]
Merge branch 'PHP-5.6'
* PHP-5.6:
explicitly PHP_ANALYZER=no when no known keyword was passed
Anatol Belski [Thu, 10 Jul 2014 13:20:34 +0000 (15:20 +0200)]
explicitly PHP_ANALYZER=no when no known keyword was passed
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.
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
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.
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
Xinchen Hui [Wed, 9 Jul 2014 10:35:30 +0000 (18:35 +0800)]
Merge branch 'master' into phpng
Xinchen Hui [Wed, 9 Jul 2014 10:35:13 +0000 (18:35 +0800)]
Merge branch '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
Xinchen Hui [Wed, 9 Jul 2014 10:34:40 +0000 (18:34 +0800)]
Fixed tests affect by local ini
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
Dmitry Stogov [Wed, 9 Jul 2014 09:30:47 +0000 (13:30 +0400)]
Added missed warning (ext/spl/tests/iterator_035.phpt)
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().
Xinchen Hui [Wed, 9 Jul 2014 07:13:56 +0000 (15:13 +0800)]
Use ZEND_HASH_FOREACH_* macros
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
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
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
Stanislav Malyshev [Wed, 9 Jul 2014 04:26:39 +0000 (21:26 -0700)]
5.4.31
Stanislav Malyshev [Tue, 8 Jul 2014 22:05:24 +0000 (15:05 -0700)]
Merge branch 'PHP-5.6'
* PHP-5.6:
update NEWS