summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSterling Hughes <sterling@php.net>2001-09-22 16:56:21 +0000
committerSterling Hughes <sterling@php.net>2001-09-22 16:56:21 +0000
commit958675c067606b132fd0e42371f1f0b4b560551f (patch)
tree048f69ac70c7f77ada9ebeb325bf3b62b59de364
parente42ab2c95f08e468f8b1cfed4d1cfcb8352868b2 (diff)
downloadphp-git-958675c067606b132fd0e42371f1f0b4b560551f.tar.gz
fix compile
-rw-r--r--ext/curl/curl.c4
-rw-r--r--ext/curl/php_curl.h1
2 files changed, 3 insertions, 2 deletions
diff --git a/ext/curl/curl.c b/ext/curl/curl.c
index efe195f9c7..96bc4cabf9 100644
--- a/ext/curl/curl.c
+++ b/ext/curl/curl.c
@@ -773,7 +773,7 @@ PHP_FUNCTION(curl_setopt)
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 @@ PHP_FUNCTION(curl_setopt)
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");
diff --git a/ext/curl/php_curl.h b/ext/curl/php_curl.h
index ef7dc6a1e1..1b72ed4905 100644
--- a/ext/curl/php_curl.h
+++ b/ext/curl/php_curl.h
@@ -41,6 +41,7 @@ extern zend_module_entry curl_module_entry;
#define CURLOPT_BINARYTRANSFER 19914
PHP_MINIT_FUNCTION(curl);
+PHP_MSHUTDOWN_FUNCTION(curl);
PHP_MINFO_FUNCTION(curl);
PHP_FUNCTION(curl_version);
PHP_FUNCTION(curl_init);