]> granicus.if.org Git - php/log
php
10 years agoMerge branch 'PHP-5.5' into PHP-5.6
Remi Collet [Mon, 17 Nov 2014 05:58:28 +0000 (06:58 +0100)]
Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
  comment about ipv4-mapped in fpm conf
  Improve fix bug #68421 access.format='%R' doesn't log ipv6 address

10 years agocomment about ipv4-mapped in fpm conf
Remi Collet [Mon, 17 Nov 2014 05:57:59 +0000 (06:57 +0100)]
comment about ipv4-mapped in fpm conf

10 years agoImprove fix bug #68421 access.format='%R' doesn't log ipv6 address
Remi Collet [Mon, 17 Nov 2014 05:53:38 +0000 (06:53 +0100)]
Improve fix bug #68421 access.format='%R' doesn't log ipv6 address

Log IPv4-Mapped-Ipv6 address as IPv4 (not as IPv6)

10 years agoMerge branch 'PHP-5.5' into PHP-5.6
Remi Collet [Sun, 16 Nov 2014 17:00:24 +0000 (18:00 +0100)]
Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
  improve comments about FPM listen option

10 years agoimprove comments about FPM listen option
Remi Collet [Sun, 16 Nov 2014 16:59:36 +0000 (17:59 +0100)]
improve comments about FPM listen option

10 years agoNEWS
Remi Collet [Sat, 15 Nov 2014 07:14:43 +0000 (08:14 +0100)]
NEWS

10 years agoMerge branch 'PHP-5.5' into PHP-5.6
Remi Collet [Sat, 15 Nov 2014 07:14:09 +0000 (08:14 +0100)]
Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
  NEWS

10 years agoNEWS
Remi Collet [Sat, 15 Nov 2014 07:13:56 +0000 (08:13 +0100)]
NEWS

10 years agoMerge branch 'PHP-5.5' into PHP-5.6
Remi Collet [Sat, 15 Nov 2014 07:11:32 +0000 (08:11 +0100)]
Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
  Fixed Bug #68420 listen=9000 listens to ipv6 localhost instead of all addresses

10 years agoFixed Bug #68420 listen=9000 listens to ipv6 localhost instead of all addresses
Remi Collet [Sat, 15 Nov 2014 07:08:23 +0000 (08:08 +0100)]
Fixed Bug #68420 listen=9000 listens to ipv6 localhost instead of all addresses

Restore default behavior when no address configured:
Listen on all IPv4 addresses.

At some time we could consider to switch to all IPv6
but this will be a BC break.

10 years agoNEWS
Remi Collet [Fri, 14 Nov 2014 18:14:42 +0000 (19:14 +0100)]
NEWS

10 years agoMerge branch 'PHP-5.5' into PHP-5.6
Remi Collet [Fri, 14 Nov 2014 18:14:02 +0000 (19:14 +0100)]
Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
  NEWS

10 years agoNEWS
Remi Collet [Fri, 14 Nov 2014 18:13:53 +0000 (19:13 +0100)]
NEWS

10 years agoMerge branch 'PHP-5.5' into PHP-5.6
Remi Collet [Fri, 14 Nov 2014 18:10:19 +0000 (19:10 +0100)]
Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
  Fix bug #68421 access.format='%R' doesn't log ipv6 address

10 years agoFix bug #68421 access.format='%R' doesn't log ipv6 address
Remi Collet [Fri, 14 Nov 2014 18:09:50 +0000 (19:09 +0100)]
Fix bug #68421 access.format='%R' doesn't log ipv6 address

10 years agoMerge branch 'PHP-5.5' into PHP-5.6
Remi Collet [Fri, 14 Nov 2014 16:32:46 +0000 (17:32 +0100)]
Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
  Fix bug #68423i PHP-FPM will no longer load all pools

10 years agoFix bug #68423i PHP-FPM will no longer load all pools
Remi Collet [Fri, 14 Nov 2014 16:29:31 +0000 (17:29 +0100)]
Fix bug #68423i PHP-FPM will no longer load all pools

