cvs: php4 /ext/curl curl.c

sterling Mon Dec 3 04:19:14 2001 EDT Modified files: /php4/ext/curl curl.c Log: Re-add support for HTTP file uploads Index: php4/ext/curl/curl.c diff -u php4/ext/curl/curl.c:1.98 php4/ext/curl/curl.c:1.99 --- php4/ext/curl/curl.c:1.98 Tue Nov 20 06:29:54 2001 +++ php4/ext/curl/curl.c Mon Dec 3 04:19:14 2001 @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: curl.c,v 1.98 2001/11/20 11:29:54 sterling Exp $ */ +/* $Id: curl.c,v 1.99 2001/12/03 09:19:14 sterling Exp $ */ #ifdef HAVE_CONFIG_H #include "config.h" @@ -791,9 +791,16 @@ convert_to_string_ex(current); zend_hash_get_current_key_ex(postfields, &string_key, &string_key_len, &num_key, 0, NULL); - - error = curl_formadd(&first, &last, CURLFORM_COPYNAME, string_key, - CURLFORM_PTRCONTENTS, Z_STRVAL_PP(current), CURLFORM_END); + + postval = Z_STRVAL_PP(current); + if (*postval == '@') { + error = curl_formadd(&first, &last, CURLFORM_COPYNAME, string_key, + CURLFORM_FILE, ++postval, CURLFORM_END); + } + else { + error = curl_formadd(&first, &last, CURLFORM_COPYNAME, string_key, + CURLFORM_PTRCONTENTS, postval, CURLFORM_END); + } } if (error != CURLE_OK) {