#ifdef HAVE_CONFIG_H
# include "config.h"
#endif
+#include "php.h"
+
+#include "php_http.h"
+#include "php_http_std_defs.h"
+#include "php_http_api.h"
+#include "php_http_request_api.h"
+#include "php_http_url_api.h"
+
+#include "phpstr/phpstr.h"
#ifdef PHP_WIN32
# include <winsock2.h>
#include <curl/curl.h>
-#include "phpstr/phpstr.h"
-
-#include "php.h"
-#include "php_http.h"
-#include "php_http_std_defs.h"
-#include "php_http_api.h"
-#include "php_http_request_api.h"
-#include "php_http_url_api.h"
+ZEND_EXTERN_MODULE_GLOBALS(http);
#ifndef HTTP_CURL_USE_ZEND_MM
# define HTTP_CURL_USE_ZEND_MM 0
#endif
-ZEND_EXTERN_MODULE_GLOBALS(http)
-
#if LIBCURL_VERSION_NUM < 0x070c00
# define curl_easy_strerror(code) HTTP_G(request).error
#endif
/* progress callback */
if (zoption = http_curl_getopt(options, "onprogress", 0)) {
+ HTTP_CURL_OPT(NOPROGRESS, 0);
HTTP_CURL_OPT(PROGRESSFUNCTION, http_curl_progress_callback);
HTTP_CURL_OPT(PROGRESSDATA, http_curl_callback_data(zoption));
} else {
} else {
HTTP_CURL_OPT(COOKIEFILE, NULL);
}
-
+
/* cookiestore, read initial cookies from that file and store cookies back into that file */
if ((zoption = http_curl_getopt(options, "cookiestore", IS_STRING)) && Z_STRLEN_P(zoption)) {
HTTP_CURL_OPT(COOKIEFILE, http_request_data_copy(COPY_STRING, Z_STRVAL_P(zoption)));
HTTP_CURL_OPT(TIMEVALUE, 0);
}
- /* timeout */
+ /* timeout, defaults to 3 */
if (zoption = http_curl_getopt(options, "timeout", IS_LONG)) {
HTTP_CURL_OPT(TIMEOUT, Z_LVAL_P(zoption));
} else {
- HTTP_CURL_OPT(TIMEOUT, 1);
+ HTTP_CURL_OPT(TIMEOUT, 3);
}
- /* connecttimeout, defaults to 1 */
+ /* connecttimeout, defaults to 3 */
if (zoption = http_curl_getopt(options, "connecttimeout", IS_LONG)) {
HTTP_CURL_OPT(CONNECTTIMEOUT, Z_LVAL_P(zoption));
} else {
- HTTP_CURL_OPT(CONNECTTIMEOUT, 1);
+ HTTP_CURL_OPT(CONNECTTIMEOUT, 3);
}
/* ssl */
params_pass[2] = ¶ms_local[2];
params_pass[3] = ¶ms_local[3];
+ INIT_PZVAL(params_pass[0]);
+ INIT_PZVAL(params_pass[1]);
+ INIT_PZVAL(params_pass[2]);
+ INIT_PZVAL(params_pass[3]);
ZVAL_DOUBLE(params_pass[0], dltotal);
ZVAL_DOUBLE(params_pass[1], dlnow);
ZVAL_DOUBLE(params_pass[2], ultotal);
params_pass[0] = ¶ms_local[0];
params_pass[1] = ¶ms_local[1];
+ INIT_PZVAL(params_pass[0]);
+ INIT_PZVAL(params_pass[1]);
ZVAL_LONG(params_pass[0], type);
- ZVAL_STRINGL(params_pass[1], string, length, 1);
+ ZVAL_STRINGL(params_pass[1], string, length, 0);
call_user_function(EG(function_table), NULL, func, &retval, 2, params_pass TSRMLS_CC);
case IS_DOUBLE: convert_to_double_ex(zoption); break;
case IS_STRING: convert_to_string_ex(zoption); break;
case IS_ARRAY: convert_to_array_ex(zoption); break;
- case IS_OBJECT: convert_to_object_ex(zoption); break;
+ case IS_OBJECT: convert_to_object_ex(zoption); break;
default:
break;
}