granicus.if.org Git

datibbaw [Mon, 18 Nov 2013 04:06:27 +0000 (12:06 +0800)]

Allow NULL as value for CURLOPT_CUSTOMREQUEST option.

Added test case.

Refactored the code to isolate the string handling. Fixed return values to use SUCCESS and FAILURE.

Removed unused error variable.

Indentation fix.
Removed the ugly goto.

commit | commitdiff | tree

Remi Collet [Fri, 28 Feb 2014 07:12:16 +0000 (08:12 +0100)]

Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
man page: long option name is --strip, not --stripped
--global have be removed in 5.2

commit | commitdiff | tree

Remi Collet [Fri, 28 Feb 2014 07:12:03 +0000 (08:12 +0100)]

man page: long option name is --strip, not --stripped

commit | commitdiff | tree

Remi Collet [Fri, 28 Feb 2014 07:10:01 +0000 (08:10 +0100)]

--global have be removed in 5.2

commit | commitdiff | tree

Ferenc Kovacs [Thu, 27 Feb 2014 10:28:46 +0000 (11:28 +0100)]

typo spotted by Lajos Veres

commit | commitdiff | tree

Anatol Belski [Thu, 27 Feb 2014 08:23:48 +0000 (09:23 +0100)]

update libs_version.txt

commit | commitdiff | tree

Remi Collet [Thu, 27 Feb 2014 07:49:56 +0000 (08:49 +0100)]

commit | commitdiff | tree

Remi Collet [Thu, 27 Feb 2014 07:49:33 +0000 (08:49 +0100)]

Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  NEWS
  test for bug #66762
  Fixed Bug #66762 Segfault in mysqli_stmt::bind_result() when link closed

commit | commitdiff | tree

Remi Collet [Thu, 27 Feb 2014 07:49:08 +0000 (08:49 +0100)]

commit | commitdiff | tree

Remi Collet [Thu, 27 Feb 2014 07:48:01 +0000 (08:48 +0100)]

commit | commitdiff | tree

Remi Collet [Thu, 27 Feb 2014 07:45:16 +0000 (08:45 +0100)]

Fixed Bug #66762 Segfault in mysqli_stmt::bind_result() when link closed

Each new mysqli_stmt now increase the refcount of the link object.
So the link is really destroy after all statements.

Only implemented with libmysqlclient, as mysqlnd already implement
this internally.

So, libmysqlclient and mysqlnd have the same behavior.

commit | commitdiff | tree

Ferenc Kovacs [Thu, 27 Feb 2014 01:32:07 +0000 (02:32 +0100)]

Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
fix tests broken by 633f898f1520253d3530fe91fc82f68bca7c4627

commit | commitdiff | tree

Ferenc Kovacs [Thu, 27 Feb 2014 01:31:42 +0000 (02:31 +0100)]

fix tests broken by 633f898f1520253d3530fe91fc82f68bca7c4627

commit | commitdiff | tree

Ferenc Kovacs [Thu, 27 Feb 2014 00:18:11 +0000 (01:18 +0100)]

add missing NEWS entry

commit | commitdiff | tree

Ferenc Kovacs [Wed, 26 Feb 2014 14:10:23 +0000 (15:10 +0100)]

Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
add news entry
add clear_env option to FPM config

commit | commitdiff | tree

Antony Dovgal [Tue, 25 Feb 2014 08:15:35 +0000 (12:15 +0400)]

commit | commitdiff | tree

Antony Dovgal [Tue, 25 Feb 2014 08:14:50 +0000 (12:14 +0400)]

commit | commitdiff | tree

Paul Annesley [Wed, 19 Feb 2014 19:48:40 +0000 (11:48 -0800)]

add clear_env option to FPM config

This makes it possible to leave the envoronment as is on startup and
pass all the variables to the workers.
The default value of clear_env is "yes", preserving previous behaviour.
Patch by Paul Annesley.

commit | commitdiff | tree

Paul Annesley [Wed, 19 Feb 2014 19:48:40 +0000 (11:48 -0800)]

commit | commitdiff | tree

Christopher Jones [Tue, 25 Feb 2014 01:02:16 +0000 (17:02 -0800)]

Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
Reduce test noise on cross Oracle client <-> server version tests. This fix is already in PHP 5.6+

commit | commitdiff | tree

Christopher Jones [Tue, 25 Feb 2014 01:01:30 +0000 (17:01 -0800)]

Reduce test noise on cross Oracle client <-> server version tests.
This fix is already in PHP 5.6+

commit | commitdiff | tree

