Commit Graph
106966 Commits
Author SHA1 Message Date
Christoph M. Becker ef01ec08f0 Merge branch 'PHP-7.2'
* PHP-7.2:
  Fix #62545: wrong unicode mapping in some charsets
2018-03-11 18:05:08 +01:00
Christoph M. Becker 2b02e6dff3 Merge branch 'PHP-7.1' into PHP-7.2
* PHP-7.1:
  Fix #62545: wrong unicode mapping in some charsets
2018-03-11 17:54:45 +01:00
Christoph M. Becker 01ea314e8c Fix #62545: wrong unicode mapping in some charsets
Undefined characters are best mapped to Unicode REPLACEMENT characters.
2018-03-11 17:38:28 +01:00
Gabriel Caruso d0ee2a8254 Add is_countable function
RFC: https://wiki.php.net/rfc/is-countable
2018-03-11 16:41:16 +01:00
Gabriel Caruso 57896cf515 Make some skipped tests run, and fix some skip messages 2018-03-11 16:38:00 +01:00
Gabriel Caruso 2bd7e2bb27 Fix link for phpdbg documentation 2018-03-11 16:37:40 +01:00
Nikita Popov bd2ecb01d2 Merge branch 'PHP-7.2' 2018-03-11 16:37:08 +01:00
Thomas Petazzoni 8489ecefd3 ext/sockets: make AI_IDN usage optional
AI_IDN is not supported by all C libraries (uClibc, musl), so make it
optional, like AI_ALL.

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
2018-03-11 16:35:17 +01:00
Anatol Belski 8f8a6a3a49 Merge branch 'PHP-7.2'
* PHP-7.2:
  [ci skip] Update NEWS
  [ci skip] Update NEWS
2018-03-10 20:09:23 +01:00
Anatol Belski d34ab3a53c [ci skip] Update NEWS 2018-03-10 20:08:43 +01:00
Anatol Belski 53f227bb2a Merge branch 'PHP-7.1' into PHP-7.2
* PHP-7.1:
  [ci skip] Update NEWS
2018-03-10 20:08:03 +01:00
Anatol Belski 76fc73cbfc [ci skip] Update NEWS 2018-03-10 20:07:23 +01:00
Bob Weinand 827dff310b Merge branch 'PHP-7.2' 2018-03-10 15:29:21 +01:00
Bob Weinand 9d908c70d5 Fixup mess in NEWS file (mixed 7.2.3 and 7.2.4 NEWS) 2018-03-10 15:29:07 +01:00
Bob Weinand cfd0979be5 Merge branch 'PHP-7.1' into PHP-7.2 2018-03-10 15:21:16 +01:00
Bob Weinand 9c6df8a238 Fix bug #76074 (opcache corrupts variable in for-loop) 2018-03-10 15:20:45 +01:00
Anatol Belski 363e0450aa Merge branch 'PHP-7.2'
* PHP-7.2:
  Fixed bug #76068 parse_ini_string fails to parse "[foo]\nbar=1|>baz" with segfault
2018-03-10 11:21:01 +01:00
Anatol Belski cf0012dad0 Merge branch 'PHP-7.1' into PHP-7.2
* PHP-7.1:
  Fixed bug #76068 parse_ini_string fails to parse "[foo]\nbar=1|>baz" with segfault
2018-03-10 11:20:11 +01:00
Anatol Belski 8417a23973 Fixed bug #76068 parse_ini_string fails to parse "[foo]\nbar=1|>baz" with segfault 2018-03-10 11:18:21 +01:00
Joe Watkins 4b43f5c533 Merge branch 'master' of git://github.com/php/php-src 2018-03-10 10:55:12 +01:00
Anatol Belski 98729c95a7 Merge branch 'PHP-7.2'
* PHP-7.2:
  [ci skip] Update link
2018-03-10 09:41:53 +01:00
Anatol Belski d4cb4168ba [ci skip] Update link 2018-03-10 09:40:50 +01:00
Christoph M. Becker d48b233991 Update to Oniguruma 6.7.1
We also apply the still relevant parts of `oniguruma.patch` and update
the patch accordingly.
2018-03-10 01:07:00 +01:00
Christoph M. Becker 4095f63a90 Merge branch 'PHP-7.2'
* PHP-7.2:
  Fix #73957: signed integer conversion in imagescale()
2018-03-10 00:26:25 +01:00
Christoph M. Becker d709922979 Merge branch 'PHP-7.1' into PHP-7.2
* PHP-7.1:
  Fix #73957: signed integer conversion in imagescale()
