bb2ab75555
Merge branch 'PHP-7.0' into PHP-7.1
2017-01-07 22:54:16 +01:00
a46bbdda2e
Fixed bug #67583
...
As fcgi_request is an opaque struct as of PHP 7, expose a new API
function fcgi_end() which does fcgi_flush() with end=1 and checks/
sets the ->ended flag.
2017-01-07 22:53:28 +01:00
f346bd6ee6
Rename fcgi_request.closed to .ended
...
"closed" refers to whether FCGI_END_REQUEST has been sent, while
the "close" operation does something entirely different. It gets
extra confusing when fcgi_is_closed() does not actually return
fcgi_request.closed...
2017-01-07 22:45:19 +01:00
bba09d56e5
Merge branch 'PHP-7.0' into PHP-7.1
...
* PHP-7.0:
add 'e' flag for fopen() to enable CLOEXEC
2017-01-07 12:36:09 +01:00
d0279242ce
add 'e' flag for fopen() to enable CLOEXEC
2017-01-07 12:10:51 +01:00
d5a1c5a96b
Merge branch 'PHP-7.0' into PHP-7.1
...
* PHP-7.0:
Increase realpath_cache_size default value
add UPGRADING note for realpath_cache_size
2017-01-06 05:31:29 +00:00
782b84c6d5
updated default per proposal
...
TODO: adjust php.ini defaults
2017-01-06 05:25:08 +00:00
66b698c3cf
Increase realpath_cache_size default value
2017-01-06 05:25:04 +00:00
4cce1e9a94
wrong version
2017-01-05 17:00:40 +00:00
e627aa9841
bump version after release
2017-01-05 16:50:52 +00:00
997d902762
move dev to next
2017-01-05 01:12:18 +01:00
dac6c639bb
Update copyright headers to 2017
2017-01-04 11:23:42 -06:00
478f119ab9
Update copyright headers to 2017
2017-01-04 11:14:55 -06:00
a5027d43dd
Merge branch 'PHP-7.0' into PHP-7.1
2017-01-01 21:09:27 +01:00
935b5cb11e
Flush stderr on win32 in cli_log_message
...
This allows us to unfork a bunch of tests for Windows.
2017-01-01 21:09:02 +01:00
e33ec61f9c
Care about intput and output encoding, as per default encoding RFC
...
If PHP CLI is used with programs with no Unicode support, the default
PHP console codepage might cause backward incompatible behaviors. This
is solved with this patch by separating the handling of I/O codepage.
As per https://wiki.php.net/rfc/default_encoding input_encodnig and
output_encoding are centralized INI settings, so they're used for the
purpose of adjusting the codepage. This gives user the ability to use
UTF-8 internally, while letting the system API to convert the output
to a compatible codepage. This also might solve the font issues on
systems without good true type support.
Note, that there no change to the default behavior - if input and
output encoding are not set, which is the default case, the default
charset applies to both console input and output. The patch is just
a compilment to the backward compatibility, not more and not less.
2016-12-14 02:51:29 +01:00
2f5090168f
Bump versions and NEWS for 7.1.1-dev
2016-12-02 02:24:54 -08:00
df902a7c28
move dev to next
2016-11-22 11:49:09 +01:00
277e829f10
move dev to 7.0.14
2016-10-25 10:29:51 +02:00
f8be3ede4f
Fix bug #73189 - Memcpy negative size parameter php_resolve_path
...
(cherry picked from commit da7e89cde8c4c2cce37d
2016-10-14 01:50:22 +02:00
25d4943b44
Clear FG(user_stream_current_filename) when bailing out
...
If a userwrapper opener E_ERRORs then FG(user_stream_current_filename)
would remain set until the next request and would not be pointing
at unallocated memory.
Catch the bailout, clear the variable, then continue bailing.
Closes https://bugs.php.net/bug.php?id=73188
(cherry picked from commit 9f86cdaf7f
2016-10-14 01:34:51 +02:00
c4c2cce37d
Fix bug #73189 - Memcpy negative size parameter php_resolve_path
...
(cherry picked from commit da7e89cde8
2016-10-12 21:31:37 +02:00
4d11a8eedf
Clear FG(user_stream_current_filename) when bailing out
...
If a userwrapper opener E_ERRORs then FG(user_stream_current_filename)
would remain set until the next request and would not be pointing
at unallocated memory.
Catch the bailout, clear the variable, then continue bailing.
Closes https://bugs.php.net/bug.php?id=73188
2016-10-11 21:44:14 -07:00
bc5efe501e
Merge branch 'PHP-7.0' into PHP-7.1
...
* PHP-7.0:
fix datatype
2016-10-06 11:03:09 +02:00
ea83e504e5
fix datatype
2016-10-06 11:01:27 +02:00
4c0804c07d
Ensure symtable exists before checking it
2016-09-28 19:20:17 +02:00
cb29c01ed6
prepare next
2016-09-27 12:49:52 +02:00
90a3671c09
Merge branch 'PHP-7.0' into PHP-7.1
...
* PHP-7.0:
Revert "Fixed bug #73037 SoapServer reports Bad Request when gzipped"
2016-09-23 18:48:14 +02:00
4685297f05
Merge branch 'PHP-5.6' into PHP-7.0
...
* PHP-5.6:
Revert "Fixed bug #73037 SoapServer reports Bad Request when gzipped"
2016-09-23 18:46:51 +02:00
075aa911ff
Revert "Fixed bug #73037 SoapServer reports Bad Request when gzipped"
...
This reverts commit f9a699f6c3
2016-09-23 18:45:03 +02:00
f9a699f6c3
Fixed bug #73037 SoapServer reports Bad Request when gzipped
...
(cherry picked from commit 410c68788a
2016-09-23 18:06:12 +02:00
4b13f60278
Merge branch 'PHP-7.0' into PHP-7.1
...
* PHP-7.0:
Fixed bug #73037 SoapServer reports Bad Request when gzipped
2016-09-23 16:07:12 +02:00
410c68788a
Fixed bug #73037 SoapServer reports Bad Request when gzipped
2016-09-23 16:02:50 +02:00
ac07008bb7
Fixed bug #72505 (readfile() mangles files larger than 2G)
2016-09-16 20:53:51 +08:00
68d3501381
Merge branch 'pull-request/2115' into PHP-7.1
2016-09-06 14:14:23 +02:00
69f0d3df60
Bump PHP_API_VERSION
2016-09-04 14:27:28 +02:00
727b422ad9
Fix #72948 : Uncatchable "Catchable" fatal error for class to string conversions
...
E_RECOVERABLE errors are reported as "Catchable fatal error". This is
misleading, because they actually can't be caught via try-catch statements.
Therefore we change the wording to "Recoverable fatal error" as suggested by
Nikita.
2016-09-03 13:05:37 +02:00
fbb81dd755
5.6.27 will be next
2016-09-01 20:27:19 +02:00
bc7460260b
prepare for next
2016-08-30 14:11:22 +02:00
37b0dcc8e0
Decouple DEBUG_FILE_UPLOAD from ZEND_DEBUG
...
Enabling ZEND_DEBUG should not result in intrusive program
behavior changes.
2016-08-19 00:34:13 +02:00
ce6ad9bdd9
Merge branch 'PHP-7.0' into PHP-7.1
...
* PHP-7.0: (48 commits)
Update NEWs
Unused label
Fixed bug #72853 (stream_set_blocking doesn't work)
fix test
Bug #72663 - part 3
Bug #72663 - part 2
Bug #72663 - part 1
Update NEWS
BLock test with memory leak
fix tests
Fix TSRM build
Fix bug #72850 - integer overflow in uuencode
Fixed bug #72849 - integer overflow in urlencode
Fix bug #72848 - integer overflow in quoted_printable_encode caused heap corruption
Fix bug #72838 - Integer overflow lead to heap corruption in sql_regcase
Fix bug #72837 - integer overflow in bzdecompress caused heap corruption
Fix bug #72836 - integer overflow in base64_decode caused heap corruption
Fix for bug #72807 - do not produce strings with negative length
Fix for bug #72790 and bug #72799
Fix bug #72730 - imagegammacorrect allows arbitrary write access
...
Conflicts:
ext/standard/var_unserializer.c
2016-08-17 17:14:30 +08:00
3956deb1b2
Merge branch 'PHP-5.6' into PHP-7.0
...
* PHP-5.6:
Fixed bug #72853 (stream_set_blocking doesn't work)
Conflicts:
main/streams/plain_wrapper.c
2016-08-17 16:56:02 +08:00
abe00908af
Fixed bug #72853 (stream_set_blocking doesn't work)
...
Implemented PHP_STREAM_OPTION_META_DATA_API for plain_wrappers
2016-08-17 16:54:21 +08:00
75d7666968
Merge branch 'PHP-7.0.10' into PHP-7.0
...
* PHP-7.0.10:
Fix bug #72749 : wddx_deserialize allows illegal memory access
Fixed bug #72627 : Memory Leakage In exif_process_IFD_in_TIFF
fix tests
Fix bug#72697 - select_colors write out-of-bounds
Fix bug #72708 - php_snmp_parse_oid integer overflow in memory allocation
Fix bug #72730 - imagegammacorrect allows arbitrary write access
Fix bug #72750 : wddx_deserialize null dereference
Fix bug #72771 : ftps:// opendir wrapper is vulnerable to protocol downgrade attack
fix tests
add missing skipif section
Fix for bug #72790 and bug #72799
Fix bug #72837 - integer overflow in bzdecompress caused heap corruption
Fix bug #72742 - memory allocator fails to realloc small block to large one
Use size_t for path length
Check for string overflow
Fix for bug #72782 : mcrypt accepts only ints, so don't pass anything else
Fix bug #72674 - check both curl_escape and curl_unescape
2016-08-16 23:52:22 -07:00
abc7d1f140
Merge branch 'PHP-7.0' into PHP-7.1
...
* PHP-7.0:
fix test
fix blocking pipe stream option value
2016-08-17 00:58:54 +02:00
6de67244d4
fix blocking pipe stream option value
...
As revealed by #72857 , this value conflicts with the xport option.
Wrong code can otherwise cause streams misbehave, fe if local and
network streams APIs are mixed.
2016-08-17 00:53:15 +02:00
6304a611cd
Use size_t for path length
2016-08-10 23:46:58 -07:00
af77c53ee1
Fix PUTC warning
...
Change the macro to not provide a useless return value using a
comma expression, which generates warnings.
2016-08-07 17:43:20 +02:00
3800e1cf97
Fixed bug #72743 (Out-of-bound read in php_stream_filter_create)
2016-08-04 19:10:40 +08:00
562c17eb4e
5.6.26 will be next
2016-08-04 01:39:37 +02:00
Nikita Popov