c081ce628f
Bump year
2014-01-03 11:08:10 +08:00
5a756afcf1
Merge branch 'PHP-5.5' into PHP-5.6
2013-12-30 11:07:37 +08:00
ed5be4f7ad
Fix test fail
2013-12-30 11:07:25 +08:00
31d4d11432
Fix one more test in dos style eol
2013-12-30 10:58:40 +08:00
f204df9a7f
Merge branch 'PHP-5.5' into PHP-5.6
2013-12-30 10:58:23 +08:00
6699b1f8ea
Fix dos style eol in phpts
2013-12-30 10:58:01 +08:00
a88543a106
Fixed bug #66298 (ext/opcache/Optimizer/zend_optimizer.c has dos-style ^M as lineend)
2013-12-30 10:51:47 +08:00
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
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
a00e7f22d2
Fixed bug #66338 (Optimization binding of class constants is not safely opcacheable)
2013-12-23 16:53:34 +04:00
ccb29a6e41
Fixed bug #66334 (Memory Leak in new pass1_5.c optimizations). (Terry)
2013-12-23 16:04:10 +04:00
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
f7b6db7555
Added suggestion about opcache.revalidate_freq setting in development environment
2013-12-23 13:09:45 +04:00
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
0dcaf0f445
Fixed Issue #140 : "opcache.enable_file_override" doesn't respect "opcache.revalidate_freq"
2013-12-23 12:46:30 +04:00
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
16e95d9137
Fixed reavlidate_path=1 behavior to avoid caching of symlinks values.
2013-12-18 19:19:53 +04:00
eeb37c40e6
Save one char compare
2013-12-17 15:09:52 +08:00
73f13f439b
Fixed bug #66251 (Constants get statically bound at compile time when Optimized)
2013-12-10 17:04:17 +04:00
d36cf90291
Merge branch 'const_scalar_exprs' into PHP-5.6
...
Conflicts:
Zend/zend_extensions.h
2013-11-28 13:41:42 +01:00
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
de65817136
Fixed opcahce_reset() crash when opcache.protect_memory is set
2013-11-26 21:57:32 +04:00
f000624864
Added an optimization of class constants and constant calls to some internal functions
2013-11-26 21:37:31 +04:00
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
d79dd9cc1c
Fixed bug #66176 (Invalid constant substitution)
2013-11-26 21:00:00 +04:00
27524b52b5
Fixed bug #66176 (Invalid constant substitution)
2013-11-26 19:55:49 +04:00
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
d85ac7fb3f
Fixed bug #66176 (Invalid constant substitution)
2013-11-26 17:47:02 +04:00
8fdc973afa
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
Added test
2013-11-26 12:14:12 +04:00
f28ac55b6d
Added test
2013-11-26 12:13:42 +04:00
621f83e35c
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
Fixed bug #65559 (Opcache: cache not cleared if changes occur while running)
bring the news
Conflicts:
NEWS
2013-11-26 11:36:23 +04:00
a8c7e50f4d
Fixed bug #65559 (Opcache: cache not cleared if changes occur while running)
2013-11-26 11:34:41 +04:00
b3c2c2bcb1
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
Fixed compatibility with old PHP versions
Fixed bug #65915 (Inconsistent results with require return value)
Conflicts:
NEWS
2013-11-25 14:11:45 +04:00
b7b6c35eea
Fixed compatibility with old PHP versions
2013-11-25 14:09:57 +04:00
27dc82d0ec
Fixed bug #65915 (Inconsistent results with require return value)
2013-11-25 14:07:24 +04:00
0e5c5072e6
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
Fixed issue #115 (path issue when using phar). Fixed issue #149 (Phar mount points not working with OPcache enabled).
Conflicts:
NEWS
2013-11-08 16:36:31 +04:00
915c428ba1
Fixed issue #115 (path issue when using phar).
...
Fixed issue #149 (Phar mount points not working with OPcache enabled).
2013-11-08 16:35:05 +04:00
4e6a0bd5a9
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
Added tests for PHAR/OPCahce incompatibilities
Update NEWS
Fixed bug #65947 (basename is no more working after fgetcsv in certain situation)
Update NEWS
Fixed Bug #66043 (Segfault calling bind_param() on mysqli)
NEWS entry
NEWS entry
Conflicts:
NEWS
2013-11-08 14:15:41 +04:00
49fbe2579e
Added tests for PHAR/OPCahce incompatibilities
2013-11-08 13:50:57 +04:00
152898ff28
Moved arrays again to "static_scalar:" & little cleanup
2013-11-07 16:39:47 +01:00
9647c61dc1
Constant expressions refactoring
2013-11-06 22:21:07 +04:00
c76be5696d
Merge branch 'PHP-5.5'
...
Conflicts:
ext/opcache/ZendAccelerator.c
2013-11-06 17:01:24 +08:00
9d75b9fb27
Revert "Fixed issue #115 (path issue when using phar)."
...
We need another better way to fix this
This reverts commit 098855433d
2013-11-06 16:53:45 +08:00
c675980046
Merge branch 'pull-request/500'
...
* pull-request/500:
limit virtual_cwd_activate() duplicated call to ZTS only
reverted the previous commit, both calls are needed in TS mode
virtual_cwd_activate() should be called only in one place
back to do_alloca()
removed unnecessary call
simplify the state free macros
compact the code to preserve the error info after state freeing
back to do_alloca(), reverted the wrong replacement
enabled windows to use stack in both ts/nts mode, some more fixes
moved to do_alloca() usage where appropriate
fixed invalid free
fixed virtual cwd header in phar
updated NEWS
fixed all the places where last error could be lost
preserve the error code
applied and fixed the original patch
initial move on renaming files and fixing includes
Conflicts:
ext/opcache/ZendAccelerator.c
2013-11-05 19:23:23 +01:00
ace2ee931c
Merge branch 'PHP-5.5'
...
* PHP-5.5:
Increased limit for opcache.max_accelerated_files to 1,000,000. (Chris)
Conflicts:
NEWS
2013-10-28 14:22:05 +04:00
eb22041ffe
Increased limit for opcache.max_accelerated_files to 1,000,000. (Chris)
2013-10-28 14:19:40 +04:00
5241cf7000
Merge branch 'PHP-5.5'
2013-10-23 19:27:48 +08:00
0adba0abb9
Added Zend Debugger to the note about the load order (by trash4you at online dot de)
2013-10-23 19:26:24 +08:00
02214e7a22
Merge branch 'PHP-5.5'
...
* PHP-5.5:
Fixed compilation warning
2013-10-21 14:18:17 +04:00
60ce3811ae
Fixed compilation warning
2013-10-21 14:17:10 +04:00
Xinchen Hui