php/archived-php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2026-04-20 22:41:20 +02:00
Code Issues Packages Projects Releases Wiki Activity
104,852 Commits 547 Branches 1,483 Tags
d7a02844f9cd41b7a91562030ca06e6d3f0bf4b9
Commit Graph

104852 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Anatol Belski
05c4f72ab6 [ci skip] Update NEWS 2018-01-13 14:48:48 +01:00
Anatol Belski
1350f4f997 Merge branch 'PHP-7.1' into PHP-7.2 
* PHP-7.1:
  Fix invalid free
 2018-01-13 12:33:02 +01:00
Anatol Belski
2503a27ae0 Fix invalid free 2018-01-13 12:32:22 +01:00
Nikita Popov
cf70e1910b Merge branch 'PHP-7.1' into PHP-7.2 2018-01-13 11:06:46 +01:00
Nikita Popov
8c07170ddb Fix generator GC if yield from parent chain does not reach root 
Parents may be unlinked while another generator sharing part of the
chain is running. As such, we cannot assume that the parent chain
goes all the way to the root. Instead walk backwards from root to
leaf, like we also do during destruction.
 2018-01-13 11:04:26 +01:00
Nikita Popov
d00f52b6a9 Merge branch 'PHP-7.1' into PHP-7.2 2018-01-12 22:51:20 +01:00
Nikita Popov
cab0a814bd Try to fix yield from GC issues 
Make sure we always update root and parent references before
releasing the old root object.

This fixes some crashes under aggressive cycle collection, so
hopefully this will also fix bug #75351.
 2018-01-12 22:51:03 +01:00
Nikita Popov
e112b8474a Merge branch 'PHP-7.1' into PHP-7.2 2018-01-12 21:28:24 +01:00
Nikita Popov
420d11e8ca Fixed bug #75396 
Do not run finally blocks in generators on unclean shutdown (e.g.
caused by exit). This is consistent with how finally blocks outside
of generators behave.
 2018-01-12 21:27:23 +01:00