]> granicus.if.org Git - php/log
php
11 years agofix bad cast
Michael Wallner [Tue, 8 Oct 2013 09:16:53 +0000 (11:16 +0200)]
fix bad cast

11 years agoMerge branch 'PHP-5.5'
Michael Wallner [Tue, 8 Oct 2013 06:37:44 +0000 (08:37 +0200)]
Merge branch 'PHP-5.5'

* PHP-5.5:
  fix bug #51076 (race condition in shtool's mkdir -p)

11 years agofix bug #51076 (race condition in shtool's mkdir -p)
Michael Wallner [Tue, 8 Oct 2013 06:37:08 +0000 (08:37 +0200)]
fix bug #51076 (race condition in shtool's mkdir -p)

11 years agoAdd new tests to package.xml
Christopher Jones [Tue, 8 Oct 2013 00:38:56 +0000 (17:38 -0700)]
Add new tests to package.xml

11 years agoAdd new tests
Christopher Jones [Tue, 8 Oct 2013 00:26:00 +0000 (17:26 -0700)]
Add new tests

11 years agoBump mininum requirements for PHP OCI8 2.0 to PHP 5.2 and Oracle
Christopher Jones [Tue, 8 Oct 2013 00:23:11 +0000 (17:23 -0700)]
Bump mininum requirements for PHP OCI8 2.0 to PHP 5.2 and Oracle
client library 10.2 (Note this will connect to Oracle Database 8.1.7
onwards). Use the older OCI8 1.4 from PECL if using an earlier PHP
version or older Oracle client library support is necessary.

11 years agoMerge branch 'PHP-5.5'
Anatol Belski [Mon, 7 Oct 2013 11:50:59 +0000 (13:50 +0200)]
Merge branch 'PHP-5.5'

* PHP-5.5:
  added fixed tests for ICU >= 51.2
  fixed failing tests for ICU >= 51.2
  FIX BUG #65219 - Typo correction
  FIX BUG #65219 - USE DB not being sent for FreeTDS version < 0.92 FreeTDS <0.92 does not support DBSETLDBNAME option and therefore will not work with SQL Azure. Fallback to dbuse command in letter versions.
  - Fixed bug #65818 (Segfault with built-in webserver and chunked transfer encoding)
  - BFN

11 years agoadded fixed tests for ICU >= 51.2
Anatol Belski [Mon, 7 Oct 2013 11:49:55 +0000 (13:49 +0200)]
added fixed tests for ICU >= 51.2

11 years agofixed failing tests for ICU >= 51.2
Anatol Belski [Mon, 7 Oct 2013 11:49:10 +0000 (13:49 +0200)]
fixed failing tests for ICU >= 51.2

11 years agoFIX BUG #65219 - Typo correction
Stanley Sufficool [Sun, 6 Oct 2013 04:00:47 +0000 (21:00 -0700)]
FIX BUG #65219 - Typo correction

11 years agoFix bug #64338 pdo_dblib can't connect to Azure SQL
Stanley Sufficool [Sun, 6 Oct 2013 01:26:25 +0000 (18:26 -0700)]
Fix bug #64338 pdo_dblib can't connect to Azure SQL

11 years agoMerge branch 'master' of https://git.php.net/push/php-src
Stanley Sufficool [Sun, 6 Oct 2013 00:57:23 +0000 (17:57 -0700)]
Merge branch 'master' of https://git.php.net/push/php-src

* 'master' of https://git.php.net/push/php-src: (705 commits)
  Allow the ldap extension to be compiled with Oracle's LDAP implementation, if desired.  Note the implementations differ so you will see different ldap behavior.
  Fix bug #65667: ftp_nb_continue produces segfault
  fix bug #64146 (serialize incorrectly saving objects when they are cloned)
  such a weird hack probably helps in finding regressions in the future
  Fix bug #65821: By-ref foreach on property access of string offset segfaults
  Fixed bug #64230 (XMLReader does not suppress errors)
  add NEWS and UPGRADING about gost-crypto
  fix bug #55285 XMLReader::getAttribute/No/Ns methods inconsistency
  typo: really fix bug #51936  Crash with clone xmlreader
  fix bug #59613 (Crash with clone XMLReader)
  Fix Bug #60633 build warning in bcmath
  fix bug #65808  the socket_connect() won't work with IPv6 address
  5.4.22-dev now
  Revert "Make 'make distclean' remove the downloaded pear PHAR"
  fix bug #62396 'make test' crashes starting with 5.3.14 (missing gzencode())
  Fixed bug #61548
  Reverted patch (it was used for internal testing and was committed by accident)
  OCI8 2.0: Added a new oci_set_db_operation() user space function for the "DB Operation" tracing feature of Oracle DB 12c.
  Make 'make distclean' remove the downloaded pear PHAR
  fix test
  ...

