]>
granicus.if.org Git - php/log
Xinchen Hui [Fri, 27 Feb 2015 03:11:45 +0000 (11:11 +0800)]
Merge branch 'PHP-5.5' into PHP-5.6
Taoguang Chen [Fri, 27 Feb 2015 02:41:53 +0000 (10:41 +0800)]
fix bug#68942's patch
Fix type confusion bug in unserialize() with DateTimeZone. https://bugs.php.net/bug.php?id=68942
George Wang [Wed, 25 Feb 2015 15:48:19 +0000 (10:48 -0500)]
Fixed a bug that header value is not terminated by '\0' when accessed through getenv().
George Wang [Wed, 25 Feb 2015 15:48:19 +0000 (10:48 -0500)]
Fixed a bug that header value is not terminated by '\0' when accessed through getenv().
Xinchen Hui [Wed, 25 Feb 2015 12:49:17 +0000 (20:49 +0800)]
Merge branch 'PHP-5.5' into PHP-5.6
Xinchen Hui [Wed, 25 Feb 2015 12:49:07 +0000 (20:49 +0800)]
better name
Xinchen Hui [Wed, 25 Feb 2015 12:08:52 +0000 (20:08 +0800)]
Merge branch 'PHP-5.5' into PHP-5.6
Conflicts:
ext/opcache/tests/bug69038.phpt
Xinchen Hui [Wed, 25 Feb 2015 12:07:02 +0000 (20:07 +0800)]
Improve fix for #69038
Xinchen Hui [Wed, 25 Feb 2015 10:22:41 +0000 (18:22 +0800)]
Update NEWs
Xinchen Hui [Wed, 25 Feb 2015 10:22:18 +0000 (18:22 +0800)]
Merge branch 'PHP-5.5' into PHP-5.6
Xinchen Hui [Wed, 25 Feb 2015 10:21:59 +0000 (18:21 +0800)]
Fixed bug #69108 ("Segmentation fault" when (de)serializing SplObjectStorage)
Julien Pauli [Mon, 23 Feb 2015 10:23:48 +0000 (11:23 +0100)]
Updated NEWS
Julien Pauli [Mon, 23 Feb 2015 10:23:00 +0000 (11:23 +0100)]
Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
updated NEWS
curl: add new proxy constants
Julien Pauli [Mon, 23 Feb 2015 10:22:44 +0000 (11:22 +0100)]
updated NEWS
Linus Unnebäck [Tue, 17 Jun 2014 10:28:44 +0000 (12:28 +0200)]
curl: add new proxy constants
Julien Pauli [Mon, 23 Feb 2015 09:35:35 +0000 (10:35 +0100)]
Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
Fixed test fails for bug68557
Xinchen Hui [Sat, 21 Feb 2015 04:36:38 +0000 (12:36 +0800)]
Fixed test fails for bug68557
Jakub Zelenka [Sun, 22 Feb 2015 20:35:03 +0000 (20:35 +0000)]
Merge branch 'PHP-5.5' into PHP-5.6
Conflicts:
ext/json/json.c
Jakub Zelenka [Sun, 22 Feb 2015 20:22:47 +0000 (20:22 +0000)]
Fix bug #64695 (JSON_NUMERIC_CHECK has issues with strings that are numbers plus the letter e)
Rasmus Lerdorf [Sun, 22 Feb 2015 16:32:32 +0000 (08:32 -0800)]
NEWS entry
Rasmus Lerdorf [Sun, 22 Feb 2015 16:31:17 +0000 (08:31 -0800)]
NEWS entry
Rasmus Lerdorf [Sun, 22 Feb 2015 16:14:41 +0000 (08:14 -0800)]
Fix bug #68166
We can't always efree here
php_escape_html_entities can return an interned_empty_string
Rasmus Lerdorf [Sun, 22 Feb 2015 16:14:41 +0000 (08:14 -0800)]
Fix bug #68166
We can't always efree here
php_escape_html_entities can return an interned_empty_string
Anatol Belski [Sun, 22 Feb 2015 15:47:56 +0000 (16:47 +0100)]
Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
updated NEWS
Anatol Belski [Sun, 22 Feb 2015 15:47:44 +0000 (16:47 +0100)]
updated NEWS
Anatol Belski [Sun, 22 Feb 2015 15:46:39 +0000 (16:46 +0100)]
updated NEWS
Anatol Belski [Sun, 22 Feb 2015 15:26:52 +0000 (16:26 +0100)]
Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
Fix Win32 SSPI initialization for digest authentication in cURL
Anatol Belski [Sun, 22 Feb 2015 15:26:02 +0000 (16:26 +0100)]
Merge branch 'pull-request/1112' into PHP-5.5
Grant Pannell [Sun, 22 Feb 2015 13:04:55 +0000 (23:34 +1030)]
Fix Win32 SSPI initialization for digest authentication in cURL
Anatol Belski [Sat, 21 Feb 2015 13:14:24 +0000 (14:14 +0100)]
Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
revisit fix for bug #65272
Conflicts:
ext/standard/file.c
Anatol Belski [Sat, 21 Feb 2015 13:10:59 +0000 (14:10 +0100)]
revisit fix for bug #65272
Anatol Belski [Fri, 20 Feb 2015 15:02:07 +0000 (16:02 +0100)]
Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
split test for bug #68557 for windows
Anatol Belski [Fri, 20 Feb 2015 15:01:34 +0000 (16:01 +0100)]
split test for bug #68557 for windows
Julien Pauli [Fri, 20 Feb 2015 14:44:18 +0000 (15:44 +0100)]
Updated NEWS
Julien Pauli [Fri, 20 Feb 2015 14:43:53 +0000 (15:43 +0100)]
Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
Updated NEWS
Julien Pauli [Fri, 20 Feb 2015 14:43:38 +0000 (15:43 +0100)]
Updated NEWS
Julien Pauli [Fri, 20 Feb 2015 14:38:48 +0000 (15:38 +0100)]
Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
fix #68557
Julien Pauli [Fri, 20 Feb 2015 14:09:35 +0000 (15:09 +0100)]
fix #68557
Dmitry Stogov [Fri, 20 Feb 2015 07:32:34 +0000 (10:32 +0300)]
Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
Fixed type mismatch
Dmitry Stogov [Fri, 20 Feb 2015 07:31:24 +0000 (10:31 +0300)]
Fixed type mismatch
Ferenc Kovacs [Wed, 18 Feb 2015 19:10:28 +0000 (20:10 +0100)]
update NEWS to match the actual stuff in 5.6.6
Ferenc Kovacs [Wed, 18 Feb 2015 19:09:12 +0000 (20:09 +0100)]
Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
update NEWS to match the actual stuff in 5.5.22
Ferenc Kovacs [Wed, 18 Feb 2015 19:08:46 +0000 (20:08 +0100)]
update NEWS to match the actual stuff in 5.5.22
Ferenc Kovacs [Wed, 18 Feb 2015 18:52:00 +0000 (19:52 +0100)]
update NEWS(add missing entry for the enchant fix, and reorder the entries a bit)
Ferenc Kovacs [Wed, 18 Feb 2015 18:49:23 +0000 (19:49 +0100)]
Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
fix typo in bug#
add CVE
5.4.39 next
Ferenc Kovacs [Wed, 18 Feb 2015 18:48:50 +0000 (19:48 +0100)]
Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
fix typo in bug#
add CVE
5.4.39 next
Conflicts:
configure.in
main/php_version.h
Ferenc Kovacs [Wed, 18 Feb 2015 18:47:07 +0000 (19:47 +0100)]
fix typo in bug#
Ferenc Kovacs [Wed, 18 Feb 2015 18:39:58 +0000 (19:39 +0100)]
update NEWS
Ferenc Kovacs [Wed, 18 Feb 2015 18:20:13 +0000 (19:20 +0100)]
fix email format
Ferenc Kovacs [Wed, 18 Feb 2015 15:33:32 +0000 (16:33 +0100)]
update NEWS
Ferenc Kovacs [Wed, 18 Feb 2015 15:32:57 +0000 (16:32 +0100)]
update 5.6.6 release date in NEWS
Ferenc Kovacs [Wed, 18 Feb 2015 15:32:23 +0000 (16:32 +0100)]
Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
Fix bug #69033 (Request may get env. variables from previous requests if PHP works as FastCGI)
Ferenc Kovacs [Wed, 18 Feb 2015 14:27:27 +0000 (15:27 +0100)]
Fix bug #69033 (Request may get env. variables from previous requests if PHP works as FastCGI)
Michael Wallner [Wed, 18 Feb 2015 13:08:52 +0000 (14:08 +0100)]
BFN
Michael Wallner [Wed, 18 Feb 2015 13:06:39 +0000 (14:06 +0100)]
Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
fix test
Michael Wallner [Wed, 18 Feb 2015 13:06:32 +0000 (14:06 +0100)]
fix test
Michael Wallner [Wed, 18 Feb 2015 13:05:02 +0000 (14:05 +0100)]
Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
fix test
Michael Wallner [Wed, 18 Feb 2015 13:04:53 +0000 (14:04 +0100)]
fix test
Michael Wallner [Wed, 18 Feb 2015 12:59:32 +0000 (13:59 +0100)]
Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
Fixed bug #65593 (Segfault when calling ob_start from output buffering callback)
Michael Wallner [Wed, 18 Feb 2015 12:58:31 +0000 (13:58 +0100)]
Fixed bug #65593 (Segfault when calling ob_start from output buffering callback)
Julien Pauli [Wed, 18 Feb 2015 11:41:47 +0000 (12:41 +0100)]
Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
Updated NEWS
Julien Pauli [Wed, 18 Feb 2015 11:40:38 +0000 (12:40 +0100)]
Updated NEWS
Remi Collet [Wed, 18 Feb 2015 05:44:41 +0000 (06:44 +0100)]
add CVE
Xinchen Hui [Tue, 17 Feb 2015 13:17:06 +0000 (21:17 +0800)]
Merge branch 'PHP-5.5' of https://git.php.net/repository/php-src into PHP-5.5
Xinchen Hui [Tue, 17 Feb 2015 13:16:53 +0000 (21:16 +0800)]
Merge branch 'PHP-5.6' of https://git.php.net/repository/php-src into PHP-5.6
Xinchen Hui [Tue, 17 Feb 2015 13:16:37 +0000 (21:16 +0800)]
Replace var is introduced
Stanislav Malyshev [Tue, 17 Feb 2015 06:47:27 +0000 (07:47 +0100)]
Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
fix TS build
Stanislav Malyshev [Tue, 17 Feb 2015 06:47:12 +0000 (07:47 +0100)]
fix TS build
Stanislav Malyshev [Tue, 17 Feb 2015 06:34:00 +0000 (07:34 +0100)]
5.4.39 next
Stanislav Malyshev [Tue, 17 Feb 2015 05:58:24 +0000 (06:58 +0100)]
Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
update news
Stanislav Malyshev [Tue, 17 Feb 2015 05:58:14 +0000 (06:58 +0100)]
update news
Stanislav Malyshev [Tue, 17 Feb 2015 05:56:20 +0000 (06:56 +0100)]
Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
Fix bug #68942 (Use after free vulnerability in unserialize() with DateTimeZone)
Port for for bug #68552
Fix bug #68942 (Use after free vulnerability in unserialize() with DateTimeZone)
- BFN
Stanislav Malyshev [Tue, 17 Feb 2015 05:53:48 +0000 (06:53 +0100)]
Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
Port for for bug #68552
Fix bug #68942 (Use after free vulnerability in unserialize() with DateTimeZone)
- BFN
Stanislav Malyshev [Tue, 17 Feb 2015 05:53:27 +0000 (06:53 +0100)]
Fix bug #68942 (Use after free vulnerability in unserialize() with DateTimeZone)
Stanislav Malyshev [Mon, 16 Feb 2015 05:50:10 +0000 (06:50 +0100)]
Port for for bug #68552
Stanislav Malyshev [Sun, 1 Feb 2015 06:40:08 +0000 (22:40 -0800)]
Fix bug #68942 (Use after free vulnerability in unserialize() with DateTimeZone)
Conflicts:
ext/date/php_date.c
Xinchen Hui [Tue, 17 Feb 2015 03:36:44 +0000 (11:36 +0800)]
Update NEWS
Xinchen Hui [Tue, 17 Feb 2015 03:36:15 +0000 (11:36 +0800)]
Merge branch 'PHP-5.5' into PHP-5.6
Xinchen Hui [Tue, 17 Feb 2015 03:34:57 +0000 (11:34 +0800)]
Fixed bug #69038 (switch(SOMECONSTANT) misbehaves)
Felipe Pena [Tue, 17 Feb 2015 03:14:05 +0000 (01:14 -0200)]
- BFN
Felipe Pena [Tue, 17 Feb 2015 03:08:48 +0000 (01:08 -0200)]
Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
Felipe Pena [Tue, 17 Feb 2015 03:08:07 +0000 (01:08 -0200)]
Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
- Fixed bug #67827 (broken detection of system crypt sha256/sha512 support)
- Fixed bug #67427 (SoapServer cannot handle large messages) patch by: brandt at docoloc dot de
Update NEWS
Felipe Pena [Tue, 17 Feb 2015 02:28:28 +0000 (00:28 -0200)]
Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
- Fixed bug #67827 (broken detection of system crypt sha256/sha512 support)
- Fixed bug #67427 (SoapServer cannot handle large messages) patch by: brandt at docoloc dot de
Update NEWS
Felipe Pena [Tue, 17 Feb 2015 02:28:11 +0000 (00:28 -0200)]
Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
- Fixed bug #67827 (broken detection of system crypt sha256/sha512 support)
- Fixed bug #67427 (SoapServer cannot handle large messages) patch by: brandt at docoloc dot de
Update NEWS
Felipe Pena [Tue, 17 Feb 2015 02:23:47 +0000 (00:23 -0200)]
- Fixed bug #67827 (broken detection of system crypt sha256/sha512 support)
Felipe Pena [Mon, 16 Feb 2015 15:09:52 +0000 (13:09 -0200)]
Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
- Fix merge
BFN
Felipe Pena [Mon, 16 Feb 2015 15:09:40 +0000 (13:09 -0200)]
- Fix merge
Felipe Pena [Mon, 16 Feb 2015 15:07:26 +0000 (13:07 -0200)]
- Fixed bug #67427 (SoapServer cannot handle large messages) patch by: brandt at docoloc dot de
Antony Dovgal [Mon, 16 Feb 2015 12:23:13 +0000 (15:23 +0300)]
BFN
Antony Dovgal [Mon, 16 Feb 2015 12:15:33 +0000 (15:15 +0300)]
Merge branch 'pull-request/995' into PHP-5.5
* pull-request/995:
fix bug #68822 (request time is reset too early)
Antony Dovgal [Mon, 16 Feb 2015 12:15:11 +0000 (15:15 +0300)]
Merge branch 'pull-request/995' into PHP-5.6
* pull-request/995:
fix bug #68822 (request time is reset too early)
redfoxli [Tue, 13 Jan 2015 05:59:24 +0000 (13:59 +0800)]
fix bug #68822 (request time is reset too early)
this caused wrong time in the logs
Xinchen Hui [Mon, 16 Feb 2015 06:16:52 +0000 (14:16 +0800)]
Fixed bug #68912 (Segmentation fault at openssl_spki_new)
Xinchen Hui [Sun, 15 Feb 2015 15:00:34 +0000 (23:00 +0800)]
Update NEWs
Xinchen Hui [Sun, 15 Feb 2015 14:55:42 +0000 (22:55 +0800)]
Merge branch 'PHP-5.5' into PHP-5.6
Xinchen Hui [Sun, 15 Feb 2015 14:54:05 +0000 (22:54 +0800)]
Fixed bug #69054 (Null dereference in readline_(read|write)_history() without parameters)
Michael Wallner [Sun, 8 Feb 2015 20:45:19 +0000 (21:45 +0100)]
fix detection of mbstate_t with clang
AC_TRY_COMPILE expexts a function body
Xinchen Hui [Sat, 14 Feb 2015 14:18:13 +0000 (22:18 +0800)]
Merge branch 'PHP-5.5' into PHP-5.6
Conflicts:
ext/pgsql/pgsql.c
Xinchen Hui [Sat, 14 Feb 2015 14:14:31 +0000 (22:14 +0800)]
Fixed bug #68638 (pg_update() fails to store infinite values)
Xinchen Hui [Sat, 14 Feb 2015 14:03:53 +0000 (22:03 +0800)]
Merge branch 'PHP-5.4' of https://github.com/wfelipew/php-src into PHP-5.5