]> granicus.if.org Git - php/log
php
11 years agoMerge branch 'PHP-5.5'
Xinchen Hui [Sat, 4 May 2013 12:45:07 +0000 (20:45 +0800)]
Merge branch 'PHP-5.5'

11 years agoFix #64749 (warning: cast from pointer to integer of different size)
Xinchen Hui [Sat, 4 May 2013 12:42:50 +0000 (20:42 +0800)]
Fix #64749 (warning: cast from pointer to integer of different size)

11 years agoMerge branch 'PHP-5.5'
Anatol Belski [Sat, 4 May 2013 10:20:36 +0000 (12:20 +0200)]
Merge branch 'PHP-5.5'

* PHP-5.5:
  better fix for bug #64770
  better fix for bug #64770

11 years agoMerge branch 'PHP-5.4' into PHP-5.5
Anatol Belski [Sat, 4 May 2013 10:20:19 +0000 (12:20 +0200)]
Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  better fix for bug #64770
  better fix for bug #64770

11 years agobetter fix for bug #64770
Anatol Belski [Sat, 4 May 2013 10:19:52 +0000 (12:19 +0200)]
better fix for bug #64770

11 years agoMerge branch 'PHP-5.3' into PHP-5.4
Anatol Belski [Sat, 4 May 2013 10:18:06 +0000 (12:18 +0200)]
Merge branch 'PHP-5.3' into PHP-5.4

* PHP-5.3:
  better fix for bug #64770

11 years agobetter fix for bug #64770
Anatol Belski [Sat, 4 May 2013 10:16:38 +0000 (12:16 +0200)]
better fix for bug #64770

11 years agoMerge branch 'PHP-5.5'
Boris Lytochkin [Fri, 3 May 2013 20:06:15 +0000 (00:06 +0400)]
Merge branch 'PHP-5.5'

* PHP-5.5:
  remove OS-specific OIDs from 'WALK multiple on single OID with OID suffix as keys' test part

11 years agoMerge branch 'PHP-5.4' into PHP-5.5
Boris Lytochkin [Fri, 3 May 2013 20:06:06 +0000 (00:06 +0400)]
Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  remove OS-specific OIDs from 'WALK multiple on single OID with OID suffix as keys' test part

11 years agoremove OS-specific OIDs from
Boris Lytochkin [Fri, 3 May 2013 20:04:52 +0000 (00:04 +0400)]
remove OS-specific OIDs from
'WALK multiple on single OID with OID suffix as keys' test part

11 years agoMerge branch 'PHP-5.5'
Boris Lytochkin [Fri, 3 May 2013 19:22:27 +0000 (23:22 +0400)]
Merge branch 'PHP-5.5'

* PHP-5.5:
  re-work walkaround for net-snmp BUGid 2027834, no need to detect it anymore add test for Bug #64159 bump default buffer size for values(32->512): do not reallocate buffers in 99% cases
  cut PHP_VERSION_ID - we know API version now

11 years agoMerge branch 'PHP-5.4' into PHP-5.5
Boris Lytochkin [Fri, 3 May 2013 19:10:11 +0000 (23:10 +0400)]
Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  re-work walkaround for net-snmp BUGid 2027834, no need to detect it anymore add test for Bug #64159 bump default buffer size for values(32->512): do not reallocate buffers in 99% cases

11 years agore-work walkaround for net-snmp BUGid 2027834, no need to detect it anymore
Boris Lytochkin [Fri, 3 May 2013 19:06:34 +0000 (23:06 +0400)]
re-work walkaround for net-snmp BUGid 2027834, no need to detect it anymore
add test for Bug #64159
bump default buffer size for values(32->512): do not reallocate buffers in 99% cases

11 years agoMerge branch 'master' of https://git.php.net/push/php-src
Boris Lytochkin [Fri, 3 May 2013 15:25:33 +0000 (19:25 +0400)]
Merge branch 'master' of https://git.php.net/push/php-src

* 'master' of https://git.php.net/push/php-src:
  updated NEWS
  updated NEWS
  Fixed bug #64770 stream_select() fails with pipes

