]>
granicus.if.org Git - php/log
Ferenc Kovacs [Thu, 27 Feb 2014 00:18:11 +0000 (01:18 +0100)]
add missing NEWS entry
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
Antony Dovgal [Tue, 25 Feb 2014 08:15:35 +0000 (12:15 +0400)]
add news entry
Antony Dovgal [Tue, 25 Feb 2014 08:14:50 +0000 (12:14 +0400)]
add news entry
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.
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.
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+
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+
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+
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+
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
Anatol Belski [Mon, 24 Feb 2014 09:12:18 +0000 (10:12 +0100)]
fixed macro
Johannes Schlüter [Sun, 23 Feb 2014 13:56:32 +0000 (14:56 +0100)]
Merge branch 'PHP-5.4' into PHP-5.5
Johannes Schlüter [Sun, 23 Feb 2014 13:55:29 +0000 (14:55 +0100)]
Make sure value is initialized
Johannes Schlüter [Sun, 23 Feb 2014 13:18:24 +0000 (14:18 +0100)]
We can't dereference dbh if it is NULL
Dmitry Stogov [Fri, 21 Feb 2014 08:43:42 +0000 (12:43 +0400)]
Added information about interned strings usage
Dmitry Stogov [Fri, 21 Feb 2014 08:04:42 +0000 (12:04 +0400)]
Updated opcache version
Dmitry Stogov [Fri, 21 Feb 2014 07:59:14 +0000 (11:59 +0400)]
Added function opcache_is_script_cached(). (Danack)
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
Anatol Belski [Thu, 20 Feb 2014 18:00:05 +0000 (19:00 +0100)]
updated libmagic.patch in 5.4/5
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
Anatol Belski [Thu, 20 Feb 2014 17:53:53 +0000 (18:53 +0100)]
fixed leak introduced after CVE/upgrade
Bob Weinand [Thu, 20 Feb 2014 16:48:38 +0000 (17:48 +0100)]
Merge branch 'PHP-5.4' into PHP-5.5
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...
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.
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
Daniel Lowrey [Wed, 19 Feb 2014 10:57:37 +0000 (03:57 -0700)]
Skip failing tests when EC unavailable (RHEL)
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
Anatol Belski [Tue, 18 Feb 2014 18:08:16 +0000 (19:08 +0100)]
updated libmagic.patch
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
Stanislav Malyshev [Tue, 18 Feb 2014 16:36:51 +0000 (08:36 -0800)]
update news with CVE
Julien Pauli [Tue, 18 Feb 2014 15:45:48 +0000 (16:45 +0100)]
5.5.11-dev next
Julien Pauli [Tue, 18 Feb 2014 15:40:19 +0000 (16:40 +0100)]
5.5.11 next for NEWS
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)
Remi Collet [Tue, 18 Feb 2014 12:57:28 +0000 (13:57 +0100)]
NEWS
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
Remi Collet [Tue, 18 Feb 2014 12:56:58 +0000 (13:56 +0100)]
NEWS
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
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
Stanislav Malyshev [Tue, 18 Feb 2014 05:19:25 +0000 (21:19 -0800)]
5.4.27 now
Stanislav Malyshev [Tue, 18 Feb 2014 05:16:48 +0000 (21:16 -0800)]
update NEWS
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
Daniel Lowrey [Mon, 17 Feb 2014 23:55:39 +0000 (18:55 -0500)]
Fixed broken build when EC unavailable
Julien Pauli [Mon, 17 Feb 2014 10:13:38 +0000 (11:13 +0100)]
Updated NEWS for #65753
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
Julien Pauli [Mon, 17 Feb 2014 10:05:34 +0000 (11:05 +0100)]
Updated NEWS for #65753
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)
Julien Pauli [Mon, 17 Feb 2014 09:25:40 +0000 (10:25 +0100)]
Export JsonSerializable Interface (bug #65753)
Yasuo Ohgaki [Sun, 16 Feb 2014 01:47:13 +0000 (10:47 +0900)]
Update NEWS
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()
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()
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()
Yasuo Ohgaki [Sat, 15 Feb 2014 22:49:07 +0000 (07:49 +0900)]
Refactor build_tablename()
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
Yasuo Ohgaki [Sat, 15 Feb 2014 21:21:39 +0000 (06:21 +0900)]
Revise encoding blacklist
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
Felipe Pena [Sat, 15 Feb 2014 13:04:49 +0000 (11:04 -0200)]
- Fix ZTS build when HAVE_PQESCAPELITERAL is not set
Yasuo Ohgaki [Sat, 15 Feb 2014 10:21:54 +0000 (19:21 +0900)]
Update NEWS
Yasuo Ohgaki [Sat, 15 Feb 2014 10:20:34 +0000 (19:20 +0900)]
Update NEWS
Yasuo Ohgaki [Sat, 15 Feb 2014 09:29:36 +0000 (18:29 +0900)]
Merge branch 'PHP-5.4' into PHP-5.5
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.
Daniel Lowrey [Sat, 15 Feb 2014 04:42:36 +0000 (21:42 -0700)]
Update NEWS
Daniel Lowrey [Sat, 15 Feb 2014 04:41:18 +0000 (21:41 -0700)]
Update NEWS
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"
mk-j [Wed, 22 Jan 2014 19:58:44 +0000 (12:58 -0700)]
Fix for bug66501 - "key type not supported in this PHP build"
Veres Lajos [Fri, 14 Feb 2014 15:12:52 +0000 (17:12 +0200)]
a few typofixes
Lior Kaplan [Fri, 14 Feb 2014 13:30:00 +0000 (15:30 +0200)]
Merge branch 'PHP-5.4' into PHP-5.5
Veres Lajos [Fri, 14 Feb 2014 12:51:10 +0000 (14:51 +0200)]
a few typofixes
Derick Rethans [Tue, 11 Feb 2014 11:27:01 +0000 (11:27 +0000)]
Fixed ZTS and added fix to NEWS.
Mats Lindh [Sun, 9 Feb 2014 19:17:26 +0000 (21:17 +0200)]
Replace old SVN references to Git
Anatol Belski [Thu, 6 Feb 2014 08:13:05 +0000 (09:13 +0100)]
update libs_version.txt
Hannes Magnusson [Wed, 5 Feb 2014 18:15:11 +0000 (10:15 -0800)]
Fix year
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
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.
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.
Derick Rethans [Thu, 6 Feb 2014 01:59:10 +0000 (20:59 -0500)]
Rename timelib_get_zone to timelib_parse_zone and export.
Nuno Lopes [Sat, 8 Feb 2014 11:54:27 +0000 (06:54 -0500)]
fix regex to detect valgrind version
New PCRE version got stricter
Julien Pauli [Thu, 6 Feb 2014 14:16:16 +0000 (15:16 +0100)]
5.5.9 now released
Anatol Belski [Thu, 6 Feb 2014 08:17:29 +0000 (09:17 +0100)]
Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
update libs_version.txt
Conflicts:
win32/build/libs_version.txt
Anatol Belski [Thu, 6 Feb 2014 08:14:30 +0000 (09:14 +0100)]
updated libs_version.txt
Hannes Magnusson [Wed, 5 Feb 2014 18:15:50 +0000 (10:15 -0800)]
Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
Fix year
Anatol Belski [Wed, 5 Feb 2014 14:16:57 +0000 (15:16 +0100)]
Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
adapt test to curl 7.35.0 upgrade
Anatol Belski [Wed, 5 Feb 2014 09:51:08 +0000 (10:51 +0100)]
move the NEWS entry into the right section
Anatol Belski [Tue, 4 Feb 2014 09:38:17 +0000 (10:38 +0100)]
updated NEWS
Anatol Belski [Tue, 4 Feb 2014 09:34:11 +0000 (10:34 +0100)]
pcre tests go with 8.34 upgrade
Anatol Belski [Tue, 4 Feb 2014 09:31:07 +0000 (10:31 +0100)]
pcre upgraded to 8.34
Stanislav Malyshev [Thu, 30 Jan 2014 07:48:19 +0000 (23:48 -0800)]
Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
tests still failing, so xfail for now until fixed
Stanislav Malyshev [Thu, 30 Jan 2014 01:40:39 +0000 (17:40 -0800)]
tests still failing, so xfail for now until fixed
Stanislav Malyshev [Thu, 30 Jan 2014 01:40:39 +0000 (17:40 -0800)]
tests still failing, so xfail for now until fixed
Yasuo Ohgaki [Thu, 30 Jan 2014 05:16:05 +0000 (14:16 +0900)]
Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
Fixed bug data->fd not set to -1 for open_basedir failure.
Yasuo Ohgaki [Thu, 30 Jan 2014 05:15:29 +0000 (14:15 +0900)]
Fixed bug data->fd not set to -1 for open_basedir failure.
Remi Collet [Wed, 29 Jan 2014 08:53:22 +0000 (09:53 +0100)]
Fixed Request #66574 Allow multiple paths in php_ini_scanned_path
php_ini_scanned_path, from --with-config-file-scan-dir option or
from PHP_INI_SCAN_DIR environment variable allow a single path.
In some case it could be useful to allow multiple.
In the proposed patch, multiple paths are allow, using syntax inspired
from Unix MANPATH (: separated list, empty string for builtin value).
For example, this allow to use:
PHP_INI_SCAN_DIR=/foo/php.d:/bar/php.d php
PHP_INI_SCAN_DIR=:/myproject/php.d php
PHP_INI_SCAN_DIR=/myproject/php.d: php
Real use case: in SCL for dependent collections where each collection
provides a separate tree for extensions, libraries and ini files.
Yasuo Ohgaki [Wed, 29 Jan 2014 06:51:47 +0000 (15:51 +0900)]
Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
Fixed zend.multibyte tests partially
Yasuo Ohgaki [Wed, 29 Jan 2014 06:41:30 +0000 (15:41 +0900)]
Fixed zend.multibyte tests partially
Andrey Hristov [Tue, 28 Jan 2014 13:33:16 +0000 (15:33 +0200)]
Merge branch 'PHP-5.4' into PHP-5.5
Andrey Hristov [Tue, 28 Jan 2014 13:32:59 +0000 (15:32 +0200)]
add text for the new constants
Andrey Hristov [Tue, 28 Jan 2014 13:24:45 +0000 (15:24 +0200)]
Merge branch 'PHP-5.4' into PHP-5.5
Andrey Hristov [Tue, 28 Jan 2014 13:23:54 +0000 (15:23 +0200)]
Merge branch 'PHP-5.4' of git.php.net:php-src into PHP-5.4
Andrey Hristov [Tue, 28 Jan 2014 13:23:41 +0000 (15:23 +0200)]
add new consts
Bob Weinand [Tue, 28 Jan 2014 12:33:44 +0000 (13:33 +0100)]
Merge branch 'PHP-5.4' into PHP-5.5