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
Xinchen Hui
47c9027772
Bump year
2014-01-03 11:06:16 +08:00
Xinchen Hui
6b34343479
Merge branch 'PHP-5.6'
2013-12-30 11:07:42 +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
8b72df0608
Merge branch 'PHP-5.6'
2013-12-30 10:58:56 +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
408ae9a452
Merge branch 'PHP-5.6'
2013-12-30 10:52:21 +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
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
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
67eccf8617
Merge branch 'PHP-5.6'
...
* PHP-5.6:
Fixed bug #66338 (Optimization binding of class constants is not safely opcacheable)
2013-12-23 16:54:54 +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
209ec406ca
Merge branch 'PHP-5.6'
...
* PHP-5.6:
Fixed bug #66334 (Memory Leak in new pass1_5.c optimizations). (Terry)
2013-12-23 16:05:18 +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
62fa84a031
Merge branch 'PHP-5.6'
...
* PHP-5.6:
Added suggestion about opcache.revalidate_freq setting in development environment
2013-12-23 13:11:22 +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
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
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
Bob Weinand
b11b3d201f
Fixed ZTS build. Needed to bump API version number.
2013-12-18 16:44:20 +01:00
Dmitry Stogov
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
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
Kalle Sommer Nielsen
2eb9bd316d
Merge branch 'master' of https://git.php.net/push/php-src
2013-12-18 07:27:14 +01:00
Kalle Sommer Nielsen
d14670ccdb
Eliminate another TSRMLS_FETCH() in i_zend_is_true()
...
# Affected extensions have all been updated, ext/opcache and ext/zip
# both have macros for cross version compatibility
2013-12-18 07:25:05 +01:00
Xinchen Hui
a9c503bc27
Merge branch 'PHP-5.6'
2013-12-17 15:10:56 +08:00
Xinchen Hui
eeb37c40e6
Save one char compare
2013-12-17 15:09:52 +08:00
Kalle Sommer Nielsen
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
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
Dmitry Stogov
f28ac55b6d
Added test
2013-11-26 12:13:42 +04:00
Dmitry Stogov
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
Dmitry Stogov
a8c7e50f4d
Fixed bug #65559 (Opcache: cache not cleared if changes occur while running)
2013-11-26 11:34:41 +04:00
Dmitry Stogov
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
Dmitry Stogov
b7b6c35eea
Fixed compatibility with old PHP versions
2013-11-25 14:09:57 +04:00
Dmitry Stogov
27dc82d0ec
Fixed bug #65915 (Inconsistent results with require return value)
2013-11-25 14:07:24 +04:00
Dmitry Stogov
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
Dmitry Stogov
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
Dmitry Stogov
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
Dmitry Stogov
49fbe2579e
Added tests for PHAR/OPCahce incompatibilities
2013-11-08 13:50:57 +04:00
Bob Weinand
152898ff28
Moved arrays again to "static_scalar:" & little cleanup
2013-11-07 16:39:47 +01:00
Dmitry Stogov
9647c61dc1
Constant expressions refactoring
2013-11-06 22:21:07 +04:00
Xinchen Hui
c76be5696d
Merge branch 'PHP-5.5'
...
Conflicts:
ext/opcache/ZendAccelerator.c
2013-11-06 17:01:24 +08:00
Xinchen Hui
9d75b9fb27
Revert "Fixed issue #115 (path issue when using phar)."
...
We need another better way to fix this
This reverts commit 098855433d
.
Conflicts:
ext/opcache/ZendAccelerator.c
2013-11-06 16:53:45 +08:00
Anatol Belski
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
Dmitry Stogov
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
Dmitry Stogov
eb22041ffe
Increased limit for opcache.max_accelerated_files to 1,000,000. (Chris)
2013-10-28 14:19:40 +04:00
Xinchen Hui
5241cf7000
Merge branch 'PHP-5.5'
2013-10-23 19:27:48 +08:00
Xinchen Hui
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
Dmitry Stogov
02214e7a22
Merge branch 'PHP-5.5'
...
* PHP-5.5:
Fixed compilation warning
2013-10-21 14:18:17 +04:00
Dmitry Stogov
60ce3811ae
Fixed compilation warning
2013-10-21 14:17:10 +04:00
Xinchen Hui
aed56fc9a7
Merge branch 'PHP-5.5'
2013-10-21 17:41:03 +08:00
Xinchen Hui
098855433d
Fixed issue #115 (path issue when using phar).
2013-10-21 17:40:39 +08:00
Anatol Belski
e30b2aae5a
initial move on renaming files and fixing includes
2013-10-17 09:43:52 +02:00
Felipe Pena
0ca4b6c083
Merge branch 'PHP-5.5'
...
* PHP-5.5:
- Fixed resource leak
2013-10-12 17:25:37 -03:00
Felipe Pena
5c6dbc35e7
- Fixed resource leak
2013-10-12 17:25:26 -03:00
Dmitry Stogov
a2aa6a3440
Merge branch 'PHP-5.5'
...
* PHP-5.5:
Fixed bug #65845 (Error when Zend Opcache Optimizer is fully enabled).
Conflicts:
NEWS
2013-10-10 15:33:17 +04:00
Dmitry Stogov
ef8cf76815
Fixed bug #65845 (Error when Zend Opcache Optimizer is fully enabled).
2013-10-10 15:32:30 +04:00
Dmitry Stogov
56eee05f66
Merge branch 'PHP-5.5'
...
* PHP-5.5:
Removed references to "Zend Support"
2013-09-27 14:02:01 +04:00
Dmitry Stogov
80346690ba
Removed references to "Zend Support"
2013-09-27 14:01:07 +04:00
Dmitry Stogov
3eba8cf673
Merge branch 'PHP-5.5'
...
* PHP-5.5:
Added support for GNU Hurd. (Svante Signell)
Conflicts:
NEWS
2013-09-27 13:44:31 +04:00
Dmitry Stogov
f904830012
Added support for GNU Hurd. (Svante Signell)
2013-09-27 13:43:25 +04:00
Nikita Popov
0d7a638866
Implement variadic function syntax
...
As per RFC: https://wiki.php.net/rfc/variadics
2013-09-26 18:39:17 +02:00
Dmitry Stogov
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
Dmitry Stogov
69454d9f0f
Added function opcache_compile_file() to load PHP scripts into cache without execution.
2013-09-25 12:14:06 +04:00
Dmitry Stogov
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
Dmitry Stogov
dc8705c256
Fixed issue #135 (segfault in interned strings if initial memory is too low)
2013-09-25 11:02:39 +04:00
Xinchen Hui
743c680545
Merge branch 'PHP-5.5'
2013-09-16 15:03:09 +08:00
Xinchen Hui
1916aaa272
Add test for ISSUE #128
2013-09-16 14:58:18 +08:00
Xinchen Hui
e53e79c701
Merge branch 'PHP-5.5'
2013-09-16 14:43:13 +08:00
Xinchen Hui
46f18ccf0d
Fixed bug #65665 (Exception not properly caught when opcache enabled)
2013-09-16 14:43:01 +08:00
Dmitry Stogov
df711f2c56
Merge branch 'PHP-5.5'
...
* PHP-5.5:
Fixed issue #128 (opcache_invalidate segmentation fault)
2013-09-09 10:11:43 +04:00
Dmitry Stogov
8d860c1218
Fixed issue #128 (opcache_invalidate segmentation fault)
2013-09-09 10:05:59 +04:00
Dmitry Stogov
ec173433da
Merge branch 'PHP-5.5'
...
* PHP-5.5:
Fixed bug #65510 (5.5.2 crashes in _get_zval_ptr_ptr_var)
Conflicts:
NEWS
2013-08-29 11:57:19 +04:00
Dmitry Stogov
5015c4af6c
Fixed bug #65510 (5.5.2 crashes in _get_zval_ptr_ptr_var)
2013-08-29 11:56:01 +04:00
Dmitry Stogov
c8673b64ce
Merge branch 'PHP-5.5'
...
* PHP-5.5:
Fixed compatibility with php-5.2
2013-08-29 10:45:00 +04:00
Dmitry Stogov
94816ed9bf
Fixed compatibility with php-5.2
2013-08-29 10:44:07 +04:00
Dmitry Stogov
b6864d978c
Merge branch 'PHP-5.5'
...
* PHP-5.5:
Fixed bug #65561 (Zend Opcache on Solaris 11 x86 needs ZEND_MM_ALIGNMENT=4). (Terry Ellison)
Conflicts:
NEWS
2013-08-29 10:31:14 +04:00
Dmitry Stogov
790db9ff9b
Fixed bug #65561 (Zend Opcache on Solaris 11 x86 needs ZEND_MM_ALIGNMENT=4). (Terry Ellison)
2013-08-29 10:29:48 +04:00
Dmitry Stogov
a13c00cd14
Merge branch 'PHP-5.5'
...
* PHP-5.5:
Fixed compilation warning
2013-08-26 09:49:22 +04:00
Dmitry Stogov
1c67a9940a
Fixed compilation warning
2013-08-26 09:48:10 +04:00
Dmitry Stogov
2bc886abed
Merge branch 'PHP-5.5'
...
* PHP-5.5:
Replce ZEND_FETCH_* instructions with IS_CV if possible
Conflicts:
ext/opcache/Optimizer/zend_optimizer.c
2013-08-09 17:52:22 +04:00
Dmitry Stogov
b27f6826d4
Replce ZEND_FETCH_* instructions with IS_CV if possible
2013-08-09 17:47:47 +04:00
Christopher Jones
4c3c9d1fe5
Merge branch 'PHP-5.5'
...
* PHP-5.5:
Fix long-standing visual pain point: the misalignment of './configure help' text. Whitespace changes and a couple of grammar fixes.
2013-08-06 11:09:12 -07:00
Christopher Jones
c6d977dd39
Fix long-standing visual pain point: the misalignment of './configure help' text.
...
Whitespace changes and a couple of grammar fixes.
2013-08-06 11:06:09 -07:00
Dmitry Stogov
e2a433fc5d
Merge branch 'PHP-5.5'
...
* PHP-5.5:
Added opcache.restrict_api configuration directive that may limit usage of OPcahce API functions only to patricular script(s)
added test script for bug65045.
MFH: fixed #65045 : mb_convert_encoding breaks well-formed character.
Conflicts:
NEWS
2013-07-31 14:24:30 +04:00
Dmitry Stogov
d69b3d8f59
Added opcache.restrict_api configuration directive that may limit usage of OPcahce API functions only to patricular script(s)
2013-07-31 14:20:56 +04:00
Dmitry Stogov
a0fece5201
Merge branch 'PHP-5.5'
...
* PHP-5.5:
Fixed php-5.2 support
2013-07-31 03:23:10 +04:00
Dmitry Stogov
f3aca8bc4d
Fixed php-5.2 support
2013-07-31 03:22:34 +04:00
Dmitry Stogov
5338bbbf38
Merge branch 'PHP-5.5'
...
* PHP-5.5:
Added support for glob symbols in blacklist entries (?, *, **)
Conflicts:
NEWS
2013-07-31 03:04:00 +04:00
Dmitry Stogov
02409669e4
Added support for glob symbols in blacklist entries (?, *, **)
2013-07-31 03:01:19 +04:00
Dmitry Stogov
147d5241dc
Merge branch 'PHP-5.5'
...
* PHP-5.5:
Improved implementation of NOP removal pass from O(n^2) to O(n) (hnw)
2013-07-30 22:33:46 +04:00
Dmitry Stogov
cb17c99511
Improved implementation of NOP removal pass from O(n^2) to O(n) (hnw)
2013-07-30 22:31:37 +04:00
Dmitry Stogov
e831041c5a
Merge branch 'PHP-5.5'
...
* PHP-5.5:
A minor fix for configure outpu (Tony)
2013-07-30 22:04:55 +04:00
Dmitry Stogov
e2aba1cf9e
A minor fix for configure outpu (Tony)
2013-07-30 22:03:21 +04:00
Dmitry Stogov
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
Dmitry Stogov
3550f3d0aa
Fixed bug #65338 (Enabling both php_opcache and php_wincache AVs on shutdown).
2013-07-30 17:35:19 +04:00
Dmitry Stogov
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
Dmitry Stogov
ae5e70afac
Merge from GitHub
2013-07-28 13:47:13 +04:00
Veres Lajos
1b06e0be96
typo fixes
2013-07-15 00:19:49 -07:00
Veres Lajos
6c4af15d6c
typos (orig)
2013-07-15 00:19:32 -07:00
Veres Lajos
72085b0e5f
typo fixes
2013-07-15 00:18:57 -07:00
Xinchen Hui
d99a76ca96
Merge branch 'PHP-5.5'
2013-06-25 13:48:54 +08:00
Xinchen Hui
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
Dmitry Stogov
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
Dmitry Stogov
f49b27e166
OPcache must be compatible with LiteSpeed SAPI
2013-06-24 11:59:50 +04:00
Stanislav Malyshev
8ac131503d
Merge branch 'PHP-5.5'
...
* PHP-5.5:
Merge branch 'pull-request/341'
Merge branch 'pull-request/341'
2013-06-10 14:31:57 -07:00
Stanislav Malyshev
4427d1dcfd
Merge branch 'pull-request/341'
...
* pull-request/341: (23 commits)
typofixes
2013-06-10 14:30:59 -07:00
Dmitry Stogov
738dfc69e7
Merge branch 'PHP-5.5'
...
* PHP-5.5:
Fixed comments
2013-06-10 12:06:14 +04:00
Dmitry Stogov
53e6529203
Fixed comments
2013-06-10 12:05:20 +04:00
Dmitry Stogov
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
23a9bb09ba
Avoid multiple allocations of the same key in different processes
2013-06-10 11:43:03 +04:00
Dmitry Stogov
456ef2ebfa
Merge branch 'PHP-5.5'
...
* PHP-5.5:
Compact HashTables before storing them in shared memory
Conflicts:
ext/opcache/ZendAccelerator.c
2013-06-10 11:25:41 +04:00
Dmitry Stogov
540488bf55
Compact HashTables before storing them in shared memory
2013-06-10 11:22:19 +04:00