]>
granicus.if.org Git - php/log
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 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
Christian Wenz [Tue, 9 Jun 2015 08:40:36 +0000 (10:40 +0200)]
Fix #69781: phpinfo() reports Professional Editions of Windows 7/8/8.1/10 as "Business"
Christian Wenz [Tue, 9 Jun 2015 08:29:26 +0000 (10:29 +0200)]
Revert "Fix #69781: phpinfo() reports Professional Editions of Windows 7/8/8.1/10 as "Business""
This reverts commit
4a05c81b85336b76d05017cc86372fbd04871e3f .
Christian Wenz [Tue, 9 Jun 2015 08:05:27 +0000 (10:05 +0200)]
Fix #69781: phpinfo() reports Professional Editions of Windows 7/8/8.1/10 as "Business"
Anatol Belski [Wed, 10 Jun 2015 08:42:31 +0000 (10:42 +0200)]
updated NEWS
Christoph M. Becker [Thu, 4 Jun 2015 00:40:05 +0000 (02:40 +0200)]
fixed bug, where a linebreak immediately after an opening quote of a value caused a segfault
Christoph M. Becker [Thu, 4 Jun 2015 00:25:43 +0000 (02:25 +0200)]
made failing test more meaningful
Christoph M. Becker [Thu, 4 Jun 2015 00:16:25 +0000 (02:16 +0200)]
added failing test
Ferenc Kovacs [Wed, 10 Jun 2015 07:35:38 +0000 (09:35 +0200)]
add missing NEWS entries
Stanislav Malyshev [Wed, 10 Jun 2015 04:35:31 +0000 (21:35 -0700)]
Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
add NEWS
Stanislav Malyshev [Wed, 10 Jun 2015 04:35:18 +0000 (21:35 -0700)]
add NEWS
Stanislav Malyshev [Wed, 10 Jun 2015 04:33:38 +0000 (21:33 -0700)]
Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
Fixed bug #68776
Yasuo Ohgaki [Wed, 13 May 2015 00:18:46 +0000 (09:18 +0900)]
Fixed bug #68776
Stanislav Malyshev [Wed, 10 Jun 2015 00:12:11 +0000 (17:12 -0700)]
Merge branch 'PHp-5.4' into PHP-5.5
* PHp-5.4:
fix test
update NEWS
Stanislav Malyshev [Wed, 10 Jun 2015 00:11:33 +0000 (17:11 -0700)]
fix test
Stanislav Malyshev [Tue, 9 Jun 2015 23:23:05 +0000 (16:23 -0700)]
update NEWS
Stanislav Malyshev [Tue, 9 Jun 2015 22:31:27 +0000 (15:31 -0700)]
Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
Fix bug #69646 OS command injection vulnerability in escapeshellarg
Fix #69719 - more checks for nulls in paths
fix test description
Fixed Buf #68812 Unchecked return value.
Conflicts:
ext/dom/document.c
ext/gd/gd.c
Stanislav Malyshev [Mon, 1 Jun 2015 05:53:35 +0000 (22:53 -0700)]
Fix bug #69646 OS command injection vulnerability in escapeshellarg
Stanislav Malyshev [Mon, 1 Jun 2015 05:47:52 +0000 (22:47 -0700)]
Fix #69719 - more checks for nulls in paths
Julien Pauli [Tue, 9 Jun 2015 08:29:29 +0000 (10:29 +0200)]
5.5.27 now
Remi Collet [Tue, 9 Jun 2015 07:12:59 +0000 (09:12 +0200)]
fix test description
Remi Collet [Tue, 9 Jun 2015 07:12:59 +0000 (09:12 +0200)]
fix test description
George Wang [Mon, 8 Jun 2015 19:38:59 +0000 (15:38 -0400)]
Fixed Buf #68812 Unchecked return value.
George Wang [Mon, 8 Jun 2015 19:38:59 +0000 (15:38 -0400)]
Fixed Buf #68812 Unchecked return value.
Lior Kaplan [Mon, 8 Jun 2015 19:32:29 +0000 (22:32 +0300)]
NEWS entry for: Upgrade bundled sqlite to 3.8.10.2
Includes fixes for CVE-2015-3414, CVE-2015-3415, CVE-2015-3416
Lior Kaplan [Mon, 8 Jun 2015 19:29:35 +0000 (22:29 +0300)]
Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
NEWS entry for: Upgrade bundled sqlite to 3.8.10.2
Upgrade bundled sqlite to 3.8.10.2
Add CVE used in PHP 5.4.39, 5.4.40, 5.4.41
Add CVE to #68598
Lior Kaplan [Mon, 1 Jun 2015 08:50:12 +0000 (11:50 +0300)]
Upgrade bundled sqlite to 3.8.10.2
Includes fixes for CVE-2015-3414, CVE-2015-3415, CVE-2015-3416 done in 3.8.9
Lior Kaplan [Mon, 8 Jun 2015 19:23:22 +0000 (22:23 +0300)]
NEWS entry for: Upgrade bundled sqlite to 3.8.10.2
Includes fixes for CVE-2015-3414, CVE-2015-3415, CVE-2015-3416
Lior Kaplan [Tue, 2 Jun 2015 22:55:28 +0000 (01:55 +0300)]
Upgrade bundled sqlite to 3.8.10.2
Includes fixes for CVE-2015-3414, CVE-2015-3415, CVE-2015-3416 done in 3.8.9
Lior Kaplan [Mon, 8 Jun 2015 19:12:42 +0000 (22:12 +0300)]
Add CVE used in PHP 5.4.39, 5.4.40, 5.4.41
Lior Kaplan [Mon, 8 Jun 2015 19:04:42 +0000 (22:04 +0300)]
Add CVE to #68598