Dmitry Stogov
2c39cf670c
Use appropriate macro
2014-04-25 11:29:35 +04:00
Dmitry Stogov
df7ca608ce
Optimized constant lookup
2014-04-25 00:56:15 +04:00
Nikita Popov
08ae88157b
Allocate zend_strings with correct size
...
For me (32bit) sizeof(zend_string) is 20, which means that the
char[1] array at the end is padded with three bytes. Thus allocating
based on sizeof(zend_string)-1 overallocates by those 3 padding bytes.
This commit fixes the allocation size, by using XtOffsetOf.
2014-04-23 19:34:51 +02:00
Nikita Popov
20580a511c
Fix ZTS build
2014-04-23 18:30:24 +02:00
Dmitry Stogov
5864ce8a44
Fixed compilation warnings
2014-04-22 17:46:34 +04:00
Dmitry Stogov
72c287bd23
Combine HashTable.flags and HashTable.nApplyCount into single 32-bit word
2014-04-21 18:25:34 +04:00
Dmitry Stogov
afe66d89a1
Cleanup
2014-04-21 16:34:40 +04:00
Dmitry Stogov
3434d3fc98
Optimize CASE(TRUE, X) into BOOL(X) (this pattern affects wordpress)
2014-04-17 21:15:02 +04:00
Dmitry Stogov
e96073b1e4
Moved zend_literal->cache_slot right into zval.
...
It should be accessed using Z_CACHE_SLOT() macro.
zend_literal structure is removed.
API functions that accepted pointer to zend_literal now accept pointer to zval or cache_slot directly.
Calls of such functiond that now accept cache_slot need to be changed to pass -1 instead of NULL.
2014-04-17 15:40:45 +04:00
Dmitry Stogov
c92dd8eedf
Fixed ZEND_CAST related optimizations (now it returns IS_VAR instead of IS_TMP_VAR)
2014-04-17 11:12:47 +04:00
Dmitry Stogov
05817f1a93
Prevented unintended SHM modification
2014-04-16 21:01:11 +04:00
Dmitry Stogov
be60f90dd7
Set reference values of reference counters of not-interned strings when they are restored from SHM
2014-04-16 16:28:27 +04:00
Dmitry Stogov
a86eb10dae
Fixed non-interned strings refcounting
2014-04-16 13:36:38 +04:00
Dmitry Stogov
f9b26bc39a
Cleanup (2-nd round)
2014-04-15 21:56:30 +04:00
Dmitry Stogov
050d7e38ad
Cleanup (1-st round)
2014-04-15 15:40:40 +04:00
Dmitry Stogov
cc50ebc487
Fixed memory leak
2014-04-14 23:53:25 +04:00
Dmitry Stogov
5dc52e4880
Fixed interface constants inheritance.
...
Now we use IS_REFERENCE for inhereted class constants.
I might miss some edje cases.
2014-04-14 13:24:43 +04:00
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
Dmitry Stogov
479f520d14
Fixed store of "shared" zend_strings
2014-04-09 09:43:42 +04:00
Dmitry Stogov
7402af380b
Fixed destruction of objects and iterators on unclean request shutdown and GC (few cases are still unfixed).
...
Now we destroy objects it two steps. At first - object properties of all objects and only then the objects their selves.
2014-04-09 01:50:15 +04:00
Dmitry Stogov
3167b49ce9
Allocate HashTable->arData and HashTable->arHash at once
2014-04-07 18:22:03 +04:00
Dmitry Stogov
66b3b907c2
Cleanup
2014-04-07 16:50:41 +04:00
Dmitry Stogov
76cc99fe60
Refactored ZVAL flags usage to simplify various checks (e.g. Z_REFCOUNTED(), candidate for GC, etc)
2014-04-03 15:26:23 +04:00
Dmitry Stogov
d8099d0468
Changed data layout to allow more efficient operations
2014-04-02 14:34:44 +04:00
Dmitry Stogov
3b25faa4aa
Fixed 0 index handling
2014-04-02 12:09:05 +04:00
Dmitry Stogov
8dedaf8512
Use interned strings for one character strings
2014-04-01 18:06:50 +04:00
Dmitry Stogov
7eff369ba9
Store constant flags
2014-04-01 16:30:13 +04:00
Dmitry Stogov
0da12b9273
Fixed script size calculation
2014-04-01 13:04:33 +04:00
Dmitry Stogov
569bfbd00b
Keep constnat flags
2014-04-01 12:20:16 +04:00
Dmitry Stogov
ceecd31cb6
Fixed support for arg_info and type hinfing (TODO: names should be interned)
2014-04-01 11:44:11 +04:00
Dmitry Stogov
46647180ef
function_name might be shared across few op_arrays (inherited methods)
2014-04-01 11:29:22 +04:00
Dmitry Stogov
2a612e91c2
Fixed optimizer
2014-04-01 11:04:12 +04:00
Dmitry Stogov
b964621294
Fixed optimizer (incomplete)
2014-04-01 01:53:33 +04:00
Dmitry Stogov
3fc8449e1e
Fixed interned strings support
2014-04-01 00:50:25 +04:00
Dmitry Stogov
fd4d11e053
fixes
2014-03-31 23:38:37 +04:00
Dmitry Stogov
7465be4fbd
Optimizer related fixes (incomplete)
2014-03-31 18:13:16 +04:00
Dmitry Stogov
47fdb9eae3
fixed craches at request shutdown and memory leaks
2014-03-31 16:09:45 +04:00
Dmitry Stogov
292b8dffc8
Make opcache work (incomplete - optimizer doesn't work yet; crashes on request shutdown)
2014-03-31 13:11:58 +04:00
Dmitry Stogov
5324f22f59
ext/opcache refactoring (incomplete)
2014-03-28 23:34:49 +04: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
Dmitry Stogov
f4cfaf36e2
Use better data structures (incomplete)
2014-02-10 10:04:30 +04: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
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