The hash need to be unique per IP + Port
Previous version have (IPv4 only)
   sprintf(key, "%u.%u.%u.%u:%u", IPQUAD(&sa_in->sin_addr), (unsigned int) ntohs(sa_in->sin_port));

10 years agoNEWS for 1b156207446e0c5ec8a9476ad0966b5daa82f516
Remi Collet [Fri, 14 Nov 2014 09:58:27 +0000 (10:58 +0100)]
NEWS for 1b156207446e0c5ec8a9476ad0966b5daa82f516

10 years agoFix build with gmp < 4.2
Remi Collet [Thu, 13 Nov 2014 12:08:00 +0000 (13:08 +0100)]
Fix build with gmp < 4.2

See 3d6d863ccbd10d212352462b587ae1573af4f1d1
and acd7fcf55f81955e4837c750a5e45f83d3c55ba2

10 years agoMerge branch 'PHP-5.5' into PHP-5.6
Matteo Beccati [Wed, 12 Nov 2014 15:54:03 +0000 (16:54 +0100)]
Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
  Fixed NEWS

10 years agoFixed NEWS
Matteo Beccati [Wed, 12 Nov 2014 15:45:36 +0000 (16:45 +0100)]
Fixed NEWS

Some entries had been mistakenly removed in ad468d20b130c720020139b8d5f6601f6f3033ab

10 years agoupdate NEWS
Ferenc Kovacs [Wed, 12 Nov 2014 13:51:18 +0000 (14:51 +0100)]
update NEWS

10 years agoupdate NEWS
Ferenc Kovacs [Wed, 12 Nov 2014 13:45:39 +0000 (14:45 +0100)]
update NEWS

10 years agoupdate NEWS
Ferenc Kovacs [Wed, 12 Nov 2014 13:28:45 +0000 (14:28 +0100)]
update NEWS

10 years agoMerge branch 'PHP-5.5' into PHP-5.6
Matteo Beccati [Wed, 12 Nov 2014 10:21:40 +0000 (11:21 +0100)]
Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
  Fixed bug #53829 Compiling PHP with large file support will replace function gzopen by gzopen64

10 years agoFixed bug #53829 Compiling PHP with large file support will replace function gzopen...
Matteo Beccati [Wed, 12 Nov 2014 10:21:11 +0000 (11:21 +0100)]
Fixed bug #53829 Compiling PHP with large file support will replace function gzopen by gzopen64

10 years agoFixed wrong NEWS
Julien Pauli [Wed, 12 Nov 2014 09:59:54 +0000 (10:59 +0100)]
Fixed wrong NEWS

10 years agoRemove unneeded md5 hashing from PHP-5.6 branch.
Yasuo Ohgaki [Wed, 12 Nov 2014 04:40:27 +0000 (13:40 +0900)]
Remove unneeded md5 hashing from PHP-5.6 branch.
It's removed from master already by my previous commit.

10 years agofix loop - size_t is unsigned so can not be negative
Stanislav Malyshev [Wed, 5 Nov 2014 05:58:44 +0000 (21:58 -0800)]
fix loop - size_t is unsigned so can not be negative

10 years agofix copypaste error
Stanislav Malyshev [Wed, 5 Nov 2014 05:48:44 +0000 (21:48 -0800)]
fix copypaste error

10 years agoMerge branch 'PHp-5.4' into PHP-5.5
Stanislav Malyshev [Wed, 12 Nov 2014 00:32:38 +0000 (16:32 -0800)]
Merge branch 'PHp-5.4' into PHP-5.5

* PHp-5.4:
  5.4.36-dev
  Fixed bug #66584 Segmentation fault on statement deallocation

Conflicts:
configure.in
main/php_version.h

10 years ago5.4.36-dev
Stanislav Malyshev [Wed, 12 Nov 2014 00:31:38 +0000 (16:31 -0800)]
5.4.36-dev

10 years agoFixed bug #66584 Segmentation fault on statement deallocation
Matteo Beccati [Sat, 1 Nov 2014 18:11:43 +0000 (19:11 +0100)]
Fixed bug #66584 Segmentation fault on statement deallocation

10 years agoupdate NEWS
Ferenc Kovacs [Tue, 11 Nov 2014 23:25:16 +0000 (00:25 +0100)]
update NEWS