Christopher Jones [Tue, 25 Feb 2014 00:35:08 +0000 (16:35 -0800)]

Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
Reduce test noise in cross Oracle client <-> server version testing. This change is already in PHP 5.6+

commit | commitdiff | tree

Christopher Jones [Tue, 25 Feb 2014 00:33:41 +0000 (16:33 -0800)]

Reduce test noise in cross Oracle client <-> server version testing.
This change is already in PHP 5.6+

commit | commitdiff | tree

Anatol Belski [Mon, 24 Feb 2014 09:12:50 +0000 (10:12 +0100)]

Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
fixed macro

commit | commitdiff | tree

Anatol Belski [Mon, 24 Feb 2014 09:12:18 +0000 (10:12 +0100)]

commit | commitdiff | tree

Johannes Schlüter [Sun, 23 Feb 2014 13:56:32 +0000 (14:56 +0100)]

Merge branch 'PHP-5.4' into PHP-5.5

commit | commitdiff | tree

Johannes Schlüter [Sun, 23 Feb 2014 13:55:29 +0000 (14:55 +0100)]

Make sure value is initialized

commit | commitdiff | tree

Johannes Schlüter [Sun, 23 Feb 2014 13:18:24 +0000 (14:18 +0100)]

We can't dereference dbh if it is NULL

commit | commitdiff | tree

Dmitry Stogov [Fri, 21 Feb 2014 08:43:42 +0000 (12:43 +0400)]

Added information about interned strings usage

commit | commitdiff | tree

Dmitry Stogov [Fri, 21 Feb 2014 08:04:42 +0000 (12:04 +0400)]

Updated opcache version

commit | commitdiff | tree

Dmitry Stogov [Fri, 21 Feb 2014 07:59:14 +0000 (11:59 +0400)]

Added function opcache_is_script_cached(). (Danack)

commit | commitdiff | tree

Anatol Belski [Thu, 20 Feb 2014 18:00:36 +0000 (19:00 +0100)]

Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
updated libmagic.patch in 5.4/5

commit | commitdiff | tree

Anatol Belski [Thu, 20 Feb 2014 18:00:05 +0000 (19:00 +0100)]

updated libmagic.patch in 5.4/5

commit | commitdiff | tree

Anatol Belski [Thu, 20 Feb 2014 17:54:35 +0000 (18:54 +0100)]

Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
fixed leak introduced after CVE/upgrade

commit | commitdiff | tree

Anatol Belski [Thu, 20 Feb 2014 17:53:53 +0000 (18:53 +0100)]

fixed leak introduced after CVE/upgrade

commit | commitdiff | tree

Bob Weinand [Thu, 20 Feb 2014 16:48:38 +0000 (17:48 +0100)]

Merge branch 'PHP-5.4' into PHP-5.5

commit | commitdiff | tree

Bob Weinand [Thu, 20 Feb 2014 16:39:58 +0000 (17:39 +0100)]

Use nicer output for characters < 32 and > 126 in exception strings
Using question marks might confuse more than it helps.
Users are wondering what happened to their string...

commit | commitdiff | tree

Brad Daily [Wed, 19 Feb 2014 21:24:15 +0000 (15:24 -0600)]

Fixes #66714: imageconvolution breakage in 5.5.9

5.5.9 included some GD fixes related to #66356. One of those fixes changed the
above section of imageconvolution, but the variable was mistyped.

commit | commitdiff | tree

Daniel Lowrey [Wed, 19 Feb 2014 11:01:08 +0000 (04:01 -0700)]

Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
Skip failing tests when EC unavailable (RHEL)

Conflicts:
ext/openssl/openssl.c

commit | commitdiff | tree

Daniel Lowrey [Wed, 19 Feb 2014 10:57:37 +0000 (03:57 -0700)]

Skip failing tests when EC unavailable (RHEL)

commit | commitdiff | tree

Anatol Belski [Tue, 18 Feb 2014 18:08:45 +0000 (19:08 +0100)]

Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
updated libmagic.patch

commit | commitdiff | tree

Anatol Belski [Tue, 18 Feb 2014 18:08:16 +0000 (19:08 +0100)]

updated libmagic.patch

commit | commitdiff | tree

Stanislav Malyshev [Tue, 18 Feb 2014 16:47:43 +0000 (08:47 -0800)]

MErge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
update news with CVE

commit | commitdiff | tree

Stanislav Malyshev [Tue, 18 Feb 2014 16:36:51 +0000 (08:36 -0800)]

update news with CVE

commit | commitdiff | tree

