mirrors/php-src
0
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2024-12-15 21:05:51 +08:00
Code Issues Packages Projects Releases Wiki Activity
101,436 Commits 503 Branches 1,384 Tags 823 MiB
869ca9b733
Commit Graph

1037 Commits

Author SHA1 Message Date
Anatol Belski
efd0e7222b Reduce var scope 2018-03-14 22:59:54 +01:00
Anatol Belski
7bcd55c264 Fix stack use after scope 2018-03-14 22:21:43 +01:00
Pedro Magalhães
5673c641dc
Fixes bug #75871 Use pkg-config for libxml2 if available 2018-02-08 10:50:22 +01:00
Lior Kaplan
fbfdd1e1c4 Happy new year (Update copyright to 2018) 2018-01-02 23:42:29 +02:00
Xinchen Hui
ccd4716ec7 year++ 2018-01-02 12:53:31 +08:00
Nikita Popov
d534d59bd8 Fixed bug #75502 
The string keys were not duplicated into persistent memory in this
case.
 2018-01-01 21:29:24 +01:00
Dmitry Stogov
7c96e974d9 Fixed reference-counting 2017-12-28 11:19:52 +03:00
Anton Artamonov
0246373788 Fixed bug #70469 
Don't generate an E_ERROR if we've already thrown an exception.
This interacts badly with error_get_last() checks.
 2017-12-22 17:47:54 +01:00
Nikita Popov
1f736085f1 Merge branch 'PHP-7.0' into PHP-7.1 2017-11-02 20:56:25 +01:00
Nikita Popov
d88ef8d7e1 Fix ext/soap/tests/bug69137.phpt 
Switch to example.org. Also mark it as an online test.
 2017-11-02 20:56:03 +01:00
Joe Watkins
5262bd9ea3
Merge branch 'PHP-7.0' into PHP-7.1 
* PHP-7.0:
  Fix bug #75464 Wrong reflection on SoapClient::__setSoapHeaders
 2017-10-30 14:13:31 +00:00
Fabien Villepinte
a308000ff2
Fix bug #75464 Wrong reflection on SoapClient::__setSoapHeaders 2017-10-30 14:13:05 +00:00
Dmitry Stogov
84b9b164a8 Merge branch 'PHP-7.0' into PHP-7.1 
* PHP-7.0:
  Fixed bug #74679 (Incorrect conversion array with WSDL_CACHE_MEMORY)
 2017-06-13 17:16:13 +03:00
Dmitry Stogov
648be8600f Fixed bug #74679 (Incorrect conversion array with WSDL_CACHE_MEMORY) 2017-06-13 17:15:47 +03:00
Dmitry Stogov
500232ef35 Merge branch 'PHP-7.0' into PHP-7.1 
* PHP-7.0:
  too many dashes
 2017-02-21 10:48:21 +03:00
Dmitry Stogov
593a4d8fe9 too many dashes 2017-02-21 10:47:48 +03:00
Dmitry Stogov
508d78ce5e Merge branch 'PHP-7.0' into PHP-7.1 
* PHP-7.0:
  Increase WSDL cache version (7.0 wsdl cache is incomatible with PHP-5) Include WSDL cache version number into file name
 2017-02-21 10:42:42 +03:00
Dmitry Stogov
bd7e5c1548 Increase WSDL cache version (7.0 wsdl cache is incomatible with PHP-5) 
Include WSDL cache version number into file name
 2017-02-21 10:41:20 +03:00
Sammy Kaye Powers
dac6c639bb Update copyright headers to 2017 2017-01-04 11:23:42 -06:00
Sammy Kaye Powers
478f119ab9 Update copyright headers to 2017 2017-01-04 11:14:55 -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 to 5.6
 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 to 5.6
 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