11 years agoFIX BUG #65219 - USE DB not being sent for FreeTDS version < 0.92
Stanley Sufficool [Sat, 5 Oct 2013 16:54:45 +0000 (09:54 -0700)]
FIX BUG #65219 - USE DB not being sent for FreeTDS version < 0.92
FreeTDS <0.92 does not support DBSETLDBNAME option and therefore
will not work with SQL Azure. Fallback to dbuse command in
letter versions.

11 years agoMerge branch 'PHP-5.4' into PHP-5.5
Felipe Pena [Sat, 5 Oct 2013 15:53:10 +0000 (12:53 -0300)]
Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  - Fixed bug #65818 (Segfault with built-in webserver and chunked transfer encoding)
  - BFN

11 years ago- Fixed bug #65818 (Segfault with built-in webserver and chunked transfer encoding)
Felipe Pena [Sat, 5 Oct 2013 15:52:55 +0000 (12:52 -0300)]
- Fixed bug #65818 (Segfault with built-in webserver and chunked transfer encoding)

11 years ago- BFN
Felipe Pena [Sat, 5 Oct 2013 15:52:32 +0000 (12:52 -0300)]
- BFN

11 years agoMerge branch 'PHP-5.5'
Christopher Jones [Fri, 4 Oct 2013 22:51:39 +0000 (15:51 -0700)]
Merge branch 'PHP-5.5'

* PHP-5.5:
  Allow the ldap extension to be compiled with Oracle's LDAP implementation, if desired.  Note the implementations differ so you will see different ldap behavior.

11 years agoAllow the ldap extension to be compiled with Oracle's LDAP
Christopher Jones [Fri, 4 Oct 2013 22:50:16 +0000 (15:50 -0700)]
Allow the ldap extension to be compiled with Oracle's LDAP
implementation, if desired.  Note the implementations differ so you
will see different ldap behavior.

The patch allows configuration similar to:
--with-ldap=$HOME/instantclient --with-oci8=instantclient,$HOME/instantclient

The patch doesn't support configuration similar to:
--with-ldap --with-oci8=instantclient,$HOME/instantclient
since this would try and mix the default LDAP and Oracle LDAP
implementations.

This patch closes out bug #61450 and the associated github PR.

Regardless of this patch, my recommended way to install both OCI8 and
ldap extensions is to statically configure PHP with ldap, and then add
OCI8 as a shared extension from PECL.

11 years agoMerge branch 'master' of https://git.php.net/repository/php-src
Christopher Jones [Fri, 4 Oct 2013 17:51:36 +0000 (10:51 -0700)]
Merge branch 'master' of https://git.php.net/repository/php-src

* 'master' of https://git.php.net/repository/php-src:
  Fix bug #65667: ftp_nb_continue produces segfault
  fix bug #64146 (serialize incorrectly saving objects when they are cloned)
  such a weird hack probably helps in finding regressions in the future

11 years agoMerge branch 'PHP-5.5' of https://git.php.net/repository/php-src into PHP-5.5
Christopher Jones [Fri, 4 Oct 2013 17:51:04 +0000 (10:51 -0700)]
Merge branch 'PHP-5.5' of https://git.php.net/repository/php-src into PHP-5.5

* 'PHP-5.5' of https://git.php.net/repository/php-src:
  Fix bug #65667: ftp_nb_continue produces segfault
  fix bug #64146 (serialize incorrectly saving objects when they are cloned)
  such a weird hack probably helps in finding regressions in the future

11 years agoMerge branch 'PHP-5.4' of https://git.php.net/repository/php-src into PHP-5.4
Christopher Jones [Fri, 4 Oct 2013 17:50:53 +0000 (10:50 -0700)]
Merge branch 'PHP-5.4' of https://git.php.net/repository/php-src into PHP-5.4

* 'PHP-5.4' of https://git.php.net/repository/php-src:
  Fix bug #65667: ftp_nb_continue produces segfault
  fix bug #64146 (serialize incorrectly saving objects when they are cloned)
  such a weird hack probably helps in finding regressions in the future

11 years agoMerge branch 'PHP-5.5'
Nikita Popov [Fri, 4 Oct 2013 15:27:22 +0000 (17:27 +0200)]
Merge branch 'PHP-5.5'

11 years agoMerge branch 'PHP-5.4' into PHP-5.5
Nikita Popov [Fri, 4 Oct 2013 15:26:35 +0000 (17:26 +0200)]
Merge branch 'PHP-5.4' into PHP-5.5

