- fix ssl options

[m6w6/ext-http] / http_functions.c

diff --git a/http_functions.c b/http_functions.c
index 341cec245070baf8d7af3dc89664bf914a30456a..548788a960391f41e436d4877c54c936647a3329 100644 (file)
--- a/http_functions.c
+++ b/http_functions.c
@@ -145,6 +145,40 @@ PHP_FUNCTION(http_build_url)
 }
 /* }}} */
 
+/* {{{ proto string http_build_str(array query [, string prefix[, string arg_separator]])
+ *
+ * Opponent to parse_str().
+ */
+PHP_FUNCTION(http_build_str)
+{
+       zval *formdata;
+       char *prefix = NULL, *arg_sep = INI_STR("arg_separator.output");
+       int prefix_len = 0, arg_sep_len = strlen(arg_sep);
+       phpstr formstr;
+
+       if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "a|ss", &formdata, &prefix, &prefix_len, &arg_sep, &arg_sep_len) != SUCCESS) {
+               RETURN_FALSE;
+       }
+
+       if (!arg_sep_len) {
+               arg_sep = HTTP_URL_ARGSEP;
+               arg_sep_len = lenof(HTTP_URL_ARGSEP);
+       }
+
+       phpstr_init(&formstr);
+       if (SUCCESS != http_urlencode_hash_recursive(HASH_OF(formdata), &formstr, arg_sep, arg_sep_len, prefix, prefix_len)) {
+               RETURN_FALSE;
+       }
+
+       if (!formstr.used) {
+               phpstr_dtor(&formstr);
+               RETURN_NULL();
+       }
+
+       RETURN_PHPSTR_VAL(&formstr);
+}
+/* }}} */
+
 #define HTTP_DO_NEGOTIATE(type, supported, rs_array) \
 { \
        HashTable *result; \
@@ -1120,7 +1154,6 @@ PHP_FUNCTION(http_match_request_header)
  *  - httpauth:         string, http credentials in "user:pass" format
  *  - httpauthtype:     int, HTTP_AUTH_BASIC, DIGEST and/or NTLM
  *  - compress:         bool, whether to allow gzip/deflate content encoding
- *                      (defaults to true)
  *  - port:             int, use another port as specified in the url
  *  - referer:          string, the referer to send
  *  - useragent:        string, the user agent to send
@@ -1135,9 +1168,26 @@ PHP_FUNCTION(http_match_request_header)
  *  - maxfilesize:      int, maximum file size that should be downloaded;
  *                      has no effect, if the size of the requested entity is not known
  *  - lastmodified:     int, timestamp for If-(Un)Modified-Since header
+ *  - etag:             string, quoted etag for If-(None-)Match header
  *  - timeout:          int, seconds the request may take
  *  - connecttimeout:   int, seconds the connect may take
  *  - onprogress:       mixed, progress callback
+ *  - ssl:              array, with the following options:
+ *                      cert:        string, path to certificate
+ *                      certtype:    string, type of certificate
+ *                      certpasswd:  string, password for certificate
+ *                      key:         string, path to key
+ *                      keytype:     string, type of key
+ *                      keypasswd:   string, pasword for key
+ *                      engine:      string, ssl engine to use
+ *                      version:     int, ssl version to use
+ *                      verifypeer:  bool, whether to verify the peer
+ *                      verifyhost:  bool whether to verify the host
+ *                      cipher_list: string, list of allowed ciphers
+ *                      cainfo:      string
+ *                      capath:      string
+ *                      random_file: string
+ *                      egdsocket:   string
  * </pre>
  *
  * The optional third parameter will be filled with some additional information
@@ -1563,44 +1613,6 @@ PHP_FUNCTION(http_request_method_name)
 }
 /* }}} */
 
-/* {{{ Sara Golemons http_build_query() */
-#ifndef ZEND_ENGINE_2
-
-/* {{{ proto string http_build_query(mixed formdata [, string prefix[, string arg_separator]])
-   Generates a form-encoded query string from an associative array or object. */
-PHP_FUNCTION(http_build_query)
-{
-       zval *formdata;
-       char *prefix = NULL, *arg_sep = INI_STR("arg_separator.output");
-       int prefix_len = 0, arg_sep_len = strlen(arg_sep);
-       phpstr *formstr;
-
-       if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "a|ss", &formdata, &prefix, &prefix_len, &arg_sep, &arg_sep_len) != SUCCESS) {
-               RETURN_FALSE;
-       }
-
-       if (!arg_sep_len) {
-               arg_sep = HTTP_URL_ARGSEP;
-               arg_sep_len = lenof(HTTP_URL_ARGSEP);
-       }
-
-       formstr = phpstr_new();
-       if (SUCCESS != http_urlencode_hash_recursive(HASH_OF(formdata), formstr, arg_sep, arg_sep_len, prefix, prefix_len)) {
-               phpstr_free(&formstr);
-               RETURN_FALSE;
-       }
-
-       if (!formstr->used) {
-               phpstr_free(&formstr);
-               RETURN_NULL();
-       }
-
-       RETURN_PHPSTR_PTR(formstr);
-}
-/* }}} */
-#endif /* !ZEND_ENGINE_2 */
-/* }}} */
-
 /* {{{ */
 #ifdef HTTP_HAVE_ZLIB