clones/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2024-09-29 05:46:06 +00:00
Code Issues Packages Projects Releases Wiki Activity
74,612 Commits 494 Branches 1,367 Tags 786 MiB
8059ec1832
Commit Graph

74612 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Sara Golemon
e217db8e69 Harden loopback tests 
These tests depend on being able to bind port 31337.
Try a range of ports until one binds or we give up trying.
 2013-04-30 19:30:55 -07:00
Sara Golemon
6aefaad46e Fix race condition when ext/hash/tests run in parallel 2013-04-30 16:28:37 -07:00
Gustavo Lopes
3f2f534a5c Remove trailing space in NEWS 2013-04-30 19:42:31 +02:00
Gustavo Lopes
1656b337ce NEWS for 514afd67 2013-04-30 19:41:27 +02:00
Gustavo Lopes
734cb61f81 Merge branch 'PHP-5.5' 
* PHP-5.5:
  Fix bug #64729: compilation failure on x32
 2013-04-30 19:38:00 +02:00
Gustavo Lopes
865cc3a800 Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  Fix bug #64729: compilation failure on x32

Conflicts:
	Zend/zend_alloc.c
 2013-04-30 19:36:08 +02:00
Gustavo Lopes
514afd67b6 Fix bug #64729: compilation failure on x32 2013-04-30 19:28:24 +02:00
Johannes Schlüter
bfb787b16f Merge branch 'PHP-5.5' 2013-04-30 14:28:18 +02:00
Johannes Schlüter
062519ed41 don't include smart_str.h in a too global header, fixes #64718 2013-04-30 14:26:55 +02:00
Remi Collet
bd77763889 Merge branch 'PHP-5.5' 
* PHP-5.5:
  NEWS
  When Apache use RewriteRule to redirect, via mod_proxy_fgi, to php-fpm the SCRIPT_FILENAME may contains the QUERY_STRING.
 2013-04-30 09:03:28 +02:00
Remi Collet
36b968ae96 NEWS 2013-04-30 09:03:18 +02:00
Remi Collet
fbff4ccf27 Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  When Apache use RewriteRule to redirect, via mod_proxy_fgi, to php-fpm the SCRIPT_FILENAME may contains the QUERY_STRING.
 2013-04-30 09:02:59 +02:00
Remi Collet
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
Dmitry Stogov
13de57c0f4 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 #64738, fix implicit type declaration
 2013-04-30 10:27:24 +04:00
Dmitry Stogov
4558533ef3 Merge branch 'master' of git.php.net:php-src 
* 'master' of git.php.net:php-src:
  fix #64738, fix implicit type declaration
 2013-04-30 10:26:57 +04:00
Dmitry Stogov
a9679227cf Merge branch 'PHP-5.5' 
* PHP-5.5:
  Added SoapClient constructor option 'ssl_method' to specify ssl method
 2013-04-30 10:26:29 +04:00
Dmitry Stogov
c782cf7fb3 Added SoapClient constructor option 'ssl_method' to specify ssl method 2013-04-30 10:24:49 +04:00
Pierre Joye
fc666bdb83 Merge branch 'PHP-5.5' 
* PHP-5.5:
  fix #64738, fix implicit type declaration
 2013-04-30 08:03:46 +02:00
Pierre Joye
83682d8833 Merge branch 'PHP-5.5' of git.php.net:php-src into PHP-5.5 2013-04-30 08:01:52 +02:00
Pierre Joye
1a335d20a8 fix #64738, fix implicit type declaration 2013-04-30 07:52:40 +02: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
Stanislav Malyshev
4aecf0eb66 Merge branch 'PHP-5.5' 
* PHP-5.5:
  Revert "Add CURL_WRAPPERS_ENABLE constant"
 2013-04-28 22:28:53 -07:00
Stanislav Malyshev
8a51bdd3ce Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  Revert "Add CURL_WRAPPERS_ENABLE constant"

