Merge branch 'R_2_5'

[m6w6/ext-http] / src / php_http_options.h

diff --git a/src/php_http_options.h b/src/php_http_options.h
index 2475383c3800f303e026c35b6ca230734c9cd214..4fff611a3b40aadfeac1c5d210894b369a9ec0dd 100644 (file)
--- a/src/php_http_options.h
+++ b/src/php_http_options.h
@@ -31,18 +31,14 @@ struct php_http_options {
 struct php_http_option {
        php_http_options_t suboptions;
 
-       struct {
-               const char *s;
-               size_t l;
-               ulong h;
-       } name;
-
+       zend_string *name;
        ulong option;
        zend_uchar type;
        unsigned flags;
        zval defval;
 
        php_http_option_set_callback_t setter;
+       unsigned persistent:1;
 };
 
 PHP_HTTP_API php_http_options_t *php_http_options_init(php_http_options_t *registry, zend_bool persistent);