657f93e7b9
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
updated NEWS
fixes bug #69835 : phpinfo() does not report many Windows SKUs
2015-06-18 22:03:28 +02:00
c0119ca7f3
updated NEWS
2015-06-18 22:02:37 +02:00
a85156db7d
fixes bug #69835 : phpinfo() does not report many Windows SKUs
2015-06-18 22:01:20 +02:00
3930e1f2fa
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
Fixed bug #69689 (Align PCRE_MINOR with current version)
2015-06-18 17:35:54 +03:00
ca33ae3eb2
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
Fixed bug #69689 (Align PCRE_MINOR with current version)
2015-06-18 17:34:53 +03:00
cc7194dd10
Fixed bug #69689 (Align PCRE_MINOR with current version)
2015-06-18 17:30:21 +03:00
811816dc25
Add CVE to bugs #69545 , #69646 and #69667
2015-06-18 16:56:06 +03:00
0f49c205f4
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
Add CVE to bugs #69545 , #69646 and #69667
2015-06-18 16:52:51 +03:00
991b2cc37b
Add CVE to bugs #69545 , #69646 and #69667
2015-06-18 16:51:20 +03:00
189af22cf0
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
Add CVE to bugs #69545 , #69646 and #69667
2015-06-18 15:50:11 +03:00
5f67caad54
Add CVE to bugs #69545 , #69646 and #69667
2015-06-18 15:45:10 +03:00
c4dd65c723
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
Fix buffer growth in sockets/conversion.c
2015-06-17 13:34:33 -07:00
d241711f44
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
2015-06-17 13:34:20 -07:00
eb702637a9
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
2015-06-17 15:39:07 +02:00
e7af0fe1eb
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
2015-06-17 14:36:38 +02:00
8836404faf
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)
2015-06-17 13:50:14 +02:00
e4917bc747
updated NEWS
2015-06-17 02:20:14 +02:00
7958a7b38f
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
updated NEWS
Fixed bug #61221 - imagegammacorrect function loses alpha channel
2015-06-17 02:18:53 +02:00
61d58f2d9e
updated NEWS
2015-06-17 02:17:40 +02:00
7469c7e7d0
Fixed bug #61221 - imagegammacorrect function loses alpha channel
...
When applying imagegammacorrect() the alpha channel is now fully retained, instead of being completely lost.
2015-06-17 02:15:59 +02:00
c661e7680f
- Updated to version 2015.5 (2015e)
2015-06-15 10:41:30 +01:00
76c3117af5
Empty merge
2015-06-15 10:41:30 +01:00
558342124e
- Updated to version 2015.5 (2015e)
2015-06-15 10:41:29 +01:00
22a43410cb
- Updated to version 2015.5 (2015e)
2015-06-15 10:28:23 +01:00
dab34e2433
Empty merge
2015-06-15 10:28:23 +01:00
9026a66579
- Updated to version 2015.5 (2015e)
2015-06-15 10:28:22 +01:00
4903f1d139
- Updated to version .-96 ()
2015-06-15 10:17:24 +01:00
3f93e4485e
Empty merge
2015-06-15 10:17:24 +01:00
1d6f4891bd
- Updated to version .-96 ()
2015-06-15 10:17:23 +01:00
b564aa95be
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
Fix copy/paste error in test
2015-06-13 08:08:21 +02:00
9e4d720825
Fix copy/paste error in test
2015-06-13 08:07:49 +02:00
7f4e1a0eef
5.4.43 next
2015-06-11 20:46:47 -07:00
3bb1a4ffe3
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
2015-06-12 02:07:02 +02:00
b60efdce9f
Fix bug #69344 (PDO PgSQL Incorrect binding numeric array with gaps)
2015-06-12 02:05:28 +02:00
afa4c3e7c7
Fix bug #69362 (PDO-pgsql fails to connect if password contains a leading single quote)
2015-06-12 00:21:48 +02:00
7c0b8f872e
Fix bug #69362 (PDO-pgsql fails to connect if password contains a leading single quote)
2015-06-12 00:20:33 +02:00
8de667b8d2
Merge branch 'PHP-5.6' of https://git.php.net/push/php-src into PHP-5.6
2015-06-11 23:55:10 +02:00
d8223c4424
Fixed bug #61574 - No MSI
...
The information regarding the Windows installers (.msi) in install.txt are
obsolete, so let's remove them.
2015-06-11 22:52:30 +02:00
44b09b80f2
Fixed bug #61574 - No MSI
...
The information regarding the Windows installers (.msi) in install.txt are
obsolete, so let's remove them.
2015-06-11 22:44:14 +02:00
1acf55eb75
Fixed bug #69803
2015-06-11 22:20:05 +02:00
3f471c1c69
this is in 5.6.10, not in 5.6.9
2015-06-11 20:30:56 +02:00
8405265578
Fix bug #69740
2015-06-11 17:40:10 +02:00
702e349df4
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
rework that test to allow delta for rounding errors
2015-06-11 17:06:46 +02:00
a037b6de21
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.
2015-06-11 17:05:03 +02:00
d777669679
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
improve test
2015-06-11 15:36:30 +02:00
dcfd1153ec
improve test
2015-06-11 15:36:02 +02:00
b19790ab34
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
added test for bug #69646
2015-06-11 12:07:32 +02:00
e711325ca6
added test for bug #69646
2015-06-11 12:06:59 +02:00
9d162550ac
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
fix bad copypaste
2015-06-11 01:52:23 -07:00
cd927cca50
fix bad copypaste
2015-06-11 01:51:55 -07:00
Anatol Belski