11 years agoFix bug #65667: ftp_nb_continue produces segfault
Philip Hofstetter [Wed, 2 Oct 2013 06:35:02 +0000 (08:35 +0200)]
Fix bug #65667: ftp_nb_continue produces segfault

the idea behind ftp_nb_get is for it to be followed by multiple calls
to ftp_nb_continue in order to download a file piece-by-piece.

As such, it's unwise to close the stream used to write the downloaded
data to when the file hasn't been completely downloaded within the first
call to ftp_nb_get.

This regression was added in a93a462dcefd62e07963dd2da506fbb3409c88b5
and this patch restores the behavior that was seen pre-patch.

11 years agoMerge branch 'PHP-5.5'
Michael Wallner [Fri, 4 Oct 2013 14:17:46 +0000 (16:17 +0200)]
Merge branch 'PHP-5.5'

* PHP-5.5:
  fix bug #64146 (serialize incorrectly saving objects when they are cloned)

11 years agoMerge branch 'PHP-5.4' into PHP-5.5
Michael Wallner [Fri, 4 Oct 2013 14:17:37 +0000 (16:17 +0200)]
Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  fix bug #64146 (serialize incorrectly saving objects when they are cloned)

11 years agofix bug #64146 (serialize incorrectly saving objects when they are
Michael Wallner [Fri, 4 Oct 2013 14:16:15 +0000 (16:16 +0200)]
fix bug #64146 (serialize incorrectly saving objects when they are
cloned)

11 years agoMerge branch 'PHP-5.5'
Michael Wallner [Fri, 4 Oct 2013 14:12:41 +0000 (16:12 +0200)]
Merge branch 'PHP-5.5'

* PHP-5.5:
  such a weird hack probably helps in finding regressions in the future

11 years agoMerge branch 'PHP-5.4' into PHP-5.5
Michael Wallner [Fri, 4 Oct 2013 14:12:23 +0000 (16:12 +0200)]
Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  such a weird hack probably helps in finding regressions in the future

11 years agosuch a weird hack probably helps in finding regressions in the future
Michael Wallner [Fri, 4 Oct 2013 14:11:49 +0000 (16:11 +0200)]
such a weird hack probably helps in finding regressions in the future

11 years agoMerge branch 'master' of https://git.php.net/repository/php-src
Christopher Jones [Fri, 4 Oct 2013 12:41:03 +0000 (05:41 -0700)]
Merge branch 'master' of https://git.php.net/repository/php-src

* 'master' of https://git.php.net/repository/php-src:
  Fix bug #65821: By-ref foreach on property access of string offset segfaults
  Fixed bug #64230 (XMLReader does not suppress errors)

11 years agoMerge branch 'PHP-5.5' of https://git.php.net/repository/php-src into PHP-5.5
Christopher Jones [Fri, 4 Oct 2013 12:40:43 +0000 (05:40 -0700)]
Merge branch 'PHP-5.5' of https://git.php.net/repository/php-src into PHP-5.5

* 'PHP-5.5' of https://git.php.net/repository/php-src:
  Fix bug #65821: By-ref foreach on property access of string offset segfaults
  Fixed bug #64230 (XMLReader does not suppress errors)

11 years agoMerge branch 'PHP-5.4' of https://git.php.net/repository/php-src into PHP-5.4
Christopher Jones [Fri, 4 Oct 2013 12:40:30 +0000 (05:40 -0700)]
Merge branch 'PHP-5.4' of https://git.php.net/repository/php-src into PHP-5.4

* 'PHP-5.4' of https://git.php.net/repository/php-src:
  Fixed bug #64230 (XMLReader does not suppress errors)

11 years agoMerge branch 'PHP-5.5'
Nikita Popov [Fri, 4 Oct 2013 11:15:45 +0000 (13:15 +0200)]
Merge branch 'PHP-5.5'

11 years agoFix bug #65821: By-ref foreach on property access of string offset segfaults
Nikita Popov [Fri, 4 Oct 2013 11:13:46 +0000 (13:13 +0200)]
Fix bug #65821: By-ref foreach on property access of string offset segfaults

This removes the now unnecessary ZEND_FETCH_ADD_LOCK on the
container of a property fetch of a by-reference foreach.

11 years agoMerge branch 'PHP-5.5'
Michael Wallner [Fri, 4 Oct 2013 09:22:52 +0000 (11:22 +0200)]
Merge branch 'PHP-5.5'

* PHP-5.5:
  Fixed bug #64230 (XMLReader does not suppress errors)