Conflicts:
	ext/curl/interface.c
 2013-04-28 22:28:13 -07:00
Stanislav Malyshev
4e773c1b92 Revert "Add CURL_WRAPPERS_ENABLE constant" 
This reverts commit d7f709a032.
Since wrappers are deleted from 5.5, no point in adding this constant.
 2013-04-28 22:26:05 -07:00
David Soria Parra
6bac9bb1e8 Merge branch 'PHP-5.5' 
* PHP-5.5:
  Revert "Fix conversion from unsigned char to char"
 2013-04-29 02:28:46 +02:00
David Soria Parra
86685aefab Revert "Fix conversion from unsigned char to char" 
This reverts commit bc50ba4bf9.
 2013-04-29 02:27:11 +02:00
Pierre Joye
9877773438 Merge branch 'PHP-5.5' of git.php.net:php-src into PHP-5.5 2013-04-27 18:00:02 +02:00
Pierre Joye
03ab53b213 Merge branch 'master' of git.php.net:php-src 2013-04-27 17:59:40 +02:00
Pierre Joye
eaec5522ff Merge branch 'PHP-5.5' 
* PHP-5.5:
  fix #64725, wrong res check
 2013-04-27 17:52:38 +02:00
Pierre Joye
25c9f34c9c fix #64725, wrong res check 2013-04-27 17:52:30 +02:00
Xinchen Hui
24a26df1f8 Merge branch 'PHP-5.5' 2013-04-27 23:50:29 +08:00
Xinchen Hui
e60638faca Merge branch 'PHP-5.4' into PHP-5.5 2013-04-27 23:50:23 +08:00
Xinchen Hui
7b9eabaf51 Merge branch 'PHP-5.3' into PHP-5.4 2013-04-27 23:50:02 +08:00
Xinchen Hui
15b554cd9b Also fixed bug #64726 in 5.3 2013-04-27 23:49:43 +08:00
Xinchen Hui
9555531eea Merge branch 'PHP-5.5' 2013-04-27 23:42:34 +08:00
Xinchen Hui
a56a95e58d Update NEWS 2013-04-27 23:42:18 +08:00
Xinchen Hui
1c07590ed7 Merge branch 'PHP-5.4' into PHP-5.5 2013-04-27 23:41:51 +08:00
Xinchen Hui
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
Xinchen Hui
d54432ed98 Merge branch 'PHP-5.3' into PHP-5.4 2013-04-27 23:38:10 +08:00
Xinchen Hui
c7b8368ed5 Fix memory realted to #64726 2013-04-27 23:38:00 +08:00
Anatol Belski
35364cd71d Merge branch 'PHP-5.5' 
* PHP-5.5:
  updated libmagic.patch
 2013-04-27 14:10:09 +02:00
Anatol Belski
ca148c030f Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  updated libmagic.patch
 2013-04-27 14:09:55 +02:00
Anatol Belski
e9b03c412b updated libmagic.patch 2013-04-27 14:09:29 +02:00
Anatol Belski
232f5d0306 Merge branch 'PHP-5.5' 
* PHP-5.5:
  Fixed bug bug #64713 Compilation warnings in finfo
 2013-04-27 13:51:31 +02:00
Anatol Belski
d72307f1ca Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  Fixed bug bug #64713 Compilation warnings in finfo
 2013-04-27 13:51:12 +02:00
Anatol Belski
cdc1a63790 Fixed bug bug #64713 Compilation warnings in finfo 2013-04-27 13:49:50 +02:00
David Soria Parra
e0e18a2b1d Merge branch 'PHP-5.5' 
* PHP-5.5:
  Fix implicit declaration warning for cdf_timestamp_to_timespec
  Fix #64711 ("value computed but not used" in parse_date.c)
  Fix implicit uint* to int* conversion warning
  Fix conversion from unsigned char to char
  Fix #64712 (Obsolete declarations in php_date.c)
 2013-04-26 12:41:08 +02:00