php/archived-php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2026-03-26 09:12:14 +01:00
Code Issues Packages Projects Releases Wiki Activity
98,742 Commits 547 Branches 1,481 Tags
6b671ca3ed28cf46a30e7fbfdfd688cda5878fff
Commit Graph

98742 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Xinchen Hui
6b671ca3ed Merge branch 'PHP-7.0' into PHP-7.1 
* PHP-7.0:
  Skip if no jit is built
 2016-10-29 14:23:47 +08:00
Xinchen Hui
66caa61188 Skip if no jit is built 2016-10-29 14:23:25 +08:00
Anatol Belski
8e4ea7a188 Merge branch 'PHP-7.0' into PHP-7.1 
* PHP-7.0:
  fix test run with autogenerated ini
 2016-10-29 03:18:19 +02:00
Anatol Belski
ddbcb2084a fix test run with autogenerated ini 2016-10-29 03:17:29 +02:00
Anatol Belski
3f35078857 Merge branch 'PHP-7.0' into PHP-7.1 
* PHP-7.0:
  generate test ini file, so shared exts are loaded for nmake test
  additional env is generated for phpize, too
 2016-10-29 02:12:05 +02:00
Anatol Belski
5b04a2187e generate test ini file, so shared exts are loaded for nmake test 2016-10-29 02:08:48 +02:00
Anatol Belski
f5131c6c04 additional env is generated for phpize, too 2016-10-28 23:11:47 +02:00
Xinchen Hui
103f633092 Update NEWS 2016-10-28 21:21:48 +08:00
Xinchen Hui
7778bdcd04 Merge branch 'PHP-7.0' into PHP-7.1 
* PHP-7.0:
  Fixed bug #73392 (A use-after-free in zend allocator management)
 2016-10-28 21:21:35 +08:00
Xinchen Hui
e5aa365147 Fixed bug #73392 (A use-after-free in zend allocator management) 2016-10-28 21:21:24 +08:00
Ferenc Kovacs
2e2433531b Merge branch 'PHP-7.0' into PHP-7.1 2016-10-27 23:40:41 +02:00
Ferenc Kovacs
09a224d702 Merge branch 'PHP-5.6' into PHP-7.0 2016-10-27 23:37:51 +02:00
Ferenc Kovacs
9b3a1e00ab 5.6.29 will be next 2016-10-27 23:10:59 +02:00
Anatol Belski
3f12d852ec Merge branch 'PHP-7.0' into PHP-7.1 
* PHP-7.0:
  use rather the nmake var as it's evaluated on every run
 2016-10-27 22:36:00 +02:00
Anatol Belski
a481291f02 use rather the nmake var as it's evaluated on every run 2016-10-27 22:34:34 +02:00
Anatol Belski
66f3fcee08 Merge branch 'PHP-7.0' into PHP-7.1 
* PHP-7.0:
  prepend known bin folders to the path for nmake test runs
 2016-10-27 20:43:25 +02:00
Anatol Belski
1be8339891 prepend known bin folders to the path for nmake test runs 2016-10-27 20:41:41 +02:00
Anatol Belski
931ea5c872 Merge branch 'PHP-7.0' into PHP-7.1 
* PHP-7.0:
  yet another uninitialized pointer
 2016-10-27 02:45:48 +02:00
Anatol Belski
e586c7c612 yet another uninitialized pointer 2016-10-27 02:42:30 +02:00
Anatol Belski
4e3eb4a5f8 Merge branch 'PHP-7.0' into PHP-7.1 
* PHP-7.0:
  fix uninitialized pointer
 2016-10-27 02:20:12 +02:00
Anatol Belski
b9993c8b6c fix uninitialized pointer 2016-10-27 02:15:14 +02:00
Dmitry Stogov
4616441980 Merge branch 'PHP-7.0' into PHP-7.1 
* PHP-7.0:
  Fixded bug #72736 (Slow performance when fetching large dataset with mysqli / PDO)
 2016-10-26 15:22:51 +03:00
Dmitry Stogov
3fb0a1a4e7 Fixded bug #72736 (Slow performance when fetching large dataset with mysqli / PDO) 2016-10-26 15:17:09 +03:00
Anatol Belski
81f859b5ce Merge branch 'PHP-7.0' into PHP-7.1 
* PHP-7.0:
  make config.w32 compatible with ICU 58
 2016-10-26 13:07:44 +02:00
