Dmitry Stogov
36d343c0c4
Merge branch 'PHP-5.5' into PHP-5.5-opcache
...
* PHP-5.5:
Initialize literals hash_value and cache_slot
Added curl config test for windows
updated lib versions
updated lib versions
fixed EOL
updated lib versions
allow lcov 1.10
allow lcov 1.10
Conflicts:
ext/opcache/Optimizer/zend_optimizer.c
2013-04-17 21:32:08 +04:00
Dmitry Stogov
5a897009a8
Initialize literals hash_value and cache_slot
2013-04-17 21:19:56 +04:00
Anatol Belski
2d9cbf720d
Added curl config test for windows
2013-04-17 14:25:45 +02:00
Dmitry Stogov
e16f24327d
Merge branch 'PHP-5.5' into PHP-5.5-opcache
...
* PHP-5.5:
allow lcov 1.10
Fixed bug (Wrong ce cached)
apply change from opcache readme to php.ini
lucky that the name is not used, fix name of encoder
2013-04-15 12:09:02 +04:00
Dmitry Stogov
276847caba
Added script level constant replacement
2013-04-11 15:18:35 +04:00
Pierre Joye
e71b794569
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
lucky that the name is not used, fix name of encoder
2013-04-11 07:08:39 +02:00
Pierre Joye
4475dbf11d
Merge branch 'PHP-5.4' of git.php.net:php-src into PHP-5.4
2013-04-11 06:58:04 +02:00
Pierre Joye
684f4d5272
lucky that the name is not used, fix name of encoder
2013-04-11 06:42:38 +02:00
Anatol Belski
7133eee5f2
Merge branch 'PHP-5.5' of git.php.net:php-src into PHP-5.5
2013-04-10 20:51:58 +02:00
Anatol Belski
b6d54faa92
Merge branch 'PHP-5.4' of git.php.net:php-src into PHP-5.4
2013-04-10 20:51:32 +02:00
Anatol Belski
0655ab7c26
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
updated NEWS
Fixed bug #64342 ZipArchive::addFile() has to check for file existence
2013-04-10 20:45:28 +02:00
Anatol Belski
ceb5b684e0
Merge branch 'PHP-5.3' into PHP-5.4
...
* PHP-5.3:
Fixed bug #64342 ZipArchive::addFile() has to check for file existence
2013-04-10 20:40:28 +02:00
Anatol Belski
968ae4a56a
Fixed bug #64342 ZipArchive::addFile() has to check for file existence
2013-04-10 20:39:17 +02:00
Pierre Joye
6ea7e6da8b
Merge branch 'PHP-5.5' of git.php.net:php-src into PHP-5.5
2013-04-10 20:15:03 +02:00
Pierre Joye
87f5d9aa1b
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
add external 2.1 detection and fix gd_compat for 2.1+
2013-04-10 20:13:46 +02:00
Pierre Joye
c480bf3fb2
Merge branch 'PHP-5.3' into PHP-5.4
...
* PHP-5.3:
add external 2.1 detection and fix gd_compat for 2.1+
2013-04-10 20:13:18 +02:00
Pierre Joye
224a67fb9f
add external 2.1 detection and fix gd_compat for 2.1+
2013-04-10 20:12:25 +02:00
Dmitry Stogov
af967de2af
Allow wilcards in opcache.blacklist_filename
2013-04-10 21:41:30 +04:00
Dmitry Stogov
e27039630a
Fixed support for PHP-5.3
2013-04-10 21:27:06 +04:00
Dmitry Stogov
2b3a4afcbf
Added missing ARG_INFO
2013-04-10 16:45:59 +04:00
Dmitry Stogov
7845f49006
Numeric string constants used as array indeces have to be converted to long at compile time
2013-04-10 15:33:08 +04:00
Dmitry Stogov
2b28f29e53
Fixed CFG construction bugs
2013-04-09 17:48:45 +04:00
Dmitry Stogov
e13d2c7c7f
Merge branch 'PHP-5.5' of git.php.net:php-src into PHP-5.5
...
* 'PHP-5.5' of git.php.net:php-src:
fix possible NULL deref
fix null deref
Fixed bugs #47675 and #64577 (fd leak on Solaris)
2013-04-09 12:10:54 +04:00
Pierre Joye
24f1045d55
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
fix possible NULL deref
2013-04-09 10:09:47 +02:00
Pierre Joye
aab5659357
Merge branch 'PHP-5.3' into PHP-5.4
...
* PHP-5.3:
fix possible NULL deref
2013-04-09 10:09:36 +02:00
Pierre Joye
88b3cdc4e9
fix possible NULL deref
2013-04-09 10:09:17 +02:00
Pierre Joye
1359eaa057
Merge branch 'PHP-5.5' of git.php.net:php-src into PHP-5.5
2013-04-09 10:06:49 +02:00
Pierre Joye
4d6c367177
Merge branch 'PHP-5.4' into PHP-5.5
...
# By Pierre Joye (1) and Rasmus Lerdorf (1)
* PHP-5.4:
fix null deref
Fixed bugs #47675 and #64577 (fd leak on Solaris)
2013-04-09 10:04:32 +02:00
Pierre Joye
10d62de4aa
Merge branch 'PHP-5.3' into PHP-5.4
...
# By Pierre Joye (1) and Rasmus Lerdorf (1)
* PHP-5.3:
fix null deref
Fixed bugs #47675 and #64577 (fd leak on Solaris)
2013-04-09 10:04:17 +02:00
Pierre Joye
4d4adf47e0
fix null deref
2013-04-09 10:04:01 +02:00
Dmitry Stogov
4bf1f3801b
Fixed ZTS build
2013-04-09 12:03:41 +04:00
Dmitry Stogov
4cf00c08bd
Fixed issue #26 (added opcache_invalidate(string $filename [, bool $force = false]) function)
2013-04-09 11:57:28 +04:00
Dmitry Stogov
d9c9e78369
Fixed issue #82 (allow comments in blacklist file, lines started with ";")
2013-04-09 10:51:19 +04:00
Pierre Joye
83500123d0
ws and comment for recommended aa method
2013-04-09 07:04:52 +02:00
Pierre Joye
ec136c219e
Merge branch 'PHP-5.5' of git.php.net:php-src into PHP-5.5
2013-04-09 06:47:21 +02:00
Pierre Joye
85ad65ef40
fix some unitialized values and typo
2013-04-09 06:44:45 +02:00
Anatol Belski
a9f9ff68a2
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
updated libmagic.patch
2013-04-08 16:24:20 +02:00
Anatol Belski
a35d386612
updated libmagic.patch
2013-04-08 16:23:43 +02:00
Anatol Belski
b810878e7d
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
fix ident
2013-04-08 15:51:53 +02:00
Anatol Belski
9de5dcad1c
fix ident
2013-04-08 15:51:22 +02:00
Anatol Belski
a1f66c0b50
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
Refactored the previous memleak fix
2013-04-08 14:34:09 +02:00
Anatol Belski
f3ca1155d6
Refactored the previous memleak fix
...
to avoid usage of a freed pointer. Thanks Laruence )
2013-04-08 14:32:37 +02:00
Anatol Belski
9f0bfed435
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
fix memory leak at apprentice.c:1095
2013-04-08 12:50:25 +02:00
Anatol Belski
28e26b0fad
fix memory leak at apprentice.c:1095
2013-04-08 12:49:53 +02:00
Anatol Belski
30fc3ac6aa
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
fixed EOL
2013-04-08 09:21:06 +02:00
Anatol Belski
b0b81c0a37
fixed EOL
2013-04-08 09:20:43 +02:00
Anatol Belski
b12f79cafb
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
upgraded libmagic to 5.14
2013-04-07 22:18:53 +02:00
Anatol Belski
10367fa7c6
upgraded libmagic to 5.14
2013-04-07 22:15:56 +02:00
Xinchen Hui
5ac8084e5f
Merge branch 'PHP-5.4' into PHP-5.5
2013-04-05 23:28:02 +08:00
Carson McDonald
39bc1bd25f
Fix typo
2013-04-05 23:27:34 +08:00