*/
DCL_CONST(long, "VERSION_1_0", CURL_HTTP_VERSION_1_0);
DCL_CONST(long, "VERSION_1_1", CURL_HTTP_VERSION_1_1);
- DCL_CONST(long, "VERSION_NONE", CURL_HTTP_VERSION_NONE);
+ DCL_CONST(long, "VERSION_NONE", CURL_HTTP_VERSION_NONE); /* to be removed */
+ DCL_CONST(long, "VERSION_ANY", CURL_HTTP_VERSION_NONE);
+
+ /*
+ * SSL Version Constants
+ */
+ DCL_CONST(long, "SSL_VERSION_TLSv1", CURL_SSLVERSION_TLSv1);
+ DCL_CONST(long, "SSL_VERSION_SSLv2", CURL_SSLVERSION_SSLv2);
+ DCL_CONST(long, "SSL_VERSION_SSLv3", CURL_SSLVERSION_SSLv3);
+ DCL_CONST(long, "SSL_VERSION_ANY", CURL_SSLVERSION_DEFAULT);
/*
* DNS IPvX resolving
DCL_CONST(long, "AUTH_BASIC", CURLAUTH_BASIC);
DCL_CONST(long, "AUTH_DIGEST", CURLAUTH_DIGEST);
DCL_CONST(long, "AUTH_NTLM", CURLAUTH_NTLM);
+ DCL_CONST(long, "AUTH_GSSNEG", CURLAUTH_GSSNEGOTIATE);
DCL_CONST(long, "AUTH_ANY", CURLAUTH_ANY);
/*
case HTTP_PUT:
{
- zval *put_data = GET_PROP(putData);
+ zval *put_file = GET_PROP(putFile);
http_request_object_check_request_content_type(getThis());
- if (Z_STRLEN_P(put_data)) {
- obj->request->body = http_request_body_init_ex(obj->request->body, HTTP_REQUEST_BODY_CSTRING,
- estrndup(Z_STRVAL_P(put_data), Z_STRLEN_P(put_data)), Z_STRLEN_P(put_data), 1);
- } else {
+
+ if (Z_STRLEN_P(put_file)) {
php_stream_statbuf ssb;
- php_stream *stream = php_stream_open_wrapper_ex(Z_STRVAL_P(GET_PROP(putFile)), "rb", REPORT_ERRORS|ENFORCE_SAFE_MODE, NULL, HTTP_DEFAULT_STREAM_CONTEXT);
+ php_stream *stream = php_stream_open_wrapper_ex(Z_STRVAL_P(put_file), "rb", REPORT_ERRORS|ENFORCE_SAFE_MODE, NULL, HTTP_DEFAULT_STREAM_CONTEXT);
- if (stream && !php_stream_stat(stream, &ssb)) {
+ if (stream && SUCCESS == php_stream_stat(stream, &ssb)) {
obj->request->body = http_request_body_init_ex(obj->request->body, HTTP_REQUEST_BODY_UPLOADFILE, stream, ssb.sb.st_size, 1);
} else {
status = FAILURE;
}
+ } else {
+ zval *put_data = GET_PROP(putData);
+ obj->request->body = http_request_body_init_ex(obj->request->body, HTTP_REQUEST_BODY_CSTRING,
+ estrndup(Z_STRVAL_P(put_data), Z_STRLEN_P(put_data)), Z_STRLEN_P(put_data), 1);
}
break;
}
array_init(new_opts);
old_opts = GET_PROP(options);
if (Z_TYPE_P(old_opts) == IS_ARRAY) {
- array_copy(old_opts, new_opts);
+ array_copy(Z_ARRVAL_P(old_opts), Z_ARRVAL_P(new_opts));
}
- if (prettify_keys && opts) {
- zend_hash_apply_with_arguments(Z_ARRVAL_P(opts), apply_pretty_key, 0);
- }
if (SUCCESS == zend_hash_find(Z_ARRVAL_P(new_opts), key, len, (void *) &entry)) {
if (overwrite) {
zend_hash_clean(Z_ARRVAL_PP(entry));
}
if (opts && zend_hash_num_elements(Z_ARRVAL_P(opts))) {
if (overwrite) {
- array_copy(opts, *entry);
+ array_copy(Z_ARRVAL_P(opts), Z_ARRVAL_PP(entry));
} else {
- array_merge(opts, *entry);
+ array_join(Z_ARRVAL_P(opts), Z_ARRVAL_PP(entry), 0, prettify_keys ? ARRAY_JOIN_PRETTIFY : 0);
}
}
} else if (opts) {
+ if (prettify_keys) {
+ zend_hash_apply_with_arguments(Z_ARRVAL_P(opts), apply_pretty_key, 0);
+ }
ZVAL_ADDREF(opts);
- add_assoc_zval(new_opts, key, opts);
+ add_assoc_zval_ex(new_opts, key, len, opts);
}
SET_PROP(options, new_opts);
zval_ptr_dtor(&new_opts);
if ( (Z_TYPE_P(opts) == IS_ARRAY) &&
(SUCCESS == zend_hash_find(Z_ARRVAL_P(opts), key, len, (void *) &options))) {
convert_to_array(*options);
- array_copy(*options, return_value);
+ array_copy(Z_ARRVAL_PP(options), Z_ARRVAL_P(return_value));
}
}
}
*/
PHP_METHOD(HttpRequest, setOptions)
{
- char *key = NULL;
- ulong idx = 0;
+ HashKey key = initHashKey(0);
HashPosition pos;
zval *opts = NULL, *old_opts, *new_opts, *add_opts, **opt;
MAKE_STD_ZVAL(add_opts);
array_init(add_opts);
/* some options need extra attention -- thus cannot use array_merge() directly */
- FOREACH_KEYVAL(pos, opts, key, idx, opt) {
- if (key) {
- if (!strcmp(key, "headers")) {
+ FOREACH_KEYVAL(pos, opts, key, opt) {
+ if (key.type == HASH_KEY_IS_STRING) {
+ if (!strcmp(key.str, "headers")) {
zend_call_method_with_1_params(&getThis(), Z_OBJCE_P(getThis()), NULL, "addheaders", NULL, *opt);
- } else if (!strcmp(key, "cookies")) {
+ } else if (!strcmp(key.str, "cookies")) {
zend_call_method_with_1_params(&getThis(), Z_OBJCE_P(getThis()), NULL, "addcookies", NULL, *opt);
- } else if (!strcmp(key, "ssl")) {
+ } else if (!strcmp(key.str, "ssl")) {
zend_call_method_with_1_params(&getThis(), Z_OBJCE_P(getThis()), NULL, "addssloptions", NULL, *opt);
- } else if ((!strcasecmp(key, "url")) || (!strcasecmp(key, "uri"))) {
+ } else if ((!strcasecmp(key.str, "url")) || (!strcasecmp(key.str, "uri"))) {
zend_call_method_with_1_params(&getThis(), Z_OBJCE_P(getThis()), NULL, "seturl", NULL, *opt);
- } else if (!strcmp(key, "method")) {
+ } else if (!strcmp(key.str, "method")) {
zend_call_method_with_1_params(&getThis(), Z_OBJCE_P(getThis()), NULL, "setmethod", NULL, *opt);
#if HTTP_CURL_VERSION(7,14,1)
- } else if (!strcmp(key, "resetcookies")) {
+ } else if (!strcmp(key.str, "resetcookies")) {
getObject(http_request_object, obj);
http_request_reset_cookies(obj->request, 0);
#endif
- } else if (!strcmp(key, "enablecookies")) {
+ } else if (!strcmp(key.str, "enablecookies")) {
getObject(http_request_object, obj);
http_request_enable_cookies(obj->request);
- } else if (!strcasecmp(key, "recordHistory")) {
+ } else if (!strcasecmp(key.str, "recordHistory")) {
UPD_PROP(bool, recordHistory, 1);
} else {
ZVAL_ADDREF(*opt);
- add_assoc_zval(add_opts, key, *opt);
+ add_assoc_zval_ex(add_opts, key.str, key.len, *opt);
}
- /* reset */
- key = NULL;
}
}
old_opts = GET_PROP(options);
if (Z_TYPE_P(old_opts) == IS_ARRAY) {
- array_copy(old_opts, new_opts);
+ array_copy(Z_ARRVAL_P(old_opts), Z_ARRVAL_P(new_opts));
}
- array_merge(add_opts, new_opts);
+ array_join(Z_ARRVAL_P(add_opts), Z_ARRVAL_P(new_opts), 0, 0);
SET_PROP(options, new_opts);
zval_ptr_dtor(&new_opts);
zval_ptr_dtor(&add_opts);
array_init(new_post);
old_post = GET_PROP(postFields);
if (Z_TYPE_P(old_post) == IS_ARRAY) {
- array_copy(old_post, new_post);
+ array_copy(Z_ARRVAL_P(old_post), Z_ARRVAL_P(new_post));
}
- array_merge(post_data, new_post);
+ array_join(Z_ARRVAL_P(post_data), Z_ARRVAL_P(new_post), 0, 0);
SET_PROP(postFields, new_post);
zval_ptr_dtor(&new_post);
}
MAKE_STD_ZVAL(post);
array_init(post);
if (post_data && zend_hash_num_elements(Z_ARRVAL_P(post_data))) {
- array_copy(post_data, post);
+ array_copy(Z_ARRVAL_P(post_data), Z_ARRVAL_P(post));
}
SET_PROP(postFields, post);
zval_ptr_dtor(&post);
array_init(new_post);
old_post = GET_PROP(postFiles);
if (Z_TYPE_P(old_post) == IS_ARRAY) {
- array_copy(old_post, new_post);
+ array_copy(Z_ARRVAL_P(old_post), Z_ARRVAL_P(new_post));
}
add_next_index_zval(new_post, entry);
SET_PROP(postFiles, new_post);
MAKE_STD_ZVAL(post);
array_init(post);
if (files && (Z_TYPE_P(files) == IS_ARRAY)) {
- array_copy(files, post);
+ array_copy(Z_ARRVAL_P(files), Z_ARRVAL_P(post));
}
SET_PROP(postFiles, post);
zval_ptr_dtor(&post);
if (SUCCESS == zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "|la!", &flags, &allowed_extras_array)) {
int i = 0;
- ulong idx = 0;
- char *key = NULL, **allowed_extras = NULL;
+ HashKey key = initHashKey(0);
+ char **allowed_extras = NULL;
zval **header = NULL, **entry = NULL, *message = GET_PROP(responseMessage);
HashPosition pos, pos1, pos2;
}
}
- FOREACH_HASH_KEYVAL(pos1, &msg->message->hdrs, key, idx, header) {
- if (key && !strcasecmp(key, "Set-Cookie")) {
+ FOREACH_HASH_KEYVAL(pos1, &msg->message->hdrs, key, header) {
+ if (key.type == HASH_KEY_IS_STRING && !strcasecmp(key.str, "Set-Cookie")) {
http_cookie_list list;
if (Z_TYPE_PP(header) == IS_ARRAY) {
zval_ptr_dtor(header);
}
}
- /* reset key */
- key = NULL;
}
if (allowed_extras) {