clones/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2024-09-23 02:47:26 +00:00
Code Issues Packages Projects Releases Wiki Activity
104,861 Commits 491 Branches 1,363 Tags 841 MiB
aef59537e6
Commit Graph

104861 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jakub Zelenka
aef59537e6 Merge branch 'PHP-7.1' into PHP-7.2 2018-01-30 20:02:34 +00:00
Jakub Zelenka
fe2ac52d50 Use correct certs for SNI server tests 2018-01-30 19:58:40 +00:00
Thomas Punt
0f393a6102 Merge branch 'PHP-7.1' into PHP-7.2 
* PHP-7.1:
  Use the correct freeing function
 2018-01-29 11:13:22 +00:00
Thomas Punt
fb128f6512 Use the correct freeing function 2018-01-29 11:13:10 +00:00
Bishop Bettini
fa586cee3e Fixed bug #54289 
If a directory is passed to Phar::extractTo(), loop over all
entries and extract all files with the given prefix.
 2018-01-28 21:51:25 +01:00
Anatol Belski
a99df321f1 [ci skip] Update NEWS. 2018-01-27 17:24:29 +01:00
Sam Ding
a8c6b36d62 fixed Big_endian issue on s390x for stream test cases 2018-01-27 16:39:03 +01:00
Christoph M. Becker
96595a232a Merge branch 'PHP-7.1' into PHP-7.2 
* PHP-7.1:
  Revert "Fix #75878: RecursiveTreeIterator::setPostfix has wrong signature"
 2018-01-27 13:13:06 +01:00
Christoph M. Becker
a882f95e39 Revert "Fix #75878: RecursiveTreeIterator::setPostfix has wrong signature" 
This reverts commit 4bd7658e1b.

To avoid the BC break we apply the fix to master only.
 2018-01-27 13:11:30 +01:00
Christoph M. Becker
d7a02844f9 Merge branch 'PHP-7.1' into PHP-7.2 
* PHP-7.1:
  Fix #75878: RecursiveTreeIterator::setPostfix has wrong signature
 2018-01-27 12:41:15 +01:00
Christoph M. Becker
4bd7658e1b Fix #75878: RecursiveTreeIterator::setPostfix has wrong signature 2018-01-27 12:33:36 +01:00
Nikita Popov
fd255b8878 Merge branch 'PHP-7.1' into PHP-7.2 2018-01-26 22:28:48 +01:00
Philip Prindeville
aad76a9b79 Be consistent in clearing out in php_iconv_string() 2018-01-26 22:28:27 +01:00
Dmitry Stogov
aad12cb49c Restore initial values on graceful server restart. 2018-01-26 15:22:36 +03:00
Michael Orlitzky
3fe9e10a1b ext/session: catch incompatible configure flags earlier. 
The session extension has a --with-mm flag that tells it to build
the mm backend ("mm" is the name of the library). However, that
backend is not thread-safe, and mod_mm.c will refuse to compile if
the --enable-maintainer-zts flag was also passed to the configure
script.

Rather than crash halfway through the build, this commit adds a check
to the session extension's config.m4 file. If both --with-mm and
--enable-maintainer-zts are "on," then the configure script will
die and explain that they can't be used together.

PHP-bug: 14269
 2018-01-24 21:22:15 +01:00
Derick Rethans
6dbe046154 Updated to version 2018.3 (2018c) 2018-01-24 13:57:07 +00:00
Derick Rethans
3bdcb6cf3e Empty merge 2018-01-24 13:57:07 +00:00
Derick Rethans
f80e59a566 Updated to version 2018.3 (2018c) 2018-01-24 13:57:06 +00:00
Sara Golemon
0c22cda951 Merge branch 'PHP-7.1' into PHP-7.2 
* PHP-7.1:
  Fix alignment of PG struct cause by ignore_user_abort big endian fix
 2018-01-23 11:11:37 -05:00
Sara Golemon
3ffdf6c088
Fix alignment of PG struct cause by ignore_user_abort big endian fix 2018-01-23 11:06:34 -05:00
Sara Golemon
0067420049 Merge branch 'PHP-7.1' into PHP-7.2 
* PHP-7.1:
  Use Z_EXPECTED_LONG to initialize FAST_ZPP parsing loop
 2018-01-23 09:24:47 -05:00
Sara Golemon
e954bafc28 Merge branch 'PHP-7.0' into PHP-7.1 
* PHP-7.0:
  Use Z_EXPECTED_LONG to initialize FAST_ZPP parsing loop
 2018-01-23 09:24:40 -05:00
