]> granicus.if.org Git - php/log
php
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 #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 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 '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.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.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.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 '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 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.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 '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.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.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 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.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 '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 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 '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.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 '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.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 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 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 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.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 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.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 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 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

11 years agoMerge branch 'PHP-5.4' into PHP-5.5
Lior Kaplan [Fri, 27 Sep 2013 15:50:03 +0000 (17:50 +0200)]
Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  Add information about which INI file is which inside respective files

11 years agoAdd information about which INI file is which inside respective files
Ondřej Surý [Fri, 27 Sep 2013 15:46:14 +0000 (17:46 +0200)]
Add information about which INI file is which inside respective files

11 years agoRemoved references to "Zend Support"
Dmitry Stogov [Fri, 27 Sep 2013 10:01:07 +0000 (14:01 +0400)]
Removed references to "Zend Support"

11 years agoAdded support for GNU Hurd. (Svante Signell)
Dmitry Stogov [Fri, 27 Sep 2013 09:43:25 +0000 (13:43 +0400)]
Added support for GNU Hurd. (Svante Signell)

11 years agoMerge branch 'PHP-5.4' into PHP-5.5
Derick Rethans [Fri, 27 Sep 2013 09:14:47 +0000 (10:14 +0100)]
Merge branch 'PHP-5.4' into PHP-5.5

11 years ago- Updated to version 2013.6 (2013f)
Derick Rethans [Fri, 27 Sep 2013 09:14:46 +0000 (10:14 +0100)]
- Updated to version 2013.6 (2013f)

11 years agoMerge branch 'PHP-5.4' into PHP-5.5
Stanley Sufficool [Fri, 27 Sep 2013 03:16:28 +0000 (20:16 -0700)]
Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  FIX BUG #48539 - Disable TEXTLIMIT for FreeTDS driver

11 years agoFIX BUG #48539 - Disable TEXTLIMIT for FreeTDS driver
Stanley Sufficool [Fri, 27 Sep 2013 02:53:47 +0000 (19:53 -0700)]
FIX BUG #48539 - Disable TEXTLIMIT for FreeTDS driver

11 years agoMerge branch 'PHP-5.4' of https://git.php.net/push/php-src into PHP-5.4
Stanley Sufficool [Fri, 27 Sep 2013 02:52:01 +0000 (19:52 -0700)]
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: (140 commits)
  Copy dba_*() keys before converting to string.
  Fix the broken sh syntax in ext/imap/config.m4.
  Revert "EmptyIterator now implements Countable; fixes bug 60577"
  RFC 6598 reserved ip range starts at 100.64.0.0
  fix a very rare case of use of uninitialized value combined with a memleak
  NEWS for added reserved ip addresses according to RFC 6598
  Add RFC 6598 IPs to reserved addresses
  NEWS for #60577
  NEWS for bug #64441
  Fix bug #64441 (FILTER_VALIDATE_URL rejects fully qualified domain names)
  EmptyIterator now implements Countable; fixes bug 60577
  News for bugfix #64157
  Bug 64157 Changed error message to make sense
  Tinker with the wording of the short_open_tag description.
  Handle CLI server request headers case insensitively.
  5.4.21 now
  Typo....
  Add a XFAIL test for #64896
  Fixed Bug #65564 stack-buffer-overflow in DateTimeZone stuff caught by AddressSanitizer
  Fixed bug #60598 (cli/apache sapi segfault on objects manipulation)
  ...

