php/archived-php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2026-04-29 11:13:36 +02:00
Code Issues Packages Projects Releases Wiki Activity
80,010 Commits 549 Branches 1,486 Tags
ec7eccaaaedc13bf9bbc635fc4dd1968e62e5637
Commit Graph

246 Commits

Author SHA1 Message Date
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
Dmitry Stogov 7864fcaec9 Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  Fixed bug #66461 (PHP crashes if opcache.interned_strings_buffer=0)

Conflicts:
	NEWS
 2014-01-13 18:06:49 +04:00
Dmitry Stogov ce2f024e9f Fixed bug #66461 (PHP crashes if opcache.interned_strings_buffer=0) 2014-01-13 18:05:21 +04:00
Dmitry Stogov e141592da6 Merge branch 'PHP-5.6' 
* PHP-5.6:
  Fixed bug #66440 (Optimisation of conditional JMPs based on pre-evaluate constant function calls)
 2014-01-13 16:16:57 +04:00
Dmitry Stogov 9b74dc4a07 Fixed bug #66440 (Optimisation of conditional JMPs based on pre-evaluate constant function calls) 2014-01-13 16:16:23 +04:00
Dmitry Stogov 3458dac342 Merge branch 'PHP-5.6' 
* PHP-5.6:
  Fixed bug #66471 (Keep backward compatibility)
 2014-01-13 15:36:06 +04:00
Dmitry Stogov ca550248f1 Fixed bug #66471 (Keep backward compatibility) 2014-01-13 15:34:25 +04:00
Dmitry Stogov aab2e8eb7e Merge branch 'PHP-5.6' 
* PHP-5.6:
  Fixed bug #66474 (Optimizer bug in constant string to boolean conversion)
 2014-01-13 12:08:23 +04:00
Dmitry Stogov d09d64c15c Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  Fixed bug #66474 (Optimizer bug in constant string to boolean conversion)

Conflicts:
	NEWS
 2014-01-13 12:07:50 +04:00
Dmitry Stogov fcd75690fe Fixed bug #66474 (Optimizer bug in constant string to boolean conversion) 2014-01-13 12:06:19 +04:00
Dmitry Stogov 83b00bbd08 Merge branch 'PHP-5.6' 
* PHP-5.6:
  Fixed ADD_INTERNED_STRING() logic to support strings that are already interned. (Terry)
 2014-01-09 13:50:12 +04:00
Dmitry Stogov f16a4bc203 Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  Fixed ADD_INTERNED_STRING() logic to support strings that are already interned. (Terry)
 2014-01-09 13:49:54 +04:00
Dmitry Stogov b5fbde9c5b Fixed ADD_INTERNED_STRING() logic to support strings that are already interned. (Terry) 2014-01-09 13:48:08 +04:00
Xinchen Hui 0f53e37494 Merge branch 'PHP-5.6' 2014-01-03 11:09:07 +08:00
Xinchen Hui c081ce628f Bump year 2014-01-03 11:08:10 +08:00