cvs: php4 /ext/curl curl.c php_curl.h

sterling Sat Apr 28 14:44:45 2001 EDT Modified files: /php4/ext/curl curl.c php_curl.h Log: # Actually fix the bug this time (I fixed another bug last time :) Index: php4/ext/curl/curl.c diff -u php4/ext/curl/curl.c:1.43 php4/ext/curl/curl.c:1.44 --- php4/ext/curl/curl.c:1.43 Sat Apr 28 14:37:45 2001 +++ php4/ext/curl/curl.c Sat Apr 28 14:44:44 2001 @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: curl.c,v 1.43 2001/04/28 21:37:45 sterling Exp $ */ +/* $Id: curl.c,v 1.44 2001/04/28 21:44:44 sterling Exp $ */ #include "php.h" @@ -580,9 +580,10 @@ php_error(E_WARNING, "Cannot initialize temporary file to save output from %s()", get_active_function_name()); RETURN_FALSE; } - - curl_easy_setopt(curl_handle->cp, CURLOPT_FILE, fp); - + curl_handle->tmp_fp = fp; + + curl_easy_setopt(curl_handle->cp, CURLOPT_FILE, fp); + is_temp_file = 1; } else if (curl_handle->return_transfer && @@ -803,6 +804,7 @@ { php_curl *curl_handle = (php_curl *)rsrc->ptr; curl_easy_cleanup(curl_handle->cp); + if (curl_handle->tmp_fp) fclose(curl_handle->tmp_fp); zend_llist_clean(&curl_handle->to_free); efree(curl_handle); } Index: php4/ext/curl/php_curl.h diff -u php4/ext/curl/php_curl.h:1.18 php4/ext/curl/php_curl.h:1.19 --- php4/ext/curl/php_curl.h:1.18 Sun Feb 25 22:06:52 2001 +++ php4/ext/curl/php_curl.h Sat Apr 28 14:44:44 2001 @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: php_curl.h,v 1.18 2001/02/26 06:06:52 andi Exp $ */ +/* $Id: php_curl.h,v 1.19 2001/04/28 21:44:44 sterling Exp $ */ #ifndef _PHP_CURL_H #define _PHP_CURL_H @@ -55,6 +55,7 @@ int php_stdout; int cerrno; char error[CURL_ERROR_SIZE+1]; + FILE *tmp_fp; CURL *cp; zend_llist to_free; } php_curl;