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
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
ce2f024e9f
Fixed bug #66461 (PHP crashes if opcache.interned_strings_buffer=0)
2014-01-13 18:05:21 +04:00
3458dac342
Merge branch 'PHP-5.6'
...
* PHP-5.6:
Fixed bug #66471 (Keep backward compatibility)
2014-01-13 15:36:06 +04:00
ca550248f1
Fixed bug #66471 (Keep backward compatibility)
2014-01-13 15:34:25 +04:00
0f53e37494
Merge branch 'PHP-5.6'
2014-01-03 11:09:07 +08:00
c081ce628f
Bump year
2014-01-03 11:08:10 +08:00
47c9027772
Bump year
2014-01-03 11:06:16 +08:00
65fd18fd88
Merge branch 'PHP-5.6'
...
* PHP-5.6:
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).
Conflicts:
NEWS
Zend/zend_extensions.h
Zend/zend_modules.h
2013-12-26 14:51:05 +04: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
5bc9e006e8
Merge branch 'PHP-5.6'
...
* PHP-5.6:
Fixed Issue #140 : "opcache.enable_file_override" doesn't respect "opcache.revalidate_freq"
fix news
opcodes
opcodes
Conflicts:
NEWS
2013-12-23 12:52:27 +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
26096aa73f
Merge branch 'PHP-5.6'
...
* PHP-5.6:
Fixed reavlidate_path=1 behavior to avoid caching of symlinks values.
2013-12-18 19:22:05 +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
0fc8e6af0a
Eliminate another straight forward TSRMLS_FETCH() in zend_startup_module()
...
# For THTTPD:
# The code that uses a call to this function is for older versions of PHP anyway so its not covered
# For Zend OpCache:
# Added a new define for 5.6 and wrapped the code around that so its still compatible with older version
2013-12-12 20:30:45 +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
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
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
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
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
aed56fc9a7
Merge branch 'PHP-5.5'
2013-10-21 17:41:03 +08:00
098855433d
Fixed issue #115 (path issue when using phar).
2013-10-21 17:40:39 +08:00
e30b2aae5a
initial move on renaming files and fixing includes
2013-10-17 09:43:52 +02:00
6daa04a4f6
Merge branch 'PHP-5.5'
...
* PHP-5.5:
Added function opcache_compile_file() to load PHP scripts into cache without execution.
Conflicts:
NEWS
2013-09-25 12:15:01 +04:00
69454d9f0f
Added function opcache_compile_file() to load PHP scripts into cache without execution.
2013-09-25 12:14:06 +04:00
4e249c8a93
Merge branch 'PHP-5.5'
...
* PHP-5.5:
Fixed issue #135 (segfault in interned strings if initial memory is too low)
Conflicts:
NEWS
2013-09-25 11:04:03 +04:00
dc8705c256
Fixed issue #135 (segfault in interned strings if initial memory is too low)
2013-09-25 11:02:39 +04:00
df711f2c56
Merge branch 'PHP-5.5'
...
* PHP-5.5:
Fixed issue #128 (opcache_invalidate segmentation fault)
2013-09-09 10:11:43 +04:00
8d860c1218
Fixed issue #128 (opcache_invalidate segmentation fault)
2013-09-09 10:05:59 +04:00
0aa342e903
Merge branch 'PHP-5.5'
...
* PHP-5.5:
Fixed bug #65338 (Enabling both php_opcache and php_wincache AVs on shutdown).
Conflicts:
NEWS
2013-07-30 17:36:47 +04:00
3550f3d0aa
Fixed bug #65338 (Enabling both php_opcache and php_wincache AVs on shutdown).
2013-07-30 17:35:19 +04:00
294335761b
Merge branch 'PHP-5.5'
...
* PHP-5.5:
Merge from GitHub
Update NEWS
Fixed bug #65336
Conflicts:
NEWS
2013-07-28 13:50:13 +04:00
ae5e70afac
Merge from GitHub
2013-07-28 13:47:13 +04:00
1b06e0be96
typo fixes
2013-07-15 00:19:49 -07:00
72085b0e5f
typo fixes
2013-07-15 00:18:57 -07:00
d99a76ca96
Merge branch 'PHP-5.5'
2013-06-25 13:48:54 +08:00
157ccaf507
Fixed bug #64827 Segfault in zval_mark_grey (zend_gc.c)
...
I can not get a reproduce script since the context is very strict.
Of course I will try to make one, but for now, I just commit this first.
2013-06-25 13:47:50 +08:00
0c9de2d94b
Merge branch 'PHP-5.5'
...
* PHP-5.5:
OPcache must be compatible with LiteSpeed SAPI
Conflicts:
NEWS
2013-06-24 12:01:58 +04:00
f49b27e166
OPcache must be compatible with LiteSpeed SAPI
2013-06-24 11:59:50 +04:00
738dfc69e7
Merge branch 'PHP-5.5'
...
* PHP-5.5:
Fixed comments
2013-06-10 12:06:14 +04:00
53e6529203
Fixed comments
2013-06-10 12:05:20 +04:00
95d88cc66a
Merge branch 'PHP-5.5'
...
* PHP-5.5:
Avoid multiple allocations of the same key in different processes
2013-06-10 11:44:54 +04:00
Dmitry Stogov