X-Git-Url: https://git.m6w6.name/?p=m6w6%2Fext-http;a=blobdiff_plain;f=http_methods.c;h=85d029e675359d70717b8df34de1072c6bac419e;hp=5e9e0d3b6cca8e8ba559a6ac3970aa09a4aa664a;hb=d1ae8375420c406fdbb47f8347c6b75230668f09;hpb=2811a2111f519ee55e05c4084903a34dc0c3b818

diff --git a/http_methods.c b/http_methods.c
index 5e9e0d3..85d029e 100644
--- a/http_methods.c
+++ b/http_methods.c
@@ -277,7 +277,6 @@ PHP_METHOD(HTTPi_Response, getETag)
 PHP_METHOD(HTTPi_Response, setData)
 {
 	zval *the_data;
-	char *etag;
 	getObject(httpi_response_object, obj);
 
 	if (SUCCESS != zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "z", &the_data)) {
@@ -314,7 +313,6 @@ PHP_METHOD(HTTPi_Response, setStream)
 {
 	zval *the_stream;
 	php_stream *the_real_stream;
-	char *etag;
 	getObject(httpi_response_object, obj);
 
 	if (SUCCESS != zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "r", &the_stream)) {
@@ -440,7 +438,8 @@ PHP_METHOD(HTTPi_Response, send)
 		{
 			case SEND_DATA:
 			{
-				RETURN_SUCCESS(http_send_data(GET_PROP(obj, data)));
+				zval *zdata = GET_PROP(obj, data);
+				RETURN_SUCCESS(http_send_data(Z_STRVAL_P(zdata), Z_STRLEN_P(zdata)));
 			}
 
 			case SEND_RSRC:
@@ -453,7 +452,8 @@ PHP_METHOD(HTTPi_Response, send)
 
 			default:
 			{
-				RETURN_SUCCESS(http_send_file(GET_PROP(obj, file)));
+				zval *zfile = GET_PROP(obj, file);
+				RETURN_SUCCESS(http_send_file(Z_STRVAL_P(zfile)));
 			}
 		}
 	}
@@ -472,7 +472,6 @@ PHP_METHOD(HTTPi_Request, __construct)
 	char *URL = NULL;
 	int URL_len;
 	long meth = -1;
-	zval *info, *opts, *resp;
 	getObject(httpi_request_object, obj);
 
 	if (SUCCESS != zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "|sl", &URL, &URL_len, &meth)) {
@@ -545,12 +544,12 @@ PHP_METHOD(HTTPi_Request, setOptions)
 			}
 			zval_add_ref(opt);
 			add_assoc_zval(old_opts, key, *opt);
-		
+
 			/* reset */
 			key = NULL;
 		}
 	}
-	
+
 	RETURN_TRUE;
 }
 /* }}} */
@@ -733,14 +732,14 @@ PHP_METHOD(HTTPi_Request, addQueryData)
 	}
 
 	old_qdata = GET_PROP(obj, queryData);
-	
+
 	if (SUCCESS != http_urlencode_hash_ex(HASH_OF(qdata), 1, Z_STRVAL_P(old_qdata), Z_STRLEN_P(old_qdata), &query_data, NULL)) {
 		RETURN_FALSE;
 	}
 
 	UPD_PROP(obj, string, queryData, query_data);
 	efree(query_data);
-	
+
 	RETURN_TRUE;
 }
 /* }}} */
@@ -1046,12 +1045,12 @@ PHP_METHOD(HTTPi_Request, send)
 								CURLFORM_CONTENTSLENGTH,	Z_STRLEN_PP(data),
 								CURLFORM_END
 							);
-						
+
 							/* reset */
 							key = NULL;
 						}
 					}
-					
+
 					/* file data */
 					FOREACH_VAL(post_files, data) {
 						zval **file, **type, **name;
@@ -1121,4 +1120,5 @@ PHP_METHOD(HTTPi_Request, send)
  * End:
  * vim600: noet sw=4 ts=4 fdm=marker
  * vim<600: noet sw=4 ts=4
- */
\ No newline at end of file
+ */
+