11 years agoMerge branch 'PHP-5.4' of https://git.php.net/push/php-src into PHP-5.4
Boris Lytochkin [Fri, 3 May 2013 15:24:24 +0000 (19:24 +0400)]
Merge branch 'PHP-5.4' of https://git.php.net/push/php-src into PHP-5.4

* 'PHP-5.4' of https://git.php.net/push/php-src:
  updated NEWS
  Fixed bug #64770 stream_select() fails with pipes

11 years agoMerge branch 'PHP-5.3' of https://git.php.net/push/php-src into PHP-5.3
Boris Lytochkin [Fri, 3 May 2013 15:23:46 +0000 (19:23 +0400)]
Merge branch 'PHP-5.3' of https://git.php.net/push/php-src into PHP-5.3

* 'PHP-5.3' of https://git.php.net/push/php-src:
  Fixed bug #64770 stream_select() fails with pipes

11 years agocut PHP_VERSION_ID - we know API version now
Boris Lytochkin [Fri, 3 May 2013 15:22:21 +0000 (19:22 +0400)]
cut PHP_VERSION_ID - we know API version now

11 years agoMerge branch 'PHP-5.5' of https://git.php.net/push/php-src into PHP-5.5
Boris Lytochkin [Fri, 3 May 2013 15:10:22 +0000 (19:10 +0400)]
Merge branch 'PHP-5.5' of https://git.php.net/push/php-src into PHP-5.5

* 'PHP-5.5' of https://git.php.net/push/php-src:
  updated NEWS
  updated NEWS
  Fixed bug #64770 stream_select() fails with pipes

11 years agoMerge branch 'PHP-5.5'
Anatol Belski [Fri, 3 May 2013 15:06:16 +0000 (17:06 +0200)]
Merge branch 'PHP-5.5'

* PHP-5.5:
  updated NEWS
  updated NEWS
  Fixed bug #64770 stream_select() fails with pipes

11 years agoupdated NEWS
Anatol Belski [Fri, 3 May 2013 15:05:54 +0000 (17:05 +0200)]
updated NEWS

11 years agoMerge branch 'PHP-5.4' into PHP-5.5
Anatol Belski [Fri, 3 May 2013 15:04:53 +0000 (17:04 +0200)]
Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  updated NEWS
  Fixed bug #64770 stream_select() fails with pipes

11 years agoupdated NEWS
Anatol Belski [Fri, 3 May 2013 15:04:26 +0000 (17:04 +0200)]
updated NEWS

11 years agoMerge branch 'PHP-5.3' into PHP-5.4
Anatol Belski [Fri, 3 May 2013 15:03:16 +0000 (17:03 +0200)]
Merge branch 'PHP-5.3' into PHP-5.4

* PHP-5.3:
  Fixed bug #64770 stream_select() fails with pipes

11 years agoFixed bug #64770 stream_select() fails with pipes
Anatol Belski [Fri, 3 May 2013 15:01:33 +0000 (17:01 +0200)]
Fixed bug #64770 stream_select() fails with pipes

returned by proc_open() on Windows x64

11 years agoMerge branch 'PHP-5.5'
Boris Lytochkin [Fri, 3 May 2013 11:47:29 +0000 (15:47 +0400)]
Merge branch 'PHP-5.5'

* PHP-5.5:
  Fixed bug #64159 (Truncated snmpget)
  Fixed bug #64159 (Truncated snmpget)

11 years agoFixed bug #64159 (Truncated snmpget)
Boris Lytochkin [Fri, 3 May 2013 11:46:43 +0000 (15:46 +0400)]
Fixed bug #64159 (Truncated snmpget)

11 years agoMerge branch 'PHP-5.4' into PHP-5.5
Boris Lytochkin [Fri, 3 May 2013 11:39:57 +0000 (15:39 +0400)]
Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  Fixed bug #64159 (Truncated snmpget)

11 years agoFixed bug #64159 (Truncated snmpget)
Boris Lytochkin [Fri, 3 May 2013 11:35:09 +0000 (15:35 +0400)]
Fixed bug #64159 (Truncated snmpget)

