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

sterling Sat Sep 22 12:56:21 2001 EDT Modified files: /php4/ext/curl curl.c php_curl.h Log: fix compile Index: php4/ext/curl/curl.c diff -u php4/ext/curl/curl.c:1.86 php4/ext/curl/curl.c:1.87 --- php4/ext/curl/curl.c:1.86 Fri Sep 21 20:38:59 2001 +++ php4/ext/curl/curl.c Sat Sep 22 12:56:21 2001 @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: curl.c,v 1.86 2001/09/22 00:38:59 sterling Exp $ */ +/* $Id: curl.c,v 1.87 2001/09/22 16:56:21 sterling Exp $ */ #ifdef HAVE_CONFIG_H #include "config.h" @@ -773,7 +773,7 @@ SEPARATE_ZVAL(current); convert_to_string_ex(current); - zend_hash_get_current_key_ex(postfields, &string_key, &string_key_len, &num_key, 0); + zend_hash_get_current_key_ex(postfields, &string_key, &string_key_len, &num_key, 0, NULL); postval = emalloc((string_key_len - 1) + Z_STRLEN_PP(current) + 1); snprintf(postval, (sizeof("%s=%s") - 1) + (string_key_len - 1) + Z_STRLEN_PP(current), @@ -810,7 +810,7 @@ struct curl_slist *slist = NULL; ph = HASH_OF(*zvalue); - if (! hash) { + if (! ph) { php_error(E_WARNING, "You must pass either an object or an array with the CURLOPT_HTTPHEADER," "CURLOPT_QUOTE and CURLOPT_POSTQUOTE arguments"); Index: php4/ext/curl/php_curl.h diff -u php4/ext/curl/php_curl.h:1.25 php4/ext/curl/php_curl.h:1.26 --- php4/ext/curl/php_curl.h:1.25 Mon Jun 25 11:14:20 2001 +++ php4/ext/curl/php_curl.h Sat Sep 22 12:56:21 2001 @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: php_curl.h,v 1.25 2001/06/25 15:14:20 sterling Exp $ */ +/* $Id: php_curl.h,v 1.26 2001/09/22 16:56:21 sterling Exp $ */ #ifndef _PHP_CURL_H #define _PHP_CURL_H @@ -41,6 +41,7 @@ #define CURLOPT_BINARYTRANSFER 19914 PHP_MINIT_FUNCTION(curl); +PHP_MSHUTDOWN_FUNCTION(curl); PHP_MINFO_FUNCTION(curl); PHP_FUNCTION(curl_version); PHP_FUNCTION(curl_init);