Commit Graph
200 Commits
Author SHA1 Message Date
Dmitry Stogov 1c462a4e4d Added suggestion about opcache.revalidate_freq setting in development environment 2013-12-23 12:34:27 +01:00
Dmitry Stogov 9c5a902106 Fixed Issue #140: "opcache.enable_file_override" doesn't respect "opcache.revalidate_freq" 2013-12-23 12:34:26 +01:00
Anatol Belski 6125278290 more semantical replacements LONG vs. INT 2013-12-19 08:40:41 -08:00
Anatol Belski f58d0b35ed massive update semantical LONG vs INT replacements 2013-12-19 05:07:37 -08:00
Anatol Belski cfb76d53f7 correct fix for ext/opcache regarding zend_size_t replacements 2013-12-18 15:29:04 -08:00
Anatol Belski e9224fc81b reverted the previous wrong patch 2013-12-18 15:28:23 -08:00
Anatol Belski 5f3e76dfe5 fixes ext/opcache after too much replacement 2013-12-18 15:21:34 -08:00
Anatol Belski b1abe4ca21 mass replacement for zend_size_t/php_size_t 2013-12-18 14:46:44 -08:00
Anatol Belski df7db6519c Merge remote-tracking branch 'origin/master' into str_size_and_int64 2013-12-18 17:07:00 +01: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
Anatol Belski 8432557dcd Merge remote-tracking branch 'origin/master' into str_size_and_int64
Conflicts:
	Zend/zend.c
	Zend/zend.h
	Zend/zend_execute.h
	Zend/zend_vm_execute.h
	main/SAPI.h
2013-12-18 15:07:42 +01: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
Anatol Belski 3e90132341 Merge remote-tracking branch 'origin/master' into str_size_and_int64
Conflicts:
	Zend/zend_compile.c
	Zend/zend_vm_def.h
	Zend/zend_vm_execute.h
	ext/opcache/Optimizer/pass1_5.c
	ext/pdo_odbc/odbc_stmt.c
2013-12-17 09:01:11 +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
Anatol Belski 409498f03c fixed conflicting types in func definition 2013-12-16 08:13:35 -08:00
Anatol Belski d51ff1322d revamp ext/opcache 2013-12-16 12:56:32 +01:00
Anatol Belski f806f4d060 Merge branch 'master' into str_size_and_int64 2013-12-13 10:45:27 +01: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
Anatol Belski 27990438f1 Merge branch 'master' into str_size_and_int64
Conflicts:
	Zend/zend_builtin_functions.c
	ext/opcache/Optimizer/pass1_5.c
	ext/reflection/php_reflection.c
	ext/soap/soap.c
2013-12-10 19:46:40 +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
Anatol Belski c253fbda9a fix conflicting types 2013-12-05 16:13:30 -08:00
Anatol Belski adb1e38468 integrated %pd into more ported extensions 2013-12-05 14:35:06 +01:00
Anatol Belski 3142989a14 finer fixes for ext/opcache 2013-12-04 14:07:27 +01:00
Anatol Belski 3930766e79 basic fixes to ext/opcache 2013-12-04 12:04:07 +01:00
Anatol Belski 5ced3db971 Merge branch 'master' into str_size_and_int64
Conflicts:
	Zend/zend.h
	Zend/zend_hash.c
	Zend/zend_hash.h
	Zend/zend_language_parser.y
	Zend/zend_vm_def.h
	Zend/zend_vm_execute.h
2013-11-28 17:27:59 +01: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
Anatol Belski 4c96b94873 Merge branch 'master' into str_size_and_int64 2013-11-26 19:09:31 +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
Anatol Belski e2f2a3fcb5 Merge branch 'master' into str_size_and_int64 2013-11-26 10:59:55 +01: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
Anatol Belski ad675f6ac2 Merge branch 'master' into str_size_and_int64
Conflicts:
	main/php_version.h
2013-11-09 11:03:04 +01:00
Dmitry Stogov 43cb6ba763 Merge branch 'PHP-5.5'
* 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:37:28 +04:00