11 years agoMerge branch 'PHP-5.5' of https://git.php.net/repository/php-src into PHP-5.5
Christopher Jones [Thu, 26 Sep 2013 16:57:32 +0000 (09: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 Adam Harvey (1) and Dmitry Stogov (1)
* 'PHP-5.5' of https://git.php.net/repository/php-src:
  Added function opcache_compile_file() to load PHP scripts into cache without execution.
  Fixed issue #135 (segfault in interned strings if initial memory is too low)
  Make message and format arguments const char * to avoid build warning about invalid cast.
  Copy dba_*() keys before converting to string.

11 years agoMerge branch 'PHP-5.4' of https://git.php.net/repository/php-src into PHP-5.4
Christopher Jones [Thu, 26 Sep 2013 16:57:30 +0000 (09:57 -0700)]
Merge branch 'PHP-5.4' of https://git.php.net/repository/php-src into PHP-5.4

# By Adam Harvey
# Via Adam Harvey
* 'PHP-5.4' of https://git.php.net/repository/php-src:
  Copy dba_*() keys before converting to string.

11 years agoAdded function opcache_compile_file() to load PHP scripts into cache without execution.
Dmitry Stogov [Wed, 25 Sep 2013 08:14:06 +0000 (12:14 +0400)]
Added function opcache_compile_file() to load PHP scripts into cache without execution.

11 years agoFixed issue #135 (segfault in interned strings if initial memory is too low)
Dmitry Stogov [Wed, 25 Sep 2013 07:02:39 +0000 (11:02 +0400)]
Fixed issue #135 (segfault in interned strings if initial memory is too low)

11 years agoMake message and format arguments const char * to avoid
Remi Collet [Mon, 23 Sep 2013 11:21:57 +0000 (13:21 +0200)]
Make message and format arguments const char * to avoid
build warning about invalid cast.

11 years agoMerge branch 'PHP-5.4' into PHP-5.5
Adam Harvey [Sun, 22 Sep 2013 23:52:41 +0000 (16:52 -0700)]
Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  Copy dba_*() keys before converting to string.

11 years agoCopy dba_*() keys before converting to string.
Adam Harvey [Sun, 22 Sep 2013 23:46:17 +0000 (16:46 -0700)]
Copy dba_*() keys before converting to string.

A nice Sunday afternoon project for somebody would be to refactor the dba
functions to use zend_parse_parameters() reliably and try to untangle some of
the macros in dba.c. Sadly, it is not a nice Sunday afternoon here.

Fixes bug #65708 (dba functions cast $key param to string in-place, bypassing
copy on write).

11 years agoMerge branch 'PHP-5.5' of https://git.php.net/repository/php-src into PHP-5.5
Christopher Jones [Sat, 21 Sep 2013 00:09:50 +0000 (17:09 -0700)]
Merge branch 'PHP-5.5' of https://git.php.net/repository/php-src into PHP-5.5

# By Adam Harvey (1) and Anatol Belski (1)
# Via Adam Harvey (2) and Christopher Jones (2)
* 'PHP-5.5' of https://git.php.net/repository/php-src:
  Fix the broken sh syntax in ext/imap/config.m4.
  Fixed bug #65678 the test cli_process_title_windows will fails on particular environnement

11 years agoMerge branch 'PHP-5.4' of https://git.php.net/repository/php-src into PHP-5.4
Christopher Jones [Sat, 21 Sep 2013 00:09:47 +0000 (17:09 -0700)]
Merge branch 'PHP-5.4' of https://git.php.net/repository/php-src into PHP-5.4

# By Adam Harvey
# Via Adam Harvey
* 'PHP-5.4' of https://git.php.net/repository/php-src:
  Fix the broken sh syntax in ext/imap/config.m4.

11 years agoMerge branch 'PHP-5.4' into PHP-5.5
Adam Harvey [Fri, 20 Sep 2013 21:19:01 +0000 (14:19 -0700)]
Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  Fix the broken sh syntax in ext/imap/config.m4.

11 years agoFix the broken sh syntax in ext/imap/config.m4.
Adam Harvey [Fri, 20 Sep 2013 21:15:19 +0000 (14:15 -0700)]
Fix the broken sh syntax in ext/imap/config.m4.

Patch by ryotakatsuki at gmail dot com. Fixes bug #65721 (configure script
broken in 5.5.4 and 5.4.20 when enabling imap).

11 years agoFixed bug #65678 the test cli_process_title_windows will fails on particular environn...
Anatol Belski [Fri, 20 Sep 2013 13:59:33 +0000 (15:59 +0200)]
Fixed bug #65678 the test cli_process_title_windows will fails on particular environnement

Patch by Pierre Renaudet

11 years agoAdded application/pdf to PHP CLI Web Server mime types.
Christopher Jones [Fri, 20 Sep 2013 03:22:50 +0000 (20:22 -0700)]
Added application/pdf to PHP CLI Web Server mime types.