11 years agoMerge branch 'PHP-5.5'
Boris Lytochkin [Fri, 3 May 2013 08:26:16 +0000 (12:26 +0400)]
Merge branch 'PHP-5.5'

* PHP-5.5:
  update NEWS
  update NEWS
  Fix bug #64765 (enclose IPv6 address into square brackets)

11 years agoupdate NEWS
Boris Lytochkin [Fri, 3 May 2013 08:25:49 +0000 (12:25 +0400)]
update NEWS

11 years agoMerge branch 'PHP-5.4' into PHP-5.5
Boris Lytochkin [Fri, 3 May 2013 08:19:10 +0000 (12:19 +0400)]
Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  update NEWS
  Fix bug #64765 (enclose IPv6 address into square brackets)

11 years agoupdate NEWS
Boris Lytochkin [Fri, 3 May 2013 08:15:35 +0000 (12:15 +0400)]
update NEWS

11 years agoFix bug #64765 (enclose IPv6 address into square brackets)
Boris Lytochkin [Fri, 3 May 2013 08:13:50 +0000 (12:13 +0400)]
Fix bug #64765 (enclose IPv6 address into square brackets)

11 years agoMerge branch 'master' of https://git.php.net/push/php-src
Boris Lytochkin [Fri, 3 May 2013 07:23:20 +0000 (11:23 +0400)]
Merge branch 'master' of https://git.php.net/push/php-src

* 'master' of https://git.php.net/push/php-src: (346 commits)
  NEWS
  NEWS
  NEWS
  From code coverity scan, syscall return value must be check.
  fix more resource leaks
  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)
  fixed size array cannot be null
  use limit_extensions as we use security_limit_extensions later (free)
  unused variable
  fix possible null deref (detected by code coverity scan)
  updated lib versions
  Oops
  Harden loopback tests
  Fix race condition when ext/hash/tests run in parallel
  Remove trailing space in NEWS
  NEWS for 514afd67
  Fix bug #64729: compilation failure on x32
  don't include smart_str.h in a too global header, fixes #64718
  NEWS
  When Apache use RewriteRule to redirect, via mod_proxy_fgi, to php-fpm the SCRIPT_FILENAME may contains the QUERY_STRING.
  ...

11 years agoMerge branch 'PHP-5.5' of https://git.php.net/push/php-src into PHP-5.5
Boris Lytochkin [Fri, 3 May 2013 07:22:42 +0000 (11:22 +0400)]
Merge branch 'PHP-5.5' of https://git.php.net/push/php-src into PHP-5.5

* 'PHP-5.5' of https://git.php.net/push/php-src: (310 commits)
  NEWS
  NEWS
  NEWS
  From code coverity scan, syscall return value must be check.
  fix more resource leaks
  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)
  fixed size array cannot be null
  use limit_extensions as we use security_limit_extensions later (free)
  unused variable
  fix possible null deref (detected by code coverity scan)
  updated lib versions
  Remove trailing space in NEWS
  NEWS for 514afd67
  Fix bug #64729: compilation failure on x32
  don't include smart_str.h in a too global header, fixes #64718
  NEWS
  When Apache use RewriteRule to redirect, via mod_proxy_fgi, to php-fpm the SCRIPT_FILENAME may contains the QUERY_STRING.
  Added SoapClient constructor option 'ssl_method' to specify ssl method
  fix #64738, fix implicit type declaration
  Avoid possible conditional jump depended on uninitialised value
  ...

11 years agoMerge branch 'PHP-5.4' of https://git.php.net/push/php-src into PHP-5.4
Boris Lytochkin [Fri, 3 May 2013 07:22:16 +0000 (11:22 +0400)]
Merge branch 'PHP-5.4' of https://git.php.net/push/php-src into PHP-5.4