10 years agoupdate NEWS
Ferenc Kovacs [Tue, 11 Nov 2014 23:21:04 +0000 (00:21 +0100)]
update NEWS

10 years agoMerge branch 'PHP-5.5' into PHP-5.6
Ferenc Kovacs [Tue, 11 Nov 2014 23:20:54 +0000 (00:20 +0100)]
Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
  update NEWS
  update NEWS

10 years agoupdate NEWS
Ferenc Kovacs [Tue, 11 Nov 2014 23:19:51 +0000 (00:19 +0100)]
update NEWS

10 years agoMerge branch 'PHP-5.4' into PHP-5.5
Ferenc Kovacs [Tue, 11 Nov 2014 23:18:55 +0000 (00:18 +0100)]
Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  update NEWS

10 years agoupdate NEWS
Ferenc Kovacs [Tue, 11 Nov 2014 23:18:13 +0000 (00:18 +0100)]
update NEWS

10 years agoMerge branch 'PHP-5.5' into PHP-5.6
Derick Rethans [Tue, 11 Nov 2014 17:01:26 +0000 (14:01 -0300)]
Merge branch 'PHP-5.5' into PHP-5.6

10 years ago- Updated to version 2014.10 (2014j)
Derick Rethans [Tue, 11 Nov 2014 17:01:24 +0000 (14:01 -0300)]
- Updated to version 2014.10 (2014j)

10 years agoUpdate NEWS
Xinchen Hui [Tue, 11 Nov 2014 08:24:59 +0000 (16:24 +0800)]
Update NEWS

10 years agoMerge branch 'PHP-5.5' into PHP-5.6
Xinchen Hui [Tue, 11 Nov 2014 08:23:18 +0000 (16:23 +0800)]
Merge branch 'PHP-5.5' into PHP-5.6

10 years agoFixed bug #68361 (Segmentation fault on SoapClient::__getTypes)
Xinchen Hui [Tue, 11 Nov 2014 08:22:49 +0000 (16:22 +0800)]
Fixed bug #68361 (Segmentation fault on SoapClient::__getTypes)

10 years agoFix skipif test here
Rasmus Lerdorf [Mon, 10 Nov 2014 18:41:18 +0000 (10:41 -0800)]
Fix skipif test here

10 years agoMerge branch 'PHP-5.5' of git.php.net:php-src into PHP-5.5
Rasmus Lerdorf [Mon, 10 Nov 2014 18:42:30 +0000 (10:42 -0800)]
Merge branch 'PHP-5.5' of git.php.net:php-src into PHP-5.5

* 'PHP-5.5' of git.php.net:php-src:
  Fixed bug #68370 ("unset($this)" can make the program crash)
  Fixed NEWS for 5.5
  Fix opcache.revalidate_freq per-request behavior
  Partial fix for bug #68365 (zend_mm_heap corrupted after memory overflow in zend_hash_copy)

10 years agoFix skipif test here
Rasmus Lerdorf [Mon, 10 Nov 2014 18:41:18 +0000 (10:41 -0800)]
Fix skipif test here

10 years agoMerge branch 'PHP-5.6' of git.php.net:php-src into PHP-5.6
Rasmus Lerdorf [Mon, 10 Nov 2014 18:36:46 +0000 (10:36 -0800)]
Merge branch 'PHP-5.6' of git.php.net:php-src into PHP-5.6

* 'PHP-5.6' of git.php.net:php-src:
  Update NEWS
  Fixed bug #68370 ("unset($this)" can make the program crash)
  Fix opcache.revalidate_freq per-request behavior
  Partial fix for bug #68365 (zend_mm_heap corrupted after memory overflow in zend_hash_copy)
  Fixed bug #68351 (PDO::PARAM_BOOL and ATTR_EMULATE_PREPARES misbehaving)

10 years agoMerge branch 'PHP-5.5' of https://git.php.net/repository/php-src into PHP-5.5
Xinchen Hui [Mon, 10 Nov 2014 05:52:07 +0000 (13:52 +0800)]
Merge branch 'PHP-5.5' of https://git.php.net/repository/php-src into PHP-5.5