11 years agoMerge branch 'PHP-5.4' into PHP-5.5
Michael Wallner [Fri, 4 Oct 2013 09:22:43 +0000 (11:22 +0200)]
Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  Fixed bug #64230 (XMLReader does not suppress errors)

11 years agoFixed bug #64230 (XMLReader does not suppress errors)
Michael Wallner [Fri, 4 Oct 2013 09:22:17 +0000 (11:22 +0200)]
Fixed bug #64230 (XMLReader does not suppress errors)

11 years agoMerge branch 'master' of https://git.php.net/repository/php-src
Christopher Jones [Thu, 3 Oct 2013 20:37:34 +0000 (13:37 -0700)]
Merge branch 'master' of https://git.php.net/repository/php-src

* 'master' of https://git.php.net/repository/php-src:
  add NEWS and UPGRADING about gost-crypto
  fix bug #55285 XMLReader::getAttribute/No/Ns methods inconsistency
  fix failing tests
  fix indention
  Add support for CryptoPro S-box for GOST

11 years agoadd NEWS and UPGRADING about gost-crypto
Michael Wallner [Thu, 3 Oct 2013 14:23:59 +0000 (16:23 +0200)]
add NEWS and UPGRADING about gost-crypto

11 years agoMerge PR #430 gost-crypto
Michael Wallner [Thu, 3 Oct 2013 14:20:00 +0000 (16:20 +0200)]
Merge PR #430 gost-crypto

Merge branch 'master' of github.com:manuelm/php-src

* 'master' of github.com:manuelm/php-src:
  fix failing tests
  fix indention
  Add support for CryptoPro S-box for GOST

11 years agofix bug #55285 XMLReader::getAttribute/No/Ns methods inconsistency
Michael Wallner [Thu, 3 Oct 2013 13:23:05 +0000 (15:23 +0200)]
fix bug #55285 XMLReader::getAttribute/No/Ns methods inconsistency

11 years agoMerge branch 'master' of https://git.php.net/repository/php-src
Christopher Jones [Thu, 3 Oct 2013 12:41:05 +0000 (05:41 -0700)]
Merge branch 'master' of https://git.php.net/repository/php-src

* 'master' of https://git.php.net/repository/php-src:
  typo: really fix bug #51936  Crash with clone xmlreader
  fix bug #59613 (Crash with clone XMLReader)
  Fix Bug #60633 build warning in bcmath
  fix bug #65808  the socket_connect() won't work with IPv6 address
  5.4.22-dev now

11 years agoMerge branch 'PHP-5.5' of https://git.php.net/repository/php-src into PHP-5.5
Christopher Jones [Thu, 3 Oct 2013 12:40:31 +0000 (05:40 -0700)]
Merge branch 'PHP-5.5' of https://git.php.net/repository/php-src into PHP-5.5

* 'PHP-5.5' of https://git.php.net/repository/php-src:
  typo: really fix bug #51936  Crash with clone xmlreader
  fix bug #59613 (Crash with clone XMLReader)
  Fix Bug #60633 build warning in bcmath
  fix bug #65808  the socket_connect() won't work with IPv6 address
  5.4.22-dev now

11 years agoMerge branch 'PHP-5.4' of https://git.php.net/repository/php-src into PHP-5.4
Christopher Jones [Thu, 3 Oct 2013 12:40:24 +0000 (05:40 -0700)]
Merge branch 'PHP-5.4' of https://git.php.net/repository/php-src into PHP-5.4

* 'PHP-5.4' of https://git.php.net/repository/php-src:
  typo: really fix bug #51936  Crash with clone xmlreader
  fix bug #59613 (Crash with clone XMLReader)
  fix bug #65808  the socket_connect() won't work with IPv6 address

11 years agoMerge branch 'PHP-5.5'
Michael Wallner [Thu, 3 Oct 2013 11:35:09 +0000 (13:35 +0200)]
Merge branch 'PHP-5.5'

* PHP-5.5:
  typo: really fix bug #51936  Crash with clone xmlreader

11 years agoMerge branch 'PHP-5.4' into PHP-5.5
Michael Wallner [Thu, 3 Oct 2013 11:35:00 +0000 (13:35 +0200)]
Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  typo: really fix bug #51936  Crash with clone xmlreader

11 years agotypo: really fix bug #51936 Crash with clone xmlreader
Michael Wallner [Thu, 3 Oct 2013 11:34:31 +0000 (13:34 +0200)]
typo: really fix bug #51936  Crash with clone xmlreader

11 years agoMerge branch 'PHP-5.5'
Michael Wallner [Thu, 3 Oct 2013 11:30:02 +0000 (13:30 +0200)]
Merge branch 'PHP-5.5'

