- need php_stream_open_wrapper_*ex* to pass a stream context

[m6w6/ext-http] / http_functions.c

diff --git a/http_functions.c b/http_functions.c
index b16cef17e43c59725be76cfd2add8d5ad0a2c594..8ce961fdac10ccdf666076eb2ad5bd7cda2db923 100644 (file)
--- a/http_functions.c
+++ b/http_functions.c
@@ -1246,6 +1246,7 @@ PHP_FUNCTION(http_match_request_header)
  *  - encodecookies:    bool, whether to urlencode the cookies (default: true)
  *  - resetcookies:     bool, wheter to reset the cookies
  *  - cookiestore:      string, path to a file where cookies are/will be stored
+ *  - cookiesession:    bool, accept (true) or reset (false) sessioncookies
  *  - resume:           int, byte offset to start the download from;
  *                      if the server supports ranges
  *  - maxfilesize:      int, maximum file size that should be downloaded;
@@ -1255,6 +1256,8 @@ PHP_FUNCTION(http_match_request_header)
  *  - timeout:          int, seconds the request may take
  *  - connecttimeout:   int, seconds the connect may take
  *  - onprogress:       mixed, progress callback
+ *  - interface:        string, outgoing network interface (ifname, ip or hostname)
+ *  - portrange:        array, 2 integers specifying outgoing portrange to try
  *  - ssl:              array, with the following options:
  *                      cert:        string, path to certificate
  *                      certtype:    string, type of certificate
@@ -1278,30 +1281,45 @@ PHP_FUNCTION(http_match_request_header)
  * <pre>
  * <?php
  * array (
- *     'effective_url' => 'http://localhost',
- *     'response_code' => 403,
- *     'total_time' => 0.017,
- *     'namelookup_time' => 0.013,
- *     'connect_time' => 0.014,
- *     'pretransfer_time' => 0.014,
- *     'size_upload' => 0,
- *     'size_download' => 202,
- *     'speed_download' => 11882,
- *     'speed_upload' => 0,
- *     'header_size' => 145,
- *     'request_size' => 62,
- *     'ssl_verifyresult' => 0,
- *     'filetime' => -1,
- *     'content_length_download' => 202,
- *     'content_length_upload' => 0,
- *     'starttransfer_time' => 0.017,
- *     'content_type' => 'text/html; charset=iso-8859-1',
- *     'redirect_time' => 0,
- *     'redirect_count' => 0,
- *     'http_connectcode' => 0,
- *     'httpauth_avail' => 0,
- *     'proxyauth_avail' => 0,
- * )
+ *    'effective_url' => 'http://www.example.com/',
+ *    'response_code' => 302,
+ *    'connect_code' => 0,
+ *    'filetime' => -1,
+ *    'total_time' => 0.212348,
+ *    'namelookup_time' => 0.038296,
+ *    'connect_time' => 0.104144,
+ *    'pretransfer_time' => 0.104307,
+ *    'starttransfer_time' => 0.212077,
+ *    'redirect_time' => 0,
+ *    'redirect_count' => 0,
+ *    'size_upload' => 0,
+ *    'size_download' => 218,
+ *    'speed_download' => 1026,
+ *    'speed_upload' => 0,
+ *    'header_size' => 307,
+ *    'request_size' => 103,
+ *    'ssl_verifyresult' => 0,
+ *    'ssl_engines' =>
+ *    array (
+ *      0 => 'dynamic',
+ *      1 => 'cswift',
+ *      2 => 'chil',
+ *      3 => 'atalla',
+ *      4 => 'nuron',
+ *      5 => 'ubsec',
+ *      6 => 'aep',
+ *      7 => 'sureware',
+ *      8 => '4758cca',
+ *    ),
+ *    'content_length_download' => 218,
+ *    'content_length_upload' => 0,
+ *    'content_type' => 'text/html',
+ *    'httpauth_avail' => 0,
+ *    'proxyauth_avail' => 0,
+ *    'num_connects' => 1,
+ *    'os_errno' => 0,
+ *    'error' => '',
+ *  )
  * ?>
  * </pre>
  * 
@@ -1484,7 +1502,7 @@ PHP_FUNCTION(http_put_file)
                RETURN_FALSE;
        }
 
-       if (!(stream = php_stream_open_wrapper(file, "rb", REPORT_ERRORS|ENFORCE_SAFE_MODE, NULL))) {
+       if (!(stream = php_stream_open_wrapper_ex(file, "rb", REPORT_ERRORS|ENFORCE_SAFE_MODE, NULL, HTTP_DEFAULT_STREAM_CONTEXT))) {
                RETURN_FALSE;
        }
        if (php_stream_stat(stream, &ssb)) {