1
0
mirror of https://github.com/php/php-src.git synced 2026-04-20 06:21:12 +02:00
Commit Graph

31339 Commits

Author SHA1 Message Date
Dmitry Stogov
4e4bc3a21b Merge branch 'PHP-5.5'
* PHP-5.5:
  Add oom, wasted, hash and manual restart counters to help identify potential configuration problems
  Add optional flag to opcache_get_status()
2013-03-18 13:16:32 +04:00
Dmitry Stogov
1fe43d0798 Add oom, wasted, hash and manual restart counters to help identify potential configuration problems 2013-03-18 13:13:35 +04:00
Dmitry Stogov
ccf7d7cc93 Add optional flag to opcache_get_status() 2013-03-18 11:23:26 +04:00
Boris Lytochkin
92198fa2a5 Merge branch 'PHP-5.5'
* PHP-5.5:
  merge with 5.4
  more test coverage: missing square bracket error message
  Fixed bug #61981
2013-03-17 20:53:19 +04:00
Boris Lytochkin
c5ba47ac59 Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
  more test coverage: missing square bracket error message
  Fixed bug #61981
2013-03-17 20:52:12 +04:00
Boris Lytochkin
85d9d85ce2 more test coverage: missing square bracket error message 2013-03-17 20:40:15 +04:00
Boris Lytochkin
719264d1af Merge branch 'PHP-5.5'
* PHP-5.5:
  Fix bug #61981
2013-03-17 20:18:17 +04:00
Boris Lytochkin
5d0826e9c3 Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
  Fix bug #61981
2013-03-17 20:02:34 +04:00
Boris Lytochkin
b32405053f Fix bug #61981 2013-03-17 20:00:37 +04:00
Dmitry Stogov
ada89863c3 Merge branch 'PHP-5.5'
* PHP-5.5:
  Load "black list" only if O+ is enabled
2013-03-17 12:17:39 +04:00
Dmitry Stogov
dcc927d3f2 Load "black list" only if O+ is enabled 2013-03-17 12:17:04 +04:00
Dmitry Stogov
513c6e7021 Merge branch 'PHP-5.5'
* PHP-5.5:
  Made opcache_get_status() return statistics during O+ restart
2013-03-17 11:57:08 +04:00
Dmitry Stogov
e66c8681c7 Made opcache_get_status() return statistics during O+ restart 2013-03-17 11:56:04 +04:00
Dmitry Stogov
8635900e8e Merge branch 'PHP-5.5'
* PHP-5.5:
  Enabled O+ build by default (it may be disabled before 5.0.0 release)
2013-03-17 10:59:23 +04:00
Dmitry Stogov
930b272d70 Enabled O+ build by default (it may be disabled before 5.0.0 release) 2013-03-17 10:58:30 +04:00
Dmitry Stogov
2db4e43436 Merge branch 'PHP-5.5'
* PHP-5.5:
  Removed files that are neccessary only for standalone pecl branch
  setting plausible default value for struct members
2013-03-17 10:42:41 +04:00
Dmitry Stogov
07b1eaa609 Removed files that are neccessary only for standalone pecl branch 2013-03-17 10:40:59 +04:00
Anatol Belski
fa3fc711d3 setting plausible default value for struct members
especially for unsigned members so they don't casted to max unsigned
2013-03-16 18:29:50 +01:00
Anatol Belski
23bf72f7b1 Merge branch 'master' of git.php.net:php-src 2013-03-16 18:27:21 +01:00
Etienne Kneuss
79d2657873 Merge branch 'PHP-5.5'
* PHP-5.5:
  Remove spurious int cast in between two longs
2013-03-16 18:20:24 +01:00
Etienne Kneuss
b46897941a Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
  Remove spurious int cast in between two longs
2013-03-16 18:20:16 +01:00
Etienne Kneuss
5de1b08482 Merge branch 'PHP-5.3' into PHP-5.4
* PHP-5.3:
  Remove spurious int cast in between two longs
2013-03-16 18:20:06 +01:00
Etienne Kneuss
62364e6e01 Remove spurious int cast in between two longs 2013-03-16 18:19:14 +01:00
Anatol Belski
a8e72b61a6 Merge branch 'PHP-5.5'
* PHP-5.5:
  setting plausible default value for struct members
2013-03-16 18:09:30 +01:00
Anatol Belski
add5420d89 setting plausible default value for struct members
especially for unsigned members so they don't casted to max unsigned
2013-03-16 18:07:21 +01:00
Xinchen Hui
1ee20ab72a Merge branch 'PHP-5.5' 2013-03-16 23:16:56 +08:00
Xinchen Hui
c1cf7538f0 Fixed test after nick previous fix 2013-03-16 23:16:32 +08:00
Xinchen Hui
acd160530a Fix test after f8b91d9acf 2013-03-16 23:14:06 +08:00
Xinchen Hui
67618a8f88 Fixed test after nick previous fix 2013-03-16 22:58:47 +08:00
Dmitry Stogov
c4c61e395b Merge branch 'PHP-5.5'
* PHP-5.5:
  Fixed memory leaks
