]>
granicus.if.org Git - php/log
Adam Harvey [Mon, 7 Jul 2014 20:49:00 +0000 (20:49 +0000)]
Merge branch 'PHP-5.6'
* PHP-5.6:
Fixed bug #66830 (Empty header causes PHP built-in web server to hang).
Adam Harvey [Mon, 7 Jul 2014 20:45:01 +0000 (20:45 +0000)]
Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
Fixed bug #66830 (Empty header causes PHP built-in web server to hang).
Adam Harvey [Mon, 7 Jul 2014 20:40:47 +0000 (20:40 +0000)]
Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
Fixed bug #66830 (Empty header causes PHP built-in web server to hang).
Adam Harvey [Mon, 7 Jul 2014 20:36:06 +0000 (20:36 +0000)]
Fixed bug #66830 (Empty header causes PHP built-in web server to hang).
We had an infinite loop in sapi_cli_server_send_headers(): while iterating over
the linked list of headers, when an empty header was hit, continue would go to
the next iteration of the loop without updating h to be the next value in the
linked list. Updating it to always increment regardless of whether the header
is actually valid or not fixes the issue.
Sara Golemon [Mon, 7 Jul 2014 19:19:11 +0000 (12:19 -0700)]
Followup fix to custom session save handlers
2d9885c introduced some regressions. This addresses those.
* Don't throw return type notice or session write failure when in an exception
* Fix tests to properly return true/false since null is no longer falsy/successy
* Rerecord a few tests to accomodate difference in raised warnings
Stanislav Malyshev [Mon, 7 Jul 2014 17:42:36 +0000 (10:42 -0700)]
Merge branch 'PHP-5.6'
* PHP-5.6:
create locales and re-add test
Stanislav Malyshev [Mon, 7 Jul 2014 17:42:13 +0000 (10:42 -0700)]
Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
create locales and re-add test
Conflicts:
.travis.yml
Stanislav Malyshev [Mon, 7 Jul 2014 16:35:37 +0000 (09:35 -0700)]
create locales and re-add test
Stanislav Malyshev [Mon, 7 Jul 2014 16:34:03 +0000 (09:34 -0700)]
Merge branch 'PHP-5.6'
* PHP-5.6:
rm test for now
Stanislav Malyshev [Mon, 7 Jul 2014 16:33:05 +0000 (09:33 -0700)]
Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
rm test for now
Stanislav Malyshev [Mon, 7 Jul 2014 16:32:26 +0000 (09:32 -0700)]
rm test for now
Stanislav Malyshev [Mon, 7 Jul 2014 08:38:04 +0000 (01:38 -0700)]
Merge branch 'PHP-5.6'
* PHP-5.6:
change locale - looks like not everybody has sl_SI
Stanislav Malyshev [Mon, 7 Jul 2014 08:36:24 +0000 (01:36 -0700)]
Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
change locale - looks like not everybody has sl_SI
Stanislav Malyshev [Mon, 7 Jul 2014 08:36:03 +0000 (01:36 -0700)]
Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
change locale - looks like not everybody has sl_SI
Stanislav Malyshev [Mon, 7 Jul 2014 08:35:25 +0000 (01:35 -0700)]
change locale - looks like not everybody has sl_SI
Stanislav Malyshev [Mon, 7 Jul 2014 07:50:15 +0000 (00:50 -0700)]
Merge branch 'PHP-5.6'
* PHP-5.6:
Fix bug #66921 - Wrong argument type hint for function intltz_from_date_time_zone
fix format
Stanislav Malyshev [Mon, 7 Jul 2014 07:49:33 +0000 (00:49 -0700)]
Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
Fix bug #66921 - Wrong argument type hint for function intltz_from_date_time_zone
fix format
Stanislav Malyshev [Mon, 7 Jul 2014 07:49:15 +0000 (00:49 -0700)]
Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
fix format
Stanislav Malyshev [Mon, 7 Jul 2014 07:48:44 +0000 (00:48 -0700)]
Fix bug #66921 - Wrong argument type hint for function intltz_from_date_time_zone
Stanislav Malyshev [Mon, 7 Jul 2014 07:48:32 +0000 (00:48 -0700)]
fix format
Stanislav Malyshev [Mon, 7 Jul 2014 07:38:50 +0000 (00:38 -0700)]
Merge branch 'PHP-5.6'
* PHP-5.6:
Fix bug #67052 (NumberFormatter::parse() resets LC_NUMERIC setting)
Make sure the generator script also creates a newline at the end of file
Add newline at end of file to prevent compilation warning
Stanislav Malyshev [Mon, 7 Jul 2014 07:38:16 +0000 (00:38 -0700)]
Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
Fix bug #67052 (NumberFormatter::parse() resets LC_NUMERIC setting)
Make sure the generator script also creates a newline at the end of file
Add newline at end of file to prevent compilation warning
Stanislav Malyshev [Mon, 7 Jul 2014 07:37:24 +0000 (00:37 -0700)]
Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
Fix bug #67052 (NumberFormatter::parse() resets LC_NUMERIC setting)
Stanislav Malyshev [Mon, 7 Jul 2014 07:36:57 +0000 (00:36 -0700)]
Fix bug #67052 (NumberFormatter::parse() resets LC_NUMERIC setting)
Stanislav Malyshev [Mon, 7 Jul 2014 05:16:27 +0000 (22:16 -0700)]
Merge branch 'PHP-5.6'
* PHP-5.6:
Reference bug report instead of github issue in NEWS file
Stanislav Malyshev [Mon, 7 Jul 2014 05:15:35 +0000 (22:15 -0700)]
Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
Make sure the generator script also creates a newline at the end of file
Add newline at end of file to prevent compilation warning
Lior Kaplan [Tue, 1 Jul 2014 08:44:39 +0000 (11:44 +0300)]
Make sure the generator script also creates a newline at the end of file
Similar to commit
d6713f39 in master
Lior Kaplan [Mon, 30 Jun 2014 22:57:01 +0000 (01:57 +0300)]
Add newline at end of file to prevent compilation warning
The newline was removed at commit
50d50c2f
Sara Golemon [Thu, 15 May 2014 21:00:15 +0000 (14:00 -0700)]
Fix handling of session user module custom handlers.
According to the documentation, returning TRUE from
user based session handlers should indicate success,
while returning FALSE should indicate failure.
The existing logic relied on casting the return value
to an integer and returning that from the function.
However, the internal handlers use SUCCESS/FAILURE
where SUCCESS == 0, and FAILURE == -1, so the following
behavior map occurs:
return false; => return 0; => return SUCCESS
return true; => return 1; => return <undefined>
Since the session API checks against FAILURE,
both boolean responses wind up appearing like "not FAILURE".
This diff reasserts boolean responses to behave as
documented and introduces some special handling
for integer responses of 0 and -1 so that code can be
written for older and newer versions of PHP.
Bob Weinand [Sun, 6 Jul 2014 11:34:03 +0000 (13:34 +0200)]
Reference bug report instead of github issue in NEWS file
Stanislav Malyshev [Sun, 6 Jul 2014 05:34:57 +0000 (22:34 -0700)]
Merge branch 'PHP-5.6'
* PHP-5.6:
add more exts for Travis
Stanislav Malyshev [Sun, 6 Jul 2014 01:09:26 +0000 (18:09 -0700)]
add more exts for Travis
Bob Weinand [Sat, 5 Jul 2014 23:21:24 +0000 (01:21 +0200)]
Merge branch 'PHP-5.6'
Bob Weinand [Sat, 5 Jul 2014 23:20:46 +0000 (01:20 +0200)]
Update NEWS
Bob Weinand [Sat, 5 Jul 2014 23:17:50 +0000 (01:17 +0200)]
Merge sapi/phpdbg into PHP-5.6
Bob Weinand [Sat, 5 Jul 2014 23:16:03 +0000 (01:16 +0200)]
Merge pull request #104 from andytson/feature/rpm-build-fix
Fix phpdbg.1 man page installation when build != src directory
Andy Thompson [Sat, 5 Jul 2014 12:05:05 +0000 (13:05 +0100)]
Fix phpdbg.1 man page installation when build != src directory
Michael Wallner [Thu, 3 Jul 2014 18:43:12 +0000 (20:43 +0200)]
Merge branch 'PHP-5.6'
* PHP-5.6:
BFN for bug #67551 (php://input temp file will be located in sys_temp_dir instead of upload_tmp_dir)
reorder
restore API compatibility
finish
refactor php_stream_temp_create{,_ex} and use it for the php://input stream
refactor _php_stream_fopen_{temporary_,tmp}file()
fix length overflow of HTTP_RAW_POST_DATA
Conflicts:
main/php_content_types.c
Michael Wallner [Wed, 2 Jul 2014 17:48:36 +0000 (19:48 +0200)]
BFN for bug #67551 (php://input temp file will be located in sys_temp_dir instead of upload_tmp_dir)
Michael Wallner [Wed, 2 Jul 2014 17:46:56 +0000 (19:46 +0200)]
reorder
Michael Wallner [Wed, 2 Jul 2014 13:41:59 +0000 (15:41 +0200)]
restore API compatibility
Michael Wallner [Wed, 2 Jul 2014 12:35:20 +0000 (14:35 +0200)]
finish
Michael Wallner [Wed, 2 Jul 2014 10:22:14 +0000 (12:22 +0200)]
refactor php_stream_temp_create{,_ex} and use it for the php://input stream
Michael Wallner [Wed, 2 Jul 2014 10:10:10 +0000 (12:10 +0200)]
refactor _php_stream_fopen_{temporary_,tmp}file()
Michael Wallner [Wed, 2 Jul 2014 08:09:05 +0000 (10:09 +0200)]
fix length overflow of HTTP_RAW_POST_DATA
Xinchen Hui [Thu, 3 Jul 2014 06:59:24 +0000 (14:59 +0800)]
Merge branch 'PHP-5.6'
Xinchen Hui [Thu, 3 Jul 2014 06:59:14 +0000 (14:59 +0800)]
Update NEWS
Xinchen Hui [Thu, 3 Jul 2014 06:58:53 +0000 (14:58 +0800)]
Merge branch 'PHP-5.5' into PHP-5.6
Xinchen Hui [Thu, 3 Jul 2014 06:58:37 +0000 (14:58 +0800)]
Fixed bug #67215 (php-cgi work with opcache, may be segmentation fault happen)
Xinchen Hui [Thu, 3 Jul 2014 05:38:38 +0000 (13:38 +0800)]
Add test for bug #67215
bjori> writing a testcase making sure you get a fatal error and does not
segfault after that... is difficult
Xinchen Hui [Thu, 3 Jul 2014 02:52:03 +0000 (10:52 +0800)]
Merge branch 'PHP-5.6'
Xinchen Hui [Thu, 3 Jul 2014 02:51:24 +0000 (10:51 +0800)]
Fixed section
Xinchen Hui [Thu, 3 Jul 2014 02:51:10 +0000 (10:51 +0800)]
Merge branch 'PHP-5.5' into PHP-5.6
Xinchen Hui [Thu, 3 Jul 2014 02:49:37 +0000 (10:49 +0800)]
Add CVE ID
Ferenc Kovacs [Wed, 2 Jul 2014 21:36:00 +0000 (23:36 +0200)]
Merge branch 'PHP-5.6'
* PHP-5.6:
also add Remi to the QA credits
add Stas and Julient to the QA credits
Ferenc Kovacs [Wed, 2 Jul 2014 21:35:31 +0000 (23:35 +0200)]
also add Remi to the QA credits
Ferenc Kovacs [Wed, 2 Jul 2014 21:32:50 +0000 (23:32 +0200)]
add Stas and Julient to the QA credits
Ferenc Kovacs [Wed, 2 Jul 2014 21:27:54 +0000 (23:27 +0200)]
Merge branch 'PHP-5.6'
* PHP-5.6:
update the credits
Ferenc Kovacs [Wed, 2 Jul 2014 21:26:41 +0000 (23:26 +0200)]
update the credits
Nikita Popov [Wed, 2 Jul 2014 20:41:04 +0000 (22:41 +0200)]
Merge branch 'PHP-5.6'
Nikita Popov [Wed, 2 Jul 2014 20:40:45 +0000 (22:40 +0200)]
Merge branch 'PHP-5.5' into PHP-5.6
Nikita Popov [Wed, 2 Jul 2014 20:40:33 +0000 (22:40 +0200)]
Merge branch 'PHP-5.4' into PHP-5.5
Nikita Popov [Wed, 2 Jul 2014 20:37:41 +0000 (22:37 +0200)]
Add test for bug #67151
Ferenc Kovacs [Wed, 2 Jul 2014 20:39:19 +0000 (22:39 +0200)]
Merge branch 'PHP-5.6'
* PHP-5.6:
adding a reproduce script for bug #49184
Ferenc Kovacs [Wed, 2 Jul 2014 20:38:53 +0000 (22:38 +0200)]
Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
adding a reproduce script for bug #49184
Ferenc Kovacs [Wed, 2 Jul 2014 20:38:27 +0000 (22:38 +0200)]
Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
adding a reproduce script for bug #49184
Ferenc Kovacs [Wed, 2 Jul 2014 20:37:43 +0000 (22:37 +0200)]
adding a reproduce script for bug #49184
Nikita Popov [Wed, 2 Jul 2014 20:35:19 +0000 (22:35 +0200)]
Merge branch 'PHP-5.6'
Nikita Popov [Wed, 2 Jul 2014 20:34:46 +0000 (22:34 +0200)]
Merge branch 'PHP-5.5' into PHP-5.6
Nikita Popov [Wed, 2 Jul 2014 20:33:57 +0000 (22:33 +0200)]
Merge branch 'PHP-5.4' into PHP-5.5
Nikita Popov [Wed, 2 Jul 2014 20:31:52 +0000 (22:31 +0200)]
Fix bug #67151: strtr with empty array crashes
Adam Harvey [Wed, 2 Jul 2014 19:30:51 +0000 (12:30 -0700)]
Merge branch 'PHP-5.6'
* PHP-5.6:
Fix ext/pgsql builds against libpq 7.3.
Adam Harvey [Wed, 2 Jul 2014 19:30:06 +0000 (12:30 -0700)]
Fix ext/pgsql builds against libpq 7.3.
Fixes bug #67555 (Cannot build against libpq 7.3).
Nikita Popov [Wed, 2 Jul 2014 15:37:25 +0000 (17:37 +0200)]
Merge branch 'PHP-5.6'
Nikita Popov [Wed, 2 Jul 2014 15:35:03 +0000 (17:35 +0200)]
Merge branch 'PHP-5.5' into PHP-5.6
Nikita Popov [Wed, 2 Jul 2014 15:33:31 +0000 (17:33 +0200)]
Fix bug #67497: eval with parse error causes segfault in generator
Bob Weinand [Wed, 2 Jul 2014 15:26:44 +0000 (17:26 +0200)]
Merge branch 'PHP-5.6'
Bob Weinand [Wed, 2 Jul 2014 15:25:47 +0000 (17:25 +0200)]
Mark test as XFAIL until fixed
Bob Weinand [Wed, 2 Jul 2014 10:44:30 +0000 (12:44 +0200)]
Merge branch 'PHP-5.6'
Bob Weinand [Wed, 2 Jul 2014 10:43:27 +0000 (12:43 +0200)]
Messed up syntax of tests
Bob Weinand [Wed, 2 Jul 2014 10:35:06 +0000 (12:35 +0200)]
Merge branch 'PHP-5.6'
Bob Weinand [Wed, 2 Jul 2014 10:31:50 +0000 (12:31 +0200)]
Add tests for constant expression arrays
Adding one failing (!) test for now about circular constant references embedded in a constant AST, must be fixed before PHP 5.6 release.
Xinchen Hui [Wed, 2 Jul 2014 09:58:49 +0000 (17:58 +0800)]
Merge branch 'PHP-5.6'
Xinchen Hui [Wed, 2 Jul 2014 09:58:37 +0000 (17:58 +0800)]
Update NEWs
Xinchen Hui [Wed, 2 Jul 2014 09:58:11 +0000 (17:58 +0800)]
Merge branch 'PHP-5.5' into PHP-5.6
Xinchen Hui [Wed, 2 Jul 2014 09:57:42 +0000 (17:57 +0800)]
Fixed bug #67539 (ArrayIterator use-after-free due to object change during sorting)
Xinchen Hui [Wed, 2 Jul 2014 09:45:09 +0000 (17:45 +0800)]
Fixed Bug #67538 (SPL Iterators use-after-free)
Anatol Belski [Wed, 2 Jul 2014 09:36:15 +0000 (11:36 +0200)]
Merge branch 'PHP-5.6'
Anatol Belski [Wed, 2 Jul 2014 09:36:00 +0000 (11:36 +0200)]
Merge branch 'PHP-5.5' into PHP-5.6
Anatol Belski [Wed, 2 Jul 2014 09:35:42 +0000 (11:35 +0200)]
Merge branch 'PHP-5.4' into PHP-5.5
Anatol Belski [Wed, 2 Jul 2014 09:34:37 +0000 (11:34 +0200)]
bundle deplister.exe with releases
Anatol Belski [Wed, 2 Jul 2014 09:12:49 +0000 (11:12 +0200)]
Merge branch 'PHP-5.6'
* PHP-5.6:
backported the VC12 fix for ARG_MAX
Anatol Belski [Wed, 2 Jul 2014 09:12:32 +0000 (11:12 +0200)]
Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
backported the VC12 fix for ARG_MAX
Anatol Belski [Wed, 2 Jul 2014 09:11:39 +0000 (11:11 +0200)]
backported the VC12 fix for ARG_MAX
Michael Wallner [Wed, 2 Jul 2014 07:56:41 +0000 (09:56 +0200)]
Merge branch 'PHP-5.6'
* PHP-5.6:
fix integer overflow in {stream,file}_{get,put}_contents()
Michael Wallner [Wed, 2 Jul 2014 07:56:05 +0000 (09:56 +0200)]
Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
fix integer overflow in {stream,file}_{get,put}_contents()
Michael Wallner [Wed, 2 Jul 2014 07:55:15 +0000 (09:55 +0200)]
Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
fix integer overflow in {stream,file}_{get,put}_contents()
Michael Wallner [Wed, 2 Jul 2014 07:53:03 +0000 (09:53 +0200)]
fix integer overflow in {stream,file}_{get,put}_contents()
Ferenc Kovacs [Wed, 2 Jul 2014 00:19:12 +0000 (02:19 +0200)]
Merge branch 'PHP-5.6'
* PHP-5.6:
add some missing NEWS entries
Ferenc Kovacs [Wed, 2 Jul 2014 00:18:48 +0000 (02:18 +0200)]
add some missing NEWS entries