be3f7ba4fb
Merge branch 'PHP-5.3' into PHP-5.4
...
* PHP-5.3:
fix possible null deref (detected by code coverity scan)
2013-05-02 09:38:12 +02:00
ab117573cd
fix possible null deref (detected by code coverity scan)
2013-05-02 09:38:00 +02:00
3f2f534a5c
Remove trailing space in NEWS
2013-04-30 19:42:31 +02:00
1656b337ce
NEWS for 514afd67
2013-04-30 19:41:27 +02:00
514afd67b6
Fix bug #64729 : compilation failure on x32
2013-04-30 19:28:24 +02:00
4a92ae3401
When Apache use RewriteRule to redirect, via mod_proxy_fgi, to php-fpm
...
the SCRIPT_FILENAME may contains the QUERY_STRING.
Ex : RewriteRule ^(.*)\.php$ fcgi://127.0.0.1:9000/$1.php [P]
From apache debug (build with -DFCGI_DUMP_ENV_VARS)
AH01062: sending env var 'SCRIPT_FILENAME' value 'proxy:fcgi://127.0.0.1:9000/var/www/html/info.php?foo'
AH01071: Got error 'Primary script unknown\n'
2013-04-30 08:55:18 +02:00
4e773c1b92
Revert "Add CURL_WRAPPERS_ENABLE constant"
...
This reverts commit d7f709a032
2013-04-28 22:26:05 -07:00
7b9eabaf51
Merge branch 'PHP-5.3' into PHP-5.4
2013-04-27 23:50:02 +08:00
15b554cd9b
Also fixed bug #64726 in 5.3
2013-04-27 23:49:43 +08:00
8f5a534b21
Fixed bug #64726 (Segfault when calling fetch_object on a use_result and DB pointer has closed)
2013-04-27 23:41:31 +08:00
d54432ed98
Merge branch 'PHP-5.3' into PHP-5.4
2013-04-27 23:38:10 +08:00
c7b8368ed5
Fix memory realted to #64726
2013-04-27 23:38:00 +08:00
e9b03c412b
updated libmagic.patch
2013-04-27 14:09:29 +02:00
cdc1a63790
Fixed bug bug #64713 Compilation warnings in finfo
2013-04-27 13:49:50 +02:00
5adf1be45d
Merge branch 'PHP-5.3' into PHP-5.4
...
* PHP-5.3:
Fix Test Bug #64714
2013-04-25 11:37:09 -07:00
bf5506f511
Fix Test Bug #64714
2013-04-25 11:34:57 -07:00
239ba8d58b
Merge branch 'PHP-5.3' into PHP-5.4
...
Conflicts:
configure.in
main/php_version.h
2013-04-25 18:05:19 +02:00
63434524f8
PHP 5.3.26 this will be
2013-04-25 18:02:53 +02:00
671ef9fda7
Fix NEWS
2013-04-25 17:58:02 +02:00
a58a279d7b
5.4.16-dev
2013-04-24 10:15:35 -07:00
84e5c8a0e2
update credits
2013-04-23 22:02:57 -07:00
5e24a6e74d
Merge branch 'PHP-5.3' into PHP-5.4
...
* PHP-5.3:
Fix bug #64458 (dns_get_record result with string of length -1)
2013-04-23 21:45:49 -07:00
18fdab5a09
Fix bug #64458 (dns_get_record result with string of length -1)
2013-04-23 21:43:35 -07:00
43ab915b41
Merge branch 'PHP-5.3' into PHP-5.4
...
* PHP-5.3:
Fixed incorrect check. SEND_REF may be executed before DO_FCALL when EX(function_state).function is not yet set to the calling function.
Conflicts:
Zend/zend_vm_def.h
Zend/zend_vm_execute.h
2013-04-23 23:55:47 +04:00
4cf0647399
Fixed incorrect check. SEND_REF may be executed before DO_FCALL when EX(function_state).function is not yet set to the calling function.
2013-04-23 23:43:23 +04:00
b3aa3c2616
updated NEWS
2013-04-22 18:59:47 +02:00
8febe2ad08
Merge branch 'PHP-5.3' into PHP-5.4
...
* PHP-5.3:
Fixed stream_socket_pair() on Windows x64 and
2013-04-22 18:59:11 +02:00
f082d6311b
Fixed stream_socket_pair() on Windows x64 and
...
improved errorhandling in the socketpair() implementation.
2013-04-22 18:55:32 +02:00
0b2c411323
Merge branch 'PHP-5.3' into PHP-5.4
2013-04-22 17:51:43 +01:00
70b67f2e50
- Updated to version 2013.3 (2013c)
2013-04-22 17:51:41 +01:00
b02241b968
Merge branch 'PHP-5.4' of git.php.net:php-src into PHP-5.4
2013-04-21 11:11:02 +08:00
92bbe6be72
Includes 5 new phpTests to check that the error message DOM_NOT_FOUND is properly raised by the method DOMNode::insertBefore(newNode, [refNode]).
...
Each file covers a different test case
DOMNode_insertBefore_error2.phpt: refNode is a sibling of the node where newNode wanted to be inserted.
DOMNode_insertBefore_error3.phpt: refNode is the parent of the node where newNode wanted to be inserted.
DOMNode_insertBefore_error4.phpt: refNode is a brand new node.
DOMNode_insertBefore_error5.phpt: refNode is a descendant (not child) of the node where newNode wanted to be inserted.
DOMNode_insertBefore_error6.phpt: refNode is the node where newNode wanted to be inserted.
2013-04-21 11:05:59 +08:00
39cc08c7e9
Merge branch 'PHP-5.3' into PHP-5.4
2013-04-19 15:55:46 +02:00
0802961bd1
lower the limit, should fit in a byte
2013-04-19 15:54:35 +02:00
ecf76e2da8
Merge branch 'PHP-5.3' into PHP-5.4
...
* PHP-5.3:
updated lib versions
allow lcov 1.10
2013-04-17 13:18:00 +02:00
fb955a613c
updated lib versions
2013-04-17 13:17:32 +02:00
4fbe1173eb
fixed EOL
2013-04-17 13:15:08 +02:00
323fdb9879
updated lib versions
2013-04-17 13:12:18 +02:00
a9271a8b0d
allow lcov 1.10
2013-04-13 16:57:25 -04:00
e694d40963
allow lcov 1.10
2013-04-13 16:56:30 -04:00
ba292b037f
Fixed bug (Wrong ce cached)
2013-04-11 14:28:42 +08:00
4475dbf11d
Merge branch 'PHP-5.4' of git.php.net:php-src into PHP-5.4
2013-04-11 06:58:04 +02:00
684f4d5272
lucky that the name is not used, fix name of encoder
2013-04-11 06:42:38 +02:00
b6d54faa92
Merge branch 'PHP-5.4' of git.php.net:php-src into PHP-5.4
2013-04-10 20:51:32 +02:00
56b028e590
Merge branch 'PHP-5.3' of git.php.net:php-src into PHP-5.3
2013-04-10 20:50:57 +02:00
782085bbfb
updated NEWS
2013-04-10 20:44:41 +02:00
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
968ae4a56a
Fixed bug #64342 ZipArchive::addFile() has to check for file existence
2013-04-10 20:39:17 +02:00
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
224a67fb9f
add external 2.1 detection and fix gd_compat for 2.1+
2013-04-10 20:12:25 +02:00
Remi Collet