Commit Graph

108478 Commits

Author SHA1 Message Date
Dmitry Stogov
6d88e1ccd6 Don't use second operand of BIND_STATIC instruction. 2018-08-21 12:22:04 +03:00
Nikita Popov
09b4b83753 Merge branch 'PHP-7.3' 2018-08-21 08:34:15 +02:00
David Carlier
0f68ff5c92 Support fixed address mmap without replacement
We did not use MAP_FIXED here, because it may replace an existing
mapping. This commit adds support for MAP_FIXED_NOREPLACE (available
on newer Linux kernels) and MAP_FIXED|MAP_EXCL (available on FreeBSD),
which avoid this issue.
2018-08-21 08:31:31 +02:00
Dmitry Stogov
7a52864ad0 Merge branch 'PHP-7.3'
* PHP-7.3:
  Removed dead code
2018-08-21 09:02:22 +03:00
Dmitry Stogov
5e5311e0ba Removed dead code 2018-08-21 09:01:54 +03:00
Nikita Popov
5e74a1f411 Merge branch 'PHP-7.3' 2018-08-21 06:27:27 +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
64f8b0185f Merge branch 'PHP-7.3'
* PHP-7.3:
  Avoid hash lookups in BIND_STATIC and BIND_LEXICAL opcode handlers. Encode static variable offset into opline->extended_value.
2018-08-20 16:11:40 +03: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
Christoph M. Becker
a13e60a954 Merge branch 'PHP-7.3' 2018-08-20 12:57:45 +02:00
Aaron Stone
1621f1739d [ci skip] Correct minor typo (GC_GLAGS to GC_FLAGS) 2018-08-20 12:56:34 +02:00
Gabriel Caruso
c86ce117c2
Merge branch 'PHP-7.3'
* PHP-7.3:
  Make array parsing parameters error messages consistency with ZPP failure
2018-08-19 21:33:41 -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
1dd4c62c99 Merge branch 'PHP-7.3' 2018-08-19 20:20:46 +01: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
ef1b26f080 Map ERROR_PRIVILEGE_NOT_HELD to EACCES
Attempting to create a symlink on Windows via the CLI SAPI without
administrative rights is likely to fail with ERROR_PRIVILEGE_NOT_HELD.
Therefore we map this Windows error to EACCES to get better diagnostics
and to avoid the assert() failure in debug mode.
2018-08-19 13:56:34 +02:00
Anatol Belski
ac68a423e1 Merge branch 'PHP-7.3'
* PHP-7.3:
  Use stable deps on AppVeyor for now
2018-08-18 20:06:14 +02:00
Anatol Belski
9708083779 Merge branch 'PHP-7.2' into PHP-7.3
* PHP-7.2:
  Use stable deps on AppVeyor for now
2018-08-18 20:05:51 +02:00
Anatol Belski
b0da1745be Use stable deps on AppVeyor for now
as long as the latest image is not synced with VC++ 15.8
2018-08-18 20:04:19 +02:00
Christoph M. Becker
a6df0bf108 Merge branch 'PHP-7.3'
* PHP-7.3:
  Add regression test for bug #68175
  Fix #68175: RegexIterator pregFlags are NULL instead of 0
2018-08-18 14:39:35 +02: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
3cb4db913d Merge branch 'PHP-7.3'
* PHP-7.3:
  Add test for bug #76738
2018-08-17 18:38:07 +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
084837f274 Merge branch 'PHP-7.3'
* PHP-7.3:
  Fix memory leak
2018-08-17 16:23:27 +02:00
Anatol Belski
0414fff205 Fix memory leak 2018-08-17 16:22:35 +02:00
Anatol Belski
03368a0840 Merge branch 'PHP-7.3'
* PHP-7.3:
  Update binary SDK version for AppVeyor
2018-08-17 15:47:03 +02:00
Anatol Belski
aa7777d36c Merge branch 'PHP-7.2' into PHP-7.3
* PHP-7.2:
  Update binary SDK version for AppVeyor
2018-08-17 15:46:28 +02:00
Anatol Belski
4aa5065bb0 Merge branch 'PHP-7.1' into PHP-7.2
* PHP-7.1:
  Update binary SDK version for AppVeyor
2018-08-17 15:45:31 +02:00
Anatol Belski
837ed71c65 Update binary SDK version for AppVeyor 2018-08-17 15:44:10 +02:00
Christoph M. Becker
cb4fb6b07c Merge branch 'PHP-7.3' 2018-08-17 13:07:41 +02:00
Christoph M. Becker
a097f926c8 [ci skip] Update NEWS
Bug #76285 was supposed to have been fixed for 7.3.0alpha3, but that
has been reverted for 7.3.0beta2 due to bug #76738.  Now that we have a
working fix in master, we backport the respective commits.
2018-08-17 13:06:27 +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
e81b0b29d3 Merge branch 'PHP-7.3'
* PHP-7.3:
  Fixed same bug #76755 in setrawcookie
2018-08-17 16:20:37 +08:00
Xinchen Hui
5c1a2d8375 Fixed same bug #76755 in setrawcookie 2018-08-17 16:19:26 +08:00
Xinchen Hui
3ca89ba007 Merge branch 'PHP-7.3'
* PHP-7.3:
  Cheaper checking
2018-08-17 15:22:50 +08:00
Xinchen Hui
0a16af043e Cheaper checking 2018-08-17 15:21:48 +08:00
Xinchen Hui
13658428a2 Merge branch 'PHP-7.3'
* PHP-7.3:
  Micro optimization & fixed invalid key handling
2018-08-17 14:56:43 +08:00
Xinchen Hui
751bbaa41f Micro optimization & fixed invalid key handling 2018-08-17 14:56:24 +08:00
Xinchen Hui
ed0c581808 Merge branch 'PHP-7.3'
* PHP-7.3:
  Fixed bug #76755 (setcookie does not accept "double" type for expire time)
2018-08-17 13:46:08 +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
59bcf22237 Merge branch 'PHP-7.3'
* PHP-7.3:
  Update NEWS
  Update NEWS
  Fixed bug #76754 (parent private constant in extends class memory leak)
2018-08-17 13:36:34 +08:00
Xinchen Hui
2aa3733daa Update NEWS 2018-08-17 13:36:12 +08:00