mirrors/php-src
0
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2024-11-30 21:35:36 +08:00
Code Issues Packages Projects Releases Wiki Activity
115,439 Commits 500 Branches 1,381 Tags 821 MiB
2cafaab885
Commit Graph

1254 Commits

Author SHA1 Message Date
Nikita Popov
ec9297592e Check zpp before other errors in SoapServer::addSoapHeader() 2019-08-30 17:03:25 +02:00
Nikita Popov
d37d418927 Merge branch 'PHP-7.4' 2019-07-23 11:28:10 +02:00
George Peter Banyard
6d6d954d0d Cleanup of remaining E_STRICT in tests 2019-07-23 11:27:23 +02:00
Nikita Popov
a1e2c8870e Merge branch 'PHP-7.4' 2019-07-22 17:26:01 +02:00
Nikita Popov
d59aac58b3 Report errors from stream read and write operations 
The php_stream_read() and php_stream_write() functions now return
an ssize_t value, with negative results indicating failure. Functions
like fread() and fwrite() will return false in that case.

As a special case, EWOULDBLOCK and EAGAIN on non-blocking streams
should not be regarded as error conditions, and be reported as
successful zero-length reads/writes instead. The handling of EINTR
remains unclear and is internally inconsistent (e.g. some code-paths
will automatically retry on EINTR, while some won't).

I'm landing this now to make sure the stream wrapper ops API changes
make it into 7.4 -- however, if the user-facing changes turn out to
be problematic we have the option of clamping negative returns to
zero in php_stream_read() and php_stream_write() to restore the
old behavior in a relatively non-intrusive manner.
 2019-07-22 17:17:28 +02:00
Nikita Popov
e36118a5c5 Merge branch 'PHP-7.4' 2019-07-16 12:20:21 +02:00
Nikita Popov
290e520c03 Use ZEND_HASH_FOREACH APIs in a few more places 2019-07-16 12:20:16 +02:00
Nikita Popov
2fe2e80b5f Merge branch 'PHP-7.4' 2019-07-12 16:52:00 +02:00
Nikita Popov
79b5b1a97f Merge branch 'PHP-7.3' into PHP-7.4 2019-07-12 16:51:52 +02:00
Nikita Popov
3f73916f10 Merge branch 'PHP-7.2' into PHP-7.3 2019-07-12 16:51:47 +02:00
Nikita Popov
a7de2af46c Use TRY_ADDREF/TRY_DELREF in soap 
The DELREF part is a possible fix for bug #78278, the ADDREF part
is a drive-by fix.
 2019-07-12 16:50:43 +02:00
Nikita Popov
74bf7bfb88 Merge branch 'PHP-7.4' 2019-07-11 15:49:02 +02:00
Nikita Popov
17f7fb7605 Switch to using shell-less proc_open() in various server tests 2019-07-11 15:48:10 +02:00
Nikita Popov
b290790cc2 Merge branch 'PHP-7.4' 2019-07-11 10:26:59 +02:00
Nikita Popov
ba8c4894d8 Add server conflict to soap custom content type test 2019-07-11 10:26:53 +02:00
Dmitry Stogov
f7f7fec7ef Merge branch 'PHP-7.4' 
* PHP-7.4:
  Reduce overhead
 2019-06-28 12:03:27 +03:00
Dmitry Stogov
143f4e3b5c Reduce overhead 2019-06-28 12:03:01 +03:00
Nikita Popov
5918171f95 Merge branch 'PHP-7.4' 2019-06-27 14:21:49 +02:00
Nikita Popov
78375aa52f Fix persistent XML memory leaks in SOAP 
SOAP uses a horrible bailout based error handling approach -- avoid
leaking persistent XML memory by catching bailouts in a number of
places.
 2019-06-27 14:20:10 +02:00
Nikita Popov
ac749b126f Merge branch 'PHP-7.4' 2019-06-26 11:43:30 +02:00
Nikita Popov
788a68900d Fix xml doc leak in soap 2019-06-26 11:43:11 +02:00
Nikita Popov
6aaab9adf7 Merge branch 'PHP-7.4' 2019-06-20 16:24:31 +02:00
Nikita Popov
27d3373496 SOAP: Avoid indexing into null pointer 2019-06-20 16:22:34 +02:00
Nikita Popov
452076de44 Merge branch 'PHP-7.4' 2019-06-19 17:27:29 +02:00
Nikita Popov
8743d5e99a Avoid signed shift ub in php_sdl 2019-06-19 17:27:09 +02:00
Nikita Popov
608097a901 Fix various instances of memcpy null ub 2019-06-19 17:27:09 +02:00
twosee
63171d88f2 Add do...while(0) for RETURN_* and ZVAL_* APIs 
Closes GH-4255.
 2019-06-12 16:17:16 +02:00
Nikita Popov
477d1e02ae Merge branch 'PHP-7.4' 2019-06-12 11:54:21 +02:00
Nikita Popov
365a905e00 Suppress int to char conversion warnings 2019-06-12 11:54:13 +02:00
Nikita Popov
d2921af348 Use labs() on long integer 2019-06-12 11:54:13 +02:00
Dmitry Stogov
b2cdde0826 Merge branch 'PHP-7.4' 
* PHP-7.4:
  Replace ZVAL_COPY() and ZVAL_COPY_VALUE() for IS_OBJECT by cheaper macros
 2019-05-28 20:19:15 +03:00
Dmitry Stogov
83804519df Replace ZVAL_COPY() and ZVAL_COPY_VALUE() for IS_OBJECT by cheaper macros 2019-05-28 20:10:02 +03:00
Nikita Popov
224353a18f Merge branch 'PHP-7.4' 2019-05-22 11:45:31 +02:00
Nikita Popov
b162c8f55a Mark bug44811.phpt as an online test 
For some reason this was checked on PHP-7.2 and PHP-7.3, but not
on PHP-7.4. Bad merge?
 2019-05-22 11:43:56 +02:00
Nikita Popov
ce8be6f499 Merge branch 'PHP-7.3' into PHP-7.4 2019-05-22 11:43:40 +02:00
Nikita Popov
3a719696bc Merge branch 'PHP-7.2' into PHP-7.3 2019-05-22 11:43:26 +02:00
Nikita Popov
3a0de243c3 Use a different URL in bug44811.phpt 2019-05-22 11:41:51 +02:00
Nikita Popov
4ebd9a5366 Merge branch 'PHP-7.2' into PHP-7.3 2019-05-21 10:04:51 +02:00
Vincent JARDIN
5f8c22d415 Support content_type stream context option in soap 
Allows overriding the HTTP header using the HTTP context:

    $client = new SoapClient('http://url.wsdl&v=latest', [
      'stream_context' => stream_context_create([
        'http' => [
          'content_type' => 'foobarX',
        ],
      ]),
    ]);

This is a backport of c55af3c65a
to the PHP 7.2 branch.
 2019-05-21 10:04:15 +02:00
Nikita Popov
12b03a8750 Merge branch 'PHP-7.4' 2019-05-13 10:52:00 +02:00
Vincent JARDIN
c55af3c65a Support content_type stream context option in soap 
Allows overriding the HTTP header using the HTTP context:

    $client = new SoapClient('http://url.wsdl&v=latest', [
      'stream_context' => stream_context_create([
        'http' => [
          'content_type' => 'foobarX',
        ],
      ]),
    ]);
 2019-05-13 10:51:03 +02:00
Peter Kokot
2cf90bb2f0 Merge branch 'PHP-7.4' 
* PHP-7.4:
  Normalize comments in *nix build system m4 files
 2019-05-12 18:51:50 +02:00
Peter Kokot
75fb74860d Normalize comments in *nix build system m4 files 
Normalization include:
- Use dnl for everything that can be ommitted when configure is built in
  favor of the shell comment character # which is visible in the output.
- Line length normalized to 80 columns
- Dots for most of the one line sentences
- Macro definitions include similar pattern header comments now
 2019-05-12 18:43:03 +02:00
Peter Kokot
5b4514dee8 Merge branch 'PHP-7.4' 
* PHP-7.4:
  Convert CRLF to LF in *.wsdl files
 2019-05-11 17:17:40 +02:00
Peter Kokot
4e0e0b8152 Merge branch 'PHP-7.3' into PHP-7.4 
* PHP-7.3:
  Convert CRLF to LF in *.wsdl files
 2019-05-11 17:16:50 +02:00
Peter Kokot
bec22af8d7 Merge branch 'PHP-7.2' into PHP-7.3 
* PHP-7.2:
  Convert CRLF to LF in *.wsdl files
 2019-05-11 17:15:08 +02:00
Peter Kokot
b15bfb9129 Convert CRLF to LF in *.wsdl files 
These EOL types are part of different environments and not part of the
tests themselves.
 2019-05-11 17:12:28 +02:00
Nikita Popov
e175c4d865 Merge branch 'PHP-7.4' 2019-04-29 13:54:04 +02:00
Nikita Popov
b1c5f7b265 Merge branch 'PHP-7.3' into PHP-7.4 2019-04-29 13:53:57 +02:00
Nikita Popov
ff2b5bda59 Merge branch 'PHP-7.2' into PHP-7.3 2019-04-29 13:53:45 +02:00