Anatol Belski
0f9a4af90b make config.w32 compatible with ICU 58 2016-10-26 13:05:03 +02:00
Dmitry Stogov
bdd3fec7f8 Fixed incorrec type usage 2016-10-25 22:12:34 +03:00
Yasuo Ohgaki
e893abda81 Revert "Update UPGRADING to reflect bug fix" 
This change was made in 7.0. Sorry for the noise.

This reverts commit e9c8e50b66.
 2016-10-26 04:01:55 +09:00
Yasuo Ohgaki
e9c8e50b66 Update UPGRADING to reflect bug fix 2016-10-26 03:26:44 +09:00
Joe Watkins
0d2084b1ce news for next rc 2016-10-25 16:22:23 +01:00
Dmitry Stogov
01bc515b4d Export zend_analyze_calls() to allow building call trees. 2016-10-25 17:20:27 +03:00
Christoph M. Becker
c30e5a32c1 Merge branch 'PHP-7.0' into PHP-7.1 2016-10-25 14:35:38 +02:00
Christoph M. Becker
af4bfe234c Merge branch 'PHP-5.6' into PHP-7.0 2016-10-25 14:31:41 +02:00
Christoph M. Becker
cd13d0260a Fix #72494: imagecropauto out-of-bounds access 
This issue has actually already been fixed with commit 46f2c690. We're
adding a regression test and a NEWS entry, and also port the fix in
gdImageCropThreshold() from libgd:
  * <https://github.com/libgd/libgd/commit/b347e034>
  * <https://github.com/libgd/libgd/commit/46f2c690>
 2016-10-25 14:29:48 +02:00
Anatol Belski
1fd3ab4fe9 Merge branch 'PHP-7.0' into PHP-7.1 
* PHP-7.0:
  move dev to 7.0.14
 2016-10-25 10:31:49 +02:00
Anatol Belski
277e829f10 move dev to 7.0.14 2016-10-25 10:29:51 +02:00
Derick Rethans
7b9a17d797 Updated to version 2016.8 (2016h) 2016-10-24 10:37:17 +01:00
Derick Rethans
4d2cc0149f Empty merge 2016-10-24 10:37:16 +01:00
Derick Rethans
7544040469 Updated to version 2016.8 (2016h) 2016-10-24 10:37:13 +01:00
Derick Rethans
76293254cf Empty merge 2016-10-24 10:37:12 +01:00
Derick Rethans
4f5a755b9d Updated to version 2016.8 (2016h) 2016-10-24 10:37:07 +01:00
Nikita Popov
cbde0a6fc2 Merge branch 'PHP-7.0' into PHP-7.1 2016-10-23 22:27:11 +02:00
Nikita Popov
89d3e234af Fix test output 
Changed due to eca84946a4.
 2016-10-23 22:26:25 +02:00
Nikita Popov
c3232c5903 Fix call graph construction 
Travis build for 7.1+ has been failing for the past week...
 2016-10-23 22:12:55 +02:00
Jakub Zelenka
820bca8ca3 Try to fix LibreSSL build 2016-10-23 19:55:22 +01:00
Jakub Zelenka
930ae4034e Drop useless checks for DH and RSA 
If DH or RSA was disabled, the build would fail already as
it's used already elsewhere without checking the OPENSSL_NO_DH
or OPENSSL_NO_RSA defines.
 2016-10-23 19:37:07 +01:00
Xinchen Hui
7c8650fe81 Update NEWS 2016-10-22 14:51:11 +08:00
Xinchen Hui
788368ff1c Merge branch 'PHP-7.0' into PHP-7.1 
* PHP-7.0:
  Fixed bug #73350 (Exception::__toString() cause circular references)
 2016-10-22 14:50:42 +08:00
Xinchen Hui
eca84946a4 Fixed bug #73350 (Exception::__toString() cause circular references) 2016-10-22 14:50:21 +08:00
Anatol Belski
2860fd40d6 Better fix for bug #73360 
This also fixes the TS issue. And, it also reveals that there's an
issue in the VCWD_* API to be possibly addressed.
 2016-10-21 21:29:35 +02:00
Anatol Belski
fbf46d36ca Revert "Fixed bug #73360 Unable to work in root with unicode chars" 
This reverts commit 64fee0aecb.
 2016-10-21 20:15:16 +02:00