php/archived-php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2026-03-27 09:42:22 +01:00
Code Issues Packages Projects Releases Wiki Activity
108,811 Commits 547 Branches 1,481 Tags
d53ecd040bc03ff1504e0fa74fd675df336f9451
Commit Graph

108811 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Remi Collet
d53ecd040b Fix: #77110 undefined symbol zend_string_equal_val in C++ build 2018-11-05 17:05:49 +01:00
Anatol Belski
68ad401b34 Implement handling for JIT recognition when cross compiling 2018-11-05 01:15:09 +01:00
Anatol Belski
db1534b1b4 Merge branch 'PHP-7.2' into PHP-7.3 
* PHP-7.2:
  Backport 7f5f4601 for 7.2
 2018-11-04 16:59:27 +01:00
Anatol Belski
c621182c42 Backport 7f5f4601 for 7.2 2018-11-04 16:57:55 +01:00
Christoph M. Becker
579d76d87b Merge branch 'PHP-7.2' into PHP-7.3 
* PHP-7.2:
  Fix #76348: WSDL_CACHE_MEMORY causes Segmentation fault
 2018-11-04 16:47:13 +01:00
Christoph M. Becker
0afc818976 Merge branch 'PHP-7.1' into PHP-7.2 
* PHP-7.1:
  Fix #76348: WSDL_CACHE_MEMORY causes Segmentation fault
 2018-11-04 16:44:45 +01:00
Christoph M. Becker
625f614cb1 Fix #76348: WSDL_CACHE_MEMORY causes Segmentation fault 
“Thou shalt not follow the NULL pointer, for chaos and madness await
thee at its end.”
 2018-11-04 16:40:27 +01:00
Anatol Belski
7f5f46013b Rework places in libmagic regarding previous CVE-2014-3538 fixes 
CVE-2014-3538 was fixed upstream, but the old patch was still kept in
the PHP port. This patch causes performance regressions when PCRE JIT is
not enabled. This is fixed by applying the relevant original code from
the newer libmagic, which makes the old patch obsolete as the
CVE-2014-3538 tests still pass.
 2018-11-04 13:11:28 +01:00
Anatol Belski
aea411657e Change the way JIT availability is checked 
The pcre2_jit_compile_8 sysmbol is always available, even JIT might be
not. If JIT is not enabled explicitly and is enabled in the PHP runtime,
this will lead to a malfunction. This approach ensures JIT is indeed
available on the given platform. For cross compilation this might get
complicated, as it would require an explicit processor architecture and
PCRE2 version check.

Another solution for this case is to run pcre2_config at runtime. That
however would require more condition checks that would impact
architectures where JIT is available.
 2018-11-03 20:50:05 +01:00
Nikita Popov
d92f7630f7 Merge branch 'PHP-7.2' into PHP-7.3 2018-11-02 14:30:50 +01:00
Nikita Popov
4daa413898 Fixed bug #77092 
Weird that this worked for so long, probably because nearly all
ext/standard functions use fast ZPP rather than ordinary ZPP.
 2018-11-02 14:29:03 +01:00
Zeev Suraski
9afce019e0 Future-proof email addresses 2018-11-01 18:35:32 +02:00
Rasmus Lerdorf
99a9e85c65 Fix stray newline that caused this test to fail 2018-10-31 11:41:17 -07:00
Rasmus Lerdorf
4e8195769d Fix session tests that fail if error_log is set 2018-10-31 10:58:45 -07:00
Rasmus Lerdorf
1954c7e1c6 This test needs to log to stdout 2018-10-31 10:43:45 -07:00
Anatol Belski
ee9d879f57 Fix error condition 2018-10-30 20:43:45 +01:00
Anatol Belski
8827cc34cf Fixed bug #77081 ftruncate() changes seek pointer in c mode 2018-10-30 20:42:00 +01:00
Christoph M. Becker
2816a3fdfa Fix and improve test case 
We fix the erroneous doctype declaration, clarify the expectation, and
add a comment to clarify the purpose of the tag mismatch in the XML.
 2018-10-30 18:53:03 +01:00
Derick Rethans
10255a0cd9 Updated to version 2018.7 (2018g) 2018-10-30 11:25:48 +00:00
Derick Rethans
fcefc28ce1 Empty merge 2018-10-30 11:25:47 +00:00
Derick Rethans
e58388ea6d Updated to version 2018.7 (2018g) 2018-10-30 11:25:45 +00:00
Peter Kokot
17df3a194b [ci skip] Update NEWS 2018-10-30 00:24:07 +01:00
Peter Kokot
82115849b3 Merge branch 'PHP-7.2' into PHP-7.3 
* PHP-7.2:
  [ci skip] Update NEWS
  [ci skip] Update NEWS
  fix bug #77079
 2018-10-30 00:23:38 +01:00