Julien Pauli [Tue, 18 Feb 2014 15:45:48 +0000 (16:45 +0100)]

commit | commitdiff | tree

Julien Pauli [Tue, 18 Feb 2014 15:40:19 +0000 (16:40 +0100)]

5.5.11 next for NEWS

commit | commitdiff | tree

Remi Collet [Tue, 18 Feb 2014 12:57:53 +0000 (13:57 +0100)]

Set fileinfo version to 1.0.5 (as in php 5.4, no diff)

commit | commitdiff | tree

Remi Collet [Tue, 18 Feb 2014 12:57:28 +0000 (13:57 +0100)]

commit | commitdiff | tree

Remi Collet [Tue, 18 Feb 2014 12:57:10 +0000 (13:57 +0100)]

Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
NEWS
Fixed Bug #66731 file: infinite recursion

commit | commitdiff | tree

Remi Collet [Tue, 18 Feb 2014 12:56:58 +0000 (13:56 +0100)]

commit | commitdiff | tree

Remi Collet [Tue, 18 Feb 2014 12:54:33 +0000 (13:54 +0100)]

Fixed Bug #66731 file: infinite recursion

Upstream commit (available in file-5.17)

https://github.com/glensc/file/commit/3c081560c23f20b2985c285338b52c7aae9fdb0f
https://github.com/glensc/file/commit/cc9e74dfeca5265ad725acc926ef0b8d2a18ee70

commit | commitdiff | tree

Stanislav Malyshev [Tue, 18 Feb 2014 05:22:03 +0000 (21:22 -0800)]

Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
5.4.27 now
update NEWS

Conflicts:
configure.in
main/php_version.h

commit | commitdiff | tree

Stanislav Malyshev [Tue, 18 Feb 2014 05:19:25 +0000 (21:19 -0800)]

commit | commitdiff | tree

Stanislav Malyshev [Tue, 18 Feb 2014 05:16:48 +0000 (21:16 -0800)]

commit | commitdiff | tree

Daniel Lowrey [Tue, 18 Feb 2014 00:38:30 +0000 (19:38 -0500)]

Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
Fixed broken build when EC unavailable

commit | commitdiff | tree

Daniel Lowrey [Mon, 17 Feb 2014 23:55:39 +0000 (18:55 -0500)]

Fixed broken build when EC unavailable

commit | commitdiff | tree

Julien Pauli [Mon, 17 Feb 2014 10:13:38 +0000 (11:13 +0100)]

Updated NEWS for #65753

commit | commitdiff | tree

Julien Pauli [Mon, 17 Feb 2014 10:09:31 +0000 (11:09 +0100)]

Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
Updated NEWS for #65753

commit | commitdiff | tree

Julien Pauli [Mon, 17 Feb 2014 10:05:34 +0000 (11:05 +0100)]

Updated NEWS for #65753

commit | commitdiff | tree

