Sammy Kaye Powers
dac6c639bb
Update copyright headers to 2017
2017-01-04 11:23:42 -06:00
Nikita Popov
a5027d43dd
Merge branch 'PHP-7.0' into PHP-7.1
2017-01-01 21:09:27 +01:00
Nikita Popov
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
Nikita Popov
b344832b80
Merge branch 'PHP-7.0' into PHP-7.1
2016-12-13 17:57:14 +01:00
Nikita Popov
4b2cc62e26
More fixes for bug #73089
...
Insert a lot more DEREFs. Some may not be necessary, but better
safe than sorry. I'm thinking the soap_hash_str_find_deref function
should become part of the zend_hash API -- we need this in many
places.
2016-12-13 17:56:38 +01:00
Anatol Belski
86f9da4452
Merge branch 'PHP-7.0' into PHP-7.1
...
* PHP-7.0:
add test for bug #73452
Backport 15ac4904
2016-11-21 15:31:34 +01:00
Anatol Belski
eb53865dfd
Merge branch 'PHP-5.6' into PHP-7.0
...
* PHP-5.6:
add test for bug #73452
Backport 15ac4904
2016-11-21 15:29:44 +01:00
Anatol Belski
4805be1db6
add test for bug #73452
2016-11-21 15:25:46 +01:00
Anatol Belski
0da5cb5fb6
Backport 15ac4904 to 5.6
2016-11-21 15:20:03 +01:00
Nikita Popov
47252a1e74
Merge branch 'PHP-7.0' into PHP-7.1
2016-11-20 21:19:20 +01:00
Craig Duncan
685b1292e9
Fix bug #73538
...
Remove any previous default headers and replace with the specified
ones, as documented, and as is the case when a single header is
passed.
2016-11-20 21:18:28 +01:00
Dmitry Stogov
0950550fb9
Merge branch 'PHP-7.0' into PHP-7.1
...
* PHP-7.0:
Don't update proprties inplace.
2016-11-10 12:34:09 +03:00
Dmitry Stogov
15ac490472
Don't update proprties inplace.
2016-11-10 12:32:07 +03:00
Joe Watkins
5de20ef3ae
Merge branch 'pull-request/2152' into PHP-7.1
2016-10-20 05:23:21 +01:00
Joe Watkins
295377630a
Merge branch 'pull-request/2152' into PHP-7.0
2016-10-20 05:19:10 +01:00
Dmitry Stogov
9ded1b4edb
Introduced HT_IS_PACKED() and HT_IS_WITHOUT_HOLES() macros. (Benjamin Coutu)
2016-10-19 23:10:42 +03:00
Keith Smiley
3b9ba6195d
soap #69137 - Invert logic to be correct
2016-10-13 23:56:24 -04:00
Keith Smiley
ddaf04053b
Fixed bug #73237
...
If the response includes both fields with simple types (which get
concatenated into an XML string) and a complex type (which is parsed
into an object), then the object will parsed into the same zval as the
simple types and will overwrite the string.
(cherry picked from commit 26287132c0
2016-10-14 01:57:04 +02:00
Anatol Belski
5a2dd84314
add test for bug #73037
...
(cherry picked from commit 256b150a96
2016-10-14 01:21:18 +02:00
Keith Smiley
26287132c0
Fixed bug #73237
...
If the response includes both fields with simple types (which get
concatenated into an XML string) and a complex type (which is parsed
into an object), then the object will parsed into the same zval as the
simple types and will overwrite the string.
2016-10-12 23:12:45 +02:00
Anatol Belski
62c68f7483
Merge branch 'PHP-5.6' into PHP-7.0
...
* PHP-5.6:
add test for bug #73037
2016-10-10 16:02:30 +02:00
Anatol Belski
256b150a96
add test for bug #73037
2016-10-10 15:59:52 +02:00
Keith Smiley
31cbce341c
soap #69137 - Fix SSL verify when using a proxy
...
Name verification was failing because the OpenSSL extension was picking
the proxy server's address when guessing which name to compare to the
SSL certificate. This scenario is already handled for stream wrappers
in http_fopen_wrapper.c. This patch applies the same fix to the SOAP
extension: when a proxy is used, set peer_name explicitly on the stream
context.
2016-10-03 14:02:34 -04:00
Anatol Belski
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
Anatol Belski
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
Anatol Belski
075aa911ff
Revert "Fixed bug #73037 SoapServer reports Bad Request when gzipped"
...
This reverts commit f9a699f6c3
2016-09-23 18:45:03 +02:00
Anatol Belski
44b7ec35ba
Merge branch 'PHP-7.0' into PHP-7.1
...
* PHP-7.0:
skip this test for now as it seems to have issues running dev server
Fixed bug #73037 SoapServer reports Bad Request when gzipped
2016-09-23 18:10:55 +02:00
Anatol Belski
f9936000da
Merge branch 'PHP-5.6' into PHP-7.0
...
* PHP-5.6:
skip this test for now as it seems to have issues running dev server
Fixed bug #73037 SoapServer reports Bad Request when gzipped
2016-09-23 18:10:07 +02:00
Anatol Belski
28887fe41b
skip this test for now as it seems to have issues running dev server
2016-09-23 18:07:08 +02:00
Anatol Belski
f9a699f6c3
Fixed bug #73037 SoapServer reports Bad Request when gzipped
...
(cherry picked from commit 410c68788a
2016-09-23 18:06:12 +02:00
Anatol Belski
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
Anatol Belski
410c68788a
Fixed bug #73037 SoapServer reports Bad Request when gzipped
2016-09-23 16:02:50 +02:00
Nikita Popov
02fb46e17c
Merge branch 'PHP-7.0' into PHP-7.1
2016-08-30 18:07:21 +02:00
Nikita Popov
3317287ce1
Fix bug #71711
...
Also handle another case of bug #71996 .
2016-08-30 18:06:18 +02:00
Nikita Popov
b218eb916f
Merge branch 'PHP-7.0' into PHP-7.1
2016-08-30 17:21:33 +02:00
Nikita Popov
8e487aefaa
Fixed bug #71996
2016-08-30 17:20:55 +02:00
Leigh
b21de28bb7
Fix some insecure usages of php_rand
2016-07-05 16:02:34 +01:00
Dmitry Stogov
adc95c5114
Fixed compilation warnings
2016-06-23 12:47:06 +03:00
Dmitry Stogov
323b2733f6
Fixed compilation warnings
2016-06-22 00:40:50 +03:00
Dmitry Stogov
1616038698
Added ZEND_ATTRIBUTE_FORMAT to some middind functions.
...
"%p" replaced by ZEND_LONG_FMT to avoid compilation warnings.
Fixed most incorrect use cases of format specifiers.
2016-06-21 16:00:37 +03:00
Dmitry Stogov
ff363e2e7c
Implemented RFC: Replace "Missing argument" warning with "Too few arguments" exception
...
Squashed commit of the following:
commit 8b45fa2acb9e18895ee5662db66e39
2016-06-16 02:32:02 +03:00
Dmitry Stogov
cca2c8ecc4
Reimplemented Bob's commit bac6fdb0c5 without insignificant renaming and white-space changes
2016-05-06 10:47:58 +03:00
Dmitry Stogov
c19cb70dac
Revert "Refactor zval cleanup into single function"
...
This reverts commit bac6fdb0c5
2016-05-06 10:47:58 +03:00
Bob Weinand
bac6fdb0c5
Refactor zval cleanup into single function
...
Also use zval_ptr_dtor_nogc() everywhere in Zend in favor of zval_dtor()
2016-05-05 23:31:57 +02:00
Dmitry Stogov
6499162ff0
- get rid of EG(scope). zend_get_executed_scope() should be used instead.
...
- ichanged zval_update_constant_ex(). Use IS_TYPE_IMMUTABLE flag on shared constants and AST, instead of "inline_change" parameter.
2016-04-28 04:13:34 +03:00
Dmitry Stogov
f0a2e8eb13
Removed "zend_fcall_info.function_table". It was assigned in many places, but is never used.
2016-04-27 13:46:38 +03:00
Xinchen Hui
f63ba809a1
Merge branch 'PHP-7.0'
...
* PHP-7.0:
Fixed bug #71986 (Nested foreach assign-by-reference creates broken variables)
2016-04-08 17:58:31 +08:00
Xinchen Hui
c45f7b97a3
Fixed bug #71986 (Nested foreach assign-by-reference creates broken variables)
2016-04-08 17:57:51 +08:00
Nikita Popov
7ed893712f
Merge branch 'PHP-7.0'
...
Conflicts:
ext/mysqlnd/mysqlnd_priv.h
main/php_streams.h
2016-03-03 23:20:50 +01:00
Nikita Popov
5602f64213
Eliminate usages of _PP macros
...
These are either in debug code (fix them), commented out (drop
them) or in dead compatibility macros (drop them).
One usage was in php_stream_get_from_zval(), which we have not used
since at least PHP 5.2 and, judging from the fact that nobody
complained about it causing compile errors in PHP 7, nobody else
uses it either, so drop it.
There are still remaining uses in mysqli embedded and odbc birdstep.
These probably need to be dropped outright.
2016-03-03 23:20:12 +01:00