Peter Kokot
69496a04ff [ci skip] Update NEWS 2018-10-30 00:23:20 +01:00
Peter Kokot
b1de24e68c Merge branch 'PHP-7.1' into PHP-7.2 
* PHP-7.1:
  [ci skip] Update NEWS
  fix bug #77079
 2018-10-30 00:22:26 +01:00
Peter Kokot
91a1111160 [ci skip] Update NEWS 2018-10-30 00:22:03 +01:00
Jon Allen
8775bead3a fix bug #77079 2018-10-30 00:19:07 +01:00
Nikita Popov
09c7108f74 Fix mb_strrpos() with encoding passed as 3rd param 2018-10-29 18:56:17 +01:00
Christoph M. Becker
eca3b9629f [ci skip] Update UPGRADING 
PR #3317[1] is relevant for the migration guide, so we add a respective
note in UPGRADING.

[1] <https://github.com/php/php-src/pull/3317>
 2018-10-28 12:48:07 +01:00
Christoph M. Becker
829b0df77b Fix #71592: External entity processing never fails 
If the callback set via `xml_set_external_entity_ref_handler()` returns
a falsy value, parsing is supposed to stop and the error number set to
`XML_ERROR_EXTERNAL_ENTITY_HANDLING`.  This is already correctly done
by the libexpat binding, but the libxml2 binding ignores the return
value.  We fix this by calling `xmlStopParser()` which is available as
of libxml 2.1.0[1] (PHP-7.1 requires at least libxml 2.6.11 anyway),
and setting the desired `errNo` ourselves.

[1] <http://xmlsoft.org/news.html>
 2018-10-27 17:30:13 +02:00
Adam Harvey
bca0a7e285 [ci skip] Fix indentation in UPGRADING. 2018-10-25 11:59:10 -07:00
Nikita Popov
b9431ef4d5 Don't optimize function if inference failed 
This was respected only for the single-function optimizations, not
in func-info mode.
 2018-10-25 16:44:24 +02:00
Nikita Popov
78c2e0e342 Merge branch 'PHP-7.2' into PHP-7.3 2018-10-25 16:44:19 +02:00
Nikita Popov
902ec36710 Merge branch 'PHP-7.1' into PHP-7.2 2018-10-25 16:43:36 +02:00
Nikita Popov
f1ceec5533 Fixed bug #77058 
Account for the fact that undef must be interpreted as null for
the purposes of INC/DEC inference.
 2018-10-25 16:37:41 +02:00
Nikita Popov
e7153e8a2f Improve "narrowing" error message 
By including the opcode name.
 2018-10-25 16:36:23 +02:00
Dmitry Stogov
335fb94d54 Fixed reseting of interned strings buffer. 2018-10-24 15:45:34 +03:00
Dmitry Stogov
770fe51bfd Make php_plain_files_wrapper to be writable (workaround for swoole) 2018-10-24 11:49:44 +03:00
Joe Watkins
33fa02ea38 bump versions 2018-10-24 08:43:27 +02:00
Υоаnn B
5df17425d3 fix typo in sysvsem.c 2018-10-23 14:57:03 +02:00
Nikita Popov
3fb0f34059 Merge branch 'PHP-7.2' into PHP-7.3 2018-10-23 14:24:55 +02:00
Cameron Porter
db47e35373 Fixed bug #50675 
SOAP: Stop overwriting the node name when creating an XML node
for an object reference.
 2018-10-23 14:20:19 +02:00
Remi Collet
0d273cf95d Merge branch 'PHP-7.2' into PHP-7.3 
* PHP-7.2:
  bump to 7.2.13-dev
  Updated to version 2018.6 (2018f)
  Updated to version 2018.6 (2018f)
 2018-10-23 12:16:31 +02:00
Remi Collet
1d5baf167a bump to 7.2.13-dev 2018-10-23 12:15:30 +02:00
Christoph M. Becker
4ffa415500 [ci skip] Update NEWS wrt. php-7.3.0RC4 tagging 2018-10-23 12:10:09 +02:00
Derick Rethans
c3a8313136 Updated to version 2018.6 (2018f) 2018-10-22 12:05:40 +01:00
Derick Rethans
c22b9e0115 Empty merge 2018-10-22 12:05:40 +01:00
Derick Rethans
41241d109a Updated to version 2018.6 (2018f) 2018-10-22 12:05:39 +01:00
Jakub Zelenka
c8febbe039 Fix arginfo and clean up fpm_get_status 2018-10-21 19:39:47 +01:00
Christoph M. Becker
10800106b3 Merge branch 'PHP-7.2' into PHP-7.3 
* PHP-7.2:
  Fix #75282: xmlrpc_encode_request() crashes
 2018-10-21 12:10:54 +02:00