php/archived-php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2026-04-17 13:01:02 +02:00
Code Issues Packages Projects Releases Wiki Activity
107,359 Commits 547 Branches 1,483 Tags
5a31e14beba625f1b32d61d6aec85b3df7f023cc
Commit Graph

48186 Commits

Author SHA1 Message Date
Dmitry Stogov
5a31e14beb Merge branch 'PHP-7.2' 
* PHP-7.2:
  Fixed bug #76205 (PHP-FPM sporadic crash when running Infinitewp)
 2018-05-03 12:12:07 +03:00
Dmitry Stogov
3fe2e2a372 Merge branch 'PHP-7.1' into PHP-7.2 
* PHP-7.1:
  Fixed bug #76205 (PHP-FPM sporadic crash when running Infinitewp)
 2018-05-03 12:11:07 +03:00
Dmitry Stogov
5b3e1ded35 Fixed bug #76205 (PHP-FPM sporadic crash when running Infinitewp) 2018-05-03 12:10:33 +03:00
Anatol Belski
a8ec35ac38 Merge branch 'PHP-7.2' 
* PHP-7.2:
  Fix shared ext/zip build with static dependency lib
 2018-05-02 17:28:10 +02:00
Anatol Belski
afc3f6e8d5 Fix shared ext/zip build with static dependency lib 2018-05-02 17:26:37 +02:00
Anatol Belski
dbea6e154d Update libmagic.patch 2018-04-30 14:29:55 +02:00
Anatol Belski
94699d2ade Use suitable datatypes 2018-04-30 14:27:11 +02:00
Anatol Belski
f603ab57fc Reuse the struct timespec based pieces in libmagic 2018-04-30 12:02:47 +02:00
Thomas Punt
26b0385df8 Merge branch 'PHP-7.2' 
* PHP-7.2:
  Fix potential memory leak in the enchant extension
  Fix potential memory leak in curl extension
 2018-04-29 20:05:20 +01:00
Thomas Punt
3139be0bea Merge branch 'PHP-7.1' into PHP-7.2 
* PHP-7.1:
  Fix potential memory leak in the enchant extension
  Fix potential memory leak in curl extension
 2018-04-29 20:04:18 +01:00
Thomas Punt
7ba70a5fed Fix potential memory leak in the enchant extension 2018-04-29 19:23:07 +01:00
Thomas Punt
d3ae4fe2d2 Fix potential memory leak in curl extension 2018-04-29 19:04:10 +01:00
Anatol Belski
cf45479a19 Reuse strcasestr implementation from libmagic 2018-04-29 19:39:57 +02:00
Thomas Punt
5295c35f69 Merge branch 'master' of https://git.php.net/push/php-src 2018-04-29 17:39:22 +01:00
Thomas Punt
091f69e869 Merge branch 'PHP-7.2' 
* PHP-7.2:
  The SO_PASSCRED constant is conditionally defined
 2018-04-29 17:38:59 +01:00
Thomas Punt
beab622265 Merge branch 'PHP-7.1' into PHP-7.2 
* PHP-7.1:
  The SO_PASSCRED constant is conditionally defined
 2018-04-29 17:38:12 +01:00
Thomas Punt
35713efa02 The SO_PASSCRED constant is conditionally defined 2018-04-29 17:34:03 +01:00
Anatol Belski
09db1ae4b7 Fix C89 compat 2018-04-29 16:18:59 +02:00
Anatol Belski
e2182a1ba7 Port libmagic 5.33 2018-04-29 16:02:08 +02:00
Thomas Punt
74ecbbebe5 Merge branch 'PHP-7.2' 
* PHP-7.2:
  Fix potential memory leaks in sockets extension
 2018-04-28 13:58:45 +01:00
Thomas Punt
d990b9316a Merge branch 'PHP-7.1' into PHP-7.2 
* PHP-7.1:
  Fix potential memory leaks in sockets extension
 2018-04-28 13:57:30 +01:00
Thomas Punt
7f090ac16a Merge branch 'PHP-7.1' of https://git.php.net/push/php-src into PHP-7.1 2018-04-28 13:56:09 +01:00
Thomas Punt
643c9c9b47 Fix potential memory leaks in sockets extension 2018-04-28 13:55:24 +01:00
Dmitry Stogov
c88be6aee1 Bit check micro-optimization 2018-04-28 14:13:12 +03:00
Dmitry Stogov
8a719c1b12 Fixed mess between BOOL and SUCCESS/FAILURE 2018-04-28 14:12:36 +03:00
Dmitry Stogov
df4d0a73d2 Revert "Fixed bug #76205 (PHP-FPM sporadic crash when running Infinitewp)." 
This reverts commit c6ce03e45e.
 2018-04-28 13:28:00 +03:00
