php/archived-php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2026-04-27 01:48:26 +02:00
Code Issues Packages Projects Releases Wiki Activity
80,875 Commits 549 Branches 1,485 Tags
03dcdf5742e56abe305809ea233ba41301fddc16
Commit Graph

260 Commits

Author SHA1 Message Date
Xinchen Hui a99e7eeab9 Merge branch 'PHP-5.6' 2014-07-03 14:59:24 +08:00
Xinchen Hui 4e16054b7a Merge branch 'PHP-5.5' into PHP-5.6 2014-07-03 14:58:53 +08:00
Xinchen Hui 2034ace052 Fixed bug #67215 (php-cgi work with opcache, may be segmentation fault happen) 2014-07-03 14:58:37 +08:00
Xinchen Hui 533b1df732 Add test for bug #67215 
bjori> writing a testcase making sure you get a fatal error and does not
segfault after that... is difficult
 2014-07-03 13:48:59 +08:00
Xinchen Hui cdacf4c90a Merge branch 'PHP-5.6' 2014-05-26 15:40:57 +08:00
Xinchen Hui b0b0be176f Merge branch 'PHP-5.5' into PHP-5.6 2014-05-26 15:40:50 +08:00
Xinchen Hui 70699d7f68 Update NEWs and add a test 2014-05-26 15:40:26 +08:00
Dmitry Stogov 347b430a03 Merge branch 'PHP-5.6' 
* PHP-5.6:
  Fixed issue #183 (TMP_VAR is not only used once)
 2014-05-26 10:12:36 +04:00
Dmitry Stogov 24a86dbb6f Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  Fixed issue #183 (TMP_VAR is not only used once)
 2014-05-26 10:12:10 +04:00
Dmitry Stogov 19be8b676c Fixed issue #183 (TMP_VAR is not only used once) 2014-05-26 10:10:59 +04:00
Dmitry Stogov 91c475fc00 Merge branch 'PHP-5.6' 
* PHP-5.6:
  Support for __debugInfo (Joe Watkins)
 2014-05-18 20:56:34 +04:00
Dmitry Stogov 1d1fdfb51d Support for __debugInfo (Joe Watkins) 2014-05-18 20:55:40 +04:00
Dmitry Stogov 0019b512ff Merge branch 'PHP-5.6' 
* PHP-5.6:
  Optimize ZEND_POW (Rouven Weßling)
  gcov: tentative fix for broken coverage data after fix for opcache coverage slightly hackish, but works. The idea is that we want to give priority to .gcda files in .libs dirs vs the files in the upper level dir

Conflicts:
	ext/opcache/ZendAccelerator.h
 2014-05-18 20:51:37 +04:00
Dmitry Stogov 3fff53fc57 Optimize ZEND_POW (Rouven Weßling) 2014-05-18 20:48:16 +04:00
Bob Weinand ccf863c8ce Merge branch 'PHP-5.6' 2014-04-11 19:35:11 +02:00
Bob Weinand 99d1a1bb3f Shut up, my lovely compiler; I do not like your warnings 2014-04-11 19:33:56 +02:00
Bob Weinand 9663193bbc Merge branch 'PHP-5.6' 2014-04-11 10:11:58 +02:00
Bob Weinand f614fc6898 Fix bug #66015 by reverting "Removed operations on constant arrays." 2014-04-11 10:08:44 +02:00
Anatol Belski 86e77b6b58 Merge branch 'PHP-5.6' 
* PHP-5.6:
  fix disabling PGO for extensions, rel bug #65715
 2014-03-25 06:46:25 +01:00
Anatol Belski 655f2973eb Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  fix disabling PGO for extensions, rel bug #65715
 2014-03-25 06:46:06 +01:00
Anatol Belski 7477f5b387 fix disabling PGO for extensions, rel bug #65715 2014-03-25 06:44:54 +01:00
Dmitry Stogov b0927faf48 Merge branch 'PHP-5.6' 
* PHP-5.6:
  Added information about interned strings usage
 2014-02-21 12:45:12 +04:00