* PHP-5.5:
  fix bug #59613 (Crash with clone XMLReader)

11 years agoMerge branch 'PHP-5.4' into PHP-5.5
Michael Wallner [Thu, 3 Oct 2013 11:29:18 +0000 (13:29 +0200)]
Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  fix bug #59613 (Crash with clone XMLReader)

11 years agofix bug #59613 (Crash with clone XMLReader)
Michael Wallner [Thu, 3 Oct 2013 11:28:41 +0000 (13:28 +0200)]
fix bug #59613 (Crash with clone XMLReader)

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

* PHP-5.5:
  Fix Bug #60633 build warning in bcmath

11 years agoFix Bug #60633 build warning in bcmath
Remi Collet [Thu, 3 Oct 2013 06:45:31 +0000 (08:45 +0200)]
Fix Bug #60633 build warning in bcmath

11 years agoMerge branch 'PHP-5.5'
Michael Wallner [Wed, 2 Oct 2013 13:56:09 +0000 (15:56 +0200)]
Merge branch 'PHP-5.5'

* PHP-5.5:
  fix bug #65808  the socket_connect() won't work with IPv6 address
  5.4.22-dev now

11 years agoMerge branch 'PHP-5.4' into PHP-5.5
Michael Wallner [Wed, 2 Oct 2013 13:55:38 +0000 (15:55 +0200)]
Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  fix bug #65808  the socket_connect() won't work with IPv6 address
  5.4.22-dev now

Conflicts:
configure.in
ext/sockets/sockets.c
main/php_version.h

11 years agofix bug #65808 the socket_connect() won't work with IPv6 address
Michael Wallner [Wed, 2 Oct 2013 13:19:25 +0000 (15:19 +0200)]
fix bug #65808  the socket_connect() won't work with IPv6 address

11 years agoMerge branch 'master' of https://git.php.net/repository/php-src
Christopher Jones [Wed, 2 Oct 2013 12:41:20 +0000 (05:41 -0700)]
Merge branch 'master' of https://git.php.net/repository/php-src

* 'master' of https://git.php.net/repository/php-src:
  Revert "Make 'make distclean' remove the downloaded pear PHAR"
  fix bug #62396 'make test' crashes starting with 5.3.14 (missing gzencode())

11 years agoMerge branch 'PHP-5.5' of https://git.php.net/repository/php-src into PHP-5.5
Christopher Jones [Wed, 2 Oct 2013 12:40:42 +0000 (05:40 -0700)]
Merge branch 'PHP-5.5' of https://git.php.net/repository/php-src into PHP-5.5

* 'PHP-5.5' of https://git.php.net/repository/php-src:
  Revert "Make 'make distclean' remove the downloaded pear PHAR"
  fix bug #62396 'make test' crashes starting with 5.3.14 (missing gzencode())

11 years agoMerge branch 'PHP-5.4' of https://git.php.net/repository/php-src into PHP-5.4
Christopher Jones [Wed, 2 Oct 2013 12:40:33 +0000 (05:40 -0700)]
Merge branch 'PHP-5.4' of https://git.php.net/repository/php-src into PHP-5.4

* 'PHP-5.4' of https://git.php.net/repository/php-src:
  5.4.22-dev now
  fix bug #62396 'make test' crashes starting with 5.3.14 (missing gzencode())

11 years ago5.4.22-dev now
Stanislav Malyshev [Wed, 2 Oct 2013 05:25:56 +0000 (22:25 -0700)]
5.4.22-dev now

11 years agoMerge branch 'PHP-5.5'
Christopher Jones [Tue, 1 Oct 2013 17:35:03 +0000 (10:35 -0700)]
Merge branch 'PHP-5.5'

* PHP-5.5:
  Revert "Make 'make distclean' remove the downloaded pear PHAR"

11 years agoRevert "Make 'make distclean' remove the downloaded pear PHAR"
Christopher Jones [Tue, 1 Oct 2013 17:33:39 +0000 (10:33 -0700)]
Revert "Make 'make distclean' remove the downloaded pear PHAR"

This reverts commit d7baf0427fb56cbde55495e5c2071b1cdacb94ce.

11 years agoMerge branch 'master' of https://git.php.net/repository/php-src
Christopher Jones [Tue, 1 Oct 2013 17:19:45 +0000 (10:19 -0700)]
Merge branch 'master' of https://git.php.net/repository/php-src

# By Michael Wallner (2) and Dmitry Stogov (1)
# Via Michael Wallner (5) and others
* 'master' of https://git.php.net/repository/php-src:
  fix bug #62396 'make test' crashes starting with 5.3.14 (missing gzencode())
  Fixed bug #61548
  Reverted patch (it was used for internal testing and was committed by accident)