Dmitry Stogov
f8c1ce18e9 Revert "Merge branch 'PHP-7.1' into PHP-7.2" 
This reverts commit c547c1b980, reversing
changes made to 4c083e7a66.
 2018-04-28 13:27:36 +03:00
Dmitry Stogov
1b305ecdcc Revert "Merge branch 'PHP-7.2'" 
This reverts commit f75b8a44cc, reversing
changes made to aeb734910a.
 2018-04-28 13:26:32 +03:00
Dmitry Stogov
83f98f7340 Don't store values of PHP_SAPI and PHP_BINARY in file cache, because it may be used by different SAPI. 2018-04-28 01:20:49 +03:00
Dmitry Stogov
f75b8a44cc Merge branch 'PHP-7.2' 
* PHP-7.2:
  Fixed bug #76205 (PHP-FPM sporadic crash when running Infinitewp).
 2018-04-28 00:28:01 +03:00
Dmitry Stogov
c547c1b980 Merge branch 'PHP-7.1' into PHP-7.2 
* PHP-7.1:
  Fixed bug #76205 (PHP-FPM sporadic crash when running Infinitewp).
 2018-04-28 00:24:56 +03:00
Dmitry Stogov
c6ce03e45e Fixed bug #76205 (PHP-FPM sporadic crash when running Infinitewp). 2018-04-28 00:19:53 +03:00
Nikita Popov
aeb734910a Merge branch 'PHP-7.2' 2018-04-27 22:24:36 +02:00
Nikita Popov
4c083e7a66 Merge branch 'PHP-7.1' into PHP-7.2 2018-04-27 22:23:55 +02:00
Nikita Popov
6738d19fb8 Fix bug #76281 
Make sure we keep the smart-branch inhibiting NOP even if there
are multiple NOPs in sequence.
 2018-04-27 22:21:59 +02:00
Nikita Popov
1c887eaf0d Merge branch 'PHP-7.2' 2018-04-27 17:02:40 +02:00
Nikita Popov
2c602be7c8 Merge branch 'PHP-7.1' into PHP-7.2 2018-04-27 17:02:01 +02:00
Nikita Popov
279ba58edb Fixed bug #76275 
* Adjust IS_SERIALIZED() check to account for potential empty
  allocations at the end of the memory region.
* Deallocate empty allocation if all try/catch elements have been
  removed in the block pass (similar to what we do if all live
  ranges have been eliminated).
 2018-04-27 17:01:35 +02:00
Nikita Popov
3182292015 Fix unused variable warnings 2018-04-26 16:53:58 +02:00
David Carlier
86cff0bd4c Avoid using _N in SSE code 
The _N constant is already defined in OpenSSL. Instead use some
more explicit variable names.
 2018-04-26 16:50:19 +02:00
Anatol Belski
16216b6666 Switch to more robust config for external pcre2 
For the standard layout the first option is pkg-config. Otherwise,
pcre2-config is used, which is produced by a manual installation into a
prefix. This removes the most of the hackish pieces like checking for
the lib filenames and parsing headers.
 2018-04-26 14:20:36 +02:00
Anatol Belski
d22d99a344 Fix regex 2018-04-25 16:30:10 +02:00
Anatol Belski
217354899b Revamp pcre config for build with external lib 
- support multiarch in addition to the usual lib path
- fix symbol checks
- fix jit availability check
- exit early on unsupported version
 2018-04-25 16:17:20 +02:00
Anatol Belski
e107a03419 Fix lib names for build with external libpcre2 2018-04-24 17:06:27 +02:00
Anatol Belski
1de1c86688 Merge branch 'PHP-7.2' 
* PHP-7.2:
  Fix test portability
 2018-04-24 10:49:34 +02:00
Anatol Belski
1df43a086f Merge branch 'PHP-7.1' into PHP-7.2 
* PHP-7.1:
  Fix test portability
 2018-04-24 10:49:15 +02:00
Anatol Belski
919ead1157 Merge branch 'PHP-7.0' into PHP-7.1 
* PHP-7.0:
  Fix test portability
 2018-04-24 10:48:49 +02:00
Anatol Belski
3070883bcf Merge branch 'PHP-5.6' into PHP-7.0 
* PHP-5.6:
  Fix test portability
 2018-04-24 10:48:22 +02:00
Anatol Belski
4371af3e19 Fix test portability 2018-04-24 10:47:32 +02:00
Stanislav Malyshev
99f1d904a0 Merge branch 'PHP-7.2' 
* PHP-7.2:
  Fix tsrm_ls
  Fix #76129 - remove more potential unfiltered outputs for phar
  Fix test
  Fix bug #76248 - Malicious LDAP-Server Response causes Crash
  Fix bug #76249 - fail on invalid sequences
  Fix #76130: Heap Buffer Overflow (READ: 1786) in exif_iif_add_value
  Fix bug #75981: prevent reading beyond buffer start
 2018-04-23 22:04:22 -07:00