Dmitry Stogov
2bc886abed
Merge branch 'PHP-5.5'
...
* PHP-5.5:
Replce ZEND_FETCH_* instructions with IS_CV if possible
Conflicts:
ext/opcache/Optimizer/zend_optimizer.c
2013-08-09 17:52:22 +04:00
Dmitry Stogov
b27f6826d4
Replce ZEND_FETCH_* instructions with IS_CV if possible
2013-08-09 17:47:47 +04:00
Christopher Jones
4c3c9d1fe5
Merge branch 'PHP-5.5'
...
* PHP-5.5:
Fix long-standing visual pain point: the misalignment of './configure help' text. Whitespace changes and a couple of grammar fixes.
2013-08-06 11:09:12 -07:00
Christopher Jones
c6d977dd39
Fix long-standing visual pain point: the misalignment of './configure help' text.
...
Whitespace changes and a couple of grammar fixes.
2013-08-06 11:06:09 -07:00
Dmitry Stogov
e2a433fc5d
Merge branch 'PHP-5.5'
...
* PHP-5.5:
Added opcache.restrict_api configuration directive that may limit usage of OPcahce API functions only to patricular script(s)
added test script for bug65045.
MFH: fixed #65045 : mb_convert_encoding breaks well-formed character.
Conflicts:
NEWS
2013-07-31 14:24:30 +04:00
Dmitry Stogov
d69b3d8f59
Added opcache.restrict_api configuration directive that may limit usage of OPcahce API functions only to patricular script(s)
2013-07-31 14:20:56 +04:00
Dmitry Stogov
a0fece5201
Merge branch 'PHP-5.5'
...
* PHP-5.5:
Fixed php-5.2 support
2013-07-31 03:23:10 +04:00
Dmitry Stogov
f3aca8bc4d
Fixed php-5.2 support
2013-07-31 03:22:34 +04:00
Dmitry Stogov
5338bbbf38
Merge branch 'PHP-5.5'
...
* PHP-5.5:
Added support for glob symbols in blacklist entries (?, *, **)
Conflicts:
NEWS
2013-07-31 03:04:00 +04:00
Dmitry Stogov
02409669e4
Added support for glob symbols in blacklist entries (?, *, **)
2013-07-31 03:01:19 +04:00
Dmitry Stogov
147d5241dc
Merge branch 'PHP-5.5'
...
* PHP-5.5:
Improved implementation of NOP removal pass from O(n^2) to O(n) (hnw)
2013-07-30 22:33:46 +04:00
Dmitry Stogov
cb17c99511
Improved implementation of NOP removal pass from O(n^2) to O(n) (hnw)
2013-07-30 22:31:37 +04:00
Dmitry Stogov
e831041c5a
Merge branch 'PHP-5.5'
...
* PHP-5.5:
A minor fix for configure outpu (Tony)
2013-07-30 22:04:55 +04:00
Dmitry Stogov
e2aba1cf9e
A minor fix for configure outpu (Tony)
2013-07-30 22:03:21 +04:00
Dmitry Stogov
0aa342e903
Merge branch 'PHP-5.5'
...
* PHP-5.5:
Fixed bug #65338 (Enabling both php_opcache and php_wincache AVs on shutdown).
Conflicts:
NEWS
2013-07-30 17:36:47 +04:00
Dmitry Stogov
3550f3d0aa
Fixed bug #65338 (Enabling both php_opcache and php_wincache AVs on shutdown).
2013-07-30 17:35:19 +04:00
Dmitry Stogov
294335761b
Merge branch 'PHP-5.5'
...
* PHP-5.5:
Merge from GitHub
Update NEWS
Fixed bug #65336
Conflicts:
NEWS
2013-07-28 13:50:13 +04:00
Dmitry Stogov
ae5e70afac
Merge from GitHub
2013-07-28 13:47:13 +04:00
Veres Lajos
1b06e0be96
typo fixes
2013-07-15 00:19:49 -07:00
Veres Lajos
6c4af15d6c
typos (orig)
2013-07-15 00:19:32 -07:00
Veres Lajos
72085b0e5f
typo fixes
2013-07-15 00:18:57 -07:00
Xinchen Hui
d99a76ca96
Merge branch 'PHP-5.5'
2013-06-25 13:48:54 +08:00
Xinchen Hui
157ccaf507
Fixed bug #64827 Segfault in zval_mark_grey (zend_gc.c)
...
I can not get a reproduce script since the context is very strict.
Of course I will try to make one, but for now, I just commit this first.
2013-06-25 13:47:50 +08:00
Dmitry Stogov
0c9de2d94b
Merge branch 'PHP-5.5'
...
* PHP-5.5:
OPcache must be compatible with LiteSpeed SAPI
Conflicts:
NEWS
2013-06-24 12:01:58 +04:00
Dmitry Stogov
f49b27e166
OPcache must be compatible with LiteSpeed SAPI
2013-06-24 11:59:50 +04:00
Stanislav Malyshev
8ac131503d
Merge branch 'PHP-5.5'
...
* PHP-5.5:
Merge branch 'pull-request/341'
Merge branch 'pull-request/341'
2013-06-10 14:31:57 -07:00
Stanislav Malyshev
4427d1dcfd
Merge branch 'pull-request/341'
...
* pull-request/341: (23 commits)
typofixes
2013-06-10 14:30:59 -07:00
Dmitry Stogov
738dfc69e7
Merge branch 'PHP-5.5'
...
* PHP-5.5:
Fixed comments
2013-06-10 12:06:14 +04:00
Dmitry Stogov
53e6529203
Fixed comments
2013-06-10 12:05:20 +04:00
Dmitry Stogov
95d88cc66a
Merge branch 'PHP-5.5'
...
* PHP-5.5:
Avoid multiple allocations of the same key in different processes
2013-06-10 11:44:54 +04:00
Dmitry Stogov
23a9bb09ba
Avoid multiple allocations of the same key in different processes
2013-06-10 11:43:03 +04:00
Dmitry Stogov
456ef2ebfa
Merge branch 'PHP-5.5'
...
* PHP-5.5:
Compact HashTables before storing them in shared memory
Conflicts:
ext/opcache/ZendAccelerator.c
2013-06-10 11:25:41 +04:00
Dmitry Stogov
540488bf55
Compact HashTables before storing them in shared memory
2013-06-10 11:22:19 +04:00
Dmitry Stogov
841e1f0364
Merge branch 'PHP-5.5'
...
* PHP-5.5:
Use size_t instead of int
2013-06-10 10:37:53 +04:00
Dmitry Stogov
2e9d3e8b39
Use size_t instead of int
2013-06-10 10:36:35 +04:00
Rasmus Lerdorf
4c762152bf
Use size_t everywhere instead
2013-05-29 14:34:53 -07:00
Rasmus Lerdorf
e02add77fc
Use size_t everywhere instead
2013-05-29 14:34:22 -07:00
Rasmus Lerdorf
80c13e9965
This needs to be a long
...
Otherwise we are limited to a 2G opcache segment
2013-05-29 14:26:42 -07:00
Rasmus Lerdorf
29ee4b81f2
This needs to be a long
...
Otherwise we are limited to a 32G opcache segment
2013-05-29 14:22:43 -07:00
Dmitry Stogov
458f02c471
Merge branch 'PHP-5.5'
...
* PHP-5.5:
Fixed crash during search in empty persistent HashTable
2013-05-29 00:01:35 +04:00
Dmitry Stogov
6008ac8e32
Fixed crash during search in empty persistent HashTable
2013-05-28 23:45:36 +04:00
Dmitry Stogov
05a88447ad
Merge branch 'PHP-5.5'
...
* PHP-5.5:
Avoid possible conditional jump depended on uninitialised value
2013-04-29 10:46:54 +04:00
Dmitry Stogov
4b83f4a011
Avoid possible conditional jump depended on uninitialised value
2013-04-29 10:45:31 +04:00
Dmitry Stogov
3f48e8765d
Merge branch 'PHP-5.5'
...
* PHP-5.5:
Fixed compilation warnings (issue #92 )
2013-04-29 10:32:50 +04:00
Dmitry Stogov
a5b4eeb5f0
Fixed compilation warnings (issue #92 )
2013-04-29 10:32:08 +04:00
Pierre Joye
3cc81d151d
Merge branch 'PHP-5.5' of git.php.net:php-src into PHP-5.5
2013-04-20 18:24:04 +02:00
Pierre Joye
d818fdcc47
Merge branch 'PHP-5.5'
...
* PHP-5.5:
fix x64 opcache, still uses fugly fixed addresses, see TODO entry for explanaton
2013-04-20 18:23:21 +02:00
Pierre Joye
14d9f3450b
fix x64 opcache, still uses fugly fixed addresses, see TODO entry for explanaton
2013-04-20 18:22:39 +02:00
Dmitry Stogov
1fe5ee4d6a
Merge branch 'PHP-5.5'
...
* PHP-5.5:
Fixed 5.2 ZTS build
2013-04-19 21:44:00 +04:00
Dmitry Stogov
c7cf9b68b6
Fixed 5.2 ZTS build
2013-04-19 21:37:24 +04:00