clones/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2024-10-01 14:56:10 +00:00
Code Issues Packages Projects Releases Wiki Activity
82,365 Commits 494 Branches 1,367 Tags 801 MiB
7bb52dda6a
Commit Graph

35173 Commits

Author SHA1 Message Date
Anatol Belski
7bb52dda6a backport missing rev bfdc9e2805 2015-06-25 11:34:04 +02:00
Christoph M. Becker
c201b63873 Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  Made bug44295-win.phpt locale independent
 2015-06-24 01:42:22 +02:00
Christoph M. Becker
cd068b1ed6 Made bug44295-win.phpt locale independent 
Formerly it failed on non English installations.
 2015-06-24 01:41:33 +02:00
Christoph M. Becker
905c5f4858 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
 2015-06-24 00:32:13 +02:00
Christoph M. Becker
8da8dc04b6 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
 2015-06-24 00:23:39 +02:00
Christoph M. Becker
a621781fdb 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 %.
 2015-06-24 00:15:55 +02:00
Christoph M. Becker
e1561c490e 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)
 2015-06-23 19:32:57 +02:00
Christoph M. Becker
23e25f3319 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.
 2015-06-23 19:28:09 +02:00
Christoph M. Becker
bc47f10a97 Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  updated NEWS
  Fixed bug #69864 (Segfault in preg_replace_callback)
 2015-06-23 16:36:35 +02:00
Côme Bernigaud
9bcdd2aabe Fixed two errors in LDAP tests 2015-06-23 16:09:56 +02:00
Christoph M. Becker
a39beaa251 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.
 2015-06-23 13:00:17 +02:00
Xinchen Hui
bca005c8d9 Merge branch 'PHP-5.5' into PHP-5.6 2015-06-19 09:35:52 +08:00
Xinchen Hui
6a8db93115 Merge branch 'patch-3' of https://github.com/s0ph1e/php-src into PHP-5.5 2015-06-19 09:35:28 +08:00
Anatol Belski
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
Christian Wenz
a85156db7d fixes bug #69835: phpinfo() does not report many Windows SKUs 2015-06-18 22:01:20 +02:00
Sophia Nepochataya
1edb2e9a10 Remove excess variable in mail.c (5.5 branch) 2015-06-18 20:06:08 +03:00
Lior Kaplan
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
Lior Kaplan
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
Lior Kaplan
cc7194dd10 Fixed bug #69689 (Align PCRE_MINOR with current version) 2015-06-18 17:30:21 +03:00
Sara Golemon
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
Sara Golemon
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
Andreas Heigl
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
Côme Bernigaud
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
Côme Bernigaud
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
Christoph M. Becker
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
Christoph M. Becker
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
Derick Rethans
c661e7680f - Updated to version 2015.5 (2015e) 2015-06-15 10:41:30 +01:00
Derick Rethans
558342124e - Updated to version 2015.5 (2015e) 2015-06-15 10:41:29 +01:00
Derick Rethans
22a43410cb - Updated to version 2015.5 (2015e) 2015-06-15 10:28:23 +01:00
Derick Rethans
9026a66579 - Updated to version 2015.5 (2015e) 2015-06-15 10:28:22 +01:00
Derick Rethans
4903f1d139 - Updated to version .-96 () 2015-06-15 10:17:24 +01:00
Derick Rethans
1d6f4891bd - Updated to version .-96 () 2015-06-15 10:17:23 +01:00
Matteo Beccati
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
Matteo Beccati
9e4d720825 Fix copy/paste error in test 2015-06-13 08:07:49 +02:00
Matteo Beccati
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
Matteo Beccati
b60efdce9f Fix bug #69344 (PDO PgSQL Incorrect binding numeric array with gaps) 2015-06-12 02:05:28 +02:00
Matteo Beccati
afa4c3e7c7 Fix bug #69362 (PDO-pgsql fails to connect if password contains a leading single quote) 2015-06-12 00:21:48 +02:00
Matteo Beccati
7c0b8f872e Fix bug #69362 (PDO-pgsql fails to connect if password contains a leading single quote) 2015-06-12 00:20:33 +02:00
Nikita Popov
1acf55eb75 Fixed bug #69803 2015-06-11 22:20:05 +02:00
Anatol Belski
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
Anatol Belski
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
Anatol Belski
d777669679 Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  improve test
 2015-06-11 15:36:30 +02:00
Anatol Belski
dcfd1153ec improve test 2015-06-11 15:36:02 +02:00
Anatol Belski
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
Anatol Belski
e711325ca6 added test for bug #69646 2015-06-11 12:06:59 +02:00
Stanislav Malyshev
9d162550ac Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  fix bad copypaste
 2015-06-11 01:52:23 -07:00
Stanislav Malyshev
cd927cca50 fix bad copypaste 2015-06-11 01:51:55 -07:00
Anatol Belski
effbc87ff1 Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  updated NEWS
  fix memory leak in pdo_pgsql closeCursor (bug 69752)
 2015-06-10 16:41:07 +02:00
Philip Hofstetter
9ba3a4c66a 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.
 2015-06-10 16:36:00 +02:00
Anatol Belski
64df05d5b1 Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  updated NEWS
  Fix #69781: phpinfo() reports Professional Editions of Windows 7/8/8.1/10 as "Business"
  Revert "Fix #69781: phpinfo() reports Professional Editions of Windows 7/8/8.1/10 as "Business""
  Fix #69781: phpinfo() reports Professional Editions of Windows 7/8/8.1/10 as "Business"
 2015-06-10 11:25:21 +02:00