11 years agoMerge branch 'PHP-5.5' of https://git.php.net/repository/php-src into PHP-5.5
Christopher Jones [Tue, 1 Oct 2013 17:19:40 +0000 (10:19 -0700)]
Merge branch 'PHP-5.5' of https://git.php.net/repository/php-src into PHP-5.5

# By Michael Wallner (2) and Dmitry Stogov (1)
# Via Michael Wallner (3) and Christopher Jones (1)
* 'PHP-5.5' of https://git.php.net/repository/php-src:
  fix bug #62396 'make test' crashes starting with 5.3.14 (missing gzencode())
  Fixed bug #61548
  Reverted patch (it was used for internal testing and was committed by accident)

11 years agoMerge branch 'PHP-5.4' of https://git.php.net/repository/php-src into PHP-5.4
Christopher Jones [Tue, 1 Oct 2013 17:19:24 +0000 (10:19 -0700)]
Merge branch 'PHP-5.4' of https://git.php.net/repository/php-src into PHP-5.4

# By Michael Wallner
# Via Michael Wallner
* 'PHP-5.4' of https://git.php.net/repository/php-src:
  fix bug #62396 'make test' crashes starting with 5.3.14 (missing gzencode())
  Fixed bug #61548

11 years agoMerge branch 'PHP-5.5'
Michael Wallner [Tue, 1 Oct 2013 15:02:20 +0000 (17:02 +0200)]
Merge branch 'PHP-5.5'

* PHP-5.5:
  fix bug #62396 'make test' crashes starting with 5.3.14 (missing gzencode())

11 years agoMerge branch 'PHP-5.4' into PHP-5.5
Michael Wallner [Tue, 1 Oct 2013 15:01:44 +0000 (17:01 +0200)]
Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  fix bug #62396 'make test' crashes starting with 5.3.14 (missing gzencode())

11 years agofix bug #62396 'make test' crashes starting with 5.3.14
Michael Wallner [Tue, 1 Oct 2013 15:01:03 +0000 (17:01 +0200)]
fix bug #62396 'make test' crashes starting with 5.3.14
(missing gzencode())

11 years agoMerge branch 'master' of https://git.php.net/repository/php-src
Christopher Jones [Tue, 1 Oct 2013 12:40:48 +0000 (05:40 -0700)]
Merge branch 'master' of https://git.php.net/repository/php-src

* 'master' of https://git.php.net/repository/php-src:
  Fixed bug #61548
  Reverted patch (it was used for internal testing and was committed by accident)
  OCI8 2.0: Added a new oci_set_db_operation() user space function for the "DB Operation" tracing feature of Oracle DB 12c.

11 years agoMerge branch 'PHP-5.5' of https://git.php.net/repository/php-src into PHP-5.5
Christopher Jones [Tue, 1 Oct 2013 12:40:28 +0000 (05:40 -0700)]
Merge branch 'PHP-5.5' of https://git.php.net/repository/php-src into PHP-5.5

* 'PHP-5.5' of https://git.php.net/repository/php-src:
  Fixed bug #61548
  Reverted patch (it was used for internal testing and was committed by accident)

11 years agoMerge branch 'PHP-5.4' of https://git.php.net/repository/php-src into PHP-5.4
Christopher Jones [Tue, 1 Oct 2013 12:40:24 +0000 (05:40 -0700)]
Merge branch 'PHP-5.4' of https://git.php.net/repository/php-src into PHP-5.4

* 'PHP-5.4' of https://git.php.net/repository/php-src:
  Fixed bug #61548

11 years agoMerge branch 'PHP-5.5'
Michael Wallner [Tue, 1 Oct 2013 09:11:48 +0000 (11:11 +0200)]
Merge branch 'PHP-5.5'

* PHP-5.5:
  Fixed bug #61548

Conflicts:
ext/standard/http_fopen_wrapper.c

11 years agoMerge branch 'PHP-5.4' into PHP-5.5
Michael Wallner [Tue, 1 Oct 2013 09:08:20 +0000 (11:08 +0200)]
Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  Fixed bug #61548

11 years agoFixed bug #61548
Michael Wallner [Tue, 1 Oct 2013 09:07:55 +0000 (11:07 +0200)]
Fixed bug #61548

11 years agoMerge branch 'PHP-5.5'
Dmitry Stogov [Tue, 1 Oct 2013 07:34:19 +0000 (11:34 +0400)]
Merge branch 'PHP-5.5'

