archive/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2025-08-17 14:38:49 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 3
103071 commits 526 branches 1434 tags 869 MiB
Commit graph

1042 commits

Author SHA1 Message Date
Tom Van Looy
04fb3f28ff Remove superfluous semicolons 2017-06-26 00:23:25 +02:00
Nikita Popov
1f924d75cb Drop soap_hash_str_find_deref() 
And directly use zend_hash_str_find_deref() instead.
 2017-06-25 18:51:59 +02:00
Nikita Popov
205807f60e Move va_copy compatibility code into zend_portability.h 
Previously this was defined in zend.c and php.h and also handled
in another way in soap.c.
 2017-06-25 17:00:26 +02:00
Dmitry Stogov
40ecad3402 Fixed wrong usage of old ZPP API. 2017-06-19 18:08:50 +03:00
Dmitry Stogov
02778731b7 Merge branch 'PHP-7.1' 
* PHP-7.1:
  Fixed bug #74679 (Incorrect conversion array with WSDL_CACHE_MEMORY)
 2017-06-13 17:17:26 +03: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
298b62af47 Merge branch 'PHP-7.1' 
* PHP-7.1:
  too many dashes
 2017-02-21 10:48:37 +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
3f2c8d30cd Merge branch 'PHP-7.1' 
* PHP-7.1:
  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:59 +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
Nikita Popov
162aa1a5fc Deprecate __autoload() 2017-02-03 18:52:57 +01: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
Sammy Kaye Powers
9e29f841ce Update copyright headers to 2017 2017-01-02 09:30:12 -06:00
Nikita Popov
52da05c535 Merge branch 'PHP-7.1' 2017-01-01 21:17:00 +01: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
Anatol Belski
afb6ca2566 Finish remaining replacement uint => uint32_t 
Tthe core should be normalized now, no uints anymore
 2016-12-22 14:32:02 +01:00
Nikita Popov
32c38cf7a3 Merge branch 'PHP-7.1' 2016-12-13 17:57:37 +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
b204b3abd1 further normalizations, uint vs uint32_t 
fix merge mistake

yet one more replacement run
 2016-11-26 17:29:01 +01:00
Nikita Popov
5af586bec5 Remove more PHP 6 leftovers from tests 2016-11-24 22:39:39 +01:00
Anatol Belski
273f7e3da9 Merge branch 'PHP-7.1' 
* PHP-7.1:
  add test for bug #73452
  Backport 15ac4904 to 5.6
 2016-11-21 15:32: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
42449d431f Merge branch 'PHP-7.1' 2016-11-20 21:19:34 +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
Kalle Sommer Nielsen
2104bea5d7 Remove Netware support 
If this does not break the Unix system somehow, I'll be amazed. This should get most of it out, apologies for any errors this may cause on non-Windows ends which I cannot test atm.
 2016-11-12 11:20:01 +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