11 years agoMerge branch 'PHP-5.5' of https://git.php.net/repository/php-src into PHP-5.5
Christopher Jones [Thu, 19 Sep 2013 02:49:36 +0000 (19:49 -0700)]
Merge branch 'PHP-5.5' of https://git.php.net/repository/php-src into PHP-5.5

# By David Soria Parra (6) and others
# Via David Soria Parra (5) and Michael Wallner (1)
* 'PHP-5.5' of https://git.php.net/repository/php-src:
  Revert "EmptyIterator now implements Countable; fixes bug 60577"
  RFC 6598 reserved ip range starts at 100.64.0.0
  fix a very rare case of use of uninitialized value combined with a memleak
  NEWS for added reserved ip addresses according to RFC 6598
  Add RFC 6598 IPs to reserved addresses
  NEWS for #60577
  NEWS for bug #64441
  Fix bug #64441 (FILTER_VALIDATE_URL rejects fully qualified domain names)
  EmptyIterator now implements Countable; fixes bug 60577
  News for bugfix #64157
  Bug 64157 Changed error message to make sense

11 years agoMerge branch 'PHP-5.4' of https://git.php.net/repository/php-src into PHP-5.4
Christopher Jones [Thu, 19 Sep 2013 02:49:30 +0000 (19:49 -0700)]
Merge branch 'PHP-5.4' of https://git.php.net/repository/php-src into PHP-5.4

# By David Soria Parra (6) and others
# Via David Soria Parra
* 'PHP-5.4' of https://git.php.net/repository/php-src:
  Revert "EmptyIterator now implements Countable; fixes bug 60577"
  RFC 6598 reserved ip range starts at 100.64.0.0
  fix a very rare case of use of uninitialized value combined with a memleak
  NEWS for added reserved ip addresses according to RFC 6598
  Add RFC 6598 IPs to reserved addresses
  NEWS for #60577
  NEWS for bug #64441
  Fix bug #64441 (FILTER_VALIDATE_URL rejects fully qualified domain names)
  EmptyIterator now implements Countable; fixes bug 60577
  News for bugfix #64157
  Bug 64157 Changed error message to make sense

11 years agoMerge branch 'PHP-5.4' into PHP-5.5
David Soria Parra [Wed, 18 Sep 2013 13:06:51 +0000 (15:06 +0200)]
Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  Revert "EmptyIterator now implements Countable; fixes bug 60577"

11 years agoRevert "EmptyIterator now implements Countable; fixes bug 60577"
David Soria Parra [Wed, 18 Sep 2013 13:06:19 +0000 (15:06 +0200)]
Revert "EmptyIterator now implements Countable; fixes bug 60577"

This reverts commit 8a936e8eb938965b0daaf076c109ec60141e57a7.

11 years agoMerge branch 'PHP-5.4' into PHP-5.5
David Soria Parra [Wed, 18 Sep 2013 12:28:57 +0000 (14:28 +0200)]
Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  RFC 6598 reserved ip range starts at 100.64.0.0

11 years agoRFC 6598 reserved ip range starts at 100.64.0.0
David Soria Parra [Wed, 18 Sep 2013 12:26:10 +0000 (14:26 +0200)]
RFC 6598 reserved ip range starts at 100.64.0.0

11 years agoMerge branch 'PHP-5.4' into PHP-5.5
Michael Wallner [Wed, 18 Sep 2013 09:12:11 +0000 (11:12 +0200)]
Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  fix a very rare case of use of uninitialized value combined with a memleak

11 years agofix a very rare case of use of uninitialized value combined with a
Michael Wallner [Wed, 18 Sep 2013 09:10:55 +0000 (11:10 +0200)]
fix a very rare case of use of uninitialized value combined with a
memleak

11 years agoMerge branch 'PHP-5.4' into PHP-5.5
David Soria Parra [Tue, 17 Sep 2013 07:55:03 +0000 (09:55 +0200)]
Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  NEWS for added reserved ip addresses according to RFC 6598
  Add RFC 6598 IPs to reserved addresses

11 years agoNEWS for added reserved ip addresses according to RFC 6598
David Soria Parra [Tue, 17 Sep 2013 07:54:58 +0000 (09:54 +0200)]
NEWS for added reserved ip addresses according to RFC 6598

