X-Git-Url: https://git.m6w6.name/?p=m6w6%2Fext-http;a=blobdiff_plain;f=http_functions.c;h=8f9130042def69c1a234e5e3f2a46d6970ae271c;hp=b16cef17e43c59725be76cfd2add8d5ad0a2c594;hb=ccd556e32e7264830790ec13b72a9b0e3760684b;hpb=e6b35fbe072a13b0e792952852fcd1499bd8e610 diff --git a/http_functions.c b/http_functions.c index b16cef1..8f91300 100644 --- a/http_functions.c +++ b/http_functions.c @@ -1246,6 +1246,7 @@ PHP_FUNCTION(http_match_request_header) * - encodecookies: bool, whether to urlencode the cookies (default: true) * - resetcookies: bool, wheter to reset the cookies * - cookiestore: string, path to a file where cookies are/will be stored + * - cookiesession: bool, accept (true) or reset (false) sessioncookies * - resume: int, byte offset to start the download from; * if the server supports ranges * - maxfilesize: int, maximum file size that should be downloaded; @@ -1255,6 +1256,8 @@ PHP_FUNCTION(http_match_request_header) * - timeout: int, seconds the request may take * - connecttimeout: int, seconds the connect may take * - onprogress: mixed, progress callback + * - interface: string, outgoing network interface (ifname, ip or hostname) + * - portrange: array, 2 integers specifying outgoing portrange to try * - ssl: array, with the following options: * cert: string, path to certificate * certtype: string, type of certificate @@ -1278,30 +1281,45 @@ PHP_FUNCTION(http_match_request_header) *
* 'http://localhost', - * 'response_code' => 403, - * 'total_time' => 0.017, - * 'namelookup_time' => 0.013, - * 'connect_time' => 0.014, - * 'pretransfer_time' => 0.014, - * 'size_upload' => 0, - * 'size_download' => 202, - * 'speed_download' => 11882, - * 'speed_upload' => 0, - * 'header_size' => 145, - * 'request_size' => 62, - * 'ssl_verifyresult' => 0, - * 'filetime' => -1, - * 'content_length_download' => 202, - * 'content_length_upload' => 0, - * 'starttransfer_time' => 0.017, - * 'content_type' => 'text/html; charset=iso-8859-1', - * 'redirect_time' => 0, - * 'redirect_count' => 0, - * 'http_connectcode' => 0, - * 'httpauth_avail' => 0, - * 'proxyauth_avail' => 0, - * ) + * 'effective_url' => 'http://www.example.com/', + * 'response_code' => 302, + * 'connect_code' => 0, + * 'filetime' => -1, + * 'total_time' => 0.212348, + * 'namelookup_time' => 0.038296, + * 'connect_time' => 0.104144, + * 'pretransfer_time' => 0.104307, + * 'starttransfer_time' => 0.212077, + * 'redirect_time' => 0, + * 'redirect_count' => 0, + * 'size_upload' => 0, + * 'size_download' => 218, + * 'speed_download' => 1026, + * 'speed_upload' => 0, + * 'header_size' => 307, + * 'request_size' => 103, + * 'ssl_verifyresult' => 0, + * 'ssl_engines' => + * array ( + * 0 => 'dynamic', + * 1 => 'cswift', + * 2 => 'chil', + * 3 => 'atalla', + * 4 => 'nuron', + * 5 => 'ubsec', + * 6 => 'aep', + * 7 => 'sureware', + * 8 => '4758cca', + * ), + * 'content_length_download' => 218, + * 'content_length_upload' => 0, + * 'content_type' => 'text/html', + * 'httpauth_avail' => 0, + * 'proxyauth_avail' => 0, + * 'num_connects' => 1, + * 'os_errno' => 0, + * 'error' => '', + * ) * ?> ** @@ -1484,7 +1502,7 @@ PHP_FUNCTION(http_put_file) RETURN_FALSE; } - if (!(stream = php_stream_open_wrapper(file, "rb", REPORT_ERRORS|ENFORCE_SAFE_MODE, NULL))) { + if (!(stream = php_stream_open_wrapper_ex(file, "rb", REPORT_ERRORS|ENFORCE_SAFE_MODE, NULL, HTTP_DEFAULT_STREAM_CONTEXT))) { RETURN_FALSE; } if (php_stream_stat(stream, &ssb)) { @@ -1499,12 +1517,8 @@ PHP_FUNCTION(http_put_file) RETVAL_FALSE; - body.type = HTTP_REQUEST_BODY_UPLOADFILE; - body.data = stream; - body.size = ssb.sb.st_size; - http_request_init_ex(&request, NULL, HTTP_PUT, URL); - request.body = &body; + request.body = http_request_body_init_ex(&body, HTTP_REQUEST_BODY_UPLOADFILE, stream, ssb.sb.st_size, 1); if (SUCCESS == http_request_prepare(&request, options?Z_ARRVAL_P(options):NULL)) { http_request_exec(&request); if (info) { @@ -1512,8 +1526,6 @@ PHP_FUNCTION(http_put_file) } RETVAL_RESPONSE_OR_BODY(request); } - http_request_body_dtor(&body); - request.body = NULL; http_request_dtor(&request); } /* }}} */ @@ -1526,7 +1538,7 @@ PHP_FUNCTION(http_put_file) * opened stream, from which the data to upload should be read. * See http_get() for a full list of available options. * - * Returns the HTTP response(s) as string on success. or FALSE on failure. + * Returns the HTTP response(s) as string on success, or FALSE on failure. */ PHP_FUNCTION(http_put_stream) { @@ -1554,12 +1566,49 @@ PHP_FUNCTION(http_put_stream) RETVAL_FALSE; - body.type = HTTP_REQUEST_BODY_UPLOADFILE; - body.data = stream; - body.size = ssb.sb.st_size; + http_request_init_ex(&request, NULL, HTTP_PUT, URL); + request.body = http_request_body_init_ex(&body, HTTP_REQUEST_BODY_UPLOADFILE, stream, ssb.sb.st_size, 0); + if (SUCCESS == http_request_prepare(&request, options?Z_ARRVAL_P(options):NULL)) { + http_request_exec(&request); + if (info) { + http_request_info(&request, Z_ARRVAL_P(info)); + } + RETVAL_RESPONSE_OR_BODY(request); + } + http_request_dtor(&request); +} +/* }}} */ - http_request_init_ex(&request, NULL, HTTP_POST, URL); - request.body = &body; +/* {{{ proto string http_put_data(string url, string data[, array options[, array &info]]) + * + * Performs an HTTP PUT request on the supplied url. + * + * Expects the second parameter to be a string containing the data to upload. + * See http_get() for a full list of available options. + * + * Returns the HTTP response(s) as string on success, or FALSE on failure. + */ +PHP_FUNCTION(http_put_data) +{ + char *URL, *data; + int URL_len, data_len; + zval *options = NULL, *info = NULL; + http_request_body body; + http_request request; + + if (SUCCESS != zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "ss|a/!z", &URL, &URL_len, &data, &data_len, &options, &info)) { + RETURN_FALSE; + } + + if (info) { + zval_dtor(info); + array_init(info); + } + + RETVAL_FALSE; + + http_request_init_ex(&request, NULL, HTTP_PUT, URL); + request.body = http_request_body_init_ex(&body, HTTP_REQUEST_BODY_CSTRING, data, data_len, 0); if (SUCCESS == http_request_prepare(&request, options?Z_ARRVAL_P(options):NULL)) { http_request_exec(&request); if (info) { @@ -1567,7 +1616,6 @@ PHP_FUNCTION(http_put_stream) } RETVAL_RESPONSE_OR_BODY(request); } - request.body = NULL; http_request_dtor(&request); } /* }}} */