clones/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2024-10-01 06:46:08 +00:00
Code Issues Packages Projects Releases Wiki Activity
82,388 Commits 494 Branches 1,367 Tags 800 MiB
a8d61ab7f0
Commit Graph

35190 Commits

Author SHA1 Message Date
Edgar R. Sandi
a8d61ab7f0 adding several other testing scenarios of code without coverage in stripcslashes function 2015-06-29 19:20:23 +02:00
Edgar R. Sandi
7acdfdc84e adding another testing scenario without coverage in setlocale function 2015-06-29 18:15:03 +02:00
Dmitry Stogov
ee1e67fae6 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.
 2015-06-29 17:45:56 +03:00
Côme Bernigaud
2e85e6d3ee 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
 2015-06-29 09:31:37 +02:00
Stanislav Malyshev
d7daf814b7 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()
 2015-06-29 00:30:55 -07:00
Côme Bernigaud
736d840c8b Putting back deprecated symbols for ldap_sort 2015-06-29 09:07:49 +02:00
Stanislav Malyshev
8f2e08239f 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()
 2015-06-28 20:23:00 -07:00
Stanislav Malyshev
cd9c39d77c 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()
 2015-06-28 20:18:56 -07:00
Christoph M. Becker
6400ef192c added regression test for bug #69679 
DOMDocument::loadHTML refuses to accept NULL bytes.
 2015-06-27 01:08:56 +02:00
Christoph M. Becker
bdf3bb668f slightly revised bug69462.phpt 2015-06-26 23:20:22 +02:00
Tomasz Sawicki
af17316fcd Test for bug #69462 
Test scenario for already fixed bug #69462 with segmentation fault when
SoapVar XML node name was null.
 2015-06-26 23:19:29 +02:00
Tjerk Meesters
2ff3dafccf Fixed #69882: OpenSSL error "key values mismatch" after openssl_pkcs12_read with extra certs 
Squashed commit of the following:

commit a64c1d9bc4
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.
 2015-06-26 05:33:28 +08:00
Anatol Belski
80f9a9725c fix unknown size of void error 2015-06-25 19:12:26 +02:00
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
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
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
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
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
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
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