]>
granicus.if.org Git - php/log
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
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
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
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
Stanislav Malyshev [Thu, 26 Jun 2014 17:35:47 +0000 (10:35 -0700)]
more extensive note on unserialize() change
Bob Weinand [Wed, 25 Jun 2014 11:57:19 +0000 (13:57 +0200)]
Merge branch 'PHP-5.6'
Bob Weinand [Wed, 25 Jun 2014 11:56:45 +0000 (13:56 +0200)]
Merge sapi/phpdbg into PHP-5.6
Bob Weinand [Wed, 25 Jun 2014 11:26:58 +0000 (13:26 +0200)]
Merge branch 'master' of https://github.com/oerdnj/phpdbg into master
Rewritten author line and included instructions to make install the man page
Stanislav Malyshev [Tue, 24 Jun 2014 18:24:40 +0000 (11:24 -0700)]
Merge branch 'PHP-5.6'
* PHP-5.6:
remove bug67072_2 test for 5.6+ since we'd have cleaner solution
Fix test - because of big #67397 we don't allow overlong locales anymore
Stanislav Malyshev [Tue, 24 Jun 2014 18:24:07 +0000 (11:24 -0700)]
remove bug67072_2 test for 5.6+ since we'd have cleaner solution
Stanislav Malyshev [Tue, 24 Jun 2014 18:23:48 +0000 (11:23 -0700)]
Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
Fix test - because of big #67397 we don't allow overlong locales anymore
Stanislav Malyshev [Tue, 24 Jun 2014 18:23:02 +0000 (11:23 -0700)]
Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
Fix test - because of big #67397 we don't allow overlong locales anymore
Stanislav Malyshev [Tue, 24 Jun 2014 18:21:43 +0000 (11:21 -0700)]
Fix test - because of big #67397 we don't allow overlong locales anymore
Stanislav Malyshev [Tue, 24 Jun 2014 17:33:40 +0000 (10:33 -0700)]
Merge branch 'PHp-5.6'
* PHp-5.6:
Better fix for bug #67072 with more BC provisions
Fix bug #67498 - phpinfo() Type Confusion Information Leak Vulnerability
Fix bug #67492: unserialize() SPL ArrayObject / SPLObjectStorage Type Confusion
Fix bug #67397 (Buffer overflow in locale_get_display_name->uloc_getDisplayName (libicu 4.8.1))
Fix bug #67349: Locale::parseLocale Double Free
update NEWS
5.4.30
Better fix for bug #67072 with more BC provisions
Fix bug #67498 - phpinfo() Type Confusion Information Leak Vulnerability
update CVE
Fix bug #67492: unserialize() SPL ArrayObject / SPLObjectStorage Type Confusion
Fix bug #67397 (Buffer overflow in locale_get_display_name->uloc_getDisplayName (libicu 4.8.1))
Fix bug #67349: Locale::parseLocale Double Free
add CVEs
Fix potential segfault in dns_get_record()
Fix bug #66127 (Segmentation fault with ArrayObject unset)
5.4.30 rc1
Conflicts:
ext/intl/locale/locale_methods.c
Stanislav Malyshev [Sun, 22 Jun 2014 04:28:33 +0000 (21:28 -0700)]
Better fix for bug #67072 with more BC provisions
Stanislav Malyshev [Mon, 23 Jun 2014 07:19:37 +0000 (00:19 -0700)]
Fix bug #67498 - phpinfo() Type Confusion Information Leak Vulnerability
Stanislav Malyshev [Sun, 22 Jun 2014 02:46:16 +0000 (19:46 -0700)]
Fix bug #67492: unserialize() SPL ArrayObject / SPLObjectStorage Type Confusion
Stanislav Malyshev [Sun, 8 Jun 2014 20:44:40 +0000 (13:44 -0700)]
Fix bug #67397 (Buffer overflow in locale_get_display_name->uloc_getDisplayName (libicu 4.8.1))
Stanislav Malyshev [Wed, 4 Jun 2014 08:06:01 +0000 (01:06 -0700)]
Fix bug #67349: Locale::parseLocale Double Free
Stanislav Malyshev [Tue, 24 Jun 2014 17:30:56 +0000 (10:30 -0700)]
Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
update NEWS
5.4.30
Better fix for bug #67072 with more BC provisions
Fix bug #67498 - phpinfo() Type Confusion Information Leak Vulnerability
update CVE
Fix bug #67492: unserialize() SPL ArrayObject / SPLObjectStorage Type Confusion
Fix bug #67397 (Buffer overflow in locale_get_display_name->uloc_getDisplayName (libicu 4.8.1))
Fix bug #67349: Locale::parseLocale Double Free
add CVEs
Fix potential segfault in dns_get_record()
Fix bug #66127 (Segmentation fault with ArrayObject unset)
5.4.30 rc1
Stanislav Malyshev [Sun, 22 Jun 2014 04:28:33 +0000 (21:28 -0700)]
Better fix for bug #67072 with more BC provisions
Stanislav Malyshev [Mon, 23 Jun 2014 07:19:37 +0000 (00:19 -0700)]
Fix bug #67498 - phpinfo() Type Confusion Information Leak Vulnerability
Stanislav Malyshev [Sun, 22 Jun 2014 02:46:16 +0000 (19:46 -0700)]
Fix bug #67492: unserialize() SPL ArrayObject / SPLObjectStorage Type Confusion
Stanislav Malyshev [Sun, 8 Jun 2014 20:44:40 +0000 (13:44 -0700)]
Fix bug #67397 (Buffer overflow in locale_get_display_name->uloc_getDisplayName (libicu 4.8.1))
Stanislav Malyshev [Wed, 4 Jun 2014 08:06:01 +0000 (01:06 -0700)]
Fix bug #67349: Locale::parseLocale Double Free
Stanislav Malyshev [Tue, 24 Jun 2014 17:25:09 +0000 (10:25 -0700)]
Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
5.4.30
Better fix for bug #67072 with more BC provisions
Fix bug #67498 - phpinfo() Type Confusion Information Leak Vulnerability
update CVE
Fix bug #67492: unserialize() SPL ArrayObject / SPLObjectStorage Type Confusion
Fix bug #67397 (Buffer overflow in locale_get_display_name->uloc_getDisplayName (libicu 4.8.1))
Fix bug #67349: Locale::parseLocale Double Free
add CVEs
Fix potential segfault in dns_get_record()
Fix bug #66127 (Segmentation fault with ArrayObject unset)
5.4.30 rc1
Conflicts:
ext/intl/locale/locale_methods.c
Stanislav Malyshev [Tue, 24 Jun 2014 17:23:36 +0000 (10:23 -0700)]
Merge branch 'PHP-5.4.30' into PHP-5.4
* PHP-5.4.30:
5.4.30
Better fix for bug #67072 with more BC provisions
Fix bug #67498 - phpinfo() Type Confusion Information Leak Vulnerability
update CVE
Fix bug #67492: unserialize() SPL ArrayObject / SPLObjectStorage Type Confusion
Fix bug #67397 (Buffer overflow in locale_get_display_name->uloc_getDisplayName (libicu 4.8.1))
Fix bug #67349: Locale::parseLocale Double Free
add CVEs
Fix potential segfault in dns_get_record()
Fix bug #66127 (Segmentation fault with ArrayObject unset)
5.4.30 rc1
Conflicts:
configure.in
main/php_version.h
Stanislav Malyshev [Tue, 24 Jun 2014 17:20:51 +0000 (10:20 -0700)]
Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
update NEWS
Stanislav Malyshev [Tue, 24 Jun 2014 17:20:33 +0000 (10:20 -0700)]
update NEWS
Stanislav Malyshev [Tue, 24 Jun 2014 17:17:34 +0000 (10:17 -0700)]
5.4.30
Xinchen Hui [Tue, 24 Jun 2014 05:53:43 +0000 (13:53 +0800)]
Merge branch 'PHP-5.6'
Xinchen Hui [Tue, 24 Jun 2014 05:53:05 +0000 (13:53 +0800)]
Fixed bug #67368 (Memory leak with immediately dereferenced array in class constant)
Stanislav Malyshev [Sun, 22 Jun 2014 04:28:33 +0000 (21:28 -0700)]
Better fix for bug #67072 with more BC provisions
Stanislav Malyshev [Tue, 24 Jun 2014 05:15:21 +0000 (22:15 -0700)]
Merge branch 'PHP-5.6'
* PHP-5.6:
Better fix for bug #67072 with more BC provisions
Better fix for bug #67072 with more BC provisions
Stanislav Malyshev [Tue, 24 Jun 2014 05:14:33 +0000 (22:14 -0700)]
Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
Better fix for bug #67072 with more BC provisions
Better fix for bug #67072 with more BC provisions
Conflicts:
ext/standard/var_unserializer.c
ext/standard/var_unserializer.re
Stanislav Malyshev [Tue, 24 Jun 2014 05:13:32 +0000 (22:13 -0700)]
Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
Better fix for bug #67072 with more BC provisions
Ondřej Surý [Mon, 23 Jun 2014 09:35:42 +0000 (11:35 +0200)]
Add initial manual page for phpdbg.1
Remi Collet [Mon, 23 Jun 2014 08:39:22 +0000 (10:39 +0200)]
Merge branch 'PHP-5.6'
* PHP-5.6:
NEWS
Better fix for phpdbg + libedit - fix include - disable coloured prompt only with libedit
Fix https://github.com/krakjoe/phpdbg/issues/91
Remi Collet [Mon, 23 Jun 2014 08:39:06 +0000 (10:39 +0200)]
NEWS
Remi Collet [Mon, 23 Jun 2014 08:17:43 +0000 (10:17 +0200)]
Better fix for phpdbg + libedit
- fix include
- disable coloured prompt only with libedit
Remi Collet [Mon, 23 Jun 2014 08:04:40 +0000 (10:04 +0200)]
Fix https://github.com/krakjoe/phpdbg/issues/91
Enable edit feature when build with libedit.
Notice: coloured prompt only enable with READLINE
Remi Collet [Mon, 23 Jun 2014 08:18:55 +0000 (10:18 +0200)]
Merge branch 'PHP-5.6'
* PHP-5.6:
Better fix for phpdbg + libedit - fix include - disable coloured prompt only with libedit
Fix https://github.com/krakjoe/phpdbg/issues/91
Remi Collet [Mon, 23 Jun 2014 08:17:43 +0000 (10:17 +0200)]
Better fix for phpdbg + libedit
- fix include
- disable coloured prompt only with libedit
Ferenc Kovacs [Mon, 23 Jun 2014 08:14:08 +0000 (10:14 +0200)]
Merge branch 'PHP-5.6'
* PHP-5.6:
testcase for 67468 (only for debug build, as I could not create a stable segfault without loading other exts like pgsql)
mention 67468 fix in NEWS
Fix Bug #67468 Segfault in highlight_file()/highlight_string() when pgsql.so module is loaded
Ferenc Kovacs [Mon, 23 Jun 2014 08:10:17 +0000 (10:10 +0200)]
testcase for 67468 (only for debug build, as I could not create a stable segfault without loading other exts like pgsql)
Ferenc Kovacs [Fri, 20 Jun 2014 22:06:51 +0000 (00:06 +0200)]
mention 67468 fix in NEWS
Remi Collet [Mon, 23 Jun 2014 08:04:40 +0000 (10:04 +0200)]
Fix https://github.com/krakjoe/phpdbg/issues/91
Enable edit feature when build with libedit.
Notice: coloured prompt only enable with READLINE
Andreas Ferber [Wed, 18 Jun 2014 22:15:07 +0000 (00:15 +0200)]
Fix Bug #67468 Segfault in highlight_file()/highlight_string() when pgsql.so module is loaded
str_efree() must be used in zend_highlight() and zend_indent() to free
string data assigned to a zval to account for interned strings.
Stanislav Malyshev [Mon, 23 Jun 2014 07:19:37 +0000 (00:19 -0700)]
Fix bug #67498 - phpinfo() Type Confusion Information Leak Vulnerability
Stanislav Malyshev [Mon, 23 Jun 2014 07:07:08 +0000 (00:07 -0700)]
update CVE
Stanislav Malyshev [Sun, 22 Jun 2014 04:28:33 +0000 (21:28 -0700)]
Better fix for bug #67072 with more BC provisions
Stanislav Malyshev [Sun, 22 Jun 2014 04:28:33 +0000 (21:28 -0700)]
Better fix for bug #67072 with more BC provisions
Stanislav Malyshev [Sun, 22 Jun 2014 02:46:16 +0000 (19:46 -0700)]
Fix bug #67492: unserialize() SPL ArrayObject / SPLObjectStorage Type Confusion
Stanislav Malyshev [Sun, 8 Jun 2014 20:44:40 +0000 (13:44 -0700)]
Fix bug #67397 (Buffer overflow in locale_get_display_name->uloc_getDisplayName (libicu 4.8.1))
Stanislav Malyshev [Wed, 4 Jun 2014 08:06:01 +0000 (01:06 -0700)]
Fix bug #67349: Locale::parseLocale Double Free
Stanislav Malyshev [Sun, 22 Jun 2014 01:37:08 +0000 (18:37 -0700)]
add CVEs
Dmitry Stogov [Fri, 20 Jun 2014 10:01:22 +0000 (14:01 +0400)]
Merge branch 'PHP-5.6'
* PHP-5.6:
Fixed MarinaDB support
Dmitry Stogov [Fri, 20 Jun 2014 09:58:26 +0000 (13:58 +0400)]
Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
Fixed MarinaDB support
Dmitry Stogov [Fri, 20 Jun 2014 09:57:38 +0000 (13:57 +0400)]
Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
Fixed MarinaDB support
Dmitry Stogov [Fri, 20 Jun 2014 09:56:32 +0000 (13:56 +0400)]
Fixed MarinaDB support
Remi Collet [Fri, 20 Jun 2014 04:45:36 +0000 (06:45 +0200)]
Merge branch 'PHP-5.6'
* PHP-5.6:
skip this test which fails without network
Remi Collet [Fri, 20 Jun 2014 04:45:16 +0000 (06:45 +0200)]
skip this test which fails without network
Ferenc Kovacs [Thu, 19 Jun 2014 00:29:42 +0000 (02:29 +0200)]
Merge branch 'PHP-5.6'
* PHP-5.6:
add missing entry to NEWS
Ferenc Kovacs [Thu, 19 Jun 2014 00:29:27 +0000 (02:29 +0200)]
add missing entry to NEWS
Ferenc Kovacs [Thu, 19 Jun 2014 00:18:52 +0000 (02:18 +0200)]
Merge branch 'PHP-5.6'
* PHP-5.6:
add missing entry to NEWS
Ferenc Kovacs [Thu, 19 Jun 2014 00:18:26 +0000 (02:18 +0200)]
add missing entry to NEWS
Ferenc Kovacs [Wed, 18 Jun 2014 23:35:19 +0000 (01:35 +0200)]
Merge branch 'PHP-5.6'
* PHP-5.6:
add NEWS block for 5.6.0RC2
Ferenc Kovacs [Wed, 18 Jun 2014 23:34:25 +0000 (01:34 +0200)]
add NEWS block for 5.6.0RC2
Andrey Hristov [Wed, 18 Jun 2014 18:54:26 +0000 (21:54 +0300)]
Merge branch 'PHP-5.6'
Conflicts:
NEWS
Andrey Hristov [Wed, 18 Jun 2014 18:53:34 +0000 (21:53 +0300)]
Add support for gb18030/MySQL 5.7
Andrey Hristov [Wed, 18 Jun 2014 15:32:51 +0000 (18:32 +0300)]
Merge branch 'PHP-5.6' of git.php.net:php-src into PHP-5.6
Andrey Hristov [Wed, 18 Jun 2014 15:31:07 +0000 (18:31 +0300)]
Merge branch 'master' of git.php.net:php-src
Andrey Hristov [Wed, 18 Jun 2014 15:30:49 +0000 (18:30 +0300)]
Merge branch 'PHP-5.6'
Andrey Hristov [Wed, 18 Jun 2014 15:30:37 +0000 (18:30 +0300)]
Fix another problem with MySQL 5.7
Remi Collet [Wed, 18 Jun 2014 14:00:07 +0000 (16:00 +0200)]
Merge branch 'PHP-5.6'
* PHP-5.6:
new test, missing in
ea466a3
Remi Collet [Wed, 18 Jun 2014 13:59:45 +0000 (15:59 +0200)]
new test, missing in
ea466a3
Andrey Hristov [Wed, 18 Jun 2014 13:45:12 +0000 (16:45 +0300)]
Merge branch 'PHP-5.6'
Andrey Hristov [Wed, 18 Jun 2014 13:42:42 +0000 (16:42 +0300)]
Merge branch 'PHP-5.5' into PHP-5.6
Andrey Hristov [Wed, 18 Jun 2014 13:20:14 +0000 (16:20 +0300)]
Suppress test failure with MySQL 5.7
Lior Kaplan [Tue, 17 Jun 2014 21:22:16 +0000 (00:22 +0300)]
Update copyright year to 2014
Lior Kaplan [Tue, 17 Jun 2014 21:21:20 +0000 (00:21 +0300)]
Merge branch 'PHP-5.6'
* PHP-5.6:
Update copyright year to 2014
Update copyright year to 2014
Update copyright year to 2014
Update copyright year to 2014
Update copyright year to 2014
Update copyright year to 2014
Lior Kaplan [Tue, 17 Jun 2014 21:18:47 +0000 (00:18 +0300)]
Update copyright year to 2014