clones/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2024-09-22 18:37:25 +00:00
Code Issues Packages Projects Releases Wiki Activity
104,656 Commits 491 Branches 1,363 Tags 839 MiB
57f33b4ce2
Commit Graph

104656 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Anatol Belski
57f33b4ce2 Merge branch 'PHP-7.1' into PHP-7.2 
* PHP-7.1:
  Fix yet one data race in PCRE
 2017-12-06 16:04:22 +01:00
Anatol Belski
1b29dc0b1c Fix yet one data race in PCRE 
PCRE 8.x initializes the pattern compiler on demand during the first
pcre_study call. It could be worse, but since the compiled patterns are
cached, the locking impact is minimal. PCRE 10.x always compiles the
pattern and thread sanitizer doesn't complain about the compiler
initialization, thus the newer PCRE version seems to be unafected.
 2017-12-06 15:59:21 +01:00
Anatol Belski
d4af204637 Merge branch 'PHP-7.1' into PHP-7.2 
* PHP-7.1:
  Fix use after free revealed by phpdbg
 2017-12-05 18:34:39 +01:00
Anatol Belski
092fd44474 Fix use after free revealed by phpdbg 2017-12-05 18:32:32 +01:00
Anatol Belski
75a2ee7f7b Fixed bug #75601 Thread race in PCRE JIT support 2017-12-05 17:40:00 +01:00
Anatol Belski
ed2434a6aa Merge branch 'PHP-7.1' into PHP-7.2 
* PHP-7.1:
  Fixed bug #75601 Thread race in PCRE JIT support
  bump versions
 2017-12-05 17:39:28 +01:00
Anatol Belski
31b2b14a71 Fixed bug #75601 Thread race in PCRE JIT support 2017-12-05 17:38:18 +01:00
krakjoe
71a460ba7e
bump versions 2017-12-05 14:18:48 +01:00
Anatol Belski
b79082c99d [ci skip] update NEWS 2017-12-05 09:01:02 +01:00
Anatol Belski
2edd10f27b Merge branch 'PHP-7.1' into PHP-7.2 
* PHP-7.1:
  [ci skip] update NEWS
 2017-12-05 09:00:12 +01:00
Anatol Belski
3110bc10f5 [ci skip] update NEWS 2017-12-05 08:59:33 +01:00
Anatol Belski
c4ad9741cd Merge branch 'PHP-7.1' into PHP-7.2 
* PHP-7.1:
  7.0.28 is next
 2017-12-05 08:52:40 +01:00
Anatol Belski
be50c2fa85 Merge branch 'PHP-7.0' into PHP-7.1 
* PHP-7.0:
  7.0.28 is next
 2017-12-05 08:52:14 +01:00
Anatol Belski
484c11a541 7.0.28 is next 2017-12-05 08:51:30 +01:00
Anatol Belski
95c828b982 Merge branch 'PHP-7.1' into PHP-7.2 
* PHP-7.1:
  [ci skip] update NEWS
 2017-12-05 08:42:25 +01:00
Anatol Belski
59c36a7e17 Merge branch 'PHP-7.0' into PHP-7.1 
* PHP-7.0:
  [ci skip] update NEWS
 2017-12-05 08:42:02 +01:00
Anatol Belski
dab205cb9a [ci skip] update NEWS 2017-12-05 08:41:24 +01:00
Dmitry Stogov
3503dc7482 Merge branch 'PHP-7.1' into PHP-7.2 
* PHP-7.1:
  Fixed bug #75608 ("Narrowing occurred during type inference" error)
 2017-12-04 17:22:28 +03:00
Dmitry Stogov
5934bff913 Fixed bug #75608 ("Narrowing occurred during type inference" error) 2017-12-04 17:22:06 +03:00
Anatol Belski
5a0eb2446c Merge branch 'PHP-7.1' into PHP-7.2 
* PHP-7.1:
  Use dtor unconditionally in error case
 2017-12-04 14:16:45 +01:00
Anatol Belski
1da28c55c4 Merge branch 'PHP-7.0' into PHP-7.1 
* PHP-7.0:
  Use dtor unconditionally in error case
 2017-12-04 14:16:23 +01:00
Anatol Belski
0eb262eacb Use dtor unconditionally in error case 2017-12-04 14:15:42 +01:00
Anatol Belski
94d7b7f3db Merge branch 'PHP-7.1' into PHP-7.2 
* PHP-7.1:
  Fixed bug #75573 (Segmentation fault in 7.1.12 and 7.0.26)
 2017-12-04 11:52:33 +01:00
Anatol Belski
4201f5bcfd Merge branch 'PHP-7.0' into PHP-7.1 
* PHP-7.0:
  Fixed bug #75573 (Segmentation fault in 7.1.12 and 7.0.26)
 2017-12-04 11:52:09 +01:00
Xinchen Hui
d4dee4a614 Fixed bug #75573 (Segmentation fault in 7.1.12 and 7.0.26) 
(cherry picked from commit 3b9ba7b6bd)
 2017-12-04 11:50:44 +01:00
