ensure options are applied before the headers are set

[m6w6/ext-http] / php_http_cookie.h

diff --git a/php_http_cookie.h b/php_http_cookie.h
index d524fee3580a2088e46c78a31816a33a629eca11..7cf00fe2c75d4c0c5d283a229abf69e2d0561588 100644 (file)
--- a/php_http_cookie.h
+++ b/php_http_cookie.h
@@ -6,7 +6,7 @@
     | modification, are permitted provided that the conditions mentioned |
     | in the accompanying LICENSE file are met.                          |
     +--------------------------------------------------------------------+
-    | Copyright (c) 2004-2011, Michael Wallner <mike@php.net>            |
+    | Copyright (c) 2004-2014, Michael Wallner <mike@php.net>            |
     +--------------------------------------------------------------------+
 */
 
@@ -30,6 +30,7 @@ typedef struct php_http_cookie_list {
        char *path;
        char *domain;
        time_t expires;
+       time_t max_age;
 
 #ifdef ZTS
        void ***ts;
@@ -43,22 +44,24 @@ PHP_HTTP_API void php_http_cookie_list_dtor(php_http_cookie_list_t *list);
 PHP_HTTP_API void php_http_cookie_list_free(php_http_cookie_list_t **list);
 
 #define php_http_cookie_list_has_cookie(list, name, name_len) zend_symtable_exists(&(list)->cookies, (name), (name_len)+1)
+#define php_http_cookie_list_del_cookie(list, name, name_len) zend_symtable_del(&(list)->cookies, (name), (name_len)+1)
 PHP_HTTP_API void php_http_cookie_list_add_cookie(php_http_cookie_list_t *list, const char *name, size_t name_len, const char *value, size_t value_len);
-PHP_HTTP_API const char *php_http_cookie_list_get_cookie(php_http_cookie_list_t *list, const char *name, size_t name_len);
+PHP_HTTP_API const char *php_http_cookie_list_get_cookie(php_http_cookie_list_t *list, const char *name, size_t name_len, zval **cookie);
 
 #define php_http_cookie_list_has_extra(list, name, name_len) zend_symtable_exists(&(list)->extras, (name), (name_len)+1)
+#define php_http_cookie_list_del_extra(list, name, name_len) zend_symtable_del(&(list)->extras, (name), (name_len)+1)
 PHP_HTTP_API void php_http_cookie_list_add_extra(php_http_cookie_list_t *list, const char *name, size_t name_len, const char *value, size_t value_len);
-PHP_HTTP_API const char *php_http_cookie_list_get_extra(php_http_cookie_list_t *list, const char *name, size_t name_len);
+PHP_HTTP_API const char *php_http_cookie_list_get_extra(php_http_cookie_list_t *list, const char *name, size_t name_len, zval **extra);
 
 PHP_HTTP_API void php_http_cookie_list_to_string(php_http_cookie_list_t *list, char **str, size_t *len);
 PHP_HTTP_API php_http_cookie_list_t *php_http_cookie_list_from_struct(php_http_cookie_list_t *list, zval *strct TSRMLS_DC);
 PHP_HTTP_API void php_http_cookie_list_to_struct(php_http_cookie_list_t *list, zval *strct);
 
-
-zend_class_entry *php_http_cookie_get_class_entry(void);
+PHP_HTTP_API zend_class_entry *php_http_cookie_class_entry;
 
 typedef struct php_http_cookie_object {
-       zend_object o;
+       zend_object zo;
+       zend_object_value zv;
        php_http_cookie_list_t *list;
 } php_http_cookie_object_t;
 
@@ -67,32 +70,7 @@ zend_object_value php_http_cookie_object_new_ex(zend_class_entry *ce, php_http_c
 zend_object_value php_http_cookie_object_clone(zval *this_ptr TSRMLS_DC);
 void php_http_cookie_object_free(void *object TSRMLS_DC);
 
-PHP_METHOD(HttpCookie, __construct);
-PHP_METHOD(HttpCookie, getCookies);
-PHP_METHOD(HttpCookie, setCookies);
-PHP_METHOD(HttpCookie, addCookies);
-PHP_METHOD(HttpCookie, getExtras);
-PHP_METHOD(HttpCookie, setExtras);
-PHP_METHOD(HttpCookie, addExtras);
-PHP_METHOD(HttpCookie, getCookie);
-PHP_METHOD(HttpCookie, setCookie);
-PHP_METHOD(HttpCookie, addCookie);
-PHP_METHOD(HttpCookie, getExtra);
-PHP_METHOD(HttpCookie, setExtra);
-PHP_METHOD(HttpCookie, addExtra);
-PHP_METHOD(HttpCookie, getDomain);
-PHP_METHOD(HttpCookie, setDomain);
-PHP_METHOD(HttpCookie, getPath);
-PHP_METHOD(HttpCookie, setPath);
-PHP_METHOD(HttpCookie, getExpires);
-PHP_METHOD(HttpCookie, setExpires);
-PHP_METHOD(HttpCookie, getFlags);
-PHP_METHOD(HttpCookie, setFlags);
-PHP_METHOD(HttpCookie, toString);
-PHP_METHOD(HttpCookie, toArray);
-
-extern PHP_MINIT_FUNCTION(http_cookie);
-
+PHP_MINIT_FUNCTION(http_cookie);
 
 #endif