11 years agoAdd RFC 6598 IPs to reserved addresses
Sebastian Nohn [Sun, 15 Sep 2013 17:18:20 +0000 (19:18 +0200)]
Add RFC 6598 IPs to reserved addresses

(cherry picked from commit b3f5b822e9f83d99d7cb5eed36ba8d307d1408ee)

11 years agoMerge branch 'PHP-5.4' into PHP-5.5
David Soria Parra [Mon, 16 Sep 2013 21:36:37 +0000 (23:36 +0200)]
Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  NEWS for #60577
  NEWS for bug #64441
  Fix bug #64441 (FILTER_VALIDATE_URL rejects fully qualified domain names)
  EmptyIterator now implements Countable; fixes bug 60577
  News for bugfix #64157
  Bug 64157 Changed error message to make sense

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

# By Xinchen Hui (2) and Michael Wallner (1)
# Via Michael Wallner
* 'PHP-5.5' of https://git.php.net/repository/php-src:
  double test timeout for travis
  Add test for ISSUE #128
  Fixed bug #65665 (Exception not properly caught when opcache enabled)

11 years agoNEWS for #60577
David Soria Parra [Mon, 16 Sep 2013 14:23:29 +0000 (16:23 +0200)]
NEWS for #60577

11 years agoNEWS for bug #64441
David Soria Parra [Mon, 16 Sep 2013 03:21:42 +0000 (05:21 +0200)]
NEWS for bug #64441

11 years agodouble test timeout for travis
Michael Wallner [Mon, 16 Sep 2013 07:35:08 +0000 (09:35 +0200)]
double test timeout for travis

11 years agoAdd test for ISSUE #128
Xinchen Hui [Mon, 16 Sep 2013 06:58:18 +0000 (14:58 +0800)]
Add test for ISSUE #128

11 years agoFixed bug #65665 (Exception not properly caught when opcache enabled)
Xinchen Hui [Mon, 16 Sep 2013 06:43:01 +0000 (14:43 +0800)]
Fixed bug #65665 (Exception not properly caught when opcache enabled)

11 years agoFix bug #64441 (FILTER_VALIDATE_URL rejects fully qualified domain names)
Alex Bobrov [Sun, 21 Apr 2013 07:32:02 +0000 (14:32 +0700)]
Fix bug #64441 (FILTER_VALIDATE_URL rejects fully qualified domain names)

(cherry picked from commit c149d4ee4be81ecf005eafd43ede06e70aa4c985)

11 years agoEmptyIterator now implements Countable; fixes bug 60577
Levi Morrison [Thu, 12 Sep 2013 22:03:39 +0000 (16:03 -0600)]
EmptyIterator now implements Countable; fixes bug 60577

(cherry picked from commit 6398844c86bee08abe4ee3f206ecd86ad0a498f9)

11 years agoNews for bugfix #64157
David Soria Parra [Mon, 16 Sep 2013 01:48:34 +0000 (03:48 +0200)]
News for bugfix #64157

11 years agoBug 64157
Boro Sitnikovski [Fri, 13 Sep 2013 00:20:19 +0000 (02:20 +0200)]
Bug 64157
Changed error message to make sense

11 years agoMerge branch 'PHP-5.5' of https://git.php.net/repository/php-src into PHP-5.5
Christopher Jones [Fri, 13 Sep 2013 21:10:53 +0000 (14:10 -0700)]
Merge branch 'PHP-5.5' of https://git.php.net/repository/php-src into PHP-5.5

# By Adam Harvey (3) and others
# Via Adam Harvey (2) and Michael Wallner (1)
* 'PHP-5.5' of https://git.php.net/repository/php-src:
  fix broken sha2 configure tests
  Fixed minor bug in test.
  Move NEWS entries to correct version
  Fix bug #64782: SplFileObject constructor make $context optional
  Fix bug #65502: DateTimeImmutable::createFromFormat returns DateTime
  Fix bug #65548: Comparison for DateTimeImmutable doesn't work
  Tinker with the wording of the short_open_tag description.
  Fix NEWS: these commits were after 5.5.4 was branched and will be in 5.5.5.
  Handle CLI server request headers case insensitively.
  ensure that the defined interpolation method is used by the generic scaling functions
  Fixed issue #128 (opcache_invalidate segmentation fault)
  5.4.21 now