X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=http_functions.c;h=8f9130042def69c1a234e5e3f2a46d6970ae271c;hb=64616c6675baf9dd168a7e2763e3124db0219921;hp=1c63ba0d6b270f57dbe2a01a28d012e44b98fb59;hpb=60086d086e7f0dbfccf61931c1b2e2b410ccb5bb;p=m6w6%2Fext-http

diff --git a/http_functions.c b/http_functions.c
index 1c63ba0..8f91300 100644
--- a/http_functions.c
+++ b/http_functions.c
@@ -1502,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)) {
@@ -1517,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) {
@@ -1530,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);
 }
 /* }}} */
@@ -1544,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)
 {
@@ -1572,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) {
@@ -1585,7 +1616,6 @@ PHP_FUNCTION(http_put_stream)
 		}
 		RETVAL_RESPONSE_OR_BODY(request);
 	}
-	request.body = NULL;
 	http_request_dtor(&request);
 }
 /* }}} */