Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions NEWS
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,11 @@ PHP NEWS
class constants via OBJ->prop = $val). (Khaled Alam)
. Reverted GH-22833, which attempted to fix bug GH-18985. (ilutov)

- Curl:
. Set content length using CURLOPT_POSTFIELDSIZE_LARGE instead of
CURLOPT_POSTFIELDSIZE. This makes it possible to post strings larger than
2GB on some platforms, e.g. Windows. (Sjoerd Langkemper)

- DOM:
. Fixed bug GH-22624 (use-after-free via DOMNameSpaceNode after
DOMDocument::xinclude()). (David Carlier)
Expand Down
4 changes: 2 additions & 2 deletions ext/curl/interface.c
Original file line number Diff line number Diff line change
Expand Up @@ -2178,15 +2178,15 @@ static zend_result _php_curl_setopt(php_curl *ch, zend_long option, zval *zvalue
/* no need to build the mime structure for empty hashtables;
also works around https://github.com/curl/curl/issues/6455 */
curl_easy_setopt(ch->cp, CURLOPT_POSTFIELDS, "");
error = curl_easy_setopt(ch->cp, CURLOPT_POSTFIELDSIZE, 0L);
error = curl_easy_setopt(ch->cp, CURLOPT_POSTFIELDSIZE_LARGE, (curl_off_t) 0);
} else {
return build_mime_structure_from_hash(ch, zvalue);
}
} else {
zend_string *tmp_str;
zend_string *str = zval_get_tmp_string(zvalue, &tmp_str);
/* with curl 7.17.0 and later, we can use COPYPOSTFIELDS, but we have to provide size before */
error = curl_easy_setopt(ch->cp, CURLOPT_POSTFIELDSIZE, ZSTR_LEN(str));
error = curl_easy_setopt(ch->cp, CURLOPT_POSTFIELDSIZE_LARGE, (curl_off_t) ZSTR_LEN(str));
Comment thread
Sjord marked this conversation as resolved.
error = curl_easy_setopt(ch->cp, CURLOPT_COPYPOSTFIELDS, ZSTR_VAL(str));
zend_tmp_string_release(tmp_str);
}
Expand Down
30 changes: 30 additions & 0 deletions ext/curl/tests/curl_post_large_string.phpt
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
--TEST--
CURL post data larger than 2GB (to test CURLOPT_POSTFIELDSIZE_LARGE)
--INI--
memory_limit=3G
--SKIPIF--
<?php
if (!getenv('RUN_RESOURCE_HEAVY_TESTS')) die('skip resource-heavy test');
if (PHP_INT_SIZE < 8) die('skip 64-bit only');
include 'skipif-nocaddy.inc';
?>
--EXTENSIONS--
curl
--FILE--
<?php
$size = 2 ** 31 + 100; // a little bit more than a signed 32-bit int
$data = str_repeat('a', $size);

$ch = curl_init("https://localhost/show_upload_size");
curl_setopt_array($ch, [
CURLOPT_RETURNTRANSFER => true,
CURLOPT_POST => true,
CURLOPT_POSTFIELDS => $data,
]);

$response = curl_exec($ch);
var_dump($response);

?>
--EXPECT--
string(28) "Content-length: =2147483748="
Loading