Joe Watkins
0d768f74b6
Merge branch 'pull-request/2152'
2016-10-20 05:25:03 +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
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
Nikita Popov
f57c0b3249
Merge branch 'PHP-7.0'
2016-03-03 16:50:47 +01:00
Nikita Popov
1ac152938c
Move semicolon into TSRMLS_CACHE_EXTERN/DEFINE
...
Also re bug #71575 .
2016-03-03 16:50:01 +01:00
Dmitry Stogov
c67c166f93
Removed zend_fcall_info.symbol_table
2016-03-02 17:50:55 +03:00
Stanislav Malyshev
eaf4e77190
Fix bug #71610 : Type Confusion Vulnerability - SOAP / make_http_soap_request()
2016-02-21 23:45:57 -08:00
Antony Dovgal
c140bbb5db
check for NULL and avoid crashes
2016-01-25 14:30:33 +03:00
Anatol Belski
33cc42d8a5
port 4308c868f9 to 7.0
2016-01-14 18:38:30 +01:00
Anatol Belski
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
Lior Kaplan
ed35de784f
Merge branch 'PHP-5.6' into PHP-7.0
...
* PHP-5.6:
Happy new year (Update copyright to 2016)
2016-01-01 19:48:25 +02:00
Lior Kaplan
49493a2dcf
Happy new year (Update copyright to 2016)
2016-01-01 19:21:47 +02:00
Xinchen Hui
4531d2c591
Fixed typo
2015-12-21 18:12:57 +08:00
Xinchen Hui
5df6f9f20e
Fixed bug #70993 (Array key references break argument processing)
2015-11-30 10:50:23 +08:00
Remi Collet
6680c2b22e
Fixed bug #70940 Segfault in soep / type_to_string
2015-11-19 08:18:13 +01:00
Dmitry Stogov
04526093e4
Merge branch 'PHP-5.6' into PHP-7.0
...
* PHP-5.6:
Fixed bug #70900 (SoapClient systematic out of memory error)
2015-11-12 20:36:39 +03:00
Dmitry Stogov
f8bf9bd86b
Fixed bug #70900 (SoapClient systematic out of memory error)
2015-11-12 20:31:52 +03:00
Matteo Beccati
c263dcee2f
Merge branch 'PHP-5.6' into PHP-7.0
...
* PHP-5.6:
Fix bug #70875 Segmentation fault if wsdl has no targetNamespace attribute
2015-11-07 11:05:36 +01:00
Matteo Beccati
fd61666d96
Fix bug #70875 Segmentation fault if wsdl has no targetNamespace attribute
2015-11-07 11:00:33 +01:00
Dmitry Stogov
c67fc6bb09
Fixed memory leak in php_stream_context_set_option()
2015-10-29 20:06:55 +03:00
