Index: ext/curl/interface.c =================================================================== RCS file: /repository/php-src/ext/curl/interface.c,v retrieving revision 1.61 diff -u -a -d -p -r1.61 interface.c --- ext/curl/interface.c 18 Jul 2005 13:47:33 -0000 1.61 +++ ext/curl/interface.c 24 Jul 2005 21:17:31 -0000 @@ -91,6 +91,7 @@ function_entry curl_functions[] = { PHP_FE(curl_copy_handle, NULL) PHP_FE(curl_version, NULL) PHP_FE(curl_setopt, NULL) + PHP_FE(curl_setopt_array, NULL) PHP_FE(curl_exec, NULL) PHP_FE(curl_getinfo, NULL) PHP_FE(curl_error, NULL) @@ -293,6 +294,7 @@ PHP_MINIT_FUNCTION(curl) REGISTER_CURL_CONSTANT(CURLINFO_CONTENT_TYPE); REGISTER_CURL_CONSTANT(CURLINFO_REDIRECT_TIME); REGISTER_CURL_CONSTANT(CURLINFO_REDIRECT_COUNT); + REGISTER_CURL_CONSTANT(CURLINFO_HEADER_OUT); /* cURL protocol constants (curl_version) */ REGISTER_CURL_CONSTANT(CURL_VERSION_IPV6); @@ -670,6 +672,23 @@ static size_t curl_write_header(char *da } /* }}} */ +static int curl_debug(CURL *cp, curl_infotype type, char *buf, size_t buf_len, void *ctx) +{ + php_curl *ch = (php_curl *) ctx; + + if (type == CURLINFO_HEADER_OUT) { + if (ch->header.str_len) { + efree(ch->header.str); + } + if (buf_len > 0) { + ch->header.str = estrndup(buf, buf_len); + ch->header.str_len = buf_len; + } + } + + return 0; +} + #if CURLOPT_PASSWDFUNCTION != 0 /* {{{ curl_passwd */ @@ -792,6 +811,7 @@ static void alloc_curl_handle(php_curl * (*ch)->handlers->read = ecalloc(1, sizeof(php_curl_read)); (*ch)->in_callback = 0; + (*ch)->header.str_len = 0; memset(&(*ch)->err, 0, sizeof((*ch)->err)); @@ -900,24 +920,10 @@ PHP_FUNCTION(curl_copy_handle) } /* }}} */ -/* {{{ proto bool curl_setopt(resource ch, int option, mixed value) - Set an option for a CURL transfer */ -PHP_FUNCTION(curl_setopt) +static int _php_curl_setopt(php_curl *ch, long option, zval **zvalue, zval *return_value TSRMLS_DC) { - zval **zid, **zoption, **zvalue; - php_curl *ch; CURLcode error=CURLE_OK; - int option; - - if (ZEND_NUM_ARGS() != 3 || zend_get_parameters_ex(3, &zid, &zoption, &zvalue) == FAILURE) { - WRONG_PARAM_COUNT; - } - ZEND_FETCH_RESOURCE(ch, php_curl *, zid, -1, le_curl_name, le_curl); - - convert_to_long_ex(zoption); - - option = Z_LVAL_PP(zoption); switch (option) { case CURLOPT_INFILESIZE: case CURLOPT_VERBOSE: @@ -1240,14 +1246,80 @@ PHP_FUNCTION(curl_setopt) break; } + case CURLINFO_HEADER_OUT: + convert_to_long_ex(zvalue); + if (Z_LVAL_PP(zvalue) == 1) { + curl_easy_setopt(ch->cp, CURLOPT_DEBUGFUNCTION, curl_debug); + curl_easy_setopt(ch->cp, CURLOPT_DEBUGDATA, (void *)ch); + curl_easy_setopt(ch->cp, CURLOPT_VERBOSE, 1); + } else { + curl_easy_setopt(ch->cp, CURLOPT_DEBUGFUNCTION, NULL); + curl_easy_setopt(ch->cp, CURLOPT_DEBUGDATA, NULL); + curl_easy_setopt(ch->cp, CURLOPT_VERBOSE, 0); + } + break; } SAVE_CURL_ERROR(ch, error); if (error != CURLE_OK) { - RETURN_FALSE; + return 1; } else { + return 0; + } +} + +/* {{{ proto bool curl_setopt(resource ch, int option, mixed value) + Set an option for a CURL transfer */ +PHP_FUNCTION(curl_setopt) +{ + zval **zid, **zoption, **zvalue; + php_curl *ch; + + if (ZEND_NUM_ARGS() != 3 || zend_get_parameters_ex(3, &zid, &zoption, &zvalue) == FAILURE) { + WRONG_PARAM_COUNT; + } + + ZEND_FETCH_RESOURCE(ch, php_curl *, zid, -1, le_curl_name, le_curl); + + convert_to_long_ex(zoption); + + if (!_php_curl_setopt(ch, Z_LVAL_PP(zoption), zvalue, return_value TSRMLS_CC)) { RETURN_TRUE; + } else { + RETURN_FALSE; + } +} +/* }}} */ + +/* {{{ proto bool curl_setopt_array(resource ch, array options) + Set an array of option for a CURL transfer */ +PHP_FUNCTION(curl_setopt_array) +{ + zval *zid, *arr, **entry; + php_curl *ch; + long option; + HashPosition pos; + char *string_key; + int str_key_len; + + if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "za", &zid, &arr) == FAILURE) { + RETURN_FALSE; + } + + ZEND_FETCH_RESOURCE(ch, php_curl *, &zid, -1, le_curl_name, le_curl); + + zend_hash_internal_pointer_reset_ex(Z_ARRVAL_P(arr), &pos); + while (zend_hash_get_current_data_ex(Z_ARRVAL_P(arr), (void **)&entry, &pos) == SUCCESS) { + if (zend_hash_get_current_key_ex(Z_ARRVAL_P(arr), &string_key, &str_key_len, &option, 0, &pos) == HASH_KEY_IS_STRING) { + php_error_docref(NULL TSRMLS_CC, E_WARNING, "Array keys must be CURLOPT constants or equivalent interger values."); + RETURN_FALSE; + } + if (_php_curl_setopt(ch, option, entry, return_value TSRMLS_CC)) { + RETURN_FALSE; + } + zend_hash_move_forward_ex(Z_ARRVAL_P(arr), &pos); } + RETURN_TRUE; } /* }}} */ @@ -1258,6 +1330,10 @@ void _php_curl_cleanup_handle(php_curl * if (ch->handlers->write->buf.len > 0) { memset(&ch->handlers->write->buf, 0, sizeof(smart_str)); } + if (ch->header.str_len) { + efree(ch->header.str); + ch->header.str_len = 0; + } memset(ch->err.str, 0, CURL_ERROR_SIZE + 1); ch->err.no = 0; @@ -1389,6 +1465,9 @@ PHP_FUNCTION(curl_getinfo) if (curl_easy_getinfo(ch->cp, CURLINFO_REDIRECT_TIME, &d_code) == CURLE_OK) { CAAD("redirect_time", d_code); } + if (ch->header.str_len > 0) { + CAAS("request_header", ch->header.str); + } } else { option = Z_LVAL_PP(zoption); switch (option) { @@ -1439,6 +1518,12 @@ PHP_FUNCTION(curl_getinfo) } break; } + case CURLINFO_HEADER_OUT: + if (ch->header.str_len > 0) { + RETURN_STRINGL(ch->header.str, ch->header.str_len, 1); + } else { + RETURN_FALSE; + } } } } @@ -1532,6 +1617,10 @@ static void _php_curl_close(zend_rsrc_li if (ch->handlers->passwd) { zval_ptr_dtor(&ch->handlers->passwd); } + if (ch->header.str_len > 0) { + efree(ch->header.str); + } + efree(ch->handlers->write); efree(ch->handlers->write_header); efree(ch->handlers->read); Index: ext/curl/php_curl.h =================================================================== RCS file: /repository/php-src/ext/curl/php_curl.h,v retrieving revision 1.43 diff -u -a -d -p -r1.43 php_curl.h --- ext/curl/php_curl.h 15 Jul 2005 16:47:48 -0000 1.43 +++ ext/curl/php_curl.h 24 Jul 2005 21:17:31 -0000 @@ -63,6 +63,7 @@ PHP_FUNCTION(curl_version); PHP_FUNCTION(curl_init); PHP_FUNCTION(curl_copy_handle); PHP_FUNCTION(curl_setopt); +PHP_FUNCTION(curl_setopt_array); PHP_FUNCTION(curl_exec); PHP_FUNCTION(curl_getinfo); PHP_FUNCTION(curl_error); @@ -107,6 +108,11 @@ struct _php_curl_error { int no; }; +struct _php_curl_send_headers { + char *str; + size_t str_len; +}; + struct _php_curl_free { zend_llist str; zend_llist post; @@ -116,6 +122,7 @@ struct _php_curl_free { typedef struct { struct _php_curl_error err; struct _php_curl_free to_free; + struct _php_curl_send_headers header; void ***thread_ctx; CURL *cp; php_curl_handlers *handlers;