php/archived-php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2026-04-13 02:52:48 +02:00
Code Issues Packages Projects Releases Wiki Activity
108,846 Commits 547 Branches 1,483 Tags
9a2bd2f4530412f04dbb86becf9783eb5335be7a
Commit Graph

108846 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Christoph M. Becker
9a2bd2f453 Merge branch 'PHP-7.2' into PHP-7.3 
* PHP-7.2:
  Fix #77147: Fix for 60494 ignores ICONV_MIME_DECODE_CONTINUE_ON_ERROR
 2018-11-14 14:59:30 +01:00
Christoph M. Becker
211c6189f6 Merge branch 'PHP-7.1' into PHP-7.2 
* PHP-7.1:
  Fix #77147: Fix for 60494 ignores ICONV_MIME_DECODE_CONTINUE_ON_ERROR
 2018-11-14 14:57:40 +01:00
Christoph M. Becker
a56cdd0a82 Fix #77147: Fix for 60494 ignores ICONV_MIME_DECODE_CONTINUE_ON_ERROR 
If the `ICONV_MIME_DECODE_CONTINUE_ON_ERROR` flag is set, parsing
should not fail, if there are illegal characters in the headers;
instead we silently ignore these like before.
 2018-11-14 14:55:38 +01:00
Joe Watkins
8a11c9ee76 Merge branch 'PHP-7.2' into PHP-7.3 
* PHP-7.2:
  Validate length on socket_write
 2018-11-13 13:00:08 +01:00
Joe Watkins
ce4eb89976 Merge branch 'PHP-7.1' into PHP-7.2 
* PHP-7.1:
  Validate length on socket_write
 2018-11-13 12:58:23 +01:00
Thiago Carvalho
ec2e7a2d48 Validate length on socket_write 2018-11-13 12:56:37 +01:00
Jan Rękorajski
f76be1a0d6 Fix compilation on x32 
Signed-off-by: Elan Ruusamäe <glen@pld-linux.org>
 2018-11-13 12:31:00 +01:00
Christoph M. Becker
512b93e9d6 Merge branch 'PHP-7.2' into PHP-7.3 
* PHP-7.2:
  Fix #77141: Signedness issue in SOAP when precision=-1
 2018-11-12 23:24:48 +01:00
Christoph M. Becker
77646d2fd9 Merge branch 'PHP-7.1' into PHP-7.2 
* PHP-7.1:
  Fix #77141: Signedness issue in SOAP when precision=-1
 2018-11-12 23:22:16 +01:00
Christoph M. Becker
f6079e3c56 Fix #77141: Signedness issue in SOAP when precision=-1 
According to php_gcvt(), we assume at most 17 fractional digits for
negative precision.
 2018-11-12 23:19:30 +01:00
Anatol Belski
ee50461e4b Update libmagic.patch [ci skip] 2018-11-10 22:02:44 +01:00
Anatol Belski
df9c58e27a Merge branch 'PHP-7.2' into PHP-7.3 
* PHP-7.2:
  Update libmagic.patch [ci skip]
 2018-11-10 22:02:24 +01:00
Anatol Belski
1550451020 Update libmagic.patch [ci skip] 2018-11-10 22:01:49 +01:00
Anatol Belski
b50d93bc11 Merge branch 'PHP-7.2' into PHP-7.3 
* PHP-7.2:
  Fork test with pcre.jit=0
 2018-11-10 20:07:25 +01:00
Anatol Belski
3fd46e19ac Fork test with pcre.jit=0 2018-11-10 20:06:47 +01:00
Anatol Belski
0e38909170 Rework magic data 
Still upstream contains some slower patterns. Those might need to
be patched, if regressions arise.
 2018-11-10 18:22:44 +01:00
Anatol Belski
992e4fbc65 Fix regex 2018-11-10 12:13:03 +01:00
Anatol Belski
1c2518f906 Merge branch 'PHP-7.2' into PHP-7.3 
* PHP-7.2:
  Fix regex
 2018-11-10 12:12:25 +01:00
Anatol Belski
9d77bf0978 Fix regex 2018-11-10 12:11:02 +01:00
Anatol Belski
982a62819e Merge branch 'PHP-7.2' into PHP-7.3 
* PHP-7.2:
  Rework magic data
 2018-11-10 01:32:35 +01:00
Anatol Belski
60adea5496 Rework magic data 
Avoid patching where vanilla data suffices. More precisely, avoid data
using [:space:] posix class in regex, as it is likely to cause performance
regressions.
 2018-11-10 01:28:23 +01:00
Anatol Belski
3061d7bdad Merge branch 'PHP-7.2' into PHP-7.3 
* PHP-7.2:
  Sync one more upstream libmagic piece
 2018-11-10 00:20:39 +01:00
Anatol Belski
22f71a66ec Sync one more upstream libmagic piece 2018-11-10 00:19:42 +01:00
Christoph M. Becker
155aecd397 [ci skip] Update NEWS wrt. php-7.3.0RC5 tagging 2018-11-06 11:46:20 +01:00
Anatol Belski
ddd54401db Update NEWS [ci skip] 2018-11-05 22:53:45 +01:00
Anatol Belski
1cab286151 Merge branch 'PHP-7.2' into PHP-7.3 
* PHP-7.2:
  Update NEWS [ci skip]
 2018-11-05 22:53:19 +01:00
Anatol Belski
fab72d7571 Update NEWS [ci skip] 2018-11-05 22:53:01 +01:00
Anatol Belski
a957af6c06 Update libmagic.patch [ci skip] 2018-11-05 22:25:31 +01:00
Anatol Belski
b996611531 Merge branch 'PHP-7.2' into PHP-7.3 
* PHP-7.2:
  Update libmagic.patch [ci skip]
 2018-11-05 22:25:04 +01:00
Anatol Belski
dbb2cce968 Update libmagic.patch [ci skip] 2018-11-05 22:24:27 +01:00
Anatol Belski
29dcf19f8b Declare function proto in header 2018-11-05 21:29:35 +01:00
Anatol Belski
4aa77c380c Merge branch 'PHP-7.2' into PHP-7.3 
* PHP-7.2:
  Declare function proto in header
 2018-11-05 21:29:06 +01:00
Anatol Belski
0e33c2822c Declare function proto in header 2018-11-05 21:28:04 +01:00
Christoph M. Becker
7625f972db Fix #76825: Undefined symbols ___cpuid_count 
Apparently, the presence of `cpuid.h` is not necessarily sufficient to
guarantee the availability of `__cpuid_count()`.  We therefore test for
the latter explicitly.
 2018-11-05 18:24:39 +01:00
Remi Collet
d78479737c NEWS 2018-11-05 17:06:40 +01:00
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