Skip to content
Closed
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 UPGRADING
Original file line number Diff line number Diff line change
Expand Up @@ -147,6 +147,11 @@ PHP 8.5 UPGRADE NOTES
indicating the http and proxy authentication methods that were
used in the previous request. See CURLAUTH_* constants for
possible values.
. Added CURLOPT_INFILESIZE_LARGE Curl option, which is a safe
replacement for CURLOPT_INFILESIZE_LARGE. On certain systems,
CURLOPT_INFILESIZE only accepts a 32-bit signed integer as the file
size (2.0 GiB) even on 64-bit systems. CURLOPT_INFILESIZE_LARGE
accepts the largest integer size the system can handle.

- DOM:
. Added Dom\Element::$outerHTML.
Expand Down
5 changes: 5 additions & 0 deletions ext/curl/curl.stub.php
Original file line number Diff line number Diff line change
Expand Up @@ -188,6 +188,11 @@
* @cvalue CURLOPT_INFILESIZE
*/
const CURLOPT_INFILESIZE = UNKNOWN;
/**
* @var int
* @cvalue CURLOPT_INFILESIZE_LARGE
*/
const CURLOPT_INFILESIZE_LARGE = UNKNOWN;
/**
* @var int
* @cvalue CURLOPT_INTERFACE
Expand Down
3 changes: 2 additions & 1 deletion ext/curl/curl_arginfo.h

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions ext/curl/interface.c
Original file line number Diff line number Diff line change
Expand Up @@ -2244,6 +2244,7 @@ static zend_result _php_curl_setopt(php_curl *ch, zend_long option, zval *zvalue
break;

/* Curl off_t options */
case CURLOPT_INFILESIZE_LARGE:
case CURLOPT_MAX_RECV_SPEED_LARGE:
case CURLOPT_MAX_SEND_SPEED_LARGE:
case CURLOPT_MAXFILESIZE_LARGE:
Expand Down
5 changes: 5 additions & 0 deletions ext/curl/tests/Caddyfile
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,11 @@ respond /serverpush "main response"
respond /serverpush/pushed "pushed response"
push /serverpush /serverpush/pushed

route /show_upload_size {
templates
respond `Content-length: ={{.Req.Header.Get "Content-length"}}=`
}

basic_auth /http-basic-auth {
# bcrypt password hash for "password", calculated with 'caddy hash-password'
user $2a$14$yUKl9SGqVTAAqPTzLup.DefsbXXx3kfreNnzpJOUHcIrKnr5lgef2
Expand Down
58 changes: 58 additions & 0 deletions ext/curl/tests/curl_setopt_CURLOPT_INFILESIZE_LARGE.phpt
Original file line number Diff line number Diff line change
@@ -0,0 +1,58 @@
--TEST--
Curl option CURLOPT_INFILESIZE_LARGE
--EXTENSIONS--
curl
--SKIPIF--
<?php
include 'skipif-nocaddy.inc';
?>
--FILE--
<?php
$ch = curl_init("https://localhost/show_upload_size");
$f = fopen(__FILE__,"r");
var_dump(curl_setopt_array($ch, [
CURLOPT_RETURNTRANSFER => true,
CURLOPT_UPLOAD => true,
CURLOPT_INFILE => $f,
CURLOPT_INFILESIZE => filesize(__FILE__),
CURLOPT_CONNECTTIMEOUT => 3,
CURLOPT_TIMEOUT => 3,
CURLOPT_SSL_VERIFYHOST => 0,
CURLOPT_SSL_VERIFYPEER => 0,
]));

var_dump(curl_exec($ch));

var_dump(curl_setopt($ch, CURLOPT_INFILESIZE, -1));
var_dump(curl_exec($ch));

var_dump(curl_setopt($ch, CURLOPT_INFILESIZE_LARGE, -1));
var_dump(curl_exec($ch));

rewind($f);
var_dump(curl_setopt($ch, CURLOPT_INFILESIZE, filesize(__FILE__)));
var_dump(curl_exec($ch));
var_dump(curl_setopt($ch, CURLOPT_INFILESIZE_LARGE, -1));
var_dump(curl_exec($ch));

rewind($f);
var_dump(curl_setopt($ch, CURLOPT_INFILESIZE_LARGE, filesize(__FILE__)));
var_dump(curl_exec($ch));

var_dump(curl_error($ch));

?>
--EXPECTF--
bool(true)
string(21) "Content-length: =%d="
bool(true)
string(18) "Content-length: =="
bool(true)
string(18) "Content-length: =="
bool(true)
string(21) "Content-length: =%d="
bool(true)
string(18) "Content-length: =="
bool(true)
string(21) "Content-length: =%d="
string(0) ""
Loading