]>
granicus.if.org Git - php/log
Edgar R. Sandi [Tue, 30 Jun 2015 01:02:19 +0000 (22:02 -0300)]
Added more tests to improve function coverage
Christoph M. Becker [Thu, 2 Jul 2015 22:23:44 +0000 (00:23 +0200)]
updated NEWS
Christoph M. Becker [Thu, 2 Jul 2015 22:04:50 +0000 (00:04 +0200)]
Fix #69975: PHP segfaults when accessing nvarchar(max) defined columns
The SQL Server Native Client 11.0 and maybe other ODBC drivers report
NVARCHAR(MAX) columns as SQL_WVARCHAR with size 0. This causes too small a
buffer to be emalloc'd, likely causing a segfault in the following. As we don't
know the real size of the column data, we treat such colums as
SQL_WLONGVARCHAR.
The related bug #67437 suggests that some drivers report a size of ~4GB. It is
not certain that this is really the case (there might be some integer overflow
involved, and anyway, there has been no feedback), so we do not cater for this
now. However, it would not be hard to treat all sizes above a certain threshold
in a similar way, i.e. as SQL_WLONGVARCHAR.
Anatol Belski [Mon, 29 Jun 2015 08:12:36 +0000 (10:12 +0200)]
keep LDAP_DEPRECATED in config.w32
Edgar R. Sandi [Mon, 29 Jun 2015 20:34:57 +0000 (17:34 -0300)]
Improved code coverage of explode function
Edgar R. Sandi [Mon, 29 Jun 2015 17:33:21 +0000 (14:33 -0300)]
Added basic and error tests for hex2bin function
Edgar R. Sandi [Mon, 29 Jun 2015 13:05:27 +0000 (10:05 -0300)]
adding several other testing scenarios of code without coverage in stripcslashes function
Edgar R. Sandi [Mon, 29 Jun 2015 12:50:27 +0000 (09:50 -0300)]
adding another testing scenario without coverage in setlocale function
Dmitry Stogov [Mon, 29 Jun 2015 14:45:56 +0000 (17:45 +0300)]
On Windows PHP may be restarted with different set of DSO extensions without SHM reset.
This may make optimisation for entities from DSO extensions inconsistent.
Côme Bernigaud [Mon, 29 Jun 2015 07:31:37 +0000 (09:31 +0200)]
Merge PR about LDAP cleaning by removing deprecated calls
Merge branch 'pull-request/1357' into PHP-5.6
* pull-request/1357:
Putting back deprecated symbols for ldap_sort
Removed deprecated function calls from ldap module
Removed ifdefs of LDAP_API_FEATURE_X_OPENLDAP, fixed a warning
Stanislav Malyshev [Mon, 29 Jun 2015 07:30:55 +0000 (00:30 -0700)]
Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
Move strlen() check to php_mail_detect_multiple_crlf()
Fixed Bug #69874 : Can't set empty additional_headers for mail()
Côme Bernigaud [Mon, 29 Jun 2015 07:07:49 +0000 (09:07 +0200)]
Putting back deprecated symbols for ldap_sort
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()
Christoph M. Becker [Sat, 27 Jun 2015 18:03:38 +0000 (20:03 +0200)]
updated NEWS
Christoph M. Becker [Sat, 27 Jun 2015 17:47:32 +0000 (19:47 +0200)]
Fixed #69655: php -S changes MKCALENDAR request method to MKCOL
The parsing of the request method in the CLI server has been faulty, so that
several unsupported methods have been recognized as other methods.
Christoph M. Becker [Sat, 27 Jun 2015 13:02:52 +0000 (15:02 +0200)]
added skip condition for powershell requirement of test
Christoph M. Becker [Sat, 27 Jun 2015 12:32:34 +0000 (14:32 +0200)]
updated NEWS
Christoph M. Becker [Mon, 18 May 2015 19:28:22 +0000 (21:28 +0200)]
Fix #64878: 304 responses return Content-Type header
According to RFC 7232 304 responses should not send a Content-Type header,
so the CLI server should comply.
Christoph M. Becker [Fri, 26 Jun 2015 23:08:56 +0000 (01:08 +0200)]
added regression test for bug #69679
DOMDocument::loadHTML refuses to accept NULL bytes.
Christoph M. Becker [Fri, 26 Jun 2015 21:20:22 +0000 (23:20 +0200)]
slightly revised bug69462.phpt
Tomasz Sawicki [Thu, 25 Jun 2015 16:32:01 +0000 (18:32 +0200)]
Test for bug #69462
Test scenario for already fixed bug #69462 with segmentation fault when
SoapVar XML node name was null.
Tjerk Meesters [Thu, 25 Jun 2015 21:31:54 +0000 (05:31 +0800)]
Fixed #69882: OpenSSL error "key values mismatch" after openssl_pkcs12_read with extra certs
Squashed commit of the following:
commit
a64c1d9bc4c129fd946a478bdcb55101e42157b7
Author: Tomasz Sawicki <falundir@gmail.com>
Date: Wed Jun 24 08:49:37 2015 +0200
Fix #69882: OpenSSL error "key values mismatch" after openssl_pkcs12_read with extra certs
The "key values mismatch" error is triggered in openssl_pkcs12_read by
PKCS12_parse, because it uses X509_check_private_key to separate main
certificate (which corresponds to private key) from extra certificates.
Extra certificates usually comes first (p12 contents are reversed as
stack) and X509_check_private_key triggers X509_R_KEY_VALUES_MISMATCH
error.
The fix pops "key values mismatch" error from OpenSSL error stack for
each extra certificate if there are any.
Julien Pauli [Thu, 25 Jun 2015 17:13:20 +0000 (19:13 +0200)]
Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
fix unknown size of void error
Anatol Belski [Wed, 17 Jun 2015 21:43:13 +0000 (23:43 +0200)]
fix unknown size of void error
Anatol Belski [Thu, 25 Jun 2015 09:34:04 +0000 (11:34 +0200)]
Ferenc Kovacs [Wed, 24 Jun 2015 22:21:45 +0000 (00:21 +0200)]
5.6.12 next
Julien Pauli [Wed, 24 Jun 2015 08:42:41 +0000 (10:42 +0200)]
Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
5.5.28 now - Security Only
Conflicts:
configure.in
main/php_version.h
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:42:22 +0000 (01:42 +0200)]
Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
Made bug44295-win.phpt locale independent
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:42:24 +0000 (00:42 +0200)]
updated NEWS
Christoph M. Becker [Tue, 23 Jun 2015 22:32:13 +0000 (00:32 +0200)]
Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
updated NEWS
updated NEWS
Fixed bug #69768 (escapeshell*() doesn't cater to !)
bump API version to 6.8
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:36:59 +0000 (19:36 +0200)]
updated NEWS
Christoph M. Becker [Tue, 23 Jun 2015 17:32:57 +0000 (19:32 +0200)]
Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
updated NEWS
Fixed Bug #53823 (preg_replace: * qualifier on unicode replace garbles the string)
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:30:31 +0000 (17:30 +0200)]
Moved NEWS entry for bug #69864 to proper category
Christoph M. Becker [Tue, 23 Jun 2015 15:28:22 +0000 (17:28 +0200)]
Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
Moved NEWS entry for bug #69864 to proper category
Christoph M. Becker [Tue, 23 Jun 2015 15:27:21 +0000 (17:27 +0200)]
Moved NEWS entry for bug #69864 to proper category
Côme Bernigaud [Tue, 23 Jun 2015 14:44:48 +0000 (16:44 +0200)]
Removed deprecated function calls from ldap module
ldap_search -> ldap search_ext
ldap_search_s ->_ldap_search_ext_s
ldap_add_s -> ldap_add_ext_s
ldap_delete_s -> ldap_delete_ext_s
ldap_compare_s -> ldap_compare_ext_s
ldap_value_free -> ldap_memvfree
Only thing left is ldap_sort_entries, no replacement
Christoph M. Becker [Tue, 23 Jun 2015 14:43:12 +0000 (16:43 +0200)]
updated NEWS
Christoph M. Becker [Tue, 23 Jun 2015 14:36:35 +0000 (16:36 +0200)]
Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
updated NEWS
Fixed bug #69864 (Segfault in preg_replace_callback)
Christoph M. Becker [Tue, 23 Jun 2015 14:22:08 +0000 (16:22 +0200)]
Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
bump API version to 6.8
Côme Bernigaud [Tue, 23 Jun 2015 14:09:56 +0000 (16:09 +0200)]
Fixed two errors in LDAP tests
Côme Bernigaud [Tue, 23 Jun 2015 13:50:14 +0000 (15:50 +0200)]
Removed ifdefs of LDAP_API_FEATURE_X_OPENLDAP, fixed a warning
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:40:34 +0000 (23:40 -0400)]
Merge branch 'PHP-5.6' of git.php.net:php-src into PHP-5.6
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
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:40:27 +0000 (16:40 +0200)]
Merge branch 'PHP-5.5' into PHP-5.6
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:52 +0000 (09:35 +0800)]
Merge branch 'PHP-5.5' into PHP-5.6
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:04:03 +0000 (22:04 +0200)]
update NEWS
Anatol Belski [Thu, 18 Jun 2015 20:03:28 +0000 (22:03 +0200)]
Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
updated NEWS
fixes bug #69835: phpinfo() does not report many Windows SKUs
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:35:54 +0000 (17:35 +0300)]
Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
Fixed bug #69689 (Align PCRE_MINOR with current version)
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:56:06 +0000 (16:56 +0300)]
Add CVE to bugs #69545, #69646 and #69667
Lior Kaplan [Thu, 18 Jun 2015 13:52:51 +0000 (16:52 +0300)]
Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
Add CVE to bugs #69545, #69646 and #69667
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:34:33 +0000 (13:34 -0700)]
Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
Fix buffer growth in sockets/conversion.c
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
Andreas Heigl [Tue, 5 May 2015 19:30:29 +0000 (21:30 +0200)]
Implements extended error messages
This commit introduces a new constant that can be used to retrieve more
detailed error messages.
This fixes #47222
The new constant LDAP_OPT_DIAGNOSTIC_MESSAGE is defined in PHP when the
underlying library provides (and understands) it. This is the case in
the current OpenLDAP-implementation.
Tanks to Johnny Willer who provided the solution at http://stackoverflow.com/questions/
28765077 /get-number-of-ad-errors-with-ldap-and-php-ldap-function-return-unprecise-error/
28816473 #
28816473
Côme Bernigaud [Thu, 16 Apr 2015 15:11:38 +0000 (17:11 +0200)]
Replaced calls to deprecated openldap functions
ldap_unbind_s -> ldap_unbind_ext
389 -> LDAP_PORT
ldap_init -> ldap_initialize
ldap_bind_s -> ldap_sasl_bind_s
ldap_value_free -> ber_memvfree
Also added ldap_is_ldap_url check
Côme Bernigaud [Wed, 17 Jun 2015 11:47:32 +0000 (13:47 +0200)]
Fixed LDAP tests so that base can exists
Now you can set the base in the env var LDAP_TEST_BASE.
The base has to exists. (before tests were attempting to create/delete
the base itself)
Christoph M. Becker [Wed, 17 Jun 2015 00:20:14 +0000 (02:20 +0200)]
updated NEWS
Christoph M. Becker [Wed, 17 Jun 2015 00:18:53 +0000 (02:18 +0200)]
Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
updated NEWS
Fixed bug #61221 - imagegammacorrect function loses alpha channel
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:30 +0000 (10:41 +0100)]
- Updated to version 2015.5 (2015e)
Derick Rethans [Mon, 15 Jun 2015 09:41:30 +0000 (10:41 +0100)]
Empty merge
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:23 +0000 (10:28 +0100)]
- Updated to version 2015.5 (2015e)
Derick Rethans [Mon, 15 Jun 2015 09:28:23 +0000 (10:28 +0100)]
Empty merge
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:24 +0000 (10:17 +0100)]
- Updated to version .-96 ()
Derick Rethans [Mon, 15 Jun 2015 09:17:24 +0000 (10:17 +0100)]
Empty merge
Derick Rethans [Mon, 15 Jun 2015 09:17:23 +0000 (10:17 +0100)]
- Updated to version .-96 ()
Matteo Beccati [Sat, 13 Jun 2015 06:08:21 +0000 (08:08 +0200)]
Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
Fix copy/paste error in test
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 [Fri, 12 Jun 2015 00:07:02 +0000 (02:07 +0200)]
Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
Fix bug #69344 (PDO PgSQL Incorrect binding numeric array with gaps)
Fix bug #69362 (PDO-pgsql fails to connect if password contains a leading single quote)
Fixed bug #61574 - No MSI
Conflicts:
ext/pdo_pgsql/pgsql_driver.c
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)