1
0
mirror of https://github.com/php/php-src.git synced 2026-04-21 15:08:16 +02:00
Commit Graph

203 Commits

Author SHA1 Message Date
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 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 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 77bc5b8bae We don't know PHP_5_6_X_API_NO yet 2014-01-15 11:09:38 +04:00
Nikita Popov a5ee337156 Fixed arguments unpacking segfault with opcache 2014-01-14 22:34:08 +08: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 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 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 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 ca550248f1 Fixed bug #66471 (Keep backward compatibility) 2014-01-13 15:34:25 +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 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 c081ce628f Bump year 2014-01-03 11:08:10 +08:00
Xinchen Hui 47c9027772 Bump year 2014-01-03 11:06:16 +08:00
Xinchen Hui 5a756afcf1 Merge branch 'PHP-5.5' into PHP-5.6 2013-12-30 11:07:37 +08:00
Xinchen Hui ed5be4f7ad Fix test fail 2013-12-30 11:07:25 +08:00
Xinchen Hui 31d4d11432 Fix one more test in dos style eol 2013-12-30 10:58:40 +08:00
Xinchen Hui f204df9a7f Merge branch 'PHP-5.5' into PHP-5.6 2013-12-30 10:58:23 +08:00
Xinchen Hui 6699b1f8ea Fix dos style eol in phpts 2013-12-30 10:58:01 +08:00
Xinchen Hui a88543a106 Fixed bug #66298 (ext/opcache/Optimizer/zend_optimizer.c has dos-style ^M as lineend) 2013-12-30 10:51:47 +08:00
Xinchen Hui 04c8ce259f Fixed bug #66298 (ext/opcache/Optimizer/zend_optimizer.c has dos-style ^M as lineend)
Use git blame -w to ingore the space changes
2013-12-30 10:50:46 +08:00
Dmitry Stogov 03a37de9b3 Improved empty string handling. Now ZE uses an interned string instead of allocation new empty string each time. (Some extensions might need to be fixed using str_efree() instead of efree() to support interned strings). 2013-12-26 14:47:13 +04:00
Dmitry Stogov a00e7f22d2 Fixed bug #66338 (Optimization binding of class constants is not safely opcacheable) 2013-12-23 16:53:34 +04:00
Dmitry Stogov ccb29a6e41 Fixed bug #66334 (Memory Leak in new pass1_5.c optimizations). (Terry) 2013-12-23 16:04:10 +04:00
Dmitry Stogov 8650d2dda6 Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
  Added suggestion about opcache.revalidate_freq setting in development environment
2013-12-23 13:10:42 +04:00
Dmitry Stogov f7b6db7555 Added suggestion about opcache.revalidate_freq setting in development environment 2013-12-23 13:09:45 +04:00
Dmitry Stogov f5c200fce9 Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
  Fixed Issue #140: "opcache.enable_file_override" doesn't respect "opcache.revalidate_freq"
  opcodes
2013-12-23 12:50:42 +04:00
Dmitry Stogov 0dcaf0f445 Fixed Issue #140: "opcache.enable_file_override" doesn't respect "opcache.revalidate_freq" 2013-12-23 12:46:30 +04:00
Dmitry Stogov 436ca2d019 Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
  Fixed reavlidate_path=1 behavior to avoid caching of symlinks values.

Conflicts:
	NEWS
2013-12-18 19:21:21 +04:00
Dmitry Stogov 16e95d9137 Fixed reavlidate_path=1 behavior to avoid caching of symlinks values. 2013-12-18 19:19:53 +04:00
Xinchen Hui eeb37c40e6 Save one char compare 2013-12-17 15:09:52 +08:00
Dmitry Stogov 73f13f439b Fixed bug #66251 (Constants get statically bound at compile time when Optimized) 2013-12-10 17:04:17 +04:00
Bob Weinand d36cf90291 Merge branch 'const_scalar_exprs' into PHP-5.6
Conflicts:
	Zend/zend_extensions.h
2013-11-28 13:41:42 +01:00
Dmitry Stogov 834eaae52d Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
  Fixed opcahce_reset() crash when opcache.protect_memory is set
2013-11-26 21:59:02 +04:00
Dmitry Stogov de65817136 Fixed opcahce_reset() crash when opcache.protect_memory is set 2013-11-26 21:57:32 +04:00
Dmitry Stogov f000624864 Added an optimization of class constants and constant calls to some internal functions 2013-11-26 21:37:31 +04:00
Dmitry Stogov e7132597a6 Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
  Fixed bug #66176 (Invalid constant substitution)
  Fixed bug #66176 (Invalid constant substitution)
2013-11-26 21:01:01 +04:00
Dmitry Stogov d79dd9cc1c Fixed bug #66176 (Invalid constant substitution) 2013-11-26 21:00:00 +04:00
Dmitry Stogov 27524b52b5 Fixed bug #66176 (Invalid constant substitution) 2013-11-26 19:55:49 +04:00
Dmitry Stogov 0999d85049 Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
  Fixed bug #66176 (Invalid constant substitution)

Conflicts:
	NEWS
2013-11-26 17:48:11 +04:00
Dmitry Stogov d85ac7fb3f Fixed bug #66176 (Invalid constant substitution) 2013-11-26 17:47:02 +04:00
Dmitry Stogov 8fdc973afa Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
  Added test
2013-11-26 12:14:12 +04:00