d7fc3be99e
Merge branch 'PHP-5.6' into PHP-7.0
...
* PHP-5.6:
Use SUCCESS/FAILURE
2016-01-18 13:35:01 +09:00
ee1dd4949a
Use SUCCESS/FAILURE
2016-01-18 13:33:47 +09:00
f9c595f3c0
Fixed bug #65720 ext/mbstring/libmbfl/filters/mbfilter_cp5022x.c:281: bad if test
2016-01-18 10:54:07 +09:00
7554478a4c
Merge branch 'PHP-5.6' into PHP-7.0
...
* PHP-5.6:
Fixed bug #65720 ext/mbstring/libmbfl/filters/mbfilter_cp5022x.c:281: bad if test
2016-01-18 10:52:11 +09:00
dc23f1f38f
Fixed bug #65720 ext/mbstring/libmbfl/filters/mbfilter_cp5022x.c:281: bad if test
2016-01-18 10:51:29 +09:00
e585696a0b
Fixed bug 71397 (mb_send_mail segmentation fault)
2016-01-17 15:30:09 +01:00
3b2d98a625
Fixed bug #71394 (session_regenerate_id() must close opened session on errors)
2016-01-17 17:11:47 +09:00
00eaaca18a
Remove unnecessary warning by warning reorder.
2016-01-17 17:08:44 +09:00
9f2240963f
Add test for Bug #70133 (Extended SessionHandler::read is ignoring $session_id when calling parent)
2016-01-16 05:29:19 +09:00
93db2dac48
PS(id) is zend_string *, use appropriate API
2016-01-15 15:47:09 +01:00
348dd1a018
Merge branch 'PHP-5.6' into PHP-7.0
...
* PHP-5.6:
Fix header file include
2016-01-15 08:43:56 +01:00
d1401f6059
Fix header file include
2016-01-15 08:43:00 +01:00
34ff7bbeb1
Merge branch 'PHP-5.6' into PHP-7.0
...
* PHP-5.6:
Fixed bug #69111 (Crash in SessionHandler::read()). Made session save handler abuse much harder than before.
2016-01-15 16:24:22 +09:00
bfb9307b2d
Fixed bug #69111 (Crash in SessionHandler::read()).
...
Made session save handler abuse much harder than before.
2016-01-15 15:50:14 +09:00
d7f8d9e3a9
Fix typo
2016-01-15 15:21:18 +09:00
31ae802736
Fix uninitialized read in rfc1867 handler reported by valgrind. Only in PHP 5.6.
...
This commit fixes initialized read, but calling php_session_initialize() directly
is problematic because configuration could be invalid. Invalid config may result
in segfault. This will be addressed later.
2016-01-15 15:18:00 +09:00
132d919c85
Merge branch 'PHP-5.6' into PHP-7.0
...
* PHP-5.6:
Improved fix for bug #68063 (Empty session IDs do still start sessions).
2016-01-15 10:19:01 +09:00
8c37a086c7
Improved fix for bug #68063 (Empty session IDs do still start sessions).
2016-01-15 09:45:08 +09:00
33cc42d8a5
port 4308c868f9 to 7.0
2016-01-14 18:38:30 +01:00
4308c868f9
Fixed bug #70979 crash with bad soap request
...
The error handler is overloaded with the SOAP one. However the SOAP
handler eventually wants to access some of its globals. This won't
work as long as the SOAP globals aren't initialized. The use case
is when an error is thrown before RINIT went through. As the call
order is arbitrary, the safest is to wait when all the modules
called their RINIT.
2016-01-14 17:42:28 +01:00
ad85cce1bc
Merge branch 'PHP-7.0' of git.php.net:/php-src into PHP-7.0
...
* 'PHP-7.0' of git.php.net:/php-src:
Avoid incomplete zend_internal_function initialization.
2016-01-14 14:49:57 +08:00
262f09d678
Fixed macro name
2016-01-14 14:49:23 +08:00
6a2621e3a5
Avoid incomplete zend_internal_function initialization.
2016-01-13 15:06:17 +03:00
2b4625d687
Remove obj handlers ptr value from spl_object_hash()
...
We still keep the same output length, for people who rely on the
return value having a specific format. The handler part will now
simply be always the same (it was the same nearly always anyway).
The motivation behind this change is to avoid breaking
spl_object_hash() and SplObjectStorage if an extension changes the
handlers table of an object. This has come up, for example, in
weakref implementations.
2016-01-12 16:47:21 +01:00
af3f3be0c1
Merge branch 'PHP-5.6' into PHP-7.0
...
* PHP-5.6:
fix the fix for bug #70976 (imagerotate)
Use php_session_abort()
2016-01-12 13:54:23 +01:00
14e4d393cf
fix the fix for bug #70976 (imagerotate)
2016-01-12 13:52:27 +01:00
63c77ee4b1
Use php_session_abort()
2016-01-12 20:39:33 +09:00
224aaf94af
Merge branch 'PHP-5.6' into PHP-7.0
...
* PHP-5.6:
Fixed Bug #71038 session_start() returns TRUE on failure
2016-01-12 19:52:54 +09:00
a15e9ccba8
Fixed Bug #71038 session_start() returns TRUE on failure
2016-01-12 19:09:49 +09:00
4e7cb057a0
partial test fixes, only obvious mistaking parts
2016-01-12 10:44:55 +01:00
d8e2b8424f
remove the unnecessary condition part
2016-01-12 10:22:10 +01:00
8e7c469f82
fix possible buffer overrun in the errmsg string
2016-01-12 10:17:32 +01:00
b54739e68d
integrate tsrmls cache
2016-01-12 09:42:38 +01:00
3bbcd84e2f
re-apply patch for github PR #1695
2016-01-12 07:07:51 +01:00
66d10fe085
Revert "patch for github PR #1695 "
...
This reverts commit 58dd956b63
2016-01-11 22:03:36 +01:00
58dd956b63
patch for github PR #1695
2016-01-11 21:11:55 +01:00
1f6612541f
fix out format
2016-01-11 20:57:34 +01:00
39e571c8d8
further datatype and range check fixes for ibase
2016-01-11 09:46:53 +01:00
57a2a8d4fa
datatype fixes
2016-01-11 08:52:54 +01:00
23fa54b908
fix typo for #ifdef
2016-01-11 08:37:16 +01:00
8bfa5193d5
Fix various bugs in interbase
...
Also read: https://marc.info/?l=php-internals&m=145077389117375&w=2
2016-01-11 08:32:47 +01:00
ae50a0c0be
Fix bug #71314
2016-01-08 17:20:52 +00:00
caae1191da
allow static build of ext/ftp
2016-01-08 08:07:15 +01:00
1fb763ccab
Fixed bug #71227 Can't compile php_curl statically
2016-01-07 18:55:05 +01:00
e72848c171
more informative error message for opcache fallback
2016-01-07 17:57:41 +01:00
42a145273c
add SKIPIF condition
2016-01-07 17:54:26 +01:00
ef4dc15831
Moved buffer from heap to stack
2016-01-06 11:41:16 +01:00
86f48881a4
Removed unecessary string dup
2016-01-06 10:51:36 +01:00
810452f68e
Moved buffer from heap to stack
2016-01-06 10:51:36 +01:00
2871c70efa
Patch for Heap Buffer Overflow in EscapeShell
...
Proposed patch for bug #71270
2016-01-06 07:49:21 +01:00
Yasuo Ohgaki