Sara Golemon
e88e83d3e5
Use Z_EXPECTED_LONG to initialize FAST_ZPP parsing loop 2018-01-23 09:24:10 -05:00
Sara Golemon
871066523e Merge branch 'PHP-7.1' into PHP-7.2 
* PHP-7.1:
  BigEndian fix for ignore_user_abort. Use zend_bool to match OnUpdateBool
 2018-01-23 08:58:53 -05:00
Sara Golemon
d46d53a7bc
BigEndian fix for ignore_user_abort. Use zend_bool to match OnUpdateBool 2018-01-23 08:58:19 -05:00
Anatol Belski
4626c28e9c [ci skip] Update NEWS 2018-01-22 19:15:30 +01:00
Anatol Belski
b8f14008eb Merge branch 'PHP-7.1' into PHP-7.2 
* PHP-7.1:
  [ci skip] Update NEWS
 2018-01-22 19:15:02 +01:00
Anatol Belski
594a4da3e5 [ci skip] Update NEWS 2018-01-22 19:14:24 +01:00
Anatol Belski
e403e122cd Merge branch 'PHP-7.1' into PHP-7.2 
* PHP-7.1:
  Fixed bug #73725 Unable to retrieve value of varchar(max) type
 2018-01-22 17:03:48 +01:00
Anatol Belski
2384ade53c Fixed bug #73725 Unable to retrieve value of varchar(max) type 2018-01-22 17:02:54 +01:00
Xinchen Hui
2dc1cd1154 Updated NEWS 2018-01-18 10:53:58 +08:00
Xinchen Hui
6184301212 Merge branch 'PHP-7.1' into PHP-7.2 
* PHP-7.1:
  Fixed #75838 (Memory leak in pg_escape_bytea())
 2018-01-18 10:53:39 +08:00
Xinchen Hui
fb205020ce Fixed #75838 (Memory leak in pg_escape_bytea()) 2018-01-18 10:53:23 +08:00
Anatol Belski
f0aa379dc1 Merge branch 'PHP-7.1' into PHP-7.2 
* PHP-7.1:
  Add switches for Spectre variant 1 mitigation
 2018-01-17 14:47:39 +01:00
Anatol Belski
043d53c789 Add switches for Spectre variant 1 mitigation 2018-01-17 14:33:08 +01:00
Anatol Belski
13dd12e85f Merge branch 'PHP-7.1' into PHP-7.2 
* PHP-7.1:
  7.0.15 next
 2018-01-16 19:49:23 +01:00
Anatol Belski
ea56fc840e 7.0.15 next 2018-01-16 19:47:35 +01:00
Xinchen Hui
9206afc652 Fixed NEWS 2018-01-16 17:31:44 +08:00
Remi Collet
5a54107879 next is 7.2.3 2018-01-16 09:54:57 +01:00
Anatol Belski
be89405839 [ci skip] Update NEWS 2018-01-15 17:49:21 +01:00
Anatol Belski
cc5e53695a Merge branch 'PHP-7.1' into PHP-7.2 
* PHP-7.1:
  [ci skip] Update NEWS
 2018-01-15 17:47:29 +01:00
Anatol Belski
47941976b7 [ci skip] Update NEWS 2018-01-15 17:46:34 +01:00
Anatol Belski
c5768a7e24 Merge branch 'PHP-7.1' into PHP-7.2 
* PHP-7.1:
  Allow pecl like usage in ext/phar, closes #2955
 2018-01-15 14:25:45 +01:00
Anatol Belski
2d4fb56c1d Allow pecl like usage in ext/phar, closes #2955 2018-01-15 14:23:46 +01:00
Nikita Popov
f3c1726d25 Merge branch 'PHP-7.1' into PHP-7.2 2018-01-15 12:16:00 +01:00
Nikita Popov
2023346973 Fixed bug #75079 2018-01-15 12:15:40 +01:00
Anatol Belski
be0620a2f0 Merge branch 'PHP-7.1' into PHP-7.2 
* PHP-7.1:
  Sync for upcoming vc++ 15.6 version raise
 2018-01-14 16:42:17 +01:00
Anatol Belski
089a3213ae Sync for upcoming vc++ 15.6 version raise 2018-01-14 16:38:36 +01:00
Anatol Belski
43c578b4b2 [ci skip] Update NEWS 2018-01-13 14:50:58 +01:00
Anatol Belski
4fabee770f Merge branch 'PHP-7.1' into PHP-7.2 
* PHP-7.1:
  [ci skip] Update NEWS
 2018-01-13 14:50:00 +01:00