* 'PHP-5.4' of https://git.php.net/push/php-src: (109 commits)
  NEWS
  NEWS
  From code coverity scan, syscall return value must be check.
  fix more resource leaks
  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)
  fixed size array cannot be null
  use limit_extensions as we use security_limit_extensions later (free)
  unused variable
  fix possible null deref (detected by code coverity scan)
  Remove trailing space in NEWS
  NEWS for 514afd67
  Fix bug #64729: compilation failure on x32
  When Apache use RewriteRule to redirect, via mod_proxy_fgi, to php-fpm the SCRIPT_FILENAME may contains the QUERY_STRING.
  Revert "Add CURL_WRAPPERS_ENABLE constant"
  Also fixed bug #64726 in 5.3
  Fixed bug #64726 (Segfault when calling fetch_object on a use_result and DB pointer has closed)
  Fix memory realted to #64726
  updated libmagic.patch
  Fixed bug bug #64713 Compilation warnings in finfo
  Fix Test Bug #64714
  ...

11 years agoMerge branch 'PHP-5.3' of https://git.php.net/push/php-src into PHP-5.3
Boris Lytochkin [Fri, 3 May 2013 07:21:48 +0000 (11:21 +0400)]
Merge branch 'PHP-5.3' of https://git.php.net/push/php-src into PHP-5.3

* 'PHP-5.3' of https://git.php.net/push/php-src: (39 commits)
  NEWS
  From code coverity scan, syscall return value must be check.
  fix more resource leaks
  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)
  fixed size array cannot be null
  use limit_extensions as we use security_limit_extensions later (free)
  unused variable
  fix possible null deref (detected by code coverity scan)
  Also fixed bug #64726 in 5.3
  Fix memory realted to #64726
  Fix Test Bug #64714
  PHP 5.3.26 this will be
  Fix NEWS
  Fix bug #64458 (dns_get_record result with string of length -1)
  Fixed incorrect check. SEND_REF may be executed before DO_FCALL when EX(function_state).function is not yet set to the calling function.
  Fixed stream_socket_pair() on Windows x64 and
  - Updated to version 2013.3 (2013c)
  lower the limit, should fit in a byte
  updated lib versions
  allow lcov 1.10
  ...

11 years agoMerge branch 'PHP-5.5'
Remi Collet [Fri, 3 May 2013 06:31:45 +0000 (08:31 +0200)]
Merge branch 'PHP-5.5'

* PHP-5.5:
  NEWS
  NEWS
  NEWS

11 years agoNEWS
Remi Collet [Fri, 3 May 2013 06:31:22 +0000 (08:31 +0200)]
NEWS

11 years agoMerge branch 'PHP-5.4' into PHP-5.5
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

11 years agoNEWS
Remi Collet [Fri, 3 May 2013 06:30:47 +0000 (08:30 +0200)]
NEWS

11 years agoMerge branch 'PHP-5.3' into PHP-5.4
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

11 years agoNEWS
Remi Collet [Fri, 3 May 2013 06:29:56 +0000 (08:29 +0200)]
NEWS

11 years agoMerge branch 'PHP-5.5'
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.

11 years agoMerge branch 'PHP-5.4' into PHP-5.5
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.

11 years agoMerge branch 'PHP-5.3' into PHP-5.4
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.

11 years agoFrom 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.

11 years agoMerge branch 'PHP-5.5'
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

11 years agoMerge branch 'PHP-5.4' into PHP-5.5
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

11 years agoMerge branch 'PHP-5.3' into PHP-5.4
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

11 years agofix more resource leaks
Remi Collet [Thu, 2 May 2013 11:47:24 +0000 (13:47 +0200)]
fix more resource leaks

11 years agoMerge branch 'PHP-5.5'
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)

11 years agoMerge branch 'PHP-5.4' into PHP-5.5
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)

11 years agoMerge branch 'PHP-5.3' into PHP-5.4
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)

11 years agoFrom code coverity scan
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)

11 years agoMerge branch 'PHP-5.5'
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

11 years agoMerge branch 'PHP-5.4' into PHP-5.5
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

11 years agoMerge branch 'PHP-5.3' into PHP-5.4
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

11 years agofixed size array cannot be null
Remi Collet [Thu, 2 May 2013 08:32:45 +0000 (10:32 +0200)]
fixed size array cannot be null

11 years agoMerge branch 'PHP-5.5'
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

11 years agoMerge branch 'PHP-5.4' into PHP-5.5
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

11 years agoMerge branch 'PHP-5.3' into PHP-5.4
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