10 years agoUpdate NEWS
Xinchen Hui [Mon, 10 Nov 2014 05:47:50 +0000 (13:47 +0800)]
Update NEWS

10 years agoMerge branch 'PHP-5.5' into PHP-5.6
Xinchen Hui [Mon, 10 Nov 2014 05:47:14 +0000 (13:47 +0800)]
Merge branch 'PHP-5.5' into PHP-5.6

10 years agoFixed bug #68370 ("unset($this)" can make the program crash)
Xinchen Hui [Mon, 10 Nov 2014 05:46:47 +0000 (13:46 +0800)]
Fixed bug #68370 ("unset($this)" can make the program crash)

10 years agoFixed NEWS for 5.5
Julien Pauli [Fri, 7 Nov 2014 11:59:48 +0000 (12:59 +0100)]
Fixed NEWS for 5.5

10 years agoMerge branch 'PHP-5.5' into PHP-5.6
Dmitry Stogov [Fri, 7 Nov 2014 07:17:48 +0000 (10:17 +0300)]
Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
  Fix opcache.revalidate_freq per-request behavior

10 years agoFix opcache.revalidate_freq per-request behavior
Dmitry Stogov [Fri, 7 Nov 2014 07:16:25 +0000 (10:16 +0300)]
Fix opcache.revalidate_freq per-request behavior

10 years agoMerge branch 'PHP-5.5' into PHP-5.6
Dmitry Stogov [Fri, 7 Nov 2014 06:54:05 +0000 (09:54 +0300)]
Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
  Partial fix for bug #68365 (zend_mm_heap corrupted after memory overflow in zend_hash_copy)
  Fixed bug #68351 (PDO::PARAM_BOOL and ATTR_EMULATE_PREPARES misbehaving)

10 years agoMerge branch 'PHP-5.4' into PHP-5.5
Dmitry Stogov [Fri, 7 Nov 2014 06:48:26 +0000 (09:48 +0300)]
Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  Partial fix for bug #68365 (zend_mm_heap corrupted after memory overflow in zend_hash_copy)

10 years agoPartial fix for bug #68365 (zend_mm_heap corrupted after memory overflow in zend_hash...
Dmitry Stogov [Fri, 7 Nov 2014 06:46:49 +0000 (09:46 +0300)]
Partial fix for bug #68365 (zend_mm_heap corrupted after memory overflow in zend_hash_copy)

10 years agoMerge branch 'PHP-5.6' of git.php.net:php-src into PHP-5.6
Rasmus Lerdorf [Thu, 6 Nov 2014 18:19:45 +0000 (10:19 -0800)]
Merge branch 'PHP-5.6' of git.php.net:php-src into PHP-5.6

* 'PHP-5.6' of git.php.net:php-src: (142 commits)
  Fixed bug #68351 (PDO::PARAM_BOOL and ATTR_EMULATE_PREPARES misbehaving)
  Update NEWS
  Fixed bug #68331 - This was partial patch for https://wiki.php.net/rfc/session-lock-ini
  fix dir separator in test
  arg1-3 are not variable names to use; removed useless buffer variable
  update NEWS
  Fix bug #63595 GMP memory management conflicts with other libraries using GMP
  Initialize the offset table - PCRE may sometimes miss offsets
  set default response code to 200
  set default response code to 200
  set default response code to 200
  Fixed bug #66584 Segmentation fault on statement deallocation
  Add credit
  fix ZTS build
  Added PGSQL_TEST_CONNSTR env var support for ext/pgsql tests
  Fixed bug #67462 PDO_PGSQL::beginTransaction() wrongly throws exception when not in transaction
  Fixed Bug #68104 (Segfault while pre-evaluating a disabled function)
  Temporarily disable wait/xml protocol...
  don't try to send in the test results until we restored qa.php.net
  Fix uninitialized value...
  ...

10 years agoMerge branch 'PHP-5.5' of git.php.net:php-src into PHP-5.5
Rasmus Lerdorf [Thu, 6 Nov 2014 17:49:11 +0000 (09:49 -0800)]
Merge branch 'PHP-5.5' of git.php.net:php-src into PHP-5.5

