]>
granicus.if.org Git - php/log
Reeze Xia [Sat, 7 Feb 2015 06:11:09 +0000 (14:11 +0800)]
Improve tests for bug 67436
I always use a.php or b.php for local testing,
this diff makes the test more stable
Anatol Belski [Fri, 6 Feb 2015 18:59:14 +0000 (19:59 +0100)]
fix setting default ODBCVER value in config.w32
Anatol Belski [Fri, 6 Feb 2015 18:37:01 +0000 (19:37 +0100)]
updated NEWS
Anatol Belski [Fri, 6 Feb 2015 18:00:27 +0000 (19:00 +0100)]
Fixed bug #68964 Allowed memory size exhausted with odbc_exec
This is done in two steps:
- the ODBCVER has to be rased to 0x0300 which corresponds to Sql
Server 9, otherwise the client will not recognize several SQL
datatypes
- additionally the config scripts was tweaked so then ODBCVER
can be overridden, that still allows enabling compatibility
with lower versions
Bug #67437 might be fixed by this as well.
Anatol Belski [Fri, 6 Feb 2015 08:41:02 +0000 (09:41 +0100)]
Removed erroneous condition
This condition is always false. Furthermore headers_list() is
documented to always return an array.
Stanislav Malyshev [Fri, 6 Feb 2015 05:54:47 +0000 (21:54 -0800)]
fix tests
Stanislav Malyshev [Fri, 6 Feb 2015 04:08:26 +0000 (20:08 -0800)]
Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
Update header handling to RFC 7230
Stanislav Malyshev [Wed, 4 Feb 2015 09:11:00 +0000 (01:11 -0800)]
Update header handling to RFC 7230
Stanislav Malyshev [Thu, 5 Feb 2015 08:41:35 +0000 (00:41 -0800)]
Merge branch 'PHP-5.5' of git.php.net:php-src into PHP-5.5
* 'PHP-5.5' of git.php.net:php-src:
Conflicts: main/streams/memory.c
Nayana Hettiarachchi [Thu, 5 Feb 2015 04:26:29 +0000 (12:26 +0800)]
Conflicts:
main/streams/memory.c
Stanislav Malyshev [Thu, 5 Feb 2015 08:06:25 +0000 (00:06 -0800)]
fix test to not hit php.net
Julien Pauli [Wed, 4 Feb 2015 16:43:36 +0000 (17:43 +0100)]
Updated NEWS
Julien Pauli [Wed, 4 Feb 2015 16:39:16 +0000 (17:39 +0100)]
Revert "Fixed bug #55407 (Impossible to prototype DateTime::createFromFormat)"
This reverts commit
8e19705a93d785cd1ff8ba3a69699b00169fea47 .
Julien Pauli [Wed, 4 Feb 2015 15:35:32 +0000 (16:35 +0100)]
5.5.23 now
Julien Pauli [Wed, 4 Feb 2015 11:48:17 +0000 (12:48 +0100)]
Revert "json_decode() should generate a syntax error when given ""."
This reverts commit
a7b3abe4e6f5e2fdfd8d55b676c9ca6b3f9c8cc8 .
Yasuo Ohgaki [Tue, 3 Feb 2015 10:45:20 +0000 (19:45 +0900)]
Update NEWS
Yasuo Ohgaki [Tue, 3 Feb 2015 06:26:02 +0000 (15:26 +0900)]
Fixed Bug #65199 pg_copy_from() modifies input array variable
Yasuo Ohgaki [Tue, 3 Feb 2015 05:02:58 +0000 (14:02 +0900)]
Fixed Bug #66623 no EINTR check on flock(LOCK_EX)
Yasuo Ohgaki [Tue, 3 Feb 2015 04:38:49 +0000 (13:38 +0900)]
Fixed bug #68063 Empty session IDs do still start sessions
Yasuo Ohgaki [Tue, 3 Feb 2015 03:26:01 +0000 (12:26 +0900)]
Bug #61470 is fixed only in master
Daniel Lowrey [Mon, 2 Feb 2015 15:29:11 +0000 (10:29 -0500)]
Fixed bug #65272: correctly set flock() out param in windows
Adam Harvey [Mon, 2 Feb 2015 11:31:10 +0000 (11:31 +0000)]
Let's not assume bash is always /bin/bash.
Adam Harvey [Mon, 2 Feb 2015 11:07:34 +0000 (11:07 +0000)]
json_decode() should generate a syntax error when given "".
Fixes bug #68938 (json_decode() decodes empty string without error).
Patch by jeremy at bat-country dot us.
Yasuo Ohgaki [Mon, 2 Feb 2015 09:39:07 +0000 (18:39 +0900)]
Add test for bug #61470. It is already fixed.
Stanislav Malyshev [Sun, 1 Feb 2015 20:41:10 +0000 (12:41 -0800)]
Merge branch 'PHP-5.5' of git.php.net:php-src into PHP-5.5
* 'PHP-5.5' of git.php.net:php-src:
- Updated to version 2015.1 (2015a)
Stanislav Malyshev [Sun, 1 Feb 2015 20:41:00 +0000 (12:41 -0800)]
Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
fix sizeof size
Stanislav Malyshev [Sun, 1 Feb 2015 20:40:38 +0000 (12:40 -0800)]
fix sizeof size
Derick Rethans [Sun, 1 Feb 2015 18:31:19 +0000 (18:31 +0000)]
- Updated to version 2015.1 (2015a)
Frank Stolle [Thu, 30 Oct 2014 12:07:04 +0000 (13:07 +0100)]
Fix #66479: Wrong response to FCGI_GET_VALUES
Requesting Get-Values via FCGI caused an "endless" loop over the last requested parameter and ended with an invalid response. this patch solves this loop bug.
Conflicts:
sapi/cgi/fastcgi.c
Martin Jansen [Thu, 22 Jan 2015 19:58:15 +0000 (20:58 +0100)]
Fix bug #64938: libxml_disable_entity_loader setting is shared between threads
The availability of entity loading is stored in a module global which
previously was only initialized in the GINIT constructor. This had the
effect that disabling the entity loader in one request caused
subsequent requests hitting the same Apache child process to also have
the loader disabled.
With this change the loader is explicitely enabled in the request init
phase.
Stanislav Malyshev [Sun, 1 Feb 2015 07:47:03 +0000 (23:47 -0800)]
fix group name handling
Stanislav Malyshev [Sun, 1 Feb 2015 07:34:27 +0000 (23:34 -0800)]
Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
fix TSRM
Stanislav Malyshev [Sun, 1 Feb 2015 07:34:14 +0000 (23:34 -0800)]
fix TSRM
Stanislav Malyshev [Sun, 1 Feb 2015 07:19:23 +0000 (23:19 -0800)]
add NEWS
Danack [Tue, 13 Jan 2015 01:24:19 +0000 (01:24 +0000)]
Added test and possible fix for https://bugs.php.net/bug.php?id=67068
Stanislav Malyshev [Sun, 1 Feb 2015 05:47:22 +0000 (21:47 -0800)]
Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
Use better constant since MAXHOSTNAMELEN may mean shorter name
use right sizeof for memset
Stanislav Malyshev [Sun, 1 Feb 2015 05:46:56 +0000 (21:46 -0800)]
Use better constant since MAXHOSTNAMELEN may mean shorter name
Stanislav Malyshev [Sun, 1 Feb 2015 05:30:58 +0000 (21:30 -0800)]
use right sizeof for memset
Stanislav Malyshev [Sun, 1 Feb 2015 02:59:18 +0000 (18:59 -0800)]
Add mitigation for CVE-2015-0235 (bug #68925)
Stanislav Malyshev [Sun, 1 Feb 2015 03:08:37 +0000 (19:08 -0800)]
Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
Add mitigation for CVE-2015-0235 (bug #68925)
Stanislav Malyshev [Sun, 1 Feb 2015 02:59:18 +0000 (18:59 -0800)]
Add mitigation for CVE-2015-0235 (bug #68925)
Yasuo Ohgaki [Sat, 31 Jan 2015 20:14:27 +0000 (05:14 +0900)]
Fixed typo in comment
Yasuo Ohgaki [Thu, 29 Jan 2015 06:21:17 +0000 (15:21 +0900)]
Use bash rather than sh
Yasuo Ohgaki [Thu, 29 Jan 2015 00:23:10 +0000 (09:23 +0900)]
Fixed Bug #68941 mod_files.sh is a bash-script
Xinchen Hui [Wed, 28 Jan 2015 16:00:09 +0000 (00:00 +0800)]
Fixed bug #68901 (use after free)
Xinchen Hui [Tue, 27 Jan 2015 14:25:38 +0000 (22:25 +0800)]
fcgi_write in fpm returns ssizt_t, but it returns int in cgi
Xinchen Hui [Tue, 27 Jan 2015 14:19:11 +0000 (22:19 +0800)]
Revert previous unintentional change to this
Xinchen Hui [Tue, 27 Jan 2015 14:11:23 +0000 (22:11 +0800)]
Also Fixed #68571 in CGI SAPI, and some cleanup
Xinchen Hui [Tue, 27 Jan 2015 14:04:23 +0000 (22:04 +0800)]
Merge branch 'fixbug68571tophp5.5' of https://github.com/redfoxli/php-src into PHP-5.5
Bob Weinand [Mon, 26 Jan 2015 21:50:16 +0000 (22:50 +0100)]
Add NEWS entry
Bob Weinand [Mon, 26 Jan 2015 21:47:35 +0000 (22:47 +0100)]
Fix call after close if multiple filters are attached
Keyur Govande [Mon, 26 Jan 2015 21:29:57 +0000 (21:29 +0000)]
Add NEWS
Keyur Govande [Wed, 7 Jan 2015 21:13:57 +0000 (21:13 +0000)]
Patch commit
d9f85373e32 by moving the float_to_double function to
a header file.
Keyur Govande [Tue, 6 Jan 2015 06:33:38 +0000 (06:33 +0000)]
Fix for bugs #68114 (Build fails on OS X due to undefined symbols)
and #68657 (Reading 4 byte floats with Mysqli and libmysqlclient
has rounding errors).
The patch removes support for Decimal floating point numbers and
now defaults to using similar logic as what libmysqlclient does:
convert a 4 byte floating point number into a string, and then the
string into a double. The quirks of MySQL are maintained as seen in
Field_Float::val_str()
Ferenc Kovacs [Thu, 22 Jan 2015 20:28:21 +0000 (21:28 +0100)]
Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
fix some factual errors in the process
Ferenc Kovacs [Thu, 22 Jan 2015 20:27:38 +0000 (21:27 +0100)]
fix some factual errors in the process
Remi Collet [Thu, 22 Jan 2015 12:06:15 +0000 (13:06 +0100)]
move CVE to the right version
Anatol Belski [Thu, 22 Jan 2015 09:16:13 +0000 (10:16 +0100)]
simplify error handling for dirs as magic
Joshua Rogers [Thu, 22 Jan 2015 08:59:13 +0000 (09:59 +0100)]
Fixed bug #68827 Double free with disabled ZMM
Xinchen Hui [Thu, 22 Jan 2015 08:38:34 +0000 (16:38 +0800)]
Fixed segfault while running with moodle
Julien Pauli [Wed, 21 Jan 2015 10:10:20 +0000 (11:10 +0100)]
Updated NEWS
Xinchen Hui [Wed, 21 Jan 2015 03:17:49 +0000 (11:17 +0800)]
Fixed test fails
Derick Rethans [Tue, 20 Jan 2015 21:44:19 +0000 (21:44 +0000)]
Fixed bug #55407 (Impossible to prototype DateTime::createFromFormat)
Stanislav Malyshev [Tue, 20 Jan 2015 21:27:38 +0000 (13:27 -0800)]
fix year
Stanislav Malyshev [Tue, 20 Jan 2015 19:57:50 +0000 (11:57 -0800)]
Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
format
Stanislav Malyshev [Tue, 20 Jan 2015 19:57:39 +0000 (11:57 -0800)]
update NEWS
Stanislav Malyshev [Tue, 20 Jan 2015 19:57:17 +0000 (11:57 -0800)]
format
Stanislav Malyshev [Tue, 20 Jan 2015 19:55:04 +0000 (11:55 -0800)]
Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
add CVE
Stanislav Malyshev [Tue, 20 Jan 2015 19:54:45 +0000 (11:54 -0800)]
add CVE
Stanislav Malyshev [Tue, 20 Jan 2015 19:46:39 +0000 (11:46 -0800)]
Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
add protection against nulls
Stanislav Malyshev [Tue, 20 Jan 2015 19:46:10 +0000 (11:46 -0800)]
add protection against nulls
Stanislav Malyshev [Tue, 20 Jan 2015 18:40:11 +0000 (10:40 -0800)]
Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
5.4.38 next
Fix bug #68799: Free called on unitialized pointer
Fix for bug #68710 (Use After Free Vulnerability in PHP's unserialize())
Conflicts:
configure.in
main/php_version.h
Stanislav Malyshev [Tue, 20 Jan 2015 18:38:33 +0000 (10:38 -0800)]
5.4.38 next
Julien Pauli [Tue, 20 Jan 2015 14:09:13 +0000 (15:09 +0100)]
Updated NEWS
Joshua Rogers [Fri, 16 Jan 2015 12:10:54 +0000 (23:10 +1100)]
Fix bug #68711 Remove useless checks. 'num' is unsigned and cannot be <0.
Stanislav Malyshev [Tue, 20 Jan 2015 09:00:52 +0000 (01:00 -0800)]
Merge branch 'bug68710' into PHP-5.4
* bug68710:
Fix for bug #68710 (Use After Free Vulnerability in PHP's unserialize())
Stanislav Malyshev [Tue, 20 Jan 2015 08:57:55 +0000 (00:57 -0800)]
Merge branch 'bug68799' into PHP-5.4
* bug68799:
Fix bug #68799: Free called on unitialized pointer
Derick Rethans [Mon, 19 Jan 2015 22:59:24 +0000 (22:59 +0000)]
Fixed bug #45081 (strtotime incorrectly interprets SGT time zone).
Xinchen Hui [Sat, 17 Jan 2015 05:21:20 +0000 (13:21 +0800)]
Update year
Anatol Belski [Thu, 15 Jan 2015 15:42:17 +0000 (16:42 +0100)]
updated NEWS
steffen [Mon, 5 Jan 2015 15:50:20 +0000 (16:50 +0100)]
PDO_MySQL: Differentiate between linux and win32 when passing unix_socket
Unix uses "127.0.0.1" as default host for named pipes,
while when using Windows a "." is required as host by mysqlnd.
(This can be seen at mysqlnd.c (line 945 or searching #ifndef PHP_WIN32)
Xinchen Hui [Thu, 15 Jan 2015 15:09:28 +0000 (23:09 +0800)]
Bump year
Daniel Lowrey [Wed, 14 Jan 2015 17:04:41 +0000 (18:04 +0100)]
Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
Update NEWS
Fixed bug #55618 (use case-insensitive cert name matching)
Daniel Lowrey [Wed, 14 Jan 2015 17:03:27 +0000 (18:03 +0100)]
Update NEWS
Daniel Lowrey [Wed, 14 Jan 2015 17:02:50 +0000 (18:02 +0100)]
Fixed bug #55618 (use case-insensitive cert name matching)
Anatol Belski [Mon, 12 Jan 2015 15:55:47 +0000 (16:55 +0100)]
Fixed bug #68771 SQL syntax error in sqlite lib
Anatol Belski [Mon, 12 Jan 2015 11:58:00 +0000 (12:58 +0100)]
updated libs_versions.txt
Stanislav Malyshev [Sun, 11 Jan 2015 08:51:05 +0000 (00:51 -0800)]
Fix bug #68799: Free called on unitialized pointer
Rasmus Lerdorf [Sat, 10 Jan 2015 02:08:36 +0000 (18:08 -0800)]
Fix bug #68784
Rasmus Lerdorf [Sat, 10 Jan 2015 00:16:47 +0000 (16:16 -0800)]
We can't output absolute S and T values for the
Diophantine solution here since it can vary based
on the libgmp version we are linking against and
in general there are almost always multiple valid
solutions
Julien Pauli [Fri, 9 Jan 2015 15:24:14 +0000 (16:24 +0100)]
Fix bug #68260
Adam Harvey [Thu, 8 Jan 2015 19:13:23 +0000 (19:13 +0000)]
Calling crypt() with a salt of *0 should always return *1.
Julien Pauli [Wed, 7 Jan 2015 09:42:53 +0000 (10:42 +0100)]
5.5.22 now
Remi Collet [Tue, 6 Jan 2015 10:06:25 +0000 (11:06 +0100)]
cleanup old unused typedef
Adam Harvey [Tue, 6 Jan 2015 01:23:27 +0000 (01:23 +0000)]
Handle NULL strings in sapi_cli_server_register_variable().
Fixes bug #68745 (Invalid HTTP requests make web server segfault).
Adam Harvey [Tue, 6 Jan 2015 01:22:59 +0000 (01:22 +0000)]
Allow CLI server test scripts to specify the name of the router file.
This is required to write tests that behave differently when an index.php isn't
present in the document root. (Such as the one I'm about to commit.)
Anatol Belski [Mon, 5 Jan 2015 18:19:24 +0000 (19:19 +0100)]
fix ACLs tests, make it create dir where it has to, not file
Remi Collet [Mon, 5 Jan 2015 16:34:45 +0000 (17:34 +0100)]
NEWS
Remi Collet [Mon, 5 Jan 2015 16:33:57 +0000 (17:33 +0100)]
Fix bug #68751 listen.allowed_clients is broken
Matteo Beccati [Mon, 5 Jan 2015 11:11:16 +0000 (12:11 +0100)]
Update test after fixing bug #68371