]>
granicus.if.org Git - php/log
Nikita Popov [Sat, 5 Jul 2014 12:12:20 +0000 (14:12 +0200)]
Fix ZTS build
Xinchen Hui [Thu, 3 Jul 2014 15:58:21 +0000 (23:58 +0800)]
Fixed segfault if empty POST
Xinchen Hui [Tue, 1 Jul 2014 03:54:16 +0000 (11:54 +0800)]
refcount in phpng has different meanings
Xinchen Hui [Tue, 1 Jul 2014 02:36:19 +0000 (10:36 +0800)]
Suppress warning "cast from pointer to integer of different size"
Xinchen Hui [Tue, 1 Jul 2014 02:29:11 +0000 (10:29 +0800)]
Merge branch 'phpng' of https://git.php.net/repository/php-src into phpng
Dmitry Stogov [Mon, 30 Jun 2014 20:22:05 +0000 (00:22 +0400)]
Merge branch 'master' into test
* master:
Fixed possible crash because of race conditions on modifying constants in shared memory
Dmitry Stogov [Mon, 30 Jun 2014 20:19:41 +0000 (00:19 +0400)]
Merge branch 'master' into test
* master: (67 commits)
remove the NEWS entry for the reverted fpm fix
remove the NEWS entry for the reverted fpm fix
remove the NEWS entry for the reverted fpm fix
Revert "Fix Bug #67530 error_log=syslog ignored"
--enable-fpm for the travis build
fix the last fpm NEWS entry, the other bug is related, but not the same what we fixed here
NEWS
NEWS
Fix bug #67091: make install fails to install libphp5.so on FreeBSD 10.0
adding NEWS entry for the fix for bug #65641
Updated NEWS file for recent phpdbg fixes
Fixed issue krakjoe/phpdbg#94 - List behavior is inconsistent
Fix issue krakjoe/phpdbg#97 - list now appends a newline if there is none The prompt should always ensure it is on a newline
Fixed test
Inform about back command existence in help - Fixes krakjoe/phpdbg#100 No way to list the current stack/frames
Fix issue krakjoe/phpdbg#98 break if does not seem to work
Fix issue krakjoe/phpdbg#99 register function has the same behavior as run
Fix readline/libedit (Thanks to @remicollet)
Replace incorrect `E` command with `ev` in watch help
Fix typo in `finish` help
...
Conflicts:
Zend/zend_ast.c
Zend/zend_highlight.c
Zend/zend_indent.c
ext/spl/spl_array.c
ext/spl/spl_observer.c
ext/standard/info.c
Dmitry Stogov [Mon, 30 Jun 2014 20:17:55 +0000 (00:17 +0400)]
Merge branch 'PHP-5.6'
* PHP-5.6:
Fixed possible crash because of race conditions on modifying constants in shared memory
Dmitry Stogov [Mon, 30 Jun 2014 20:13:34 +0000 (00:13 +0400)]
Fixed possible crash because of race conditions on modifying constants in shared memory
Ferenc Kovacs [Mon, 30 Jun 2014 16:39:31 +0000 (18:39 +0200)]
Merge branch 'PHP-5.6'
* PHP-5.6:
remove the NEWS entry for the reverted fpm fix
remove the NEWS entry for the reverted fpm fix
remove the NEWS entry for the reverted fpm fix
Revert "Fix Bug #67530 error_log=syslog ignored"
Ferenc Kovacs [Mon, 30 Jun 2014 16:39:06 +0000 (18:39 +0200)]
remove the NEWS entry for the reverted fpm fix
Ferenc Kovacs [Mon, 30 Jun 2014 16:38:54 +0000 (18:38 +0200)]
Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
remove the NEWS entry for the reverted fpm fix
remove the NEWS entry for the reverted fpm fix
Revert "Fix Bug #67530 error_log=syslog ignored"
Ferenc Kovacs [Mon, 30 Jun 2014 16:38:31 +0000 (18:38 +0200)]
remove the NEWS entry for the reverted fpm fix
Ferenc Kovacs [Mon, 30 Jun 2014 16:38:15 +0000 (18:38 +0200)]
Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
remove the NEWS entry for the reverted fpm fix
Revert "Fix Bug #67530 error_log=syslog ignored"
Ferenc Kovacs [Mon, 30 Jun 2014 16:37:56 +0000 (18:37 +0200)]
remove the NEWS entry for the reverted fpm fix
Ferenc Kovacs [Mon, 30 Jun 2014 16:37:23 +0000 (18:37 +0200)]
Revert "Fix Bug #67530 error_log=syslog ignored"
This reverts commit
a0ecb3794f00e65cd2a073b2073e32d6c2fb7180 .
Dmitry Stogov [Mon, 30 Jun 2014 14:08:16 +0000 (18:08 +0400)]
Fixed compilation problems
Dmitry Stogov [Mon, 30 Jun 2014 11:43:45 +0000 (15:43 +0400)]
Refactored parameter passing mechanism.
In PHP-5.6 and below each argument passed to user function was copies on VM stack twice.
Now we always have ZEND_INIT_FCALL (or simular) opcode that pushes "call frame" on top of VM stack.
"Call frame" is actually the same zend_execute_data structure.
All the following ZEND_SEND instructions push arguments on top of the stack in a way that they directly comes into corresponding CV variables of the called frame. Extra arguments are copied at the end of stack frame (after all CV and TMP variables) on function enterance.
There are two minor incompatibilities:
1) It's not allowed to decalre functions redefining arguments e.g. "function foo($a,$a) {}".
2) func_get_arg() and func_get args() return the current value of argument and not the original value that was sent.
Ferenc Kovacs [Mon, 30 Jun 2014 10:31:25 +0000 (12:31 +0200)]
Merge branch 'PHP-5.6'
* PHP-5.6:
--enable-fpm for the travis build
Ferenc Kovacs [Mon, 30 Jun 2014 10:30:49 +0000 (12:30 +0200)]
Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
--enable-fpm for the travis build
Ferenc Kovacs [Mon, 30 Jun 2014 10:30:24 +0000 (12:30 +0200)]
--enable-fpm for the travis build
Xinchen Hui [Mon, 30 Jun 2014 07:26:55 +0000 (15:26 +0800)]
Fixed segfault while info printing
Xinchen Hui [Mon, 30 Jun 2014 03:03:03 +0000 (11:03 +0800)]
Fixed reference handling in intltz_get_canonical_id
Xinchen Hui [Mon, 30 Jun 2014 03:01:26 +0000 (11:01 +0800)]
Fixed reference handling in intltz_get_offset
Ferenc Kovacs [Mon, 30 Jun 2014 00:32:46 +0000 (02:32 +0200)]
Merge branch 'PHP-5.6'
* PHP-5.6:
fix the last fpm NEWS entry, the other bug is related, but not the same what we fixed here
Ferenc Kovacs [Mon, 30 Jun 2014 00:32:06 +0000 (02:32 +0200)]
fix the last fpm NEWS entry, the other bug is related, but not the same what we fixed here
Ferenc Kovacs [Sun, 29 Jun 2014 23:35:19 +0000 (01:35 +0200)]
Merge branch 'PHP-5.6'
* PHP-5.6:
NEWS
NEWS
Fix bug #67091: make install fails to install libphp5.so on FreeBSD 10.0
Ferenc Kovacs [Sun, 29 Jun 2014 23:35:02 +0000 (01:35 +0200)]
NEWS
Ferenc Kovacs [Sun, 29 Jun 2014 23:34:47 +0000 (01:34 +0200)]
Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
NEWS
Fix bug #67091: make install fails to install libphp5.so on FreeBSD 10.0
Ferenc Kovacs [Sun, 29 Jun 2014 23:34:29 +0000 (01:34 +0200)]
NEWS
Ferenc Kovacs [Sun, 29 Jun 2014 23:34:05 +0000 (01:34 +0200)]
Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
Fix bug #67091: make install fails to install libphp5.so on FreeBSD 10.0
Ferenc Kovacs [Sun, 29 Jun 2014 23:30:36 +0000 (01:30 +0200)]
Fix bug #67091: make install fails to install libphp5.so on FreeBSD 10.0
Simplest fix is to remove the specific checks for freebsd1* as it also matches freebsd10,
and nobody should be using >=PHP 5.4 with freebsd 1.x(if it is even possible to make it
to compile there).
Ferenc Kovacs [Sun, 29 Jun 2014 23:03:29 +0000 (01:03 +0200)]
Merge branch 'PHP-5.6'
* PHP-5.6:
adding NEWS entry for the fix for bug #65641
Fix SetHandler proxy:fcgi:// incompatibilities
Ferenc Kovacs [Sun, 29 Jun 2014 23:02:22 +0000 (01:02 +0200)]
adding NEWS entry for the fix for bug #65641
Ferenc Kovacs [Sun, 29 Jun 2014 22:51:59 +0000 (00:51 +0200)]
Merge branch 'pull-request/694' into PHP-5.6
* pull-request/694:
Fix SetHandler proxy:fcgi:// incompatibilities
Xinchen Hui [Sun, 29 Jun 2014 14:56:27 +0000 (22:56 +0800)]
Fixed segfault in intlgregcal_create_instance
Xinchen Hui [Sun, 29 Jun 2014 14:30:32 +0000 (22:30 +0800)]
Fixed segfault in resourcebundle
Xinchen Hui [Sun, 29 Jun 2014 13:54:39 +0000 (21:54 +0800)]
Fixed iterators
Xinchen Hui [Sun, 29 Jun 2014 13:06:30 +0000 (21:06 +0800)]
Fixed test
Xinchen Hui [Sun, 29 Jun 2014 11:46:01 +0000 (19:46 +0800)]
Fixed memory leak
Xinchen Hui [Sun, 29 Jun 2014 11:07:06 +0000 (19:07 +0800)]
Fixed retval with zend_call_method
Bob Weinand [Sun, 29 Jun 2014 11:01:11 +0000 (13:01 +0200)]
Merge branch 'PHP-5.6'
Xinchen Hui [Sun, 29 Jun 2014 10:45:14 +0000 (18:45 +0800)]
Fixed collator_sort
Bob Weinand [Sun, 29 Jun 2014 10:54:33 +0000 (12:54 +0200)]
Updated NEWS file for recent phpdbg fixes
Bob Weinand [Sun, 29 Jun 2014 10:49:10 +0000 (12:49 +0200)]
Merge sapi/phpdbg into PHP-5.6
Bob Weinand [Sun, 29 Jun 2014 10:43:51 +0000 (12:43 +0200)]
Fixed issue krakjoe/phpdbg#94 - List behavior is inconsistent
Bob Weinand [Sun, 29 Jun 2014 10:18:39 +0000 (12:18 +0200)]
Fix issue krakjoe/phpdbg#97 - list now appends a newline if there is none
The prompt should always ensure it is on a newline
Xinchen Hui [Sun, 29 Jun 2014 10:07:12 +0000 (18:07 +0800)]
Fixed test
Xinchen Hui [Sun, 29 Jun 2014 10:06:44 +0000 (18:06 +0800)]
Merge remote branch 'origin/PHP-5.6'
Xinchen Hui [Sun, 29 Jun 2014 10:00:31 +0000 (18:00 +0800)]
Fixed test
Bob Weinand [Sun, 29 Jun 2014 09:55:42 +0000 (11:55 +0200)]
Inform about back command existence in help - Fixes krakjoe/phpdbg#100
No way to list the current stack/frames
Xinchen Hui [Sun, 29 Jun 2014 09:48:10 +0000 (17:48 +0800)]
Fixed memory leaks
Bob Weinand [Sun, 29 Jun 2014 09:40:48 +0000 (11:40 +0200)]
Fix issue krakjoe/phpdbg#98
break if does not seem to work
Bob Weinand [Sun, 29 Jun 2014 09:28:44 +0000 (11:28 +0200)]
Merge pull request #102 from dshafik/fix-96
Fix typo in `finish` help
Bob Weinand [Sun, 29 Jun 2014 09:28:33 +0000 (11:28 +0200)]
Merge pull request #101 from dshafik/fix-95
Replace incorrect `E` command with `ev` in watch help
Bob Weinand [Sun, 29 Jun 2014 09:26:27 +0000 (11:26 +0200)]
Fix issue krakjoe/phpdbg#99
register function has the same behavior as run
Bob Weinand [Sun, 29 Jun 2014 09:26:03 +0000 (11:26 +0200)]
Fix readline/libedit (Thanks to @remicollet)
Davey Shafik [Sun, 29 Jun 2014 08:33:27 +0000 (04:33 -0400)]
Replace incorrect `E` command with `ev` in watch help
Fixes #95
Davey Shafik [Sun, 29 Jun 2014 08:32:01 +0000 (04:32 -0400)]
Fix typo in `finish` help
Fixes #96
Xinchen Hui [Sun, 29 Jun 2014 07:53:42 +0000 (15:53 +0800)]
Fixed segfault
Xinchen Hui [Sun, 29 Jun 2014 07:45:08 +0000 (15:45 +0800)]
Fixed segfault temporarily (probably need to be reverted later)
Xinchen Hui [Sun, 29 Jun 2014 07:39:45 +0000 (15:39 +0800)]
Fixed object properties init
Xinchen Hui [Sun, 29 Jun 2014 07:24:00 +0000 (15:24 +0800)]
Fixed temporarily un-expected object re-init
Xinchen Hui [Sat, 28 Jun 2014 16:29:07 +0000 (00:29 +0800)]
Fixed segfault, segfault and segfault
Xinchen Hui [Sat, 28 Jun 2014 15:30:46 +0000 (23:30 +0800)]
Fixed get_debug_info
Xinchen Hui [Sat, 28 Jun 2014 13:14:50 +0000 (21:14 +0800)]
Intl's codes are really need more careful :<
Xinchen Hui [Sat, 28 Jun 2014 13:09:07 +0000 (21:09 +0800)]
Fixed refernce handling
Xinchen Hui [Sat, 28 Jun 2014 13:05:20 +0000 (21:05 +0800)]
Fixed initialize of zval
Xinchen Hui [Sat, 28 Jun 2014 12:58:50 +0000 (20:58 +0800)]
Fixed Calendar_objects_free
Xinchen Hui [Sat, 28 Jun 2014 12:53:32 +0000 (20:53 +0800)]
Fixed add_ref
Xinchen Hui [Sat, 28 Jun 2014 12:52:41 +0000 (20:52 +0800)]
Fixed segfaults
Xinchen Hui [Sat, 28 Jun 2014 12:14:12 +0000 (20:14 +0800)]
Fixed segfault while starting up
Xinchen Hui [Sat, 28 Jun 2014 04:20:35 +0000 (12:20 +0800)]
Refactoring ext/intl (only compilerable now, far to finish :<)
Xinchen Hui [Sat, 28 Jun 2014 03:19:38 +0000 (11:19 +0800)]
C++ doesn't allow implicitly convert void * to other pointer type
Xinchen Hui [Fri, 27 Jun 2014 16:09:26 +0000 (00:09 +0800)]
Suppress warning
Xinchen Hui [Fri, 27 Jun 2014 16:03:26 +0000 (00:03 +0800)]
Merge branch 'phpng' of git.php.net:php-src into phpng
Xinchen Hui [Fri, 27 Jun 2014 16:02:50 +0000 (00:02 +0800)]
Refactoring ext/intl (incompleted)
Xinchen Hui [Fri, 27 Jun 2014 15:58:55 +0000 (23:58 +0800)]
Fixed build with libmysql
Ferenc Kovacs [Fri, 27 Jun 2014 14:30:30 +0000 (16:30 +0200)]
Merge branch 'PHP-5.6'
* PHP-5.6:
removing the format added by mistake, props to Solar Designer for spotting this.
Ferenc Kovacs [Fri, 27 Jun 2014 14:29:35 +0000 (16:29 +0200)]
Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
removing the format added by mistake, props to Solar Designer for spotting this.
Ferenc Kovacs [Fri, 27 Jun 2014 14:28:24 +0000 (16:28 +0200)]
Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
removing the format added by mistake, props to Solar Designer for spotting this.
Ferenc Kovacs [Fri, 27 Jun 2014 14:27:36 +0000 (16:27 +0200)]
removing the format added by mistake, props to Solar Designer for spotting this.
Remi Collet [Fri, 27 Jun 2014 07:51:52 +0000 (09:51 +0200)]
Merge branch 'PHP-5.6'
* PHP-5.6:
NEWS
NEWS
NEWS
Fix Bug #67531 syslog cannot be set in pool configuration
Fix Bug #67530 error_log=syslog ignored
Remi Collet [Fri, 27 Jun 2014 07:51:34 +0000 (09:51 +0200)]
NEWS
Remi Collet [Fri, 27 Jun 2014 07:51:15 +0000 (09:51 +0200)]
Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
NEWS
NEWS
Fix Bug #67531 syslog cannot be set in pool configuration
Fix Bug #67530 error_log=syslog ignored
Remi Collet [Fri, 27 Jun 2014 07:50:43 +0000 (09:50 +0200)]
NEWS
Remi Collet [Fri, 27 Jun 2014 07:50:27 +0000 (09:50 +0200)]
Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
NEWS
Fix Bug #67531 syslog cannot be set in pool configuration
Fix Bug #67530 error_log=syslog ignored
Remi Collet [Fri, 27 Jun 2014 07:50:01 +0000 (09:50 +0200)]
NEWS
Remi Collet [Fri, 27 Jun 2014 07:47:28 +0000 (09:47 +0200)]
Fix Bug #67531 syslog cannot be set in pool configuration
error_log is listed in FPM_PHP_INI_TO_EXPAND,
but should not be expand when value = syslog
Remi Collet [Fri, 27 Jun 2014 07:45:53 +0000 (09:45 +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
Xinchen Hui [Fri, 27 Jun 2014 04:35:34 +0000 (12:35 +0800)]
C++ compiler doesn't allow cast a void * to other pointer type
Stanislav Malyshev [Fri, 27 Jun 2014 04:18:22 +0000 (21:18 -0700)]
Merge branch 'PHP-5.6'
* PHP-5.6:
update the date
better explanation
more extensive note on unserialize() change
more extensive note on unserialize() change
Stanislav Malyshev [Fri, 27 Jun 2014 04:18:06 +0000 (21:18 -0700)]
Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
update the date
better explanation
Stanislav Malyshev [Fri, 27 Jun 2014 04:16:15 +0000 (21:16 -0700)]
Merge branch 'PHp-5.4' into PHP-5.5
* PHp-5.4:
update the date
better explanation
Stanislav Malyshev [Fri, 27 Jun 2014 04:15:47 +0000 (21:15 -0700)]
update the date
Stanislav Malyshev [Thu, 26 Jun 2014 22:25:19 +0000 (15:25 -0700)]
better explanation
Dmitry Stogov [Thu, 26 Jun 2014 20:40:52 +0000 (00:40 +0400)]
Reverted
387c491559f1507685740bf613070d27bce59e4d (it broke ext/standard/tests/file/bug44607.phpt)
Stanislav Malyshev [Thu, 26 Jun 2014 17:40:36 +0000 (10:40 -0700)]
Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
more extensive note on unserialize() change
more extensive note on unserialize() change
Stanislav Malyshev [Thu, 26 Jun 2014 17:39:38 +0000 (10:39 -0700)]
more extensive note on unserialize() change
Stanislav Malyshev [Thu, 26 Jun 2014 17:36:38 +0000 (10:36 -0700)]
Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
more extensive note on unserialize() change