* 'PHP-5.5' of git.php.net:php-src:
  Fixed bug #68351 (PDO::PARAM_BOOL and ATTR_EMULATE_PREPARES misbehaving)

10 years agoFixed bug #68351 (PDO::PARAM_BOOL and ATTR_EMULATE_PREPARES misbehaving)
Matteo Beccati [Thu, 6 Nov 2014 14:46:49 +0000 (15:46 +0100)]
Fixed bug #68351 (PDO::PARAM_BOOL and ATTR_EMULATE_PREPARES misbehaving)

10 years agoFixed bug #68351 (PDO::PARAM_BOOL and ATTR_EMULATE_PREPARES misbehaving)
Matteo Beccati [Thu, 6 Nov 2014 14:46:49 +0000 (15:46 +0100)]
Fixed bug #68351 (PDO::PARAM_BOOL and ATTR_EMULATE_PREPARES misbehaving)

10 years agoUpdate NEWS
Yasuo Ohgaki [Thu, 6 Nov 2014 04:54:16 +0000 (13:54 +0900)]
Update NEWS

10 years agoFixed bug #68331 - This was partial patch for https://wiki.php.net/rfc/session-lock-ini
Yasuo Ohgaki [Thu, 6 Nov 2014 04:06:29 +0000 (13:06 +0900)]
Fixed bug #68331 - This was partial patch for https://wiki.php.net/rfc/session-lock-ini

10 years agoMerge branch 'PHP-5.5' of git.php.net:php-src into PHP-5.5
Rasmus Lerdorf [Wed, 5 Nov 2014 20:39:42 +0000 (12:39 -0800)]
Merge branch 'PHP-5.5' of git.php.net:php-src into PHP-5.5

* 'PHP-5.5' of git.php.net:php-src: (29 commits)
  fix dir separator in test
  update NEWS
  Fix bug #63595 GMP memory management conflicts with other libraries using GMP
  Initialize the offset table - PCRE may sometimes miss offsets
  set default response code to 200
  set default response code to 200
  Fixed bug #66584 Segmentation fault on statement deallocation
  fix ZTS build
  Added PGSQL_TEST_CONNSTR env var support for ext/pgsql tests
  Fixed bug #67462 PDO_PGSQL::beginTransaction() wrongly throws exception when not in transaction
  don't try to send in the test results until we restored qa.php.net
  Don't treat warnings as failures in the junit output
  Fixed test to work with recent libcurl versions
  PHP 5.5.20 now
  Ensure we have enough input data before parsing date
  Fix bug #68095 - invalid read in php_getopt()
  NEWS
  Fix bug #63595 GMP memory management conflicts with other libraries using GMP
  - Updated to version 2014.9 (2014i)
  updated libmagic.patch in 5.5
  ...

10 years agoMerge branch 'PHP-5.5' into PHP-5.6
Anatol Belski [Wed, 5 Nov 2014 14:43:13 +0000 (15:43 +0100)]
Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
  fix dir separator in test

10 years agofix dir separator in test
Anatol Belski [Wed, 5 Nov 2014 14:42:45 +0000 (15:42 +0100)]
fix dir separator in test

10 years agoarg1-3 are not variable names to use; removed useless buffer variable
Bob Weinand [Tue, 4 Nov 2014 15:58:32 +0000 (16:58 +0100)]
arg1-3 are not variable names to use; removed useless buffer variable

10 years agoMerge branch 'PHP-5.5' into PHP-5.6
Stanislav Malyshev [Mon, 3 Nov 2014 19:43:51 +0000 (11:43 -0800)]
Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
  update NEWS
  Fix bug #63595 GMP memory management conflicts with other libraries using GMP

10 years agoMerge branch 'PHP-5.4' into PHP-5.5
Stanislav Malyshev [Mon, 3 Nov 2014 19:43:40 +0000 (11:43 -0800)]
Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  update NEWS
  Fix bug #63595 GMP memory management conflicts with other libraries using GMP

10 years agoupdate NEWS
Stanislav Malyshev [Mon, 3 Nov 2014 19:43:15 +0000 (11:43 -0800)]
update NEWS

