ensure options are applied before the headers are set

[m6w6/ext-http] / php_http_info.h

diff --git a/php_http_info.h b/php_http_info.h
index 2e47d1935668621a1836b38d1a3ffefcda2f2c45..4f02908446b6c0c430eb6bb39269f45967500b00 100644 (file)
--- a/php_http_info.h
+++ b/php_http_info.h
@@ -6,24 +6,25 @@
     | modification, are permitted provided that the conditions mentioned |
     | in the accompanying LICENSE file are met.                          |
     +--------------------------------------------------------------------+
     | modification, are permitted provided that the conditions mentioned |
     | in the accompanying LICENSE file are met.                          |
     +--------------------------------------------------------------------+

-    | Copyright (c) 2004-2010, Michael Wallner <mike@php.net>            |
+    | Copyright (c) 2004-2014, Michael Wallner <mike@php.net>            |

     +--------------------------------------------------------------------+
 */
 
     +--------------------------------------------------------------------+
 */
 

-/* $Id: php_http_info_api.h 292841 2009-12-31 08:48:57Z mike $ */
-

 #ifndef PHP_HTTP_INFO_H
 #define PHP_HTTP_INFO_H
 
 #include "php_http_version.h"
 #ifndef PHP_HTTP_INFO_H
 #define PHP_HTTP_INFO_H
 
 #include "php_http_version.h"

+#include "php_http_url.h"

 
 

-#define PHP_HTTP_INFO_REQUEST_FMT_ARGS(_http_ptr, eol) "%s %s HTTP/%u.%u" eol, \
+#define PHP_HTTP_INFO_REQUEST_FMT_ARGS(_http_ptr, tmp, eol) "%s %s HTTP/%u.%u" eol, \

                                (_http_ptr)->info.request.method?(_http_ptr)->info.request.method:"UNKNOWN", \
                                (_http_ptr)->info.request.method?(_http_ptr)->info.request.method:"UNKNOWN", \

-                               (_http_ptr)->info.request.url?(_http_ptr)->info.request.url:"/", \
+                               (_http_ptr)->info.request.method&&!strcasecmp((_http_ptr)->info.request.method,"CONNECT")?( \
+                               (_http_ptr)->info.request.url?php_http_url_authority_to_string((_http_ptr)->info.request.url, &(tmp), NULL):"0"):( \
+                               (_http_ptr)->info.request.url?php_http_url_to_string((_http_ptr)->info.request.url, &(tmp), NULL, 0):"/"), \

                                (_http_ptr)->version.major||(_http_ptr)->version.major?(_http_ptr)->version.major:1, \
                                (_http_ptr)->version.major||(_http_ptr)->version.minor?(_http_ptr)->version.minor:1
 
                                (_http_ptr)->version.major||(_http_ptr)->version.major?(_http_ptr)->version.major:1, \
                                (_http_ptr)->version.major||(_http_ptr)->version.minor?(_http_ptr)->version.minor:1
 

-#define PHP_HTTP_INFO_RESPONSE_FMT_ARGS(_http_ptr, eol) "HTTP/%u.%u %d%s%s" eol, \
+#define PHP_HTTP_INFO_RESPONSE_FMT_ARGS(_http_ptr, tmp, eol) "HTTP/%u.%u %d%s%s" eol, \

                                (_http_ptr)->version.major||(_http_ptr)->version.major?(_http_ptr)->version.major:1, \
                                (_http_ptr)->version.major||(_http_ptr)->version.minor?(_http_ptr)->version.minor:1, \
                                (_http_ptr)->info.response.code?(_http_ptr)->info.response.code:200, \
                                (_http_ptr)->version.major||(_http_ptr)->version.major?(_http_ptr)->version.major:1, \
                                (_http_ptr)->version.major||(_http_ptr)->version.minor?(_http_ptr)->version.minor:1, \
                                (_http_ptr)->info.response.code?(_http_ptr)->info.response.code:200, \


@@ -33,7 +34,7 @@
 typedef struct php_http_info_data {
        union {
                /* GET /foo/bar */
 typedef struct php_http_info_data {
        union {
                /* GET /foo/bar */

-               struct { char *method; char *url; } request;
+               struct { char *method; php_http_url_t *url; } request;

                /* 200 Ok */
                struct { unsigned code; char *status; } response;
        } info;
                /* 200 Ok */
                struct { unsigned code; char *status; } response;
        } info;


@@ -57,8 +58,6 @@ typedef struct php_http_info {
 
 typedef zend_bool (*php_http_info_callback_t)(void **callback_data, HashTable **headers, php_http_info_t *info TSRMLS_DC);
 
 
 typedef zend_bool (*php_http_info_callback_t)(void **callback_data, HashTable **headers, php_http_info_t *info TSRMLS_DC);
 

-PHP_HTTP_API void php_http_info_default_callback(void **nothing, HashTable **headers, php_http_info_t *info TSRMLS_DC);
-

 PHP_HTTP_API php_http_info_t *php_http_info_init(php_http_info_t *info TSRMLS_DC);
 PHP_HTTP_API php_http_info_t *php_http_info_parse(php_http_info_t *info, const char *pre_header TSRMLS_DC);
 PHP_HTTP_API void php_http_info_dtor(php_http_info_t *info);
 PHP_HTTP_API php_http_info_t *php_http_info_init(php_http_info_t *info TSRMLS_DC);
 PHP_HTTP_API php_http_info_t *php_http_info_parse(php_http_info_t *info, const char *pre_header TSRMLS_DC);
 PHP_HTTP_API void php_http_info_dtor(php_http_info_t *info);