b472d0733a
Merge branch 'PHP-5.5'
2013-03-28 18:36:06 +01:00
dcf0b71c98
Fix tests after addition of ^ (xor) operator to ini
2013-03-28 18:35:46 +01:00
c7f1279903
Merge branch 'PHP-5.5'
2013-03-28 19:14:25 +08:00
f4daaf9250
Merge branch 'PHP-5.4' into PHP-5.5
2013-03-28 19:13:58 +08:00
124a867b6a
Typo fix (greater then => greater than)
2013-03-28 19:12:08 +08:00
07a6f3c677
Merge branch 'PHP-5.5'
...
* PHP-5.5:
don't optimize script if it's not going to be cached
Reimplemented OPcache restart trigger. Now, if memory or hash are full the restart is scheduled only in case the amount of wasted memory is above opcache.max_wasted_percentage. Otherwise OPcahce continue serving the following requests using already cached files, but doesn't try to add new files (the cache is full anyway).
2013-03-28 13:47:38 +04:00
3ae5c55596
don't optimize script if it's not going to be cached
2013-03-28 13:45:40 +04:00
037ea6f360
Reimplemented OPcache restart trigger. Now, if memory or hash are full the restart is scheduled only in case the amount of wasted memory is above opcache.max_wasted_percentage. Otherwise OPcahce continue serving the following requests using already cached files, but doesn't try to add new files (the cache is full anyway).
2013-03-28 13:34:59 +04:00
c4657614be
Merge branch 'PHP-5.5'
...
* PHP-5.5:
Fixed issue #78 (incorrect file path validation)
2013-03-28 12:31:33 +04:00
031553cd01
Fixed issue #78 (incorrect file path validation)
2013-03-28 12:30:18 +04:00
391a41e167
Merge branch 'PHP-5.5' of git.php.net:php-src into PHP-5.5
...
* 'PHP-5.5' of git.php.net:php-src:
Remove unused variable
NEWS Section for beta 3
News for beta 2
2013-03-27 23:15:38 +04:00
f55ff56f24
Merge branch 'master' of git.php.net:php-src
...
* 'master' of git.php.net:php-src:
Remove unused variable
NEWS Section for beta 3
News for beta 2
2013-03-27 23:15:21 +04:00
4ee7bbdd08
Merge branch 'PHP-5.5'
...
* PHP-5.5:
Fixed issue #74 (Allowed per request OPcache disabling)
2013-03-27 23:14:59 +04:00
1556d5df8a
Fixed issue #74 (Allowed per request OPcache disabling)
2013-03-27 23:13:21 +04:00
4263a23a79
Merge branch 'PHP-5.5'
...
* PHP-5.5:
Remove unused variable
2013-03-27 20:01:05 +01:00
f92a15864b
Remove unused variable
2013-03-27 20:00:54 +01:00
36861bf91d
Merge branch 'PHP-5.5'
...
* PHP-5.5:
Fixed issue #76 (actually we don't need zend_shared_memory_block_header at all)
2013-03-27 22:17:50 +04:00
91ab11ed07
Fixed issue #76 (actually we don't need zend_shared_memory_block_header at all)
2013-03-27 22:16:18 +04:00
fc7efecda0
Merge branch 'PHP-5.5' of git.php.net:php-src into PHP-5.5
...
* 'PHP-5.5' of git.php.net:php-src:
add WebP support in phpinfo
2013-03-27 21:09:51 +04:00
34ac5c9d0d
Merge branch 'master' of git.php.net:php-src
...
* 'master' of git.php.net:php-src:
add WebP support in phpinfo
2013-03-27 21:09:31 +04:00
d40174c6bb
Merge branch 'PHP-5.5'
...
* PHP-5.5:
Added description for opcache.enable_cli
2013-03-27 21:04:04 +04:00
f139534694
Added description for opcache.enable_cli
2013-03-27 21:02:39 +04:00
33e834aab8
Merge branch 'PHP-5.5'
...
* PHP-5.5:
add WebP support in phpinfo
2013-03-27 17:39:05 +01:00
e7d88a63fa
add WebP support in phpinfo
2013-03-27 17:38:57 +01:00
b03810761e
Merge branch 'PHP-5.5'
...
* PHP-5.5:
add windows 8 and windows server 2012
2013-03-27 07:29:56 +01:00
f01a7e54d3
add windows 8 and windows server 2012
2013-03-27 07:29:47 +01:00
705ab20252
Merge branch 'PHP-5.5'
...
* PHP-5.5:
FALSE on error
2013-03-27 05:13:42 +01:00
f3ebb40ad6
FALSE on error
2013-03-27 05:13:30 +01:00
8a85da4a61
merging conflict left over
2013-03-26 17:46:29 +01:00
111123af4f
conflict
2013-03-26 11:24:00 +01:00
5ae6f582fb
fix regression, take #2 (merge issue due to git 1.8 default setting changes)
2013-03-26 11:23:15 +01:00
d74a192bd4
Merge branch 'PHP-5.5'
...
* PHP-5.5:
back to dev (7.0.2-dev)
2013-03-25 13:58:12 +04:00
6a7088fd18
back to dev (7.0.2-dev)
2013-03-25 13:57:50 +04:00
57a0c655aa
Merge branch 'PHP-5.5'
...
* PHP-5.5:
Fixed copy/paste mistake
2013-03-25 13:31:19 +04:00
f17156c2d1
Fixed copy/paste mistake
2013-03-25 13:30:45 +04:00
dedd0f56b6
Merge branch 'PHP-5.5'
...
* PHP-5.5:
Fixed bug #64482 (Opcodes for dynamic includes should not be cached)
Separate "start_time" from "last_restart_time"
Fixed PHP-5.2 ZTS compatibility
2013-03-25 13:06:10 +04:00
0a00d29256
Fixed bug #64482 (Opcodes for dynamic includes should not be cached)
2013-03-25 13:05:16 +04:00
64b029af0d
Separate "start_time" from "last_restart_time"
2013-03-25 12:33:24 +04:00
987dee9ca1
Fixed PHP-5.2 ZTS compatibility
2013-03-25 12:21:58 +04:00
2c22ffc909
Merge branch 'PHP-5.5'
...
* PHP-5.5:
7.0.1 release
2013-03-25 11:45:12 +04:00
a3316ffe6a
7.0.1 release
2013-03-25 11:44:09 +04:00
4003cc23b1
Merge branch 'PHP-5.5'
...
* PHP-5.5:
make it int main
2013-03-24 23:58:50 -07:00
c20e4bbc96
make it int main
2013-03-24 23:58:30 -07:00
981cd9c500
Merge branch 'PHP-5.5'
...
* PHP-5.5:
fix return value
2013-03-24 23:43:45 -07:00
016fbd9991
fix return value
2013-03-24 23:43:25 -07:00
9e86fa301f
Merge branch 'PHP-5.5'
...
* PHP-5.5:
add code to check if we know flock definition on this system
2013-03-24 20:12:33 -07:00
385d0e52cc
add code to check if we know flock definition on this system
...
In order to configure detect it and not fail the compile.
Not an ideal solution, suggestions are welcome on how to improve it.
2013-03-24 20:11:28 -07:00
c1ac5a20a5
fix typo
2013-03-24 20:04:24 -07:00
bf457a0387
add definition for 5.5
2013-03-24 20:04:24 -07:00
504ef64c7b
fix typo
2013-03-24 20:03:57 -07:00
Nikita Popov