10 years agoFix bug #63595 GMP memory management conflicts with other libraries using GMP
Remi Collet [Mon, 27 Oct 2014 06:45:34 +0000 (07:45 +0100)]
Fix bug #63595 GMP memory management conflicts with other libraries using GMP

Drop use of php memory allocators as this raise various conflicts
with other extensions and libraries which use libgmp.

No other solution found.
We cannot for ensure correct use of allocator with shared lib.

Some memory can allocated before php init
Some memory can be freed after php shutdown

Known broken run cases
- php + curl + gnutls + gmp
- mod_gnutls + mod_php + gnutls + gmp
- php + freetds + gnutls + gmp
- php + odbc + freetds + gnutls + gmp
- php + php-mapi (zarafa) + gnutls + gmp

10 years agoMerge branch 'PHP-5.5' into PHP-5.6
Stanislav Malyshev [Mon, 3 Nov 2014 19:38:29 +0000 (11:38 -0800)]
Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
  Initialize the offset table - PCRE may sometimes miss offsets
  set default response code to 200
  set default response code to 200
  fix NEWS & version
  NEWS
  Fix bug #68283: fileinfo: out-of-bounds read in elf note headers
  Fix bug #68113 (Heap corruption in exif_thumbnail())
  Fix bug #68089 - do not accept options with embedded \0
  Fixed bug #68044: Integer overflow in unserialize() (32-bits only)
  Fix bug #68027 - fix date parsing in XMLRPC lib

10 years agoMerge branch 'PHP-5.4' into PHP-5.5
Stanislav Malyshev [Mon, 3 Nov 2014 19:37:43 +0000 (11:37 -0800)]
Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  Initialize the offset table - PCRE may sometimes miss offsets
  set default response code to 200
  fix NEWS & version
  NEWS
  Fix bug #68283: fileinfo: out-of-bounds read in elf note headers
  Fix bug #68113 (Heap corruption in exif_thumbnail())
  Fix bug #68089 - do not accept options with embedded \0
  Fixed bug #68044: Integer overflow in unserialize() (32-bits only)
  Fix bug #68027 - fix date parsing in XMLRPC lib

Conflicts:
configure.in
ext/curl/interface.c
main/php_version.h

10 years agoInitialize the offset table - PCRE may sometimes miss offsets
Stanislav Malyshev [Mon, 3 Nov 2014 00:04:00 +0000 (16:04 -0800)]
Initialize the offset table - PCRE may sometimes miss offsets

10 years agoMerge branch 'PHP-5.6' of git.php.net:php-src into PHP-5.6
George Wang [Mon, 3 Nov 2014 16:44:13 +0000 (11:44 -0500)]
Merge branch 'PHP-5.6' of git.php.net:php-src into PHP-5.6

10 years agoMerge branch 'PHP-5.5' of git.php.net:php-src into PHP-5.5
George Wang [Mon, 3 Nov 2014 16:43:43 +0000 (11:43 -0500)]
Merge branch 'PHP-5.5' of git.php.net:php-src into PHP-5.5

10 years agoset default response code to 200
George Wang [Mon, 3 Nov 2014 16:42:01 +0000 (11:42 -0500)]
set default response code to 200

10 years agoset default response code to 200
George Wang [Mon, 3 Nov 2014 16:42:01 +0000 (11:42 -0500)]
set default response code to 200

10 years agoset default response code to 200
George Wang [Mon, 3 Nov 2014 16:42:01 +0000 (11:42 -0500)]
set default response code to 200

10 years agoMerge branch 'PHP-5.5' into PHP-5.6
Matteo Beccati [Sat, 1 Nov 2014 18:20:43 +0000 (19:20 +0100)]
Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
  Fixed bug #66584 Segmentation fault on statement deallocation

10 years agoFixed bug #66584 Segmentation fault on statement deallocation
Matteo Beccati [Sat, 1 Nov 2014 18:11:43 +0000 (19:11 +0100)]
Fixed bug #66584 Segmentation fault on statement deallocation