* PHP-5.5:
  Reverted patch (it was used for internal testing and was committed by accident)

11 years agoReverted patch (it was used for internal testing and was committed by accident)
Dmitry Stogov [Tue, 1 Oct 2013 07:32:11 +0000 (11:32 +0400)]
Reverted patch (it was used for internal testing and was committed by accident)

11 years agoOCI8 2.0: Added a new oci_set_db_operation() user space function for the "DB Operatio...
Christopher Jones [Mon, 30 Sep 2013 23:51:07 +0000 (16:51 -0700)]
OCI8 2.0: Added a new oci_set_db_operation() user space function for the "DB Operation" tracing feature of Oracle DB 12c.

Currently this code is #ifdef'd out, since I can't consider the feature stable until an Oracle-side fix for Oracle bug 16695981 is available.  Having the code available in PHP OCI8 facilitates testing of any fix.

11 years agoMerge branch 'master' of https://git.php.net/repository/php-src
Christopher Jones [Mon, 30 Sep 2013 22:54:39 +0000 (15:54 -0700)]
Merge branch 'master' of https://git.php.net/repository/php-src

# By Michael Wallner (2) and others
# Via Christopher Jones (8) and others
* 'master' of https://git.php.net/repository/php-src:
  Make 'make distclean' remove the downloaded pear PHAR
  fix test
  fix memleak on resetting rebind_proc
  Fix bug #64979: Wrong behavior of static variables in closure generators
  Fix bug #65322: compile time errors won't trigger auto loading
  5.5.4 release date
  5.4.20 release date
  Add information about which INI file is which inside respective files

11 years agoMerge branch 'PHP-5.5' of https://git.php.net/repository/php-src into PHP-5.5
Christopher Jones [Mon, 30 Sep 2013 22:54:36 +0000 (15:54 -0700)]
Merge branch 'PHP-5.5' of https://git.php.net/repository/php-src into PHP-5.5

# By Michael Wallner (2) and others
# Via Christopher Jones (4) and others
* 'PHP-5.5' of https://git.php.net/repository/php-src:
  Make 'make distclean' remove the downloaded pear PHAR
  fix test
  fix memleak on resetting rebind_proc
  Fix bug #64979: Wrong behavior of static variables in closure generators
  Fix bug #65322: compile time errors won't trigger auto loading
  5.5.4 release date
  5.4.20 release date

11 years agoMerge branch 'PHP-5.4' of https://git.php.net/repository/php-src into PHP-5.4
Christopher Jones [Mon, 30 Sep 2013 22:54:34 +0000 (15:54 -0700)]
Merge branch 'PHP-5.4' of https://git.php.net/repository/php-src into PHP-5.4

# By Michael Wallner (2) and others
# Via Michael Wallner
* 'PHP-5.4' of https://git.php.net/repository/php-src:
  fix test
  fix memleak on resetting rebind_proc
  Fix bug #65322: compile time errors won't trigger auto loading
  5.4.20 release date

11 years agoMerge branch 'PHP-5.5'
Christopher Jones [Mon, 30 Sep 2013 22:47:33 +0000 (15:47 -0700)]
Merge branch 'PHP-5.5'

* PHP-5.5:
  Make 'make distclean' remove the downloaded pear PHAR

11 years agoMake 'make distclean' remove the downloaded pear PHAR
Christopher Jones [Mon, 30 Sep 2013 22:46:22 +0000 (15:46 -0700)]
Make 'make distclean' remove the downloaded pear PHAR

11 years agoMerge branch 'PHP-5.5'
Michael Wallner [Mon, 30 Sep 2013 12:05:37 +0000 (14:05 +0200)]
Merge branch 'PHP-5.5'

* PHP-5.5:
  fix test
  fix memleak on resetting rebind_proc

11 years agoMerge branch 'PHP-5.4' into PHP-5.5
Michael Wallner [Mon, 30 Sep 2013 12:04:48 +0000 (14:04 +0200)]
Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  fix test
  fix memleak on resetting rebind_proc

11 years agofix test
Michael Wallner [Mon, 30 Sep 2013 09:41:35 +0000 (11:41 +0200)]
fix test

11 years agofix memleak on resetting rebind_proc
Michael Wallner [Mon, 30 Sep 2013 09:23:33 +0000 (11:23 +0200)]
fix memleak on resetting rebind_proc

11 years agoMerge branch 'PHP-5.5'
Nikita Popov [Sun, 29 Sep 2013 18:19:40 +0000 (20:19 +0200)]
Merge branch 'PHP-5.5'