Dmitry Stogov 31f5515059 Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  Added information about interned strings usage

Conflicts:
	NEWS
 2014-02-21 12:44:58 +04:00
Dmitry Stogov 851f362882 Added information about interned strings usage 2014-02-21 12:43:42 +04:00
Dmitry Stogov f786eec680 Merge branch 'PHP-5.6' 
* PHP-5.6:
  Updated opcache version
 2014-02-21 12:06:46 +04:00
Dmitry Stogov aebfc519ea Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  Updated opcache version
 2014-02-21 12:06:35 +04:00
Dmitry Stogov f06b3432c8 Updated opcache version 2014-02-21 12:04:42 +04:00
Dmitry Stogov c3b35e2519 Merge branch 'PHP-5.6' 
* PHP-5.6:
  Added function opcache_is_script_cached(). (Danack)
 2014-02-21 12:01:06 +04:00
Dmitry Stogov b9a87a5079 Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  Added function opcache_is_script_cached(). (Danack)

Conflicts:
	NEWS
 2014-02-21 12:00:33 +04:00
Dmitry Stogov 884bbcd537 Added function opcache_is_script_cached(). (Danack) 2014-02-21 11:59:14 +04:00
Lior Kaplan 464b1bc4fb Merge branch 'PHP-5.6' 2014-02-14 17:19:33 +02:00
Lior Kaplan 23d952ed60 Merge branch 'PHP-5.5' into PHP-5.6 2014-02-14 17:15:35 +02:00
Veres Lajos f9829690d4 a few typofixes 2014-02-14 17:12:52 +02:00
Xinchen Hui aaad97675a Merge branch 'PHP-5.6' 2014-01-20 21:25:42 +08:00
Xinchen Hui dc5f36ffe1 Merge branch 'PHP-5.5' into PHP-5.6 2014-01-20 21:25:26 +08:00
Xinchen Hui c99f164b02 release 7.0.3 2014-01-20 21:23:23 +08:00
Dmitry Stogov 511a375e60 Merge branch 'PHP-5.6' 
* PHP-5.6:
  Log information about cached scripts and keys
 2014-01-15 12:15:41 +04:00
Dmitry Stogov 299d893f0a Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  Log information about cached scripts and keys
 2014-01-15 12:15:25 +04:00
Dmitry Stogov 7359dd6df3 Log information about cached scripts and keys 2014-01-15 12:12:22 +04:00
Dmitry Stogov 61028ad45e Merge branch 'PHP-5.6' 
* PHP-5.6:
  We don't know PHP_5_6_X_API_NO yet
 2014-01-15 11:11:01 +04:00
Dmitry Stogov 77bc5b8bae We don't know PHP_5_6_X_API_NO yet 2014-01-15 11:09:38 +04:00
Xinchen Hui aca07343ce Merge branch 'PHP-5.6' 2014-01-14 22:34:53 +08:00
Nikita Popov a5ee337156 Fixed arguments unpacking segfault with opcache 2014-01-14 22:34:08 +08:00
Dmitry Stogov 5980e987d2 Merge branch 'PHP-5.6' 
* PHP-5.6:
  Fixed ZTS build
 2014-01-13 23:11:36 +04:00
Dmitry Stogov 029d019dac Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  Fixed ZTS build
 2014-01-13 23:10:35 +04:00
Dmitry Stogov 9c32d30020 Fixed ZTS build 2014-01-13 23:09:59 +04:00
Anatol Belski de137e5a8d Merge branch 'PHP-5.6' 
* PHP-5.6:
  forked test for win32
 2014-01-13 17:13:11 +01:00
Anatol Belski 9b2dc009b2 Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  forked test for win32
 2014-01-13 17:12:53 +01:00
Anatol Belski 8092de3ca3 forked test for win32 2014-01-13 17:12:14 +01:00
Dmitry Stogov 127eb33b84 Merge branch 'PHP-5.6' 
* PHP-5.6:
  Fixed bug #66461 (PHP crashes if opcache.interned_strings_buffer=0)
 2014-01-13 18:07:26 +04:00