Commit graph

45697 commits

Author SHA1 Message Date
Dmitry Stogov
02778731b7 Merge branch 'PHP-7.1'
* PHP-7.1:
  Fixed bug #74679 (Incorrect conversion array with WSDL_CACHE_MEMORY)
2017-06-13 17:17:26 +03:00
Dmitry Stogov
84b9b164a8 Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
  Fixed bug #74679 (Incorrect conversion array with WSDL_CACHE_MEMORY)
2017-06-13 17:16:13 +03:00
Dmitry Stogov
648be8600f Fixed bug #74679 (Incorrect conversion array with WSDL_CACHE_MEMORY) 2017-06-13 17:15:47 +03:00
Dmitry Stogov
1385784f54 Fixed performance degradaton introduced in f6ac96b 2017-06-13 12:20:14 +03:00
Remi Collet
b1fedd88db Merge branch 'PHP-7.1'
* PHP-7.1:
  NEWS
  NEWS
  Fix bug #74705 for collator_get_sort_key
  Fixes bug #74705 Wrong ReflectionInfo for Collator::getSortKey()
2017-06-13 08:50:30 +02:00
Remi Collet
90f33b1ac7 Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
  NEWS
  Fix bug #74705 for collator_get_sort_key
  Fixes bug #74705 Wrong ReflectionInfo for Collator::getSortKey()
2017-06-13 08:50:10 +02:00
Remi Collet
78970d5338 Fix bug #74705 for collator_get_sort_key 2017-06-13 08:48:17 +02:00
Tyson Andre
5f07a895cc Fixes bug #74705 Wrong ReflectionInfo for Collator::getSortKey()
https://secure.php.net/manual/en/collator.getsortkey.php
2017-06-13 08:46:47 +02:00
Remi Collet
66a018ccb4 Merge branch 'PHP-7.1'
* PHP-7.1:
  NEWS
  NEWS
  Fixes bug #74708 reflection signatures for random_bytes+random_int
2017-06-13 08:15:33 +02:00
Remi Collet
3aa80c482c Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
  NEWS
  Fixes bug #74708 reflection signatures for random_bytes+random_int
2017-06-13 08:14:57 +02:00
Tyson Andre
81b2533a68 Fixes bug #74708 reflection signatures for random_bytes+random_int
They have 1 and 2 required parameters, respectively
See https://secure.php.net/manual/en/function.random-int.php
2017-06-13 08:11:25 +02:00
Xinchen Hui
dc098b09f8 Avoiding str duplication 2017-06-13 14:00:53 +08:00
Jakub Zelenka
f6ac96b039 Improve and simplify UTF-8 validation in JSON 2017-06-11 17:27:32 +01:00
Christoph M. Becker
68a0639c8f Fix #74744: gd.h: stdarg.h include missing for va_list use in gdErrorMethod 2017-06-11 17:17:01 +02:00
Niklas Keller
bec91e1117 Use any TLS crypto method by default, don't use SSL 2017-06-10 17:31:24 -04:00
Anatol Belski
b50fe893a7 Merge branch 'PHP-7.1' 2017-06-09 23:48:25 +02:00
Anatol Belski
0fa40b0546 group the change for bug #74720 2017-06-09 23:47:15 +02:00
Anatol Belski
587b800811 Merge branch 'PHP-7.1'
* PHP-7.1:
  Fixed bug #74720 pkcs7_en/decrypt does not work if \x1a is used in
2017-06-09 17:37:42 +02:00
Anatol Belski
cbe73b3cfe Fixed bug #74720 pkcs7_en/decrypt does not work if \x1a is used in
content
2017-06-09 17:35:37 +02:00
Christoph M. Becker
130f06a8a1 Update to SQLite 3.19.3 2017-06-09 14:47:18 +02:00
Christoph M. Becker
fb0f3f60d4 Merge branch 'PHP-7.1'
* PHP-7.1:
  Use reasonable SQLite3 module version
2017-06-09 14:11:11 +02:00
Christoph M. Becker
1980234fc2 Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
  Use reasonable SQLite3 module version
