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
c0928be7f8
Merge remote-tracking branch 'phpsec/PHP-7.0' into PHP-7.0
...
* phpsec/PHP-7.0:
add NEWS entries for 7.0.2
re-apply the patch from 1785d2b805#70976
Fix bug #70976 : fix boundary check on gdImageRotateInterpolated
Fixed bug #70755 : fpm_log.c memory leak and buffer overflow
fix merge mistake
Fixed #70728
Fixed bug #70661 (Use After Free Vulnerability in WDDX Packet Deserialization)
2016-01-06 06:09:12 +01:00
13750cb0a1
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
Update NEWS
Improve fix for bug #70976
Fixed bug #70661 (Use After Free Vulnerability in WDDX Packet Deserialization)
Fixed bug #70741 : Session WDDX Packet Deserialization Type Confusion Vulnerability
Fixed #70728
Fixed bug #70755 : fpm_log.c memory leak and buffer overflow
Fix bug #70976 : fix boundary check on gdImageRotateInterpolated
typofix
2016-01-05 19:38:29 -08:00
695e8b79af
Fixed bug #71287 (Error message contains hexadecimal instead of decimal number)
2016-01-06 00:01:44 +08:00
d4da32d312
Fixed bug #71280 (ibase_blob_add() expects parameter 2 to be resorce)
2016-01-05 23:02:17 +08:00
736b91c650
Merge branch 'PHP-5.6' into PHP-7.0
...
* PHP-5.6:
Happy new year (Update copyright to 2016)
Conflicts:
ext/json/php_json_encoder.h
sapi/continuity/capi.c
2016-01-04 18:13:38 +01:00
0ea63cb2a8
Fix small CS label issue in openssl.c
2016-01-04 16:52:52 +00:00
cf1c50957b
re-apply the patch from 1785d2b805
...
too many conflicts to cherry-pick
2016-01-04 17:52:37 +01:00
e4bdf51f0a
Replaced whitespaces with tabs and fixed aligments
2016-01-04 16:46:32 +00:00
82865dda71
Improve fix for bug #70976
2016-01-04 17:37:54 +01:00
84b8db597a
Fix bug #70976 : fix boundary check on gdImageRotateInterpolated
2016-01-04 17:37:40 +01:00
b0285db4b7
fix merge mistake
2016-01-04 17:33:23 +01:00
ef4449a8e8
Fixed #70728
...
Conflicts:
ext/xmlrpc/xmlrpc-epi-php.c
2016-01-04 17:31:34 +01:00
bc4baf608b
Fixed bug #70661 (Use After Free Vulnerability in WDDX Packet Deserialization)
...
Conflicts:
ext/wddx/wddx.c
2016-01-04 17:10:29 +01:00
36b4311edd
Do not edit the value in place (might be relates to #71261 )
2016-01-04 05:38:15 -08:00
919562d53b
Fixed bug #71264 (file_put_contents() returns unexpected value when filesystem runs full)
2016-01-03 14:21:23 +08:00
53fb2f1e5c
Happy new year (Update copyright to 2016)
2016-01-03 01:44:37 +02:00
302a35bb15
remove duplicated skipif conditions
2016-01-02 13:56:56 +01:00
97a9470d97
bump year which is missed in rev 49493a2
2016-01-02 17:56:11 +08:00
3537e95dae
bump year which is missed in rev 49493a2
2016-01-02 17:51:24 +08:00
2c6a4445f7
Merge branch 'PHP-5.6' into PHP-7.0
...
* PHP-5.6:
sync with new tests from 7.0 for ICU 55_1 and 56_1 compat
sync skipifs for ext/intl for ICU 55_* and 56_* compat
2016-01-01 20:27:23 +01:00
a7b1ea3c84
sync with new tests from 7.0 for ICU 55_1 and 56_1 compat
2016-01-01 20:25:36 +01:00
6bcf4b4f40
sync skipifs for ext/intl for ICU 55_* and 56_* compat
2016-01-01 20:13:35 +01:00
59a7ef914f
Update header to PHP Version 7
2016-01-01 20:03:16 +02:00
Bogdan Padalko