php/archived-php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2026-04-21 06:51:18 +02:00
Code Issues Packages Projects Releases Wiki Activity
108,396 Commits 547 Branches 1,483 Tags
50fec3be0e82302b2c0e10cd35af4e88427f5aa7
Commit Graph

48732 Commits

Author SHA1 Message Date
Christoph M. Becker
50fec3be0e Merge branch 'PHP-7.2' into PHP-7.3 
* PHP-7.2:
  Fix #55146: iconv_mime_decode_headers() skips some headers
 2018-08-25 14:43:13 +02:00
Christoph M. Becker
6922cae4ae Merge branch 'PHP-7.1' into PHP-7.2 
* PHP-7.1:
  Fix #55146: iconv_mime_decode_headers() skips some headers
 2018-08-25 14:41:38 +02:00
Christoph M. Becker
6e1980e152 Fix #55146: iconv_mime_decode_headers() skips some headers 
If we're expecting the start of an encoded word (`=?`), but instead of
the question mark get a line break (CR or LF), we must not append it to
the `pretval`.
 2018-08-25 14:40:07 +02:00
Christoph M. Becker
eb03290754 Fix #53891: iconv_mime_encode() fails to Q-encode UTF-8 string 
The minimum length of an encoded-word is actually the pure encoding
overhead plus the length of the `output-charset` plus the minimum unit
of encoded text, which is 4 for B-encoding and (for simplicity) 3 for
Q-encoding.  We also cater to the possibility that we need further
encoded words, which would be split by the `line-break-chars` followed
by a space character.  Obviously, the former `out_charset_len + 12` is
too simplistic and wrong in the given case (where the magic number
would be 13).

These simplifications are somewhat wasteful, but iconv_mime_encode()
with Q-encoding is wasteful anyway (see bug 66828[1]), and the proper
solution to convert the whole input to the desired output charset
upfront, and applying the encoding afterwards appears too much a change
for the stable releases.

[1] <https://bugs.php.net/66828>
 2018-08-25 14:30:07 +02:00
Christoph M. Becker
692e5d5c88 Fix #76712: Assignment of empty string creates extraneous text node 
We work around this peculiarity of libxml by using xmlNodeSetContent(),
which does not exhibit this behavior.  This also saves us from manually
calculating the string length.
 2018-08-25 14:24:09 +02:00
Christoph M. Becker
5fe8e49baa Merge branch 'PHP-7.2' into PHP-7.3 
* PHP-7.2:
  Simplify regression test
 2018-08-23 12:51:11 +02:00
Christoph M. Becker
1c3d5659bd Merge branch 'PHP-7.1' into PHP-7.2 
* PHP-7.1:
  Simplify regression test
 2018-08-23 12:49:26 +02:00
Christoph M. Becker
6644bd005f Simplify regression test 
There's no need to actually try to trigger an out-of-memory condition
to proof the leak; instead we can simply rely on the Zend MM to report
the memory leaks in debug mode (at least on Linux).  Therefore we
simplify the regression test, which also makes it run much faster.
 2018-08-23 12:48:09 +02:00
Christoph M. Becker
3278b3347c Merge branch 'PHP-7.2' into PHP-7.3 
* PHP-7.2:
  Fix #68825: Exception in DirectoryIterator::getLinkTarget()
 2018-08-22 15:40:03 +02:00
Christoph M. Becker
36946f5c45 Merge branch 'PHP-7.1' into PHP-7.2 
* PHP-7.1:
  Fix #68825: Exception in DirectoryIterator::getLinkTarget()
 2018-08-22 15:38:30 +02:00
Christoph M. Becker
32a728d351 Fix #68825: Exception in DirectoryIterator::getLinkTarget() 
intern->file_name may not have been properly set when
DirectoryIterator::getLinkTarget() is called, so we make sure it is
before using it.
 2018-08-22 15:37:02 +02:00
Christoph M. Becker
6cf382b667 Merge branch 'PHP-7.2' into PHP-7.3 
* PHP-7.2:
  Increase memory_limit to prevent test failures
 2018-08-22 14:31:36 +02:00
Christoph M. Becker
10661e28d1 Merge branch 'PHP-7.1' into PHP-7.2 
* PHP-7.1:
  Increase memory_limit to prevent test failures
 2018-08-22 14:30:23 +02:00
Christoph M. Becker
5fb01a3a42 Increase memory_limit to prevent test failures 2018-08-22 14:29:28 +02:00
Christoph M. Becker
1de17428f6 Merge branch 'PHP-7.2' into PHP-7.3 
* PHP-7.2:
  Fix #76778: array_reduce leaks memory if callback throws exception
 2018-08-22 13:51:16 +02:00
Christoph M. Becker
cdd9eb8c4a Merge branch 'PHP-7.1' into PHP-7.2 
* PHP-7.1:
  Fix #76778: array_reduce leaks memory if callback throws exception
 2018-08-22 13:49:35 +02:00
Christoph M. Becker
70b2fca220 Fix #76778: array_reduce leaks memory if callback throws exception 
We have to release the result variable in the error case, too.
 2018-08-22 13:40:24 +02:00
Christoph M. Becker
138671f2f4 Merge branch 'PHP-7.2' into PHP-7.3 
* PHP-7.2:
  Fixed bug #76777 and added test
 2018-08-22 12:54:39 +02:00
Christoph M. Becker
7ad0595712 Merge branch 'PHP-7.1' into PHP-7.2 
* PHP-7.1:
  Fixed bug #76777 and added test
 2018-08-22 12:52:41 +02:00
Ville Hukkamaki
cf2fc66b02 Fixed bug #76777 and added test 
Set undefined values to null rather than undefined.
 2018-08-22 12:51:06 +02:00
David Carlier
16a9dd74f4 Avoid directly adding to string literal 
This fixes a Clang warning.
 2018-08-21 06:25:41 +02:00
Dmitry Stogov
b8828926f2 Avoid hash lookups in BIND_STATIC and BIND_LEXICAL opcode handlers. 
Encode static variable offset into opline->extended_value.
 2018-08-20 16:10:09 +03:00
Gabriel Caruso
efbf846fd2 Make array parsing parameters error messages consistency with ZPP failure 2018-08-19 21:27:57 -03:00
Jakub Zelenka
52ea129efb Merge branch 'PHP-7.2' into PHP-7.3 2018-08-19 20:19:48 +01:00
Jakub Zelenka
73a8f72617 Merge branch 'PHP-7.1' into PHP-7.2 2018-08-19 20:19:01 +01:00
Jakub Zelenka
4c542e6c13 Fix bug #76705 (unusable ssl => peer_fingerprint in stream_context_create()) 2018-08-19 20:14:26 +01:00
Christoph M. Becker
be2447fb7c Merge branch 'PHP-7.2' into PHP-7.3 
* PHP-7.2:
  Add regression test for bug #68175
  Fix #68175: RegexIterator pregFlags are NULL instead of 0
 2018-08-18 14:39:15 +02:00
Christoph M. Becker
41d2102c77 Merge branch 'PHP-7.1' into PHP-7.2 
* PHP-7.1:
  Add regression test for bug #68175
  Fix #68175: RegexIterator pregFlags are NULL instead of 0
 2018-08-18 14:37:48 +02:00
Christoph M. Becker
4c448334bd Add regression test for bug #68175 2018-08-18 14:36:16 +02:00
Tim Siebels
3257d22fea Fix #68175: RegexIterator pregFlags are NULL instead of 0 2018-08-18 14:33:39 +02:00
Anatol Belski
990a404c2d Add test for bug #76738 
Original repro. It's unwieldy, but it's otherwise hard to trigger
the wrong buffer handling behavior.
 2018-08-17 18:31:58 +02:00
Anatol Belski
0414fff205 Fix memory leak 2018-08-17 16:22:35 +02:00
Anatol Belski
0c2327b472 Cleanup 
(cherry picked from commit 8b3174f256)
 2018-08-17 13:01:57 +02:00
Anatol Belski
ddd73d4fa8 Followup fix for ef9ed19e, see also bug #76738 
(cherry picked from commit 083285f22a)
 2018-08-17 13:01:56 +02:00
Xinchen Hui
10d724d82d Fixed build 
(cherry picked from commit 36f05a80d7)
 2018-08-17 13:01:55 +02:00
Andrew Nester
2072d377d3 DOMDocument::formatOutput attribute sometimes ignored 
(cherry picked from commit ef9ed19ec7)
 2018-08-17 13:01:55 +02:00
Xinchen Hui
5c1a2d8375 Fixed same bug #76755 in setrawcookie 2018-08-17 16:19:26 +08:00
Xinchen Hui
0a16af043e Cheaper checking 2018-08-17 15:21:48 +08:00
Xinchen Hui
751bbaa41f Micro optimization & fixed invalid key handling 2018-08-17 14:56:24 +08:00
Xinchen Hui
d61ff37f45 Fixed bug #76755 (setcookie does not accept "double" type for expire time) 2018-08-17 13:45:43 +08:00
Xinchen Hui
1ea2395712 Merge branch 'PHP-7.2' into PHP-7.3 
* PHP-7.2:
  Update NEWS
  Fixed bug #76747 (Opcache treats path containing "test.pharma.tld" as a phar file)
 2018-08-16 13:57:05 +08:00
Xinchen Hui
a879f4dd22 Merge branch 'PHP-7.1' into PHP-7.2 
* PHP-7.1:
  Fixed bug #76747 (Opcache treats path containing "test.pharma.tld" as a phar file)
 2018-08-16 13:56:37 +08:00
Xinchen Hui
8c92442b49 Fixed bug #76747 (Opcache treats path containing "test.pharma.tld" as a phar file) 2018-08-16 13:56:20 +08:00
Christoph M. Becker
819cf5283b Revert "DOMDocument::formatOutput attribute sometimes ignored" 
This reverts commit ef9ed19ec7 and its
follow-up 36f05a80d7, since these caused
a serious regression (see bug #76738).
 2018-08-14 12:14:33 +02:00
Tyson Andre
dcd4b32185 Fix arginfo for tidy::__construct() 
This was split out of PR #3439

Previously, the arginfo was wrong for these methods.
getNumberOfRequiredParameters() was 4 for that method.
Compare with http://php.net/manual/en/tidy.construct.php)

This fixes the arginfo added to PHP 7.3 in 97353cda99
 2018-08-13 16:09:32 +02:00
Christoph M. Becker
8270c7d947 Merge branch 'PHP-7.2' into PHP-7.3 
* PHP-7.2:
  Fix arginfo for bzcompress
 2018-08-13 16:02:13 +02:00
Christoph M. Becker
56abfd2798 Merge branch 'PHP-7.1' into PHP-7.2 
* PHP-7.1:
  Fix arginfo for bzcompress
 2018-08-13 16:00:25 +02:00
Tyson Andre
e20baee136 Fix arginfo for bzcompress 
bzcompress() has 1 required parameter, not 2.

See http://php.net/manual/en/function.bzcompress.php or invoke
bzcompress with 1 parameter.
 2018-08-13 15:59:08 +02:00
Anatol Belski
fdaa540fd8 Sync with e0fe6674 2018-08-13 09:18:38 +02:00
Pedro Magalhães
a16aee6cee Fix #76688: Disallow excessive parameters after options array 2018-08-12 15:49:13 +02:00