Anatol Belski
36f85e17e2 Merge branch 'PHP-7.1' into PHP-7.2 
* PHP-7.1:
  Fix compat with libcurl 7.56.1+ and file:// wrapper
 2017-12-03 12:28:41 +01:00
Anatol Belski
aaf00ae0a9 Fix compat with libcurl 7.56.1+ and file:// wrapper 
Since 7.52.x libcurl file:// scheme was implemented in a way described
in https://tools.ietf.org/html/draft-ietf-appsawg-file-scheme-16 . The
draft is still not accepted and the change contained a BC breach with
win32 path handling. It was reported upstream and 7.52.x fixed it, but
the BC breaching behavior was reintroduced in 7.56.1. Thus, it is better
to handle this on the PHP side.
 2017-12-03 12:23:25 +01:00
Nikita Popov
f9b8bd07c7 Merge branch 'PHP-7.1' into PHP-7.2 2017-12-02 18:11:17 +01:00
Nikita Popov
cbe60003f1 Merge branch 'PHP-7.0' into PHP-7.1 2017-12-02 18:11:03 +01:00
Andy Postnikov
d6d4f2a9b3 Fix ZEND_SIGNED_MULTIPLY_LONG for AArch64 
Register operands are required in this context.

This is a backport of 8c8679207a
to PHP 7.0+. The current code caused incorrect behavior on AArch64
when compiling with clang.
 2017-12-02 18:10:17 +01:00
Anatol Belski
f282b7720a Merge branch 'PHP-7.1' into PHP-7.2 
* PHP-7.1:
  Consider Xdebug for tmi ini generation, too
 2017-12-01 16:03:09 +01:00
Anatol Belski
ffd94f9bf8 Merge branch 'PHP-7.0' into PHP-7.1 
* PHP-7.0:
  Consider Xdebug for tmi ini generation, too
 2017-12-01 16:02:38 +01:00
Anatol Belski
958fdc997c Consider Xdebug for tmi ini generation, too 2017-12-01 16:01:34 +01:00
Dmitry Stogov
01b85f0e17 Merge branch 'PHP-7.1' into PHP-7.2 
* PHP-7.1:
  Set trailing zero
 2017-12-01 17:00:51 +03:00
Dmitry Stogov
b73151845f Merge branch 'PHP-7.0' into PHP-7.1 
* PHP-7.0:
  Set trailing zero
 2017-12-01 17:00:42 +03:00
Dmitry Stogov
24d5adbd5a Set trailing zero 2017-12-01 17:00:11 +03:00
Anatol Belski
b6a27c7332 Revert "Fix macro redefinition warnings" 
This reverts commit 23d2bd3748.
 2017-11-30 13:21:04 +01:00
Anatol Belski
23d2bd3748 Fix macro redefinition warnings 
The corresponding implementations are available from APR.
 2017-11-30 12:40:52 +01:00
Christoph M. Becker
995ac8a094 Merge branch 'PHP-7.1' into PHP-7.2 
* PHP-7.1:
  Define floorf if system doesn't have it (follow up for 22c48761)
 2017-11-29 16:59:17 +01:00
Christoph M. Becker
f166ea9c09 Merge branch 'PHP-7.0' into PHP-7.1 
* PHP-7.0:
  Define floorf if system doesn't have it (follow up for 22c48761)
 2017-11-29 16:53:11 +01:00
Lior Kaplan
32e3d7b99e Define floorf if system doesn't have it (follow up for 22c48761) 
floorf is checked in config.m4
 2017-11-29 16:46:47 +01:00
Frank Denis
fc8793499a Revert "Revert "ext/sodium: pwhash: do not warn on low parameters"" 
This reverts commit a1845b7fdb.

Revert "Revert "ext/sodium: throw exceptions instead of errors""
This reverts commit 31d221f9c7.
 2017-11-29 13:19:56 +01:00
Anatol Belski
367c0b4c33 Merge branch 'PHP-7.1' into PHP-7.2 
* PHP-7.1:
  [ci skip] update NEWS
 2017-11-29 09:31:29 +01:00
Anatol Belski
6a23add631 [ci skip] update NEWS 2017-11-29 09:31:14 +01:00
Anatol Belski
39d1818bd3 [ci skip] update NEWS 
Move entry to proper section
 2017-11-29 09:30:04 +01:00
Xinchen Hui
17338ddb48 Update NEWS 2017-11-29 14:47:26 +08:00
Xinchen Hui
bedf6093ad Merge branch 'PHP-7.1' into PHP-7.2 
* PHP-7.1:
  Fixed bug #75573 (Segmentation fault in 7.1.12 and 7.0.26)
 2017-11-29 14:46:44 +08:00
Xinchen Hui
3b9ba7b6bd Fixed bug #75573 (Segmentation fault in 7.1.12 and 7.0.26) 2017-11-29 14:46:21 +08:00
Frank Denis
a1845b7fdb Revert "ext/sodium: pwhash: do not warn on low parameters" 
This reverts commit c219991c77.
 2017-11-29 01:22:59 +01:00
Nikita Popov
1d557e4a62 Merge remote-tracking branch 'php-src/PHP-7.2' into PHP-7.2 2017-11-28 23:37:05 +01:00