10 years agoAdd credit
Xinchen Hui [Sat, 1 Nov 2014 14:29:55 +0000 (22:29 +0800)]
Add credit

10 years agoMerge branch 'PHP-5.5' into PHP-5.6
Anatol Belski [Fri, 31 Oct 2014 18:53:39 +0000 (19:53 +0100)]
Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
  fix ZTS build

10 years agofix ZTS build
Anatol Belski [Fri, 31 Oct 2014 18:53:16 +0000 (19:53 +0100)]
fix ZTS build

10 years agoMerge branch 'PHP-5.5' into PHP-5.6
Matteo Beccati [Fri, 31 Oct 2014 17:57:59 +0000 (18:57 +0100)]
Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
  Added PGSQL_TEST_CONNSTR env var support for ext/pgsql tests
  Fixed bug #67462 PDO_PGSQL::beginTransaction() wrongly throws exception when not in transaction

10 years agoAdded PGSQL_TEST_CONNSTR env var support for ext/pgsql tests
Matteo Beccati [Fri, 31 Oct 2014 17:54:16 +0000 (18:54 +0100)]
Added PGSQL_TEST_CONNSTR env var support for ext/pgsql tests

10 years agoFixed bug #67462 PDO_PGSQL::beginTransaction() wrongly throws exception when not...
Matteo Beccati [Fri, 31 Oct 2014 17:10:01 +0000 (18:10 +0100)]
Fixed bug #67462 PDO_PGSQL::beginTransaction() wrongly throws exception when not in transaction

10 years agoMerge branch 'PHP-5.6' of https://git.php.net/repository/php-src into PHP-5.6
Xinchen Hui [Fri, 31 Oct 2014 09:35:19 +0000 (17:35 +0800)]
Merge branch 'PHP-5.6' of https://git.php.net/repository/php-src into PHP-5.6

10 years agoFixed Bug #68104 (Segfault while pre-evaluating a disabled function)
Xinchen Hui [Fri, 31 Oct 2014 09:32:23 +0000 (17:32 +0800)]
Fixed Bug #68104 (Segfault while pre-evaluating a disabled function)

10 years agoTemporarily disable wait/xml protocol...
Bob Weinand [Thu, 30 Oct 2014 22:09:57 +0000 (23:09 +0100)]
Temporarily disable wait/xml protocol...

10 years agoMerge branch 'PHP-5.5' into PHP-5.6
Ferenc Kovacs [Thu, 30 Oct 2014 17:14:37 +0000 (18:14 +0100)]
Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
  don't try to send in the test results until we restored qa.php.net
  Don't treat warnings as failures in the junit output

Conflicts:
.travis.yml

10 years agodon't try to send in the test results until we restored qa.php.net
Ferenc Kovacs [Thu, 30 Oct 2014 17:12:37 +0000 (18:12 +0100)]
don't try to send in the test results until we restored qa.php.net

10 years agoMerge phpdbg into PHP-5.6
Bob Weinand [Thu, 30 Oct 2014 12:17:58 +0000 (13:17 +0100)]
Merge phpdbg into PHP-5.6

10 years agoFix uninitialized value...
Bob Weinand [Thu, 30 Oct 2014 11:15:27 +0000 (12:15 +0100)]
Fix uninitialized value...

10 years agoadd DLL export to the output globals
Anatol Belski [Thu, 30 Oct 2014 09:27:20 +0000 (10:27 +0100)]
add DLL export to the output globals

10 years agoUse macro
Xinchen Hui [Thu, 30 Oct 2014 03:52:29 +0000 (11:52 +0800)]
Use macro

10 years agoFixed build.... (shouldn't it be zend_output_globals?)
Xinchen Hui [Thu, 30 Oct 2014 03:42:02 +0000 (11:42 +0800)]
Fixed build.... (shouldn't it be zend_output_globals?)

10 years agofix output globals importing
Anatol Belski [Wed, 29 Oct 2014 19:03:28 +0000 (20:03 +0100)]
fix output globals importing

10 years agoexport output globals
Anatol Belski [Wed, 29 Oct 2014 19:02:41 +0000 (20:02 +0100)]
export output globals

needed by phpdbg