]>
granicus.if.org Git - php/log
Ferenc Kovacs [Mon, 24 Aug 2015 00:21:09 +0000 (02:21 +0200)]
the de_DE(iso-8859-1) locale is not available on ubuntu by default, but there is no reason to require that over the utf-8 one
Ferenc Kovacs [Sun, 23 Aug 2015 20:47:51 +0000 (22:47 +0200)]
let's try running our testsuite without sudo
Stanislav Malyshev [Wed, 5 Aug 2015 06:59:55 +0000 (23:59 -0700)]
5.5.29 next
Stanislav Malyshev [Tue, 4 Aug 2015 23:45:32 +0000 (16:45 -0700)]
Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
fix test
Stanislav Malyshev [Tue, 4 Aug 2015 23:45:20 +0000 (16:45 -0700)]
fix test
Stanislav Malyshev [Tue, 4 Aug 2015 23:13:43 +0000 (16:13 -0700)]
Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
__wakeup doesn't have to be final
Stanislav Malyshev [Tue, 4 Aug 2015 23:13:26 +0000 (16:13 -0700)]
__wakeup doesn't have to be final
Stanislav Malyshev [Tue, 4 Aug 2015 22:22:59 +0000 (15:22 -0700)]
update NEWS
Stanislav Malyshev [Tue, 4 Aug 2015 21:46:30 +0000 (14:46 -0700)]
Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
fix test
update NEWS
Stanislav Malyshev [Tue, 4 Aug 2015 21:46:19 +0000 (14:46 -0700)]
fix test
Stanislav Malyshev [Tue, 4 Aug 2015 21:37:28 +0000 (14:37 -0700)]
update NEWS
Stanislav Malyshev [Tue, 4 Aug 2015 21:10:57 +0000 (14:10 -0700)]
Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
Fix bug #70019 - limit extracted files to given directory
Do not do convert_to_* on unserialize, it messes up references
Fix #69793 - limit what we accept when unserializing exception
Fixed bug #70169 (Use After Free Vulnerability in unserialize() with SplDoublyLinkedList)
Fixed bug #70166 - Use After Free Vulnerability in unserialize() with SPLArrayObject
ignore signatures for packages too
Fix bug #70168 - Use After Free Vulnerability in unserialize() with SplObjectStorage
Fixed bug #69892
Fix bug #70014 - use RAND_bytes instead of deprecated RAND_pseudo_bytes
Improved fix for Bug #69441
Fix bug #70068 (Dangling pointer in the unserialization of ArrayObject items)
Fix bug #70121 (unserialize() could lead to unexpected methods execution / NULL pointer deref)
Fix bug #70081: check types for SOAP variables
Conflicts:
.gitignore
ext/date/php_date.c
ext/spl/spl_array.c
ext/spl/spl_observer.c
Stanislav Malyshev [Tue, 4 Aug 2015 21:04:24 +0000 (14:04 -0700)]
Merge branch 'PHP-5.4' into PHP-5.4.44
* PHP-5.4:
Fixed bug #69892
Adjust Git-Rules
Stanislav Malyshev [Tue, 4 Aug 2015 21:00:29 +0000 (14:00 -0700)]
Fix bug #70019 - limit extracted files to given directory
Stanislav Malyshev [Sun, 2 Aug 2015 07:34:09 +0000 (00:34 -0700)]
Do not do convert_to_* on unserialize, it messes up references
Stanislav Malyshev [Mon, 27 Jul 2015 08:38:27 +0000 (01:38 -0700)]
Fix #69793 - limit what we accept when unserializing exception
Stanislav Malyshev [Sun, 2 Aug 2015 04:51:08 +0000 (21:51 -0700)]
Fixed bug #70169 (Use After Free Vulnerability in unserialize() with SplDoublyLinkedList)
Stanislav Malyshev [Sun, 2 Aug 2015 04:45:19 +0000 (21:45 -0700)]
Fixed bug #70166 - Use After Free Vulnerability in unserialize() with SPLArrayObject
Stanislav Malyshev [Sun, 2 Aug 2015 04:15:37 +0000 (21:15 -0700)]
ignore signatures for packages too
Stanislav Malyshev [Sun, 2 Aug 2015 04:12:38 +0000 (21:12 -0700)]
Fix bug #70168 - Use After Free Vulnerability in unserialize() with SplObjectStorage
Nikita Popov [Sat, 20 Jun 2015 14:39:23 +0000 (16:39 +0200)]
Fixed bug #69892
Julien Pauli [Wed, 29 Jul 2015 08:04:08 +0000 (10:04 +0200)]
Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
Adjust Git-Rules
5.4.44 next
Conflicts:
configure.in
main/php_version.h
Julien Pauli [Wed, 29 Jul 2015 08:02:39 +0000 (10:02 +0200)]
Adjust Git-Rules
Anatol Belski [Tue, 28 Jul 2015 15:41:38 +0000 (17:41 +0200)]
Fixed bug #70002 TS issues with temporary dir handling
Stanislav Malyshev [Mon, 27 Jul 2015 00:43:16 +0000 (17:43 -0700)]
Fix bug #70014 - use RAND_bytes instead of deprecated RAND_pseudo_bytes
Stanislav Malyshev [Mon, 27 Jul 2015 00:31:12 +0000 (17:31 -0700)]
Improved fix for Bug #69441
Stanislav Malyshev [Mon, 27 Jul 2015 00:25:25 +0000 (17:25 -0700)]
Fix bug #70068 (Dangling pointer in the unserialization of ArrayObject items)
Stanislav Malyshev [Mon, 27 Jul 2015 00:09:34 +0000 (17:09 -0700)]
Fix bug #70121 (unserialize() could lead to unexpected methods execution / NULL pointer deref)
Stanislav Malyshev [Sun, 26 Jul 2015 23:44:18 +0000 (16:44 -0700)]
Fix bug #70081: check types for SOAP variables
Ferenc Kovacs [Sun, 26 Jul 2015 20:06:26 +0000 (22:06 +0200)]
make the travis irc notification a oneliner
Julien Pauli [Wed, 8 Jul 2015 14:59:44 +0000 (16:59 +0200)]
5.5.27 release
Stanislav Malyshev [Tue, 7 Jul 2015 22:07:28 +0000 (15:07 -0700)]
5.4.44 next
Stanislav Malyshev [Tue, 7 Jul 2015 17:09:34 +0000 (10:09 -0700)]
Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
Better fix for bug #69958
update news
Fix bug #69669 (mysqlnd is vulnerable to BACKRONYM)
Fix bug #69923 - Buffer overflow and stack smashing error in phar_fix_filepath
Fix bug #69958 - Segfault in Phar::convertToData on invalid file
Conflicts:
ext/mysqlnd/mysqlnd.c
Stanislav Malyshev [Tue, 7 Jul 2015 17:08:37 +0000 (10:08 -0700)]
Merge branch 'PHP-5.5' of git.php.net:php-src into PHP-5.5
* 'PHP-5.5' of git.php.net:php-src:
add missing second argument for ucfirst to the proto
Stanislav Malyshev [Tue, 7 Jul 2015 05:58:28 +0000 (22:58 -0700)]
Better fix for bug #69958
Stanislav Malyshev [Tue, 7 Jul 2015 04:19:42 +0000 (21:19 -0700)]
update news
Stanislav Malyshev [Sun, 5 Jul 2015 07:00:53 +0000 (00:00 -0700)]
Fix bug #69669 (mysqlnd is vulnerable to BACKRONYM)
Stanislav Malyshev [Sun, 5 Jul 2015 06:47:48 +0000 (23:47 -0700)]
Fix bug #69923 - Buffer overflow and stack smashing error in phar_fix_filepath
Stanislav Malyshev [Sun, 5 Jul 2015 04:01:50 +0000 (21:01 -0700)]
Fix bug #69958 - Segfault in Phar::convertToData on invalid file
Ferenc Kovacs [Tue, 7 Jul 2015 13:49:16 +0000 (15:49 +0200)]
Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
add missing second argument for ucfirst to the proto
Ferenc Kovacs [Tue, 7 Jul 2015 13:48:55 +0000 (15:48 +0200)]
add missing second argument for ucfirst to the proto
Stanislav Malyshev [Tue, 7 Jul 2015 07:01:42 +0000 (00:01 -0700)]
Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
Better fix for bug #69958
Stanislav Malyshev [Tue, 7 Jul 2015 05:58:28 +0000 (22:58 -0700)]
Better fix for bug #69958
Stanislav Malyshev [Tue, 7 Jul 2015 06:03:05 +0000 (23:03 -0700)]
Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
Better fix for bug #69958
Stanislav Malyshev [Tue, 7 Jul 2015 05:58:28 +0000 (22:58 -0700)]
Better fix for bug #69958
Stanislav Malyshev [Tue, 7 Jul 2015 04:53:02 +0000 (21:53 -0700)]
Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
update news
Stanislav Malyshev [Tue, 7 Jul 2015 04:19:42 +0000 (21:19 -0700)]
update news
Stanislav Malyshev [Tue, 7 Jul 2015 04:52:49 +0000 (21:52 -0700)]
Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
Fix bug #69669 (mysqlnd is vulnerable to BACKRONYM)
Fix bug #69923 - Buffer overflow and stack smashing error in phar_fix_filepath
Fix bug #69958 - Segfault in Phar::convertToData on invalid file
Conflicts:
ext/mysqlnd/mysqlnd.c
Stanislav Malyshev [Sun, 5 Jul 2015 07:00:53 +0000 (00:00 -0700)]
Fix bug #69669 (mysqlnd is vulnerable to BACKRONYM)
Stanislav Malyshev [Sun, 5 Jul 2015 06:47:48 +0000 (23:47 -0700)]
Fix bug #69923 - Buffer overflow and stack smashing error in phar_fix_filepath
Stanislav Malyshev [Sun, 5 Jul 2015 04:01:50 +0000 (21:01 -0700)]
Fix bug #69958 - Segfault in Phar::convertToData on invalid file
Stanislav Malyshev [Mon, 29 Jun 2015 03:23:00 +0000 (20:23 -0700)]
Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
Move strlen() check to php_mail_detect_multiple_crlf()
Fixed Bug #69874 : Can't set empty additional_headers for mail()
Stanislav Malyshev [Mon, 29 Jun 2015 01:53:19 +0000 (18:53 -0700)]
Merge branch 'pull-request/1350' into PHP-5.4
* pull-request/1350:
Move strlen() check to php_mail_detect_multiple_crlf()
Fixed Bug #69874 : Can't set empty additional_headers for mail()
Anatol Belski [Wed, 17 Jun 2015 21:43:13 +0000 (23:43 +0200)]
fix unknown size of void error
Julien Pauli [Wed, 24 Jun 2015 08:41:06 +0000 (10:41 +0200)]
5.5.28 now - Security Only
Christoph M. Becker [Tue, 23 Jun 2015 23:41:33 +0000 (01:41 +0200)]
Made bug44295-win.phpt locale independent
Formerly it failed on non English installations.
Christoph M. Becker [Tue, 23 Jun 2015 22:31:07 +0000 (00:31 +0200)]
updated NEWS
Christoph M. Becker [Tue, 23 Jun 2015 22:23:39 +0000 (00:23 +0200)]
Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
updated NEWS
Fixed bug #69768 (escapeshell*() doesn't cater to !)
bump API version to 6.8
Christoph M. Becker [Tue, 23 Jun 2015 22:20:32 +0000 (00:20 +0200)]
updated NEWS
Christoph M. Becker [Tue, 23 Jun 2015 22:15:55 +0000 (00:15 +0200)]
Fixed bug #69768 (escapeshell*() doesn't cater to !)
When delayed variable substitution is enabled (can be set in the
Registry, for instance), !ENV! works similar to %ENV%, and so ! should
be escaped like %.
Christoph M. Becker [Tue, 23 Jun 2015 17:32:18 +0000 (19:32 +0200)]
updated NEWS
Christoph M. Becker [Fri, 5 Jun 2015 12:40:03 +0000 (14:40 +0200)]
Fixed Bug #53823 (preg_replace: * qualifier on unicode replace garbles the string)
When advancing after empty matches, php_pcre_match_impl() as well as
php_pcre_replace_impl() always have to advance to the next code point when the
u modifier is given, instead of to the next byte.
Christoph M. Becker [Tue, 23 Jun 2015 15:27:21 +0000 (17:27 +0200)]
Moved NEWS entry for bug #69864 to proper category
Christoph M. Becker [Tue, 23 Jun 2015 11:02:08 +0000 (13:02 +0200)]
updated NEWS
Christoph M. Becker [Tue, 23 Jun 2015 11:00:17 +0000 (13:00 +0200)]
Fixed bug #69864 (Segfault in preg_replace_callback)
When preg_replace_callback() is used, cache entries which are in use must not
be removed. We ensure that by deploying a simple refcounting mechanism.
George Wang [Tue, 23 Jun 2015 03:39:53 +0000 (23:39 -0400)]
Merge branch 'PHP-5.5' of git.php.net:php-src into PHP-5.5
George Wang [Tue, 23 Jun 2015 03:38:38 +0000 (23:38 -0400)]
bump API version to 6.8
George Wang [Tue, 23 Jun 2015 03:38:38 +0000 (23:38 -0400)]
bump API version to 6.8
Nikita Popov [Sat, 20 Jun 2015 14:39:23 +0000 (16:39 +0200)]
Fixed bug #69892
Yasuo Ohgaki [Fri, 19 Jun 2015 06:17:56 +0000 (15:17 +0900)]
Move strlen() check to php_mail_detect_multiple_crlf()
Yasuo Ohgaki [Fri, 19 Jun 2015 03:19:02 +0000 (12:19 +0900)]
Fixed Bug #69874 : Can't set empty additional_headers for mail()
Xinchen Hui [Fri, 19 Jun 2015 01:35:28 +0000 (09:35 +0800)]
Merge branch 'patch-3' of https://github.com/s0ph1e/php-src into PHP-5.5
Anatol Belski [Thu, 18 Jun 2015 20:02:37 +0000 (22:02 +0200)]
updated NEWS
Christian Wenz [Mon, 15 Jun 2015 13:12:40 +0000 (15:12 +0200)]
fixes bug #69835: phpinfo() does not report many Windows SKUs
Sophia Nepochataya [Thu, 18 Jun 2015 17:06:08 +0000 (20:06 +0300)]
Remove excess variable in mail.c (5.5 branch)
Lior Kaplan [Thu, 18 Jun 2015 14:34:53 +0000 (17:34 +0300)]
Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
Fixed bug #69689 (Align PCRE_MINOR with current version)
Lior Kaplan [Thu, 18 Jun 2015 14:30:21 +0000 (17:30 +0300)]
Fixed bug #69689 (Align PCRE_MINOR with current version)
Lior Kaplan [Thu, 18 Jun 2015 13:51:20 +0000 (16:51 +0300)]
Add CVE to bugs #69545, #69646 and #69667
Lior Kaplan [Thu, 18 Jun 2015 12:50:11 +0000 (15:50 +0300)]
Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
Add CVE to bugs #69545, #69646 and #69667
Lior Kaplan [Thu, 18 Jun 2015 12:45:10 +0000 (15:45 +0300)]
Add CVE to bugs #69545, #69646 and #69667
Sara Golemon [Wed, 17 Jun 2015 20:26:48 +0000 (13:26 -0700)]
Fix buffer growth in sockets/conversion.c
memset() the *end* of the new buffer, not the beginning
Copy the pointer to the buffer, not its initial contents
Fixes bug 69619
Christoph M. Becker [Wed, 17 Jun 2015 00:17:40 +0000 (02:17 +0200)]
updated NEWS
Christoph M. Becker [Sat, 6 Jun 2015 12:57:38 +0000 (14:57 +0200)]
Fixed bug #61221 - imagegammacorrect function loses alpha channel
When applying imagegammacorrect() the alpha channel is now fully retained, instead of being completely lost.
Derick Rethans [Mon, 15 Jun 2015 09:41:29 +0000 (10:41 +0100)]
- Updated to version 2015.5 (2015e)
Derick Rethans [Mon, 15 Jun 2015 09:28:22 +0000 (10:28 +0100)]
- Updated to version 2015.5 (2015e)
Derick Rethans [Mon, 15 Jun 2015 09:17:23 +0000 (10:17 +0100)]
- Updated to version .-96 ()
Matteo Beccati [Sat, 13 Jun 2015 06:07:49 +0000 (08:07 +0200)]
Fix copy/paste error in test
Stanislav Malyshev [Fri, 12 Jun 2015 03:46:47 +0000 (20:46 -0700)]
5.4.43 next
Matteo Beccati [Thu, 11 Jun 2015 23:57:22 +0000 (01:57 +0200)]
Fix bug #69344 (PDO PgSQL Incorrect binding numeric array with gaps)
Matteo Beccati [Thu, 11 Jun 2015 21:41:56 +0000 (23:41 +0200)]
Fix bug #69362 (PDO-pgsql fails to connect if password contains a leading single quote)
Christoph M. Becker [Thu, 11 Jun 2015 20:44:14 +0000 (22:44 +0200)]
Fixed bug #61574 - No MSI
The information regarding the Windows installers (.msi) in install.txt are
obsolete, so let's remove them.
Anatol Belski [Thu, 11 Jun 2015 15:05:03 +0000 (17:05 +0200)]
rework that test to allow delta for rounding errors
If this workout doesn't make travis happy, the patch needs to be
reviewed as the leak might still persist.
Anatol Belski [Thu, 11 Jun 2015 13:36:02 +0000 (15:36 +0200)]
improve test
Anatol Belski [Thu, 11 Jun 2015 10:06:59 +0000 (12:06 +0200)]
added test for bug #69646
Stanislav Malyshev [Thu, 11 Jun 2015 08:51:55 +0000 (01:51 -0700)]
fix bad copypaste
Ferenc Kovacs [Wed, 10 Jun 2015 22:13:08 +0000 (00:13 +0200)]
make it possible to set the re2c and yacc paths via environment variables for genfiles
Anatol Belski [Wed, 10 Jun 2015 14:40:38 +0000 (16:40 +0200)]
updated NEWS
Philip Hofstetter [Wed, 3 Jun 2015 12:56:02 +0000 (14:56 +0200)]
fix memory leak in pdo_pgsql closeCursor (bug 69752)
the parent PDO closeCursor method resets the pdo_stmt_t's executed flag
which is used by the postgres driver as a flag to check whether to
allocate memory for the column data or not.
This means that after the parent closeCursor() has been called, the
pdo_pgsql driver will allocate a new buffer for the columns, so the
existing buffer should be freed when the cursor is being closed.
Anatol Belski [Wed, 10 Jun 2015 11:15:01 +0000 (13:15 +0200)]
regenerated the ini scanner
follow up fix for bug #69551
Anatol Belski [Wed, 10 Jun 2015 09:24:45 +0000 (11:24 +0200)]
updated NEWS