Dmitry Stogov
0522e2cd66
Merge branch 'master' of git.php.net:php-src
...
* 'master' of git.php.net:php-src:
fix NEWS
fix NEWS
2013-03-18 13:17:26 +04:00
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
Stanislav Malyshev
06a67b3375
Merge branch 'PHP-5.5'
...
* PHP-5.5:
fix NEWS
fix NEWS
2013-03-18 00:52:53 -07:00
Stanislav Malyshev
260007a303
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
fix NEWS
2013-03-18 00:52:36 -07:00
Stanislav Malyshev
e25b2d7ea5
Merge branch 'PHP-5.3' into PHP-5.4
...
* PHP-5.3:
fix NEWS
2013-03-18 00:52:27 -07:00
Stanislav Malyshev
87c8ea15f2
fix NEWS
2013-03-18 00:52:15 -07:00
Stanislav Malyshev
b893326e0d
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
fix NEWS
2013-03-18 00:51:35 -07:00
Stanislav Malyshev
db4d473d53
fix NEWS
2013-03-18 00:51:16 -07: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
fe384b3444
merge with 5.4
2013-03-17 20:52:55 +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
44197774c0
Fixed bug #61981
2013-03-17 20:29:14 +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
0def1ca59a
Merge branch 'PHP-5.5'
...
* PHP-5.5:
Added ability to load zend_extensions without absolute path names
2013-03-17 11:43:45 +04:00
Dmitry Stogov
0b8b6a727d
Added ability to load zend_extensions without absolute path names
2013-03-17 11:42:25 +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