2018-03-10 00:25:11 +01:00
Christoph M. Becker f1b358c9a9 Fix #73957: signed integer conversion in imagescale()
We must not pass values to `gdImageScale()` which cannot be represented
by an `unsigned int`.  Instead we return FALSE, according to what we
already did for negative integers.
2018-03-10 00:17:09 +01:00
Dmitry Stogov 9d139b16c2 Test ReflectionZendExtension class 2018-03-09 12:07:52 +01:00
Jonathan Torres 1cb3c15032 Fix typo in upgrade notes 2018-03-09 12:06:17 +01:00
Gabriel Caruso 701437a948 Remove return types from some magic method in protos
__construct, __destruct, __wakeup does not have return types defined.
2018-03-09 12:04:46 +01:00
Anatol Belski acda5e084e Document new configurue options 2018-03-08 12:14:48 +01:00
Anatol Belski d047137d7e Merge branch 'PHP-7.2'
* PHP-7.2:
  Disable PGO for phpdbg
2018-03-08 11:57:55 +01:00
Anatol Belski d1ed6b1b15 Merge branch 'PHP-7.1' into PHP-7.2
* PHP-7.1:
  Disable PGO for phpdbg
2018-03-08 11:49:25 +01:00
Anatol Belski 34b9f9dedf Disable PGO for phpdbg
For executable files, the linker seems to have issues dealing with the
empty profiling database. As PGO is unlikely to bring any benefit in
this case, the easiest is to disable it.
2018-03-08 11:48:37 +01:00
Anatol Belski 70a1b23c2c Remove unused assignment 2018-03-07 18:09:58 +01:00
Anatol Belski 98aeb528c3 Remove unused assignment 2018-03-07 17:12:27 +01:00
Anatol Belski b7940d368f Merge branch 'PHP-7.2'
* PHP-7.2:
  Exclude /Qspectre for clang analyzer
2018-03-07 15:23:39 +01:00
Anatol Belski 2d660dd630 Merge branch 'PHP-7.1' into PHP-7.2
* PHP-7.1:
  Exclude /Qspectre for clang analyzer
2018-03-07 15:23:03 +01:00
Anatol Belski 00bfc6eb49 Exclude /Qspectre for clang analyzer 2018-03-07 12:34:16 +01:00
Anatol Belski f28630eae0 Merge branch 'PHP-7.2'
* PHP-7.2:
  Guard platform dependent code
2018-03-07 12:29:56 +01:00
Anatol Belski 22857f1d89 Merge branch 'PHP-7.1' into PHP-7.2
* PHP-7.1:
  Guard platform dependent code
2018-03-07 12:29:22 +01:00
Anatol Belski 281e2f8207 Guard platform dependent code 2018-03-07 12:28:29 +01:00
Nikita Popov 3b5b64ce75 Fix garbage marking in gc_collect_roots()
gc_collect_white() will mark white nodes as black and add them as
garbage, but only if it's not buffered yet. The already buffered
roots are instead marked as garbage in gc_collect_roots() directly.
However, if gc_collect_white() marked a (buffered) root as black
through recursion, it would not subsequently be marked as garbage.
2018-03-07 09:50:25 +01:00
Dmitry Stogov dcbac8ade6 Fixed use-after-free. 2018-03-07 10:21:51 +03:00
Dmitry Stogov 228687362c Merge branch 'master' of git.php.net:php-src
* 'master' of git.php.net:php-src:
  [ci skip] Update NEWS
  [ci skip] Update NEWS
2018-03-07 00:53:50 +03:00
Anatol Belski 7febfe068a Merge branch 'PHP-7.2'
* PHP-7.2:
  [ci skip] Update NEWS
  [ci skip] Update NEWS
2018-03-06 22:08:49 +01:00
Anatol Belski 7780bfc7b3 [ci skip] Update NEWS 2018-03-06 22:07:58 +01:00
Anatol Belski 000e35db81 Merge branch 'PHP-7.1' into PHP-7.2
* PHP-7.1:
  [ci skip] Update NEWS
2018-03-06 22:07:31 +01:00
Anatol Belski 8a57fcdfbd [ci skip] Update NEWS 2018-03-06 22:06:52 +01:00
Dmitry Stogov a2d1f2df46 Eliminate conditional branches 2018-03-07 00:03:13 +03:00
Dmitry Stogov a4109e1f4c Added expectation 2018-03-06 23:22:01 +03:00