archive/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2025-08-16 05:58:45 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 3
134059 commits 526 branches 1434 tags 865 MiB
Commit graph

1360 commits

Author SHA1 Message Date
Ayesh Karunaratne
3a04532a94
[skip ci] curl: sync-constants.php regex and URL improvements (#12544) 
- Updates the URL of Curl constant page from `https://curl.haxx.se/libcurl/c/symbols-in-versions.html`
   to `https://curl.se/libcurl/c/symbols-in-versions.html`.

 - Fixes the regex used to filter constants to match `CURL_HTTP` constants.

Related: GH-12543
 2023-10-28 13:38:39 +01:00
Ilija Tovilo
f39b5c4c25
Close PHP tags in tests 
Closes GH-12422
 2023-10-18 17:34:10 +02:00
Ilija Tovilo
2b2d2b04e7
Merge branch 'PHP-8.2' 
* PHP-8.2:
  Fix EXPECT for bug52820.phpt on newer curl versions
  Fix curl_basic_009.phpt for newer curl versions
 2023-08-10 15:52:21 +02:00
Ilija Tovilo
1aae59cf43
Merge branch 'PHP-8.1' into PHP-8.2 
* PHP-8.1:
  Fix EXPECT for bug52820.phpt on newer curl versions
  Fix curl_basic_009.phpt for newer curl versions
 2023-08-10 15:52:14 +02:00
Ilija Tovilo
0e843c5d82
Fix EXPECT for bug52820.phpt on newer curl versions 
New curl versions have a "processing: url" line. The connection number in
"Closing connection" is apparently also dropped.
 2023-08-10 15:51:53 +02:00
Ilija Tovilo
3af76b2302
Fix curl_basic_009.phpt for newer curl versions 2023-08-10 15:51:49 +02:00
Niels Dossche
de60872cfd
Add new curl constants from curl until (including) 7.87 (#10459) 
Fixes GH-10454
 2023-07-17 20:42:39 +02:00
Niels Dossche
7c5a57077a Merge branch 'PHP-8.2' 
* PHP-8.2:
  Fix return value of _php_server_push_callback in case of failure
 2023-07-09 01:09:56 +02:00
Niels Dossche
e25e14ad95 Merge branch 'PHP-8.1' into PHP-8.2 
* PHP-8.1:
  Fix return value of _php_server_push_callback in case of failure
 2023-07-09 01:09:50 +02:00
Niels Dossche
dc9adda653 Fix return value of _php_server_push_callback in case of failure 
It should return CURL_PUSH_DENY by default instead of CURL_PUSH_OK in
the branch I added, just like the check above.
I forgot to change this after doing tests.
 2023-07-09 01:08:34 +02:00
Niels Dossche
46a0d043b5 Merge branch 'PHP-8.2' 
* PHP-8.2:
  Fix crash when an invalid callback function is passed to CURLMOPT_PUSHFUNCTION
 2023-07-08 21:44:26 +02:00
Niels Dossche
d0c824cb7e Merge branch 'PHP-8.1' into PHP-8.2 
* PHP-8.1:
  Fix crash when an invalid callback function is passed to CURLMOPT_PUSHFUNCTION
 2023-07-08 21:39:17 +02:00
Niels Dossche
3ccd8d7866 Fix crash when an invalid callback function is passed to CURLMOPT_PUSHFUNCTION 
Previously this caused a SIGABRT.

Closes GH-11639.
 2023-07-08 21:32:10 +02:00
Ilija Tovilo
7e57e108f9
Merge branch 'PHP-8.2' 
* PHP-8.2:
  tests(ext-curl): fix HTTP/2 Server Push tests
 2023-07-07 10:38:55 +02:00
Ilija Tovilo
30a80b8e41
Merge branch 'PHP-8.1' into PHP-8.2 
* PHP-8.1:
  tests(ext-curl): fix HTTP/2 Server Push tests
 2023-07-07 10:38:48 +02:00
Kévin Dunglas
47d478806a
tests(ext-curl): fix HTTP/2 Server Push tests 
Closes GH-10669
 2023-07-07 10:38:26 +02:00
nielsdos
18f2f0a0ab Merge branch 'PHP-8.2' 
* PHP-8.2:
  Fix GH-11433: Unable to set CURLOPT_ACCEPT_ENCODING to NULL
  Fix "invalid state error" with cloned namespace declarations
  Fix lifetime issue with getAttributeNodeNS()
 2023-06-13 17:38:04 +02:00
nielsdos
c160693515 Merge branch 'PHP-8.1' into PHP-8.2 
* PHP-8.1:
  Fix GH-11433: Unable to set CURLOPT_ACCEPT_ENCODING to NULL
  Fix "invalid state error" with cloned namespace declarations
  Fix lifetime issue with getAttributeNodeNS()
 2023-06-13 17:35:16 +02:00
nielsdos
a8a3b99e00 Fix GH-11433: Unable to set CURLOPT_ACCEPT_ENCODING to NULL 
Closes GH-11446.
 2023-06-13 17:30:57 +02:00
George Peter Banyard
d5ad75108e
More usage of known zend_str instead of C string (#11381) 2023-06-08 13:03:29 +01:00
Ilija Tovilo
b22758d764
Merge branch 'PHP-8.2' 
* PHP-8.2:
  [skip ci] Add all conflict to curl
 2023-04-19 16:24:23 +02:00
Ilija Tovilo
f948f79696
Merge branch 'PHP-8.1' into PHP-8.2 
* PHP-8.1:
  [skip ci] Add all conflict to curl
 2023-04-19 16:24:16 +02:00
Ilija Tovilo
af6b413691
[skip ci] Add all conflict to curl 2023-04-19 16:23:52 +02:00
Ilija Tovilo
49fd6306db
Merge branch 'PHP-8.2' 
* PHP-8.2:
  [skip ci] Skip bug45161.phpt on Windows
 2023-04-13 13:21:18 +02:00
Ilija Tovilo
023e17a89d
Merge branch 'PHP-8.1' into PHP-8.2 
* PHP-8.1:
  [skip ci] Skip bug45161.phpt on Windows
 2023-04-13 13:20:45 +02:00
Ilija Tovilo
4b22c3e3ad
[skip ci] Skip bug45161.phpt on Windows 
See GH-10753

The test is insanely slow on Windows and it's unclear why. It might be a curl
issue.
 2023-04-13 13:19:52 +02:00
George Peter Banyard
ad997987dd
ext/curl: Protocol should be a case insensitive check (#11052) 
Minor drive-by refactoring to use the new API
 2023-04-11 11:45:05 +01:00
Niels Dossche
2ba3c999b9 Merge branch 'PHP-8.2' 
* PHP-8.2:
  Fix GH-10928: PHP Build Failed - Test curl_version() basic functionality [ext/curl/tests/curl_version_basic_001.phpt]
 2023-03-25 18:16:55 +01:00
Niels Dossche
a095203a03 Merge branch 'PHP-8.1' into PHP-8.2 
* PHP-8.1:
  Fix GH-10928: PHP Build Failed - Test curl_version() basic functionality [ext/curl/tests/curl_version_basic_001.phpt]
 2023-03-25 18:15:42 +01:00
Niels Dossche
8e620b4ecb Fix GH-10928: PHP Build Failed - Test curl_version() basic functionality [ext/curl/tests/curl_version_basic_001.phpt] 
It's possible that curl was compiled without SSL, and/or without libz
support. In the case of the issue reporter it was without libz support.
This causes the test to fail because we expect a non-empty string.
Fix it by using %S instead of %s to allow empty strings.

Closes GH-10930.
 2023-03-25 18:15:20 +01:00
Ilija Tovilo
7b4c7374c3
Merge branch 'PHP-8.2' 
* PHP-8.2:
  ext/curl: suppress -Wdeprecated-declarations in curl_arginfo.h
 2023-03-22 20:58:33 +01:00
Ilija Tovilo
c8f9adb44d
Merge branch 'PHP-8.1' into PHP-8.2 
* PHP-8.1:
  ext/curl: suppress -Wdeprecated-declarations in curl_arginfo.h
 2023-03-22 20:58:25 +01:00
Max Kellermann
2646d76abc
ext/curl: suppress -Wdeprecated-declarations in curl_arginfo.h 
Disable the warning before including curl_arginfo.h.

(Follow-up for https://github.com/php/php-src/pull/10531)
 2023-03-22 20:57:41 +01:00
Ilija Tovilo
ba7eeeacc0
Merge branch 'PHP-8.2' 
* PHP-8.2:
  [skip ci] Add CONFLICTS file for curl tests
 2023-03-21 19:17:49 +01:00
Ilija Tovilo
7c244f5539
Merge branch 'PHP-8.1' into PHP-8.2 
* PHP-8.1:
  [skip ci] Add CONFLICTS file for curl tests
 2023-03-21 19:17:36 +01:00
Ilija Tovilo
0842b13e5c
[skip ci] Add CONFLICTS file for curl tests 2023-03-21 19:17:06 +01:00
George Peter Banyard
51b70e4414
Merge branch 'PHP-8.2' 
* PHP-8.2:
  Fixed bug GH-10270 Unable to return CURL_READFUNC_PAUSE in readfunc callback
  Fix GH-10672 (pg_lo_open segfaults in the strict_types mode)
 2023-02-24 14:33:47 +00:00
George Peter Banyard
512abc23a4
Merge branch 'PHP-8.1' into PHP-8.2 
* PHP-8.1:
  Fixed bug GH-10270 Unable to return CURL_READFUNC_PAUSE in readfunc callback
  Fix GH-10672 (pg_lo_open segfaults in the strict_types mode)
 2023-02-24 14:33:28 +00:00
Pierrick Charron
91db3a1b85
Fixed bug GH-10270 Unable to return CURL_READFUNC_PAUSE in readfunc callback 
Closes GH-10607

Signed-off-by: George Peter Banyard <girgias@php.net>
 2023-02-24 14:32:23 +00:00
Max Kellermann
1287747a9a
ext: make various internal functions static (#10650) 
Namely in:
* ext/date
* ext/libxml
* ext/dba
* ext/curl
 2023-02-21 15:51:41 +00:00
Max Kellermann
263b22f374
Make lots of string pointers const (#10646) 
This allows using string literals without implicitly casting away the
`const`.
 2023-02-21 14:01:37 +00:00
George Peter Banyard
373809c51b
Merge branch 'PHP-8.2' 
* PHP-8.2:
  ext/curl/interface: fix zend_result return value
  Zend/zend_ini: fix zend_result return values
 2023-02-21 13:54:12 +00:00
George Peter Banyard
f6ec807871
Merge branch 'PHP-8.1' into PHP-8.2 
* PHP-8.1:
  ext/curl/interface: fix zend_result return value
  Zend/zend_ini: fix zend_result return values
 2023-02-21 13:53:48 +00:00
Max Kellermann
ed4dc39e7f
ext/curl/interface: fix zend_result return value 
Closes GH-10640

Signed-off-by: George Peter Banyard <girgias@php.net>
 2023-02-21 13:41:07 +00:00
David Carlier
00ae200143 Merge branch 'PHP-8.2' 2023-02-08 18:33:51 +00:00
David Carlier
06120df71e Merge branch 'PHP-8.1' into PHP-8.2 2023-02-08 18:32:33 +00:00
Max Kellermann
8c8a38a75c ext/curl: suppress -Wdeprecated-declarations 
Closes GH-10531.
 2023-02-08 18:32:13 +00:00
George Peter Banyard
3641f824fd
Do not use zend_fcall_info_argn() in ext-curl 
Using zend_fcall_info_argn() allocates the ZVALs on the heap and they need to be freed afterwards.
Handle adding them to the FCI manually so to keep them stack allocated.
 2022-10-21 18:31:40 +01:00
Bob Weinand
a01dd9feda Revert "Port all internally used classes to use default_object_handlers" 
This reverts commit 94ee4f9834.

The commit was a bit too late to be included in PHP 8.2 RC1. Given it's a massive ABI break, we decide to postpone the change to PHP 8.3.
 2022-09-14 11:13:23 +02:00
Bob Weinand
94ee4f9834 Port all internally used classes to use default_object_handlers 
Signed-off-by: Bob Weinand <bobwei9@hotmail.com>
 2022-08-31 16:45:27 +02:00