From: Michael Wallner <mike@php.net>
Date: Wed, 29 Aug 2007 19:36:33 +0000 (+0000)
Subject: MFH: remove LFS dependent parts
X-Git-Tag: RELEASE_1_5_5~2
X-Git-Url: https://git.m6w6.name/?a=commitdiff_plain;h=335dfe2391992b141657026c4d6b31dc31379971;p=m6w6%2Fext-http

MFH: remove LFS dependent parts
---

diff --git a/http_request_api.c b/http_request_api.c
index 280302e..7643216 100644
--- a/http_request_api.c
+++ b/http_request_api.c
@@ -376,10 +376,6 @@ PHP_HTTP_API void _http_request_defaults(http_request *request)
 		HTTP_CURL_OPT(CURLOPT_IPRESOLVE, 0);
 		HTTP_CURL_OPT(CURLOPT_LOW_SPEED_LIMIT, 0L);
 		HTTP_CURL_OPT(CURLOPT_LOW_SPEED_TIME, 0L);
-#if HTTP_CURL_VERSION(7,15,5)
-		HTTP_CURL_OPT(CURLOPT_MAX_SEND_SPEED_LARGE, (curl_off_t) 0);
-		HTTP_CURL_OPT(CURLOPT_MAX_RECV_SPEED_LARGE, (curl_off_t) 0);
-#endif
 		/* crashes
 		HTTP_CURL_OPT(CURLOPT_MAXCONNECTS, 5L); */
 		HTTP_CURL_OPT(CURLOPT_FRESH_CONNECT, 0L);
@@ -515,14 +511,6 @@ PHP_HTTP_API STATUS _http_request_prepare(http_request *request, HashTable *opti
 	if ((zoption = http_request_option(request, options, "low_speed_time", IS_LONG))) {
 		HTTP_CURL_OPT(CURLOPT_LOW_SPEED_TIME, Z_LVAL_P(zoption));
 	}
-#if HTTP_CURL_VERSION(7,15,5)
-	if ((zoption = http_request_option(request, options, "max_send_speed", IS_LONG))) {
-		HTTP_CURL_OPT(CURLOPT_MAX_SEND_SPEED_LARGE, (curl_off_t) Z_LVAL_P(zoption));
-	}
-	if ((zoption = http_request_option(request, options, "max_recv_speed", IS_LONG))) {
-		HTTP_CURL_OPT(CURLOPT_MAX_RECV_SPEED_LARGE, (curl_off_t) Z_LVAL_P(zoption));
-	}
-#endif
 	/* crashes
 	if ((zoption = http_request_option(request, options, "maxconnects", IS_LONG))) {
 		HTTP_CURL_OPT(CURLOPT_MAXCONNECTS, Z_LVAL_P(zoption));
diff --git a/http_request_body_api.c b/http_request_body_api.c
index 88732a1..39cba65 100644
--- a/http_request_body_api.c
+++ b/http_request_body_api.c
@@ -21,63 +21,6 @@
 #include "php_http_url_api.h"
 #include "php_http_request_body_api.h"
 
-#if defined(HAVE_CURL_GETFORMDATA) && !defined(HAVE_CURL_FORMGET)
-struct FormData {
-	struct FormData *next;
-	int type;
-	char *line;
-	size_t length;
-};
-
-CURLcode Curl_getFormData(struct FormData **, struct curl_httppost *post, curl_off_t *size);
-
-static char *file_get_contents(char *file, size_t *len TSRMLS_DC)
-{
-	php_stream *s = NULL;
-	char *buf = NULL;
-	
-	if ((s = php_stream_open_wrapper_ex(file, "rb", REPORT_ERRORS|ENFORCE_SAFE_MODE, NULL, HTTP_DEFAULT_STREAM_CONTEXT))) {
-		*len = php_stream_copy_to_mem(s, &buf, (size_t) -1, 0);
-		php_stream_close(s);
-	} else {
-		*len = 0;
-	}
-	return buf;
-}
-
-static int curl_formget(struct FormData *post, phpstr *str TSRMLS_DC)
-{
-	int fgc_error = 0;
-	char *fdata;
-	size_t fsize;
-	struct FormData *next, *pptr = post;
-	
-	while (pptr) {
-		next = pptr->next;
-		
-		if (!fgc_error) {
-			if (pptr->type) {
-				if ((fdata = file_get_contents(pptr->line, &fsize TSRMLS_CC))) {
-					phpstr_append(str, fdata, fsize);
-					efree(fdata);
-				} else {
-					fgc_error = 1;
-				}
-			} else {
-				phpstr_append(str, pptr->line, pptr->length);
-			}
-		}
-		
-		curl_free(pptr->line);
-		curl_free(pptr);
-		pptr = next;
-	}
-	
-	return fgc_error;
-}
-#endif
-
-
 /* {{{ http_request_body *http_request_body_new() */
 PHP_HTTP_API http_request_body *_http_request_body_init_ex(http_request_body *body, int type, void *data, size_t size, zend_bool free ZEND_FILE_LINE_DC ZEND_FILE_LINE_ORIG_DC TSRMLS_DC)
 {
@@ -214,23 +157,6 @@ PHP_HTTP_API STATUS _http_request_body_encode(http_request_body *body, char **bu
 				*len = PHPSTR_LEN(&str);
 				return SUCCESS;
 			}
-#elif defined(HAVE_CURL_GETFORMDATA)
-			struct FormData *data;
-			curl_off_t size;
-			
-			if (!Curl_getFormData(&data, body->data, &size)) {
-				phpstr str;
-				
-				phpstr_init_ex(&str, (size_t) size, 0);
-				if (curl_formget(data, &str TSRMLS_CC)) {
-					phpstr_dtor(&str);
-				} else {
-					phpstr_fix(&str);
-					*buf = PHPSTR_VAL(&str);
-					*len = PHPSTR_LEN(&len);
-					return SUCCESS;
-				}
-			}
 #endif
 			break;
 		}