2017-06-09 14:05:04 +02:00
Christoph M. Becker
c3b910370c Use reasonable SQLite3 module version
Since PECL/sqlite3 has been moved to ext/sqlite3 in 2008, the SQLite3
module version is hardcoded to `0.7-dev`. It doesn't appear to make
much sense to have an own module version for a bundled extensions, but
as other code might rely on it, we don't remove the constant but rather
make it an alias of the PHP version.
2017-06-09 13:49:32 +02:00
Remi Collet
75cda24b82 cleanup
ssite_t is used in lot of places, without need for this.
If really needed, should be in global location, not in an extension
2017-06-09 09:22:05 +02:00
Dmitry Stogov
db4561bfff Introduced "zif_handler" type (zif = zend internal function). 2017-06-08 16:52:39 +03:00
Dmitry Stogov
ace9fe5317 Improved new Zend Parameter Parsing API to avoid useless dereferences.
This derefernce made sense only for explicit paramter passing by reference, but this feature was removed in PHP-7.
The improvement is 100% backward compatible, only few "tricky" functions may be affected (e.g. extract and usort).
2017-06-08 13:03:24 +03:00
Dmitry Stogov
bdc37442bf Fixed wrong type. 2017-06-08 13:03:02 +03:00
BohwaZ
626ee74ee8 Change flags to use SQLITE3_OPEN_READ* constants instead of a fake-boolean, add tests on errors 2017-06-08 11:25:00 +12:00
Christoph M. Becker
455db49c1b Update to SQLite 3.19.2 2017-06-07 14:34:57 +02:00
Dmitry Stogov
71daef93bc preg_replace() optimization 2017-06-07 13:50:16 +03:00
Remi Collet
5bced1affb Merge branch 'PHP-7.1'
* PHP-7.1:
  relax this test again (still encounter erratic failure)
2017-06-06 17:20:48 +02:00
Remi Collet
c39a10bc6e relax this test again (still encounter erratic failure) 2017-06-06 17:20:33 +02:00
Dmitry Stogov
68dc754998 Avoid string reallocations in html_entity_decode() and htmlspecialchars_decode() 2017-06-06 16:09:26 +03:00
Dmitry Stogov
81a6ee9aa4 Avoid string reallocations in preg_quote() 2017-06-06 13:56:19 +03:00
Jakub Zelenka
8baf12b161 Merge branch 'PHP-7.1' 2017-06-04 18:22:02 +01:00
Jakub Zelenka
ff93f74f63 Merge branch 'PHP-7.0' into PHP-7.1 2017-06-04 18:11:49 +01:00
Jakub Zelenka
3704947696 Replace ASN1_STRING_data with ASN1_STRING_get0_data
This is a slightly modified version of the patch from Jelle van der Waa
( @jelly ) so full credit to him.
2017-06-04 18:08:51 +01:00
Nikita Popov
d162147315 Merge branch 'PHP-7.1' 2017-06-03 15:09:04 +02:00
Nikita Popov
6af1d7ad01 Merge branch 'PHP-7.0' into PHP-7.1 2017-06-03 15:08:59 +02:00
Nikita Popov
585c9f3c4b Fix leak in WDDX serialization 2017-06-03 15:08:42 +02:00
Michael Moravec
637714cdaa Implemented FR #71520
Adding the DateTime constants to the DateTimeInterface interface.
2017-06-03 00:54:34 +02:00
Nikita Popov
d9886614dc Merge branch 'PHP-7.1' 2017-06-03 00:42:38 +02:00
Nikita Popov
d9fd44366d Merge branch 'PHP-7.0' into PHP-7.1 2017-06-03 00:42:30 +02:00
Tim Toohey
d027bc2add Fixed bug #69373
xmlNodeSetContentLen() calls xmlFreeNode() on node->children. This
causes problems if there are other references around to those children.
2017-06-03 00:40:58 +02:00
Niklas Keller
f2e7cdb8b7 Fix bug #55407
This reverts commit b148c50f48 and
reintroduces the fix for bug #55407.

With https://wiki.php.net/rfc/parameter-no-type-variance being
implemented now, it's no longer a BC break.
2017-06-03 00:11:03 +02:00
Nikita Popov
8eb7efc261 Merge branch 'PHP-7.1' 2017-06-03 00:05:58 +02:00
Nikita Popov
bfedff58e3 Merge branch 'PHP-7.0' into PHP-7.1 2017-06-03 00:05:52 +02:00
libnex
95c4564f93 Fixed bug #73473: Stack Buffer Overflow in msgfmt_parse_message 2017-06-03 00:05:16 +02:00
Nikita Popov
c28406f611 Merge branch 'PHP-7.1' 2017-06-02 23:53:00 +02:00
Jelle van der Waa
c742abb3ce openssl_pkcs12_read: add missing BIO_free
When filling the extracerts array with certificates bio_out is created
but not free'd leading to a small memory leak of 224 bytes (reported by
valgrind).
2017-06-02 23:52:43 +02:00