11 years agouse limit_extensions as we use security_limit_extensions later (free)
Remi Collet [Thu, 2 May 2013 08:15:12 +0000 (10:15 +0200)]
use limit_extensions as we use security_limit_extensions later (free)

11 years agounused variable
Remi Collet [Thu, 2 May 2013 08:15:05 +0000 (10:15 +0200)]
unused variable

11 years agoMerge branch 'PHP-5.5'
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

11 years agoMerge branch 'PHP-5.4' into PHP-5.5
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

11 years agoMerge branch 'PHP-5.3' into PHP-5.4
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)

11 years agofix 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)

11 years agoMerge branch 'PHP-5.5'
Anatol Belski [Wed, 1 May 2013 19:38:17 +0000 (21:38 +0200)]
Merge branch 'PHP-5.5'

* PHP-5.5:
  updated lib versions

11 years agoupdated lib versions
Anatol Belski [Wed, 1 May 2013 19:37:28 +0000 (21:37 +0200)]
updated lib versions

11 years agoOops
Sara Golemon [Wed, 1 May 2013 02:43:52 +0000 (19:43 -0700)]
Oops

11 years agoHarden loopback tests
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.

11 years agoFix race condition when ext/hash/tests run in parallel
Sara Golemon [Tue, 30 Apr 2013 23:28:37 +0000 (16:28 -0700)]
Fix race condition when ext/hash/tests run in parallel

11 years agoRemove trailing space in NEWS
Gustavo Lopes [Tue, 30 Apr 2013 17:42:31 +0000 (19:42 +0200)]
Remove trailing space in NEWS

11 years agoNEWS for 514afd67
Gustavo Lopes [Tue, 30 Apr 2013 17:41:27 +0000 (19:41 +0200)]
NEWS for 514afd67

11 years agoMerge branch 'PHP-5.5'
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

11 years agoMerge branch 'PHP-5.4' into PHP-5.5
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

11 years agoFix bug #64729: compilation failure on x32
Gustavo Lopes [Tue, 30 Apr 2013 17:00:31 +0000 (19:00 +0200)]
Fix bug #64729: compilation failure on x32

11 years agoMerge branch 'PHP-5.5'
Johannes Schlüter [Tue, 30 Apr 2013 12:28:18 +0000 (14:28 +0200)]
Merge branch 'PHP-5.5'

11 years agodon't include smart_str.h in a too global header, fixes #64718
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

11 years agoMerge branch 'PHP-5.5'
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.

11 years agoNEWS
Remi Collet [Tue, 30 Apr 2013 07:03:18 +0000 (09:03 +0200)]
NEWS

11 years agoMerge branch 'PHP-5.4' into PHP-5.5
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.

11 years agoWhen Apache use RewriteRule to redirect, via mod_proxy_fgi, to php-fpm
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'

11 years agoMerge branch 'PHP-5.5' of git.php.net:php-src into PHP-5.5
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

11 years agoMerge branch 'master' of git.php.net:php-src
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

11 years agoMerge branch 'PHP-5.5'
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

11 years agoAdded 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

11 years agoMerge branch 'PHP-5.5'
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

11 years agoMerge branch 'PHP-5.5' of git.php.net:php-src into PHP-5.5
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

11 years ago fix #64738, fix implicit type declaration
Pierre Joye [Tue, 30 Apr 2013 05:52:40 +0000 (07:52 +0200)]
 fix #64738, fix implicit type declaration

11 years agoMerge branch 'PHP-5.5'
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

11 years agoAvoid 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

11 years agoMerge branch 'PHP-5.5'
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)

11 years agoFixed compilation warnings (issue #92)
Dmitry Stogov [Mon, 29 Apr 2013 06:32:08 +0000 (10:32 +0400)]
Fixed compilation warnings (issue #92)

11 years agoMerge branch 'PHP-5.5'
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"

11 years agoMerge branch 'PHP-5.4' into PHP-5.5
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

11 years agoRevert "Add CURL_WRAPPERS_ENABLE constant"
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.

11 years agoMerge branch 'PHP-5.5'
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"

11 years agoRevert "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.