Julien Pauli [Mon, 17 Feb 2014 09:36:13 +0000 (10:36 +0100)]

Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
Export JsonSerializable Interface (bug #65753)

commit | commitdiff | tree

Julien Pauli [Mon, 17 Feb 2014 09:25:40 +0000 (10:25 +0100)]

Export JsonSerializable Interface (bug #65753)

commit | commitdiff | tree

Yasuo Ohgaki [Sun, 16 Feb 2014 01:47:13 +0000 (10:47 +0900)]

commit | commitdiff | tree

Yasuo Ohgaki [Sun, 16 Feb 2014 01:45:50 +0000 (10:45 +0900)]

Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
Fixed possbile injections against pg_insert()/pg_delete()/pg_update()/pg_select()

commit | commitdiff | tree

Yasuo Ohgaki [Sun, 16 Feb 2014 01:45:15 +0000 (10:45 +0900)]

Fixed possbile injections against pg_insert()/pg_delete()/pg_update()/pg_select()

commit | commitdiff | tree

Yasuo Ohgaki [Sat, 15 Feb 2014 22:51:50 +0000 (07:51 +0900)]

Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
Refactor build_tablename()

commit | commitdiff | tree

Yasuo Ohgaki [Sat, 15 Feb 2014 22:49:07 +0000 (07:49 +0900)]

Refactor build_tablename()

commit | commitdiff | tree

Yasuo Ohgaki [Sat, 15 Feb 2014 21:25:01 +0000 (06:25 +0900)]

Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
Revise encoding blacklist

commit | commitdiff | tree

Yasuo Ohgaki [Sat, 15 Feb 2014 21:21:39 +0000 (06:21 +0900)]

Revise encoding blacklist

commit | commitdiff | tree

Felipe Pena [Sat, 15 Feb 2014 13:05:08 +0000 (11:05 -0200)]

Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
- Fix ZTS build when HAVE_PQESCAPELITERAL is not set
Update NEWS

commit | commitdiff | tree

Felipe Pena [Sat, 15 Feb 2014 13:04:49 +0000 (11:04 -0200)]

- Fix ZTS build when HAVE_PQESCAPELITERAL is not set

commit | commitdiff | tree

Yasuo Ohgaki [Sat, 15 Feb 2014 10:21:54 +0000 (19:21 +0900)]

commit | commitdiff | tree

Yasuo Ohgaki [Sat, 15 Feb 2014 10:20:34 +0000 (19:20 +0900)]

commit | commitdiff | tree

Yasuo Ohgaki [Sat, 15 Feb 2014 09:29:36 +0000 (18:29 +0900)]

Merge branch 'PHP-5.4' into PHP-5.5

commit | commitdiff | tree

Yasuo Ohgaki [Sat, 15 Feb 2014 07:31:43 +0000 (16:31 +0900)]

Refactor and cleanup. WS is cleaned up. Use -b if it is needed.
Added compatibility macros, PQescapeStringConn, PGSQLescapeLiteral/Identifier, PGSQLfree.

commit | commitdiff | tree

Daniel Lowrey [Sat, 15 Feb 2014 04:42:36 +0000 (21:42 -0700)]

commit | commitdiff | tree

Daniel Lowrey [Sat, 15 Feb 2014 04:41:18 +0000 (21:41 -0700)]

commit | commitdiff | tree

Daniel Lowrey [Sat, 15 Feb 2014 01:15:24 +0000 (18:15 -0700)]

Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
Fix for bug66501 - "key type not supported in this PHP build"

commit | commitdiff | tree

mk-j [Wed, 22 Jan 2014 19:58:44 +0000 (12:58 -0700)]

Fix for bug66501 - "key type not supported in this PHP build"

commit | commitdiff | tree

Veres Lajos [Fri, 14 Feb 2014 15:12:52 +0000 (17:12 +0200)]

commit | commitdiff | tree

Lior Kaplan [Fri, 14 Feb 2014 13:30:00 +0000 (15:30 +0200)]

Merge branch 'PHP-5.4' into PHP-5.5

commit | commitdiff | tree

Veres Lajos [Fri, 14 Feb 2014 12:51:10 +0000 (14:51 +0200)]

commit | commitdiff | tree

Derick Rethans [Tue, 11 Feb 2014 11:27:01 +0000 (11:27 +0000)]

Fixed ZTS and added fix to NEWS.

commit | commitdiff | tree

Mats Lindh [Sun, 9 Feb 2014 19:17:26 +0000 (21:17 +0200)]

Replace old SVN references to Git

commit | commitdiff | tree

Anatol Belski [Thu, 6 Feb 2014 08:13:05 +0000 (09:13 +0100)]

update libs_version.txt

commit | commitdiff | tree

Hannes Magnusson [Wed, 5 Feb 2014 18:15:11 +0000 (10:15 -0800)]

commit | commitdiff | tree

Anatol Belski [Wed, 5 Feb 2014 14:15:34 +0000 (15:15 +0100)]

adapt test to curl 7.35.0 upgrade

which is a security one and should be performed as in
http://curl.haxx.se/docs/adv_20140129.html

commit | commitdiff | tree

Dmitry Panin [Mon, 3 Feb 2014 17:49:54 +0000 (09:49 -0800)]

Make html_table_gen consistent with html_table.h

In commit 6dabd7de04ae3ed the html_table.h was changed manually,
without changing the underlying generator (html_table_gen.php).
This commit fixes it.

commit | commitdiff | tree

Derick Rethans [Thu, 6 Feb 2014 02:00:13 +0000 (21:00 -0500)]

Implemented feature #45528: Allow the DateTimeZone constructor to accept timezones per offset too.

commit | commitdiff | tree

Derick Rethans [Thu, 6 Feb 2014 01:59:10 +0000 (20:59 -0500)]

Rename timelib_get_zone to timelib_parse_zone and export.

commit | commitdiff | tree

Nuno Lopes [Sat, 8 Feb 2014 11:54:27 +0000 (06:54 -0500)]

fix regex to detect valgrind version
New PCRE version got stricter

commit | commitdiff | tree

Julien Pauli [Thu, 6 Feb 2014 14:16:16 +0000 (15:16 +0100)]

commit | commitdiff | tree