clones/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2024-09-24 19:37:26 +00:00
Code Issues Packages Projects Releases Wiki Activity
82,462 Commits 493 Branches 1,365 Tags 848 MiB
96e42403d5
Commit Graph

82462 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Christoph M. Becker
b03f743e7d updated NEWS 2015-06-24 00:31:07 +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
921544cad9 updated NEWS 2015-06-24 00:20:32 +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
13347225ac updated NEWS 2015-06-23 19:36:59 +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
1cbcbcbc21 updated NEWS 2015-06-23 19:32:18 +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
868b9328a0 Moved NEWS entry for bug #69864 to proper category 2015-06-23 17:30:31 +02:00
Christoph M. Becker
b883fe1547 Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  Moved NEWS entry for bug #69864 to proper category
 2015-06-23 17:28:22 +02:00
Christoph M. Becker
eef6b10b7c Moved NEWS entry for bug #69864 to proper category 2015-06-23 17:27:21 +02:00
Côme Bernigaud
5250fc772d 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
 2015-06-23 16:44:48 +02:00
Christoph M. Becker
7953ff4ea3 updated NEWS 2015-06-23 16:43:12 +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
Christoph M. Becker
3e1aabbfc3 Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  bump API version to 6.8
 2015-06-23 16:22:08 +02:00
Côme Bernigaud
9bcdd2aabe Fixed two errors in LDAP tests 2015-06-23 16:09:56 +02:00
Côme Bernigaud
ea49be9b37 Removed ifdefs of LDAP_API_FEATURE_X_OPENLDAP, fixed a warning 2015-06-23 15:50:14 +02:00
Christoph M. Becker
75b2ce28aa updated NEWS 2015-06-23 13:02:08 +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
George Wang
9e15ce9a38 Merge branch 'PHP-5.6' of git.php.net:php-src into PHP-5.6 2015-06-22 23:40:34 -04:00
George Wang
b0954ebb79 Merge branch 'PHP-5.5' of git.php.net:php-src into PHP-5.5 2015-06-22 23:39:53 -04:00
George Wang
3a169f6c0d bump API version to 6.8 2015-06-22 23:39:35 -04:00
George Wang
8877feaeec bump API version to 6.8 2015-06-22 23:39:23 -04:00
George Wang
fdb580a5ad bump API version to 6.8 2015-06-22 23:38:38 -04:00
Nikita Popov
e09d3155a1 Merge branch 'PHP-5.5' into PHP-5.6 2015-06-20 16:40:53 +02:00
Nikita Popov
5fe078abba Fixed bug #69892 2015-06-20 16:40:14 +02:00
Yasuo Ohgaki
d263ecd864 Move strlen() check to php_mail_detect_multiple_crlf() 2015-06-19 15:17:56 +09:00
Yasuo Ohgaki
dacea3f6fb Fixed Bug #69874 : Can't set empty additional_headers for mail() 2015-06-19 12:19:12 +09: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
962fe01473 update NEWS 2015-06-18 22:04:03 +02: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
Anatol Belski
c0119ca7f3 updated NEWS 2015-06-18 22:02:37 +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
Lior Kaplan
811816dc25 Add CVE to bugs #69545, #69646 and #69667 2015-06-18 16:56:06 +03:00
Lior Kaplan
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
Lior Kaplan
991b2cc37b Add CVE to bugs #69545, #69646 and #69667 2015-06-18 16:51:20 +03:00
Lior Kaplan
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
Lior Kaplan
5f67caad54 Add CVE to bugs #69545, #69646 and #69667 2015-06-18 15:45:10 +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
e4917bc747 updated NEWS 2015-06-17 02:20: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