]>
granicus.if.org Git - php/log
Remi Collet [Fri, 3 May 2013 06:31:45 +0000 (08:31 +0200)]
Merge branch 'PHP-5.5'
* PHP-5.5:
NEWS
NEWS
NEWS
Remi Collet [Fri, 3 May 2013 06:31:22 +0000 (08:31 +0200)]
NEWS
Remi Collet [Fri, 3 May 2013 06:30:58 +0000 (08:30 +0200)]
Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
NEWS
NEWS
Remi Collet [Fri, 3 May 2013 06:30:47 +0000 (08:30 +0200)]
NEWS
Remi Collet [Fri, 3 May 2013 06:30:19 +0000 (08:30 +0200)]
Merge branch 'PHP-5.3' into PHP-5.4
* PHP-5.3:
NEWS
Remi Collet [Fri, 3 May 2013 06:29:56 +0000 (08:29 +0200)]
NEWS
Remi Collet [Fri, 3 May 2013 06:23:20 +0000 (08:23 +0200)]
Merge branch 'PHP-5.5'
* PHP-5.5:
From code coverity scan, syscall return value must be check.
Remi Collet [Fri, 3 May 2013 06:23:07 +0000 (08:23 +0200)]
Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
From code coverity scan, syscall return value must be check.
Remi Collet [Fri, 3 May 2013 06:22:55 +0000 (08:22 +0200)]
Merge branch 'PHP-5.3' into PHP-5.4
* PHP-5.3:
From code coverity scan, syscall return value must be check.
Remi Collet [Fri, 3 May 2013 06:19:14 +0000 (08:19 +0200)]
From code coverity scan, syscall return value must be check.
To not alter current behaviour, we simply log the problem,
so, if it occurs, the message will give explanation.
This are only warning as they don't block the server,
but such fail can explain strange (not expected) behaviour later.
Remi Collet [Thu, 2 May 2013 11:47:58 +0000 (13:47 +0200)]
Merge branch 'PHP-5.5'
* PHP-5.5:
fix more resource leaks
Remi Collet [Thu, 2 May 2013 11:47:48 +0000 (13:47 +0200)]
Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
fix more resource leaks
Remi Collet [Thu, 2 May 2013 11:47:36 +0000 (13:47 +0200)]
Merge branch 'PHP-5.3' into PHP-5.4
* PHP-5.3:
fix more resource leaks
Remi Collet [Thu, 2 May 2013 11:47:24 +0000 (13:47 +0200)]
fix more resource leaks
Remi Collet [Thu, 2 May 2013 11:31:38 +0000 (13:31 +0200)]
Merge branch 'PHP-5.5'
* PHP-5.5:
From code coverity scan - fix some memory leak - fix some resources leak (fd) - create fpm_worker_pool_free (shared use) - possible null dref (wp->user and wp->home can be null)
Remi Collet [Thu, 2 May 2013 11:31:22 +0000 (13:31 +0200)]
Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
From code coverity scan - fix some memory leak - fix some resources leak (fd) - create fpm_worker_pool_free (shared use) - possible null dref (wp->user and wp->home can be null)
Remi Collet [Thu, 2 May 2013 11:31:11 +0000 (13:31 +0200)]
Merge branch 'PHP-5.3' into PHP-5.4
* PHP-5.3:
From code coverity scan - fix some memory leak - fix some resources leak (fd) - create fpm_worker_pool_free (shared use) - possible null dref (wp->user and wp->home can be null)
Remi Collet [Thu, 2 May 2013 11:27:16 +0000 (13:27 +0200)]
From code coverity scan
- fix some memory leak
- fix some resources leak (fd)
- create fpm_worker_pool_free (shared use)
- possible null dref (wp->user and wp->home can be null)
Remi Collet [Thu, 2 May 2013 08:33:14 +0000 (10:33 +0200)]
Merge branch 'PHP-5.5'
* PHP-5.5:
fixed size array cannot be null
Remi Collet [Thu, 2 May 2013 08:33:05 +0000 (10:33 +0200)]
Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
fixed size array cannot be null
Remi Collet [Thu, 2 May 2013 08:32:54 +0000 (10:32 +0200)]
Merge branch 'PHP-5.3' into PHP-5.4
* PHP-5.3:
fixed size array cannot be null
Remi Collet [Thu, 2 May 2013 08:32:45 +0000 (10:32 +0200)]
fixed size array cannot be null
Remi Collet [Thu, 2 May 2013 08:16:01 +0000 (10:16 +0200)]
Merge branch 'PHP-5.5'
* PHP-5.5:
use limit_extensions as we use security_limit_extensions later (free)
unused variable
Remi Collet [Thu, 2 May 2013 08:15:49 +0000 (10:15 +0200)]
Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
use limit_extensions as we use security_limit_extensions later (free)
unused variable
Remi Collet [Thu, 2 May 2013 08:15:20 +0000 (10:15 +0200)]
Merge branch 'PHP-5.3' into PHP-5.4
* PHP-5.3:
use limit_extensions as we use security_limit_extensions later (free)
unused variable
Remi Collet [Thu, 2 May 2013 08:15:12 +0000 (10:15 +0200)]
use limit_extensions as we use security_limit_extensions later (free)
Remi Collet [Thu, 2 May 2013 08:15:05 +0000 (10:15 +0200)]
unused variable
Remi Collet [Thu, 2 May 2013 07:39:06 +0000 (09:39 +0200)]
Merge branch 'PHP-5.5'
* PHP-5.5:
fix possible null deref (detected by code coverity scan)
Remove trailing space in NEWS
NEWS for
514afd67
Remi Collet [Thu, 2 May 2013 07:38:38 +0000 (09:38 +0200)]
Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
fix possible null deref (detected by code coverity scan)
Remove trailing space in NEWS
NEWS for
514afd67
Remi Collet [Thu, 2 May 2013 07:38:12 +0000 (09:38 +0200)]
Merge branch 'PHP-5.3' into PHP-5.4
* PHP-5.3:
fix possible null deref (detected by code coverity scan)
Remi Collet [Thu, 2 May 2013 07:38:00 +0000 (09:38 +0200)]
fix possible null deref (detected by code coverity scan)
Anatol Belski [Wed, 1 May 2013 19:38:17 +0000 (21:38 +0200)]
Merge branch 'PHP-5.5'
* PHP-5.5:
updated lib versions
Anatol Belski [Wed, 1 May 2013 19:37:28 +0000 (21:37 +0200)]
updated lib versions
Sara Golemon [Wed, 1 May 2013 02:43:52 +0000 (19:43 -0700)]
Oops
Sara Golemon [Wed, 1 May 2013 02:30:55 +0000 (19:30 -0700)]
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.
Sara Golemon [Tue, 30 Apr 2013 23:28:37 +0000 (16:28 -0700)]
Fix race condition when ext/hash/tests run in parallel
Gustavo Lopes [Tue, 30 Apr 2013 17:42:31 +0000 (19:42 +0200)]
Remove trailing space in NEWS
Gustavo Lopes [Tue, 30 Apr 2013 17:41:27 +0000 (19:41 +0200)]
Gustavo Lopes [Tue, 30 Apr 2013 17:38:00 +0000 (19:38 +0200)]
Merge branch 'PHP-5.5'
* PHP-5.5:
Fix bug #64729: compilation failure on x32
Gustavo Lopes [Tue, 30 Apr 2013 17:36:08 +0000 (19:36 +0200)]
Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
Fix bug #64729: compilation failure on x32
Conflicts:
Zend/zend_alloc.c
Gustavo Lopes [Tue, 30 Apr 2013 17:00:31 +0000 (19:00 +0200)]
Fix bug #64729: compilation failure on x32
Johannes Schlüter [Tue, 30 Apr 2013 12:28:18 +0000 (14:28 +0200)]
Merge branch 'PHP-5.5'
Johannes Schlüter [Tue, 30 Apr 2013 12:26:55 +0000 (14:26 +0200)]
don't include smart_str.h in a too global header, fixes #64718
Remi Collet [Tue, 30 Apr 2013 07:03:28 +0000 (09:03 +0200)]
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.
Remi Collet [Tue, 30 Apr 2013 07:03:18 +0000 (09:03 +0200)]
NEWS
Remi Collet [Tue, 30 Apr 2013 07:02:59 +0000 (09:02 +0200)]
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.
Remi Collet [Tue, 30 Apr 2013 06:55:18 +0000 (08:55 +0200)]
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'
Dmitry Stogov [Tue, 30 Apr 2013 06:27:24 +0000 (10:27 +0400)]
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
Dmitry Stogov [Tue, 30 Apr 2013 06:26:57 +0000 (10:26 +0400)]
Merge branch 'master' of git.php.net:php-src
* 'master' of git.php.net:php-src:
fix #64738, fix implicit type declaration
Dmitry Stogov [Tue, 30 Apr 2013 06:26:29 +0000 (10:26 +0400)]
Merge branch 'PHP-5.5'
* PHP-5.5:
Added SoapClient constructor option 'ssl_method' to specify ssl method
Dmitry Stogov [Tue, 30 Apr 2013 06:24:49 +0000 (10:24 +0400)]
Added SoapClient constructor option 'ssl_method' to specify ssl method
Pierre Joye [Tue, 30 Apr 2013 06:03:46 +0000 (08:03 +0200)]
Merge branch 'PHP-5.5'
* PHP-5.5:
fix #64738, fix implicit type declaration
Pierre Joye [Tue, 30 Apr 2013 06:01:52 +0000 (08:01 +0200)]
Merge branch 'PHP-5.5' of git.php.net:php-src into PHP-5.5
Pierre Joye [Tue, 30 Apr 2013 05:52:40 +0000 (07:52 +0200)]
fix #64738, fix implicit type declaration
Dmitry Stogov [Mon, 29 Apr 2013 06:46:54 +0000 (10:46 +0400)]
Merge branch 'PHP-5.5'
* PHP-5.5:
Avoid possible conditional jump depended on uninitialised value
Dmitry Stogov [Mon, 29 Apr 2013 06:45:31 +0000 (10:45 +0400)]
Avoid possible conditional jump depended on uninitialised value
Dmitry Stogov [Mon, 29 Apr 2013 06:32:50 +0000 (10:32 +0400)]
Merge branch 'PHP-5.5'
* PHP-5.5:
Fixed compilation warnings (issue #92)
Dmitry Stogov [Mon, 29 Apr 2013 06:32:08 +0000 (10:32 +0400)]
Fixed compilation warnings (issue #92)
Stanislav Malyshev [Mon, 29 Apr 2013 05:28:53 +0000 (22:28 -0700)]
Merge branch 'PHP-5.5'
* PHP-5.5:
Revert "Add CURL_WRAPPERS_ENABLE constant"
Stanislav Malyshev [Mon, 29 Apr 2013 05:28:13 +0000 (22:28 -0700)]
Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
Revert "Add CURL_WRAPPERS_ENABLE constant"
Conflicts:
ext/curl/interface.c
Stanislav Malyshev [Mon, 29 Apr 2013 05:25:40 +0000 (22:25 -0700)]
Revert "Add CURL_WRAPPERS_ENABLE constant"
This reverts commit
d7f709a032a40cb475042b43db07a4698a2488b7 .
Since wrappers are deleted from 5.5, no point in adding this constant.
David Soria Parra [Mon, 29 Apr 2013 00:28:46 +0000 (02:28 +0200)]
Merge branch 'PHP-5.5'
* PHP-5.5:
Revert "Fix conversion from unsigned char to char"
David Soria Parra [Mon, 29 Apr 2013 00:26:55 +0000 (02:26 +0200)]
Revert "Fix conversion from unsigned char to char"
This reverts commit
bc50ba4bf971c62a1ff5b915a0c9f890b04c1087 .
Pierre Joye [Sat, 27 Apr 2013 16:00:02 +0000 (18:00 +0200)]
Merge branch 'PHP-5.5' of git.php.net:php-src into PHP-5.5
Pierre Joye [Sat, 27 Apr 2013 15:59:40 +0000 (17:59 +0200)]
Merge branch 'master' of git.php.net:php-src
Pierre Joye [Sat, 27 Apr 2013 15:52:38 +0000 (17:52 +0200)]
Merge branch 'PHP-5.5'
* PHP-5.5:
fix #64725, wrong res check
Pierre Joye [Sat, 27 Apr 2013 15:52:30 +0000 (17:52 +0200)]
fix #64725, wrong res check
Xinchen Hui [Sat, 27 Apr 2013 15:50:29 +0000 (23:50 +0800)]
Merge branch 'PHP-5.5'
Xinchen Hui [Sat, 27 Apr 2013 15:50:23 +0000 (23:50 +0800)]
Merge branch 'PHP-5.4' into PHP-5.5
Xinchen Hui [Sat, 27 Apr 2013 15:50:02 +0000 (23:50 +0800)]
Merge branch 'PHP-5.3' into PHP-5.4
Xinchen Hui [Sat, 27 Apr 2013 15:49:43 +0000 (23:49 +0800)]
Also fixed bug #64726 in 5.3
Xinchen Hui [Sat, 27 Apr 2013 15:42:34 +0000 (23:42 +0800)]
Merge branch 'PHP-5.5'
Xinchen Hui [Sat, 27 Apr 2013 15:42:18 +0000 (23:42 +0800)]
Update NEWS
Xinchen Hui [Sat, 27 Apr 2013 15:41:51 +0000 (23:41 +0800)]
Merge branch 'PHP-5.4' into PHP-5.5
Xinchen Hui [Sat, 27 Apr 2013 15:41:31 +0000 (23:41 +0800)]
Fixed bug #64726 (Segfault when calling fetch_object on a use_result and DB pointer has closed)
Xinchen Hui [Sat, 27 Apr 2013 15:38:10 +0000 (23:38 +0800)]
Merge branch 'PHP-5.3' into PHP-5.4
Xinchen Hui [Sat, 27 Apr 2013 15:36:56 +0000 (23:36 +0800)]
Fix memory realted to #64726
Anatol Belski [Sat, 27 Apr 2013 12:10:09 +0000 (14:10 +0200)]
Merge branch 'PHP-5.5'
* PHP-5.5:
updated libmagic.patch
Anatol Belski [Sat, 27 Apr 2013 12:09:55 +0000 (14:09 +0200)]
Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
updated libmagic.patch
Anatol Belski [Sat, 27 Apr 2013 12:09:29 +0000 (14:09 +0200)]
updated libmagic.patch
Anatol Belski [Sat, 27 Apr 2013 11:51:31 +0000 (13:51 +0200)]
Merge branch 'PHP-5.5'
* PHP-5.5:
Fixed bug bug #64713 Compilation warnings in finfo
Anatol Belski [Sat, 27 Apr 2013 11:51:12 +0000 (13:51 +0200)]
Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
Fixed bug bug #64713 Compilation warnings in finfo
Anatol Belski [Sat, 27 Apr 2013 11:49:50 +0000 (13:49 +0200)]
Fixed bug bug #64713 Compilation warnings in finfo
David Soria Parra [Fri, 26 Apr 2013 10:41:08 +0000 (12:41 +0200)]
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)
David Soria Parra [Fri, 26 Apr 2013 10:28:58 +0000 (12:28 +0200)]
Fix implicit declaration warning for cdf_timestamp_to_timespec
David Soria Parra [Fri, 26 Apr 2013 09:33:54 +0000 (11:33 +0200)]
Fix #64711 ("value computed but not used" in parse_date.c)
David Soria Parra [Fri, 26 Apr 2013 08:57:55 +0000 (10:57 +0200)]
Fix implicit uint* to int* conversion warning
David Soria Parra [Fri, 26 Apr 2013 08:55:52 +0000 (10:55 +0200)]
Fix conversion from unsigned char to char
David Soria Parra [Fri, 26 Apr 2013 08:18:24 +0000 (10:18 +0200)]
Fix #64712 (Obsolete declarations in php_date.c)
Pierre Joye [Fri, 26 Apr 2013 06:16:02 +0000 (08:16 +0200)]
Merge branch 'PHP-5.5'
* PHP-5.5:
- #64710, check return val
- #64710, kill unused var
#64710, kill unused vars
#64710, kill unused vars
#64710, kill unused vars
#64710, kill unused vars
#64710, kill unused vars
#64710, Implicit declaration
Pierre Joye [Fri, 26 Apr 2013 06:15:33 +0000 (08:15 +0200)]
- #64710, check return val
Pierre Joye [Fri, 26 Apr 2013 06:15:05 +0000 (08:15 +0200)]
- #64710, kill unused var
Pierre Joye [Fri, 26 Apr 2013 06:10:24 +0000 (08:10 +0200)]
#64710, kill unused vars
Pierre Joye [Fri, 26 Apr 2013 06:09:19 +0000 (08:09 +0200)]
#64710, kill unused vars
Pierre Joye [Fri, 26 Apr 2013 06:08:38 +0000 (08:08 +0200)]
#64710, kill unused vars
Pierre Joye [Fri, 26 Apr 2013 06:07:47 +0000 (08:07 +0200)]
#64710, kill unused vars
Pierre Joye [Fri, 26 Apr 2013 06:06:34 +0000 (08:06 +0200)]
#64710, kill unused vars
Pierre Joye [Fri, 26 Apr 2013 05:48:11 +0000 (07:48 +0200)]
#64710, Implicit declaration
Pierre Joye [Fri, 26 Apr 2013 04:40:42 +0000 (06:40 +0200)]
Merge branch 'master' of git.php.net:php-src
Matt Ficken [Thu, 25 Apr 2013 21:55:50 +0000 (14:55 -0700)]
Merge branch 'PHP-5.5'
* PHP-5.5:
Adding sys_get_temp_dir() test specific for Windows.