]>
granicus.if.org Git - php/log
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: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: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: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: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: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
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
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 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:16 +0000 (06:45 +0200)]
skip this test which fails without network
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:26 +0000 (02:18 +0200)]
add missing entry to NEWS
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: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:30:37 +0000 (18:30 +0300)]
Fix another problem with MySQL 5.7
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: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:18:47 +0000 (00:18 +0300)]
Update copyright year to 2014
Lior Kaplan [Tue, 17 Jun 2014 21:16:23 +0000 (00:16 +0300)]
Update copyright year to 2014
Align with online version at http://www.php.net/license/3_01.txt
Lior Kaplan [Tue, 17 Jun 2014 21:14:18 +0000 (00:14 +0300)]
Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
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:12:33 +0000 (00:12 +0300)]
Update copyright year to 2014
Lior Kaplan [Tue, 17 Jun 2014 21:11:55 +0000 (00:11 +0300)]
Update copyright year to 2014
Align with online version at http://www.php.net/license/3_01.txt
Lior Kaplan [Tue, 17 Jun 2014 21:11:35 +0000 (00:11 +0300)]
Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
Update copyright year to 2014
Update copyright year to 2014
Lior Kaplan [Tue, 17 Jun 2014 20:57:20 +0000 (23:57 +0300)]
Update copyright year to 2014
Lior Kaplan [Tue, 17 Jun 2014 20:56:46 +0000 (23:56 +0300)]
Update copyright year to 2014
Remi Collet [Tue, 17 Jun 2014 07:41:10 +0000 (09:41 +0200)]
NEWS
Remi Collet [Tue, 17 Jun 2014 07:38:54 +0000 (09:38 +0200)]
Fix Request #67453 Allow to unserialize empty data.
SplDoublyLinkedList, SplObjectStorage and ArrayObject have empty
constructor (no arg), so it make sense to allow to unserialize empty
data.
This allow the hack (used in various place, including PHPUnit) to
instanciate class without call to constructor to work.
Lior Kaplan [Mon, 16 Jun 2014 20:34:50 +0000 (23:34 +0300)]
Update copyright year to 2014
Lior Kaplan [Mon, 16 Jun 2014 20:32:10 +0000 (23:32 +0300)]
Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
Update copyright year for re2c generated files
Update copyright year to 2014
Update copyright year for re2c files as well
Lior Kaplan [Mon, 16 Jun 2014 20:30:44 +0000 (23:30 +0300)]
Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
Update copyright year for re2c generated files
Update copyright year to 2014
Update copyright year for re2c files as well
Lior Kaplan [Mon, 16 Jun 2014 20:28:36 +0000 (23:28 +0300)]
Update copyright year for re2c generated files
Lior Kaplan [Mon, 16 Jun 2014 20:27:45 +0000 (23:27 +0300)]
Update copyright year to 2014
Lior Kaplan [Mon, 16 Jun 2014 20:26:50 +0000 (23:26 +0300)]
Update copyright year for re2c files as well
Bob Weinand [Mon, 16 Jun 2014 09:18:45 +0000 (11:18 +0200)]
Merge branch 'PHP-5.5' into PHP-5.6
Conflicts:
Zend/zend_compile.c
Bob Weinand [Mon, 16 Jun 2014 09:16:33 +0000 (11:16 +0200)]
Merge branch 'PHP-5.4' into PHP-5.5
Bob Weinand [Mon, 16 Jun 2014 09:10:50 +0000 (11:10 +0200)]
Fix patch for bug #67436
Remi Collet [Mon, 16 Jun 2014 08:52:26 +0000 (10:52 +0200)]
fix failed test
Remi Collet [Mon, 16 Jun 2014 07:42:55 +0000 (09:42 +0200)]
Fix test on modern distro where old unsecure algo are disabled in openssl config.
Testing recent algo should be enough to check this function.
Bob Weinand [Sun, 15 Jun 2014 22:42:50 +0000 (00:42 +0200)]
Merge branch 'PHP-5.5' into PHP-5.6
Bob Weinand [Sun, 15 Jun 2014 22:41:46 +0000 (00:41 +0200)]
Merge branch 'PHP-5.4' into PHP-5.5
Bob Weinand [Sun, 15 Jun 2014 22:35:20 +0000 (00:35 +0200)]
Merge branch 'pull-request/695' into PHP-5.4
Levi Morrison [Sun, 15 Jun 2014 22:10:40 +0000 (16:10 -0600)]
Added tests for bug 67436
Bob Weinand [Sun, 15 Jun 2014 21:55:44 +0000 (23:55 +0200)]
Merge branch 'PHP-5.5' into PHP-5.6
Bob Weinand [Sun, 15 Jun 2014 21:54:05 +0000 (23:54 +0200)]
Merge branch 'PHP-5.4' into PHP-5.5
Bob Weinand [Sun, 15 Jun 2014 21:51:51 +0000 (23:51 +0200)]
Fixed wrong XFAIL test - already fixed
Lior Kaplan [Sun, 15 Jun 2014 21:26:01 +0000 (00:26 +0300)]
Fix typo in Bug #67406 NEWS entry
Lior Kaplan [Sun, 15 Jun 2014 21:26:01 +0000 (00:26 +0300)]
Fix typo in Bug #67406 NEWS entry
Bob Weinand [Sun, 15 Jun 2014 21:06:15 +0000 (23:06 +0200)]
Merge branch 'PHP-5.5' into PHP-5.6
Conflicts:
NEWS
Zend/zend_compile.c
Bob Weinand [Sun, 15 Jun 2014 20:36:13 +0000 (22:36 +0200)]
Merge branch 'PHP-5.4' into PHP-5.5
Bob Weinand [Sun, 15 Jun 2014 20:32:47 +0000 (22:32 +0200)]
Updated NEWS
Bob Weinand [Sun, 15 Jun 2014 20:24:44 +0000 (22:24 +0200)]
Merge branch 'PHP-5.4' into PHP-5.5
Bob Weinand [Sun, 15 Jun 2014 20:18:25 +0000 (22:18 +0200)]
Fix bug #67436
Bob Weinand [Sun, 15 Jun 2014 13:50:36 +0000 (15:50 +0200)]
Update NEWS
Bob Weinand [Sun, 15 Jun 2014 13:47:14 +0000 (15:47 +0200)]
Merge sapi/phpdbg into PHP-5.6
Stanislav Malyshev [Sun, 15 Jun 2014 08:07:48 +0000 (01:07 -0700)]
Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
update NEWS
update NEWS
Stanislav Malyshev [Sun, 15 Jun 2014 08:07:39 +0000 (01:07 -0700)]
update NEWS
Stanislav Malyshev [Sun, 15 Jun 2014 08:06:46 +0000 (01:06 -0700)]
Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
update NEWS
Stanislav Malyshev [Sun, 15 Jun 2014 08:06:37 +0000 (01:06 -0700)]
update NEWS
Sara Golemon [Tue, 10 Jun 2014 18:18:02 +0000 (11:18 -0700)]
Fix potential segfault in dns_get_record()
If the remote sends us a packet with a malformed TXT record,
we could end up trying to over-consume the packet and wander
off into overruns.
Stanislav Malyshev [Sun, 15 Jun 2014 07:46:31 +0000 (00:46 -0700)]
update NEWS
kovacs.ferenc [Sat, 14 Jun 2014 21:48:17 +0000 (23:48 +0200)]
fix bugsnet #67212: phpdbg uses non-standard TIOCGWINSZ
kovacs.ferenc [Thu, 12 Jun 2014 21:13:50 +0000 (23:13 +0200)]
change the default terminal width from 100 to 80, as that is the most common value
Derick Rethans [Fri, 13 Jun 2014 22:26:47 +0000 (23:26 +0100)]
Merge branch 'PHP-5.5' into PHP-5.6
Derick Rethans [Fri, 13 Jun 2014 22:26:43 +0000 (23:26 +0100)]
Merge branch 'PHP-5.4' into PHP-5.5
Derick Rethans [Fri, 13 Jun 2014 22:26:42 +0000 (23:26 +0100)]
- Updated to version 2014.5 (2014e)
Matteo Beccati [Fri, 13 Jun 2014 11:14:12 +0000 (13:14 +0200)]
Fix bug #67433 SIGSEGV when using count() on an object implementing Countable
krakjoe [Fri, 13 Jun 2014 06:35:11 +0000 (07:35 +0100)]
remove all references
Adam Harvey [Fri, 13 Jun 2014 01:17:18 +0000 (18:17 -0700)]
Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
Follow 308 Permanent Redirect responses.
projects / php / log