1
0
mirror of https://github.com/php/php-src.git synced 2026-04-08 08:33:06 +02:00
Commit Graph

1340 Commits

Author SHA1 Message Date
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
Máté Kocsis
b4ec3e9bc0 Do not generate CONST_CS when registering constants (#9439) 2022-08-28 08:27:19 +02:00
Máté Kocsis
51eb1d4f6c Fix curl/sync_constants.php (#9391) 2022-08-21 18:04:33 +02:00
Máté Kocsis
e6e26b444d Declare ext/curl constants in stubs (#9384) 2022-08-20 11:01:40 +02:00
Ilija Tovilo
3b92a96610 Convert return type of various object handlers from int to zend_result (#8755) 2022-06-26 01:00:19 +02:00
Pierrick Charron
b08076ef97 Merge branch 'PHP-8.1'
* PHP-8.1:
  Fixed CURLOPT_TLSAUTH_TYPE is not treated as a string option.
2022-06-17 19:54:45 -04:00
Pierrick Charron
bb010adf29 Merge branch 'PHP-8.0' into PHP-8.1 2022-06-17 19:52:44 -04:00
Pierrick Charron
d84b972658 Fixed CURLOPT_TLSAUTH_TYPE is not treated as a string option. 2022-06-17 19:51:58 -04:00
Christoph M. Becker
03e72e7a87 Update curl/tests/check_win_config.phpt
That was apparently missed in cec20f615d.
2022-06-14 11:45:44 +02:00
Pierrick Charron
65472c792c Add skip online test to curl_upkeep test 2022-06-13 18:57:37 -04:00
Pierrick Charron
b9af4335e3 Add new curl_upkeep() function 2022-06-13 18:15:21 -04:00
Pierrick Charron
cec20f615d Expose new constants from libcurl 7.62 to 7.80 2022-06-13 18:15:21 -04:00
David Carlier
10921525e6 Add CURLOPT_MAXFILESIZE_LARGE option
Like other *LARGE options, it takes a 64 bit value.

Closes GH-8557.
2022-05-16 11:01:28 +02:00
Christoph M. Becker
59272266ee Merge branch 'PHP-8.0' into PHP-8.1
* PHP-8.0:
  Fix test for curl 7.83.0
2022-05-03 15:08:43 +02:00
Christoph M. Becker
722e9b9fa5 Fix test for curl 7.83.0
libcurl 7.83.0 removed some trailing exclamation marks from error
messages[1]; we have to cater to that.

[1] <6968fb9d54>

(cherry picked from commit a4179e4c92)
2022-05-03 15:07:50 +02:00
Derick Rethans
f7a5353531 Turn off "Expect" header in test
Without this explicitly set, curl might decide to add a
`Expect: 100-continue` header if it deems the request too large.
See also: https://gms.tf/when-curl-sends-100-continue.html
2022-04-29 16:39:01 +01:00
Derick Rethans
fb3cba494e Fix multi-same-name-fields in Curl for old (> 7.56.0) versions 2022-04-29 16:39:01 +01:00
Christoph M. Becker
a4179e4c92 Fix test for curl 7.83.0
libcurl 7.83.0 removed some trailing exclamation marks from error
messages[1]; we have to cater to that.

[1] <6968fb9d54>
2022-04-27 12:37:39 +02:00
David Carlier
7a45dcfe2e Introduce CURLOPT_XFERINFOFUNCTION
`CURLOPT_XFERINFOFUNCTION` is available as of cURL 7.32.0, and
supersedes `CURLOPT_PROGRESSFUNCTION` which is still supported by
latest cURL, though.

Closes GH-7823.
2022-04-22 18:09:06 +02:00
Christoph M. Becker
6828f9d1af Fix newly introduced test
We need to tell the test runner that ext/curl is required to run the
test.
2022-04-07 11:59:29 +02:00
Derick Rethans
8093ed6168 Implemented FR #51634: Can't post multiple fields with the same name
This PR allows for multiple values with the same field name to be sent to an
HTTP server. This server can't be PHP, because PHP's POST processing does not
allow for two the same field names. But sending multiple fields with the same
name is required for some operations by RFC 7578.

This PR allows you to attach an array of values to a field name, and each of
these will then be sent as its own distinct multipart/form-data field.
2022-04-07 10:01:31 +01:00