2013-03-16 17:25:48 +04:00
Dmitry Stogov
e00b04a54f Fixed memory leaks 2013-03-16 17:24:54 +04:00
Dmitry Stogov
1b72240226 Merge branch 'PHP-5.5'
* PHP-5.5:
  Made test compatible with O+
2013-03-16 16:11:41 +04:00
Dmitry Stogov
e9641141aa Made test compatible with O+ 2013-03-16 16:11:00 +04:00
Dmitry Stogov
b7fd7c79e9 Merge branch 'PHP-5.5'
* PHP-5.5:
  Fixed compatibility with ext/phar
2013-03-16 16:08:51 +04:00
Dmitry Stogov
92430bcf5d Fixed compatibility with ext/phar 2013-03-16 16:08:11 +04:00
Dmitry Stogov
e6fc7c1e76 Merge branch 'PHP-5.5'
* PHP-5.5:
  Fixed O+ testes
2013-03-16 12:08:25 +04:00
Dmitry Stogov
ac05e68f55 Fixed O+ testes 2013-03-16 12:07:09 +04:00
Dmitry Stogov
9ef01ce698 Merge branch 'PHP-5.5' of git.php.net:php-src into PHP-5.5 2013-03-16 00:46:34 +04:00
Dmitry Stogov
b3ed38c704 Merge branch 'master' of git.php.net:php-src 2013-03-16 00:46:00 +04:00
Dmitry Stogov
29a9e13d60 Merge branch 'PHP-5.5'
* PHP-5.5: (101 commits)
  Renamed ZendOptimizerPlus.so into opcache.so
  "ZendOptimizerPlus" is renamed to "opcache" to de merged into PHP-5.5 under ext/opcache (the product name is still "Zend Optimizer+")
  More accurate restart scheduling
  Autogolobal $GLOBALS has to be pinged even if auto_globals_jit=0
  Allow only shared O+ build
  Fixed typos
  add tests into package
  Add test script for #57 (segfaults in drupal7)
  fixed memory leaks
  Fixed Issue #57 (segfaults in drupal7)
  Fixed issue #58 (PHP-5.2 compatibility)
  Allows exclusion of large files from being cached
  Add maintainers inot package.xml
  fix ANSI C90 compat
  Fixed test
  Fixed uninitialized variable
  Fixed bug #64353 (Built-in classes can be unavailable with dynamic includes and Optimizer+)
  Save a stat() call by calling sapi_module.get_stat()
  Fixed #54 (PECL install adds extension= instead of zend_extension= to php.ini)
  release 7.0.0
  ...
2013-03-16 00:43:40 +04:00
Dmitry Stogov
34d3202eda Merge Zend Optimizer+
git-subtree-dir: ext/opcache
git-subtree-mainline: b1dbfb7357
git-subtree-split: 8d35170c5f
2013-03-16 00:41:46 +04:00
Anatol Belski
be8282b927 Merge branch 'PHP-5.5'
* PHP-5.5:
  Fixed bug #62852 Unserialize Invalid Date crash
2013-03-15 21:30:18 +01:00
Anatol Belski
f8b91d9acf Fixed bug #62852 Unserialize Invalid Date crash
Error handling is the same as in bug #53437, E_ERROR if we
expect an invalid object.
2013-03-15 21:22:35 +01:00
Anatol Belski
90c8f16c3b Merge branch 'PHP-5.3' into PHP-5.4
* PHP-5.3:
  Backported patch for #64370
2013-03-15 19:08:32 +01:00
Anatol Belski
b903d2d6cd Backported patch for #64370 2013-03-15 19:04:40 +01:00
Anatol Belski
65a1c314b3 Merge branch 'PHP-5.5'
* PHP-5.5:
  Fixed bug #53437 Crash with unserialized DatePeriod instance
2013-03-15 17:01:16 +01:00
Anatol Belski
0ee71557ff Fixed bug #53437 Crash with unserialized DatePeriod instance 2013-03-15 16:59:54 +01:00
Anatol Belski
657135c16a Merge branch 'PHP-5.5'
* PHP-5.5:
  fix zts check
2013-03-14 14:40:03 +01:00
Anatol Belski
96388c78c9 Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
  fix zts check
2013-03-14 14:39:47 +01:00
Anatol Belski
5df8cf1975 Merge branch 'PHP-5.3' into PHP-5.4
* PHP-5.3:
  fix zts check
2013-03-14 14:39:09 +01:00