11 years agoFix bug #64979: Wrong behavior of static variables in closure generators
Nikita Popov [Sun, 29 Sep 2013 18:18:12 +0000 (20:18 +0200)]
Fix bug #64979: Wrong behavior of static variables in closure generators

11 years agoMerge branch 'PHP-5.5'
Nikita Popov [Sun, 29 Sep 2013 16:01:42 +0000 (18:01 +0200)]
Merge branch 'PHP-5.5'

11 years agoMerge branch 'PHP-5.4' into PHP-5.5
Nikita Popov [Sun, 29 Sep 2013 16:01:18 +0000 (18:01 +0200)]
Merge branch 'PHP-5.4' into PHP-5.5

11 years agoFix bug #65322: compile time errors won't trigger auto loading
Nikita Popov [Sun, 29 Sep 2013 15:58:25 +0000 (17:58 +0200)]
Fix bug #65322: compile time errors won't trigger auto loading

Also fixes duplicate bugs #54054 and #42098.

Furthermore this fixes incorrect error messages thrown from code
running inside an error handler when a compilation is in progress.
The error file and line are now correctly associated with the
file/line of the executor, rather than the compiler.

11 years agoMerge branch 'PHP-5.5'
Stanislav Malyshev [Sun, 29 Sep 2013 01:07:32 +0000 (18:07 -0700)]
Merge branch 'PHP-5.5'

* PHP-5.5:
  5.5.4 release date
  5.4.20 release date
  Add information about which INI file is which inside respective files

11 years ago5.5.4 release date
Stanislav Malyshev [Sun, 29 Sep 2013 01:06:15 +0000 (18:06 -0700)]
5.5.4 release date

11 years agoMerge branch 'PHP-5.4' into PHP-5.5
Stanislav Malyshev [Sun, 29 Sep 2013 01:05:38 +0000 (18:05 -0700)]
Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  5.4.20 release date

11 years ago5.4.20 release date
Stanislav Malyshev [Sun, 29 Sep 2013 01:04:44 +0000 (18:04 -0700)]
5.4.20 release date

11 years agoPrepare for next release
Christopher Jones [Sat, 28 Sep 2013 00:16:02 +0000 (17:16 -0700)]
Prepare for next release

11 years agoOCI8: Fix alloc function and DLL generation
Christopher Jones [Sat, 28 Sep 2013 00:00:41 +0000 (17:00 -0700)]
OCI8: Fix alloc function and DLL generation

11 years agoMerge branch 'master' of https://git.php.net/repository/php-src
Christopher Jones [Fri, 27 Sep 2013 22:57:13 +0000 (15:57 -0700)]
Merge branch 'master' of https://git.php.net/repository/php-src

# By Dmitry Stogov (2) and others
# Via Christopher Jones (22) and others
* 'master' of https://git.php.net/repository/php-src:
  Removed references to "Zend Support"
  Added support for GNU Hurd. (Svante Signell)
  - Updated to version 2013.6 (2013f)
  More OCI8 DTrace probe updates. Change php.ini-* doc to match an earlier change to config.w32
  FIX BUG #48539 - Disable TEXTLIMIT for FreeTDS driver
  Don't track parameter number in separate znode
  fix missing change from 'tcp_socket' to the more common 'server'
  fix many parallel test issues

11 years agoMerge branch 'PHP-5.5' of https://git.php.net/repository/php-src into PHP-5.5
Christopher Jones [Fri, 27 Sep 2013 22:57:08 +0000 (15:57 -0700)]
Merge branch 'PHP-5.5' of https://git.php.net/repository/php-src into PHP-5.5

# By Dmitry Stogov (2) and others
# Via Lior Kaplan (2) and others
* 'PHP-5.5' of https://git.php.net/repository/php-src:
  Add information about which INI file is which inside respective files
  Removed references to "Zend Support"
  Added support for GNU Hurd. (Svante Signell)
  - Updated to version 2013.6 (2013f)
  FIX BUG #48539 - Disable TEXTLIMIT for FreeTDS driver

11 years agoMerge branch 'PHP-5.4' of https://git.php.net/repository/php-src into PHP-5.4
Christopher Jones [Fri, 27 Sep 2013 22:57:04 +0000 (15:57 -0700)]
Merge branch 'PHP-5.4' of https://git.php.net/repository/php-src into PHP-5.4

# By Derick Rethans (1) and others
# Via Lior Kaplan (1) and Stanley Sufficool (1)
* 'PHP-5.4' of https://git.php.net/repository/php-src:
  Add information about which INI file is which inside respective files
  - Updated to version 2013.6 (2013f)
  FIX BUG #48539 - Disable TEXTLIMIT for FreeTDS driver