php/archived-php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2026-04-19 22:11:12 +02:00
Code Issues Packages Projects Releases Wiki Activity
108,360 Commits 547 Branches 1,483 Tags
52ea129efb7b49aaa5c49c43d886602ee0a8d878
Commit Graph

48709 Commits

Author SHA1 Message Date
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
Cristian Rodríguez
e0fe667421 Fix bug #76030 RE2C_FLAGS rarely honoured 
Since PHP 5.3 the default lexer generator is RE2C. On Unix-alike build
systems there is also optional configure option --enable-re2c-cgoto
which enables optimized conditional jumps using non-standard computed
goto extension. It is available since RE2C 0.10.3 so it's well covered
by RE2C versions PHP uses. This patch syncs usage of -g option accross
the PHP Unix-alike build system.
 2018-08-12 11:15:18 +02:00
Anatol Belski
3cef5a2476 Merge branch 'PHP-7.2' into PHP-7.3 
* PHP-7.2:
  Fixed bug #74484 MessageFormatter::formatMessage memory corruption
 2018-08-09 22:09:21 +02:00
Anatol Belski
9cc74ba229 Merge branch 'PHP-7.1' into PHP-7.2 
* PHP-7.1:
  Fixed bug #74484 MessageFormatter::formatMessage memory corruption
 2018-08-09 22:08:30 +02:00
Anatol Belski
45a05f3841 Fixed bug #74484 MessageFormatter::formatMessage memory corruption 
with 11+ named placeholder
 2018-08-09 22:07:24 +02:00
Xinchen Hui
2b1d79ce66 Fixed bug #76713 (Segmentation fault caused by property corruption) 2018-08-07 12:36:36 +08:00
Anatol Belski
b053beee7e Fix stack underflow in phar 
The checks can issue reads below and above the temporary buffer. A read
itself doesn't seem dangerous, but the condition result can be
arbitrary. Such reads have to be avoided. Likely this patch should be
backported.
 2018-08-06 22:43:45 +02:00
Anatol Belski
3082600326 Update libmagic.patch [ci skip] 2018-08-06 14:28:32 +02:00
Peter Kokot
fefaeae49c Merge branch 'PHP-7.2' into PHP-7.3 
* PHP-7.2:
  Fix bug #76709: Minimal required zlib library is 1.2.0.4
 2018-08-06 09:39:52 +02:00
Peter Kokot
fab7d9f577 Merge branch 'PHP-7.1' into PHP-7.2 
* PHP-7.1:
  Fix bug #76709: Minimal required zlib library is 1.2.0.4
 2018-08-06 09:39:33 +02:00
Peter Kokot
a3e3d914ed Fix bug #76709: Minimal required zlib library is 1.2.0.4 
The minimal required version of zlib system library is 1.2.0.4 instead
of 1.0.9 as reported in the ./configure --help.
 2018-08-06 09:37:16 +02:00
Peter Kokot
523cf6e2e7 Merge branch 'PHP-7.2' into PHP-7.3 
* PHP-7.2:
  Fix bug #65988: Zlib version check fails
 2018-08-06 06:16:07 +02:00
Peter Kokot
eceecb6900 Merge branch 'PHP-7.1' into PHP-7.2 
* PHP-7.1:
  Fix bug #65988: Zlib version check fails
 2018-08-06 06:15:51 +02:00
Jay Bonci
c8a90606c1 Fix bug #65988: Zlib version check fails 
When an 'include/zlib/' style dir is passed to --with-zlib configure
option the zlib version check fails.
 2018-08-06 06:14:11 +02:00
Peter Kokot
68ab719baa Merge branch 'PHP-7.1' into PHP-7.2 
* PHP-7.1:
  Fix bug #72443: Generate enabled extension
 2018-08-06 01:28:39 +02:00
Peter Kokot
45a3c0e596 Fix bug #72443: Generate enabled extension 
The PHP extension generator script now generates enabled extension with
less required steps for using the newly generated files.
 2018-08-06 01:22:17 +02:00
Peter Kokot
024232e94d Merge branch 'PHP-7.2' into PHP-7.3 
* PHP-7.2:
  Fixed incorrect restoring of LDFLAGS
 2018-08-05 20:32:05 +02:00
Peter Kokot
8d91e82871 Merge branch 'PHP-7.1' into PHP-7.2 
* PHP-7.1:
  Fixed incorrect restoring of LDFLAGS
 2018-08-05 20:27:33 +02:00
sji
0f557756dd Fixed incorrect restoring of LDFLAGS 2018-08-05 20:26:40 +02:00
Christoph M. Becker
a003af5b62 Add missing skip conditions 
mbstring can be built without mbregex support, in which case these
tests would fail.  Thus we add respective skip conditions.
 2018-08-05 00:01:35 +02:00
Christoph M. Becker
70ecb6e50b Fix #76706: mbstring.http_output_conv_mimetypes is ignored 
_php_mb_match_regex() is supposed to return != 0 on success, and 0 on
failure.  pcre2_match() returns >= 0 on success, and < 0 on failure.
We map the result accordingly.

Since this patch fixes four failing tests, there is no need to add
another.
 2018-08-04 23:24:04 +02:00
Anatol Belski
e1af7a794a Fix possible stack buffer overflow 2018-08-04 16:56:08 +02:00
Christoph M. Becker
5dc74d9e70 Merge branch 'PHP-7.2' into PHP-7.3 
* PHP-7.2:
  Fix #76704: mb_detect_order return value varies based on argument type
 2018-08-04 13:50:48 +02:00
Christoph M. Becker
db8bcdba80 Merge branch 'PHP-7.1' into PHP-7.2 
* PHP-7.1:
  Fix #76704: mb_detect_order return value varies based on argument type
 2018-08-04 12:57:05 +02:00