Fix operator for Visual Studio

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

diff --git a/src/php_http_url.h b/src/php_http_url.h
index 636efb584b667785fa9c1f5b4447610a1ab398e8..eead59a88f82f495793d2566f27353e963afe4b5 100644 (file)
--- a/src/php_http_url.h
+++ b/src/php_http_url.h
@@ -13,7 +13,7 @@
 #ifndef PHP_HTTP_URL_H
 #define PHP_HTTP_URL_H
 
-#include <ext/standard/url.h>
+#include "ext/standard/url.h"
 
 /* php_http_url_mod() */
 #define PHP_HTTP_URL_REPLACE           0x000
@@ -45,8 +45,23 @@
 /* percent encode multibyte sequences in userinfo, path, query and fragment */
 #define PHP_HTTP_URL_PARSE_TOPCT       0x200000
 
+#if PHP_HTTP_HAVE_IDNA2008
+#define PHP_HTTP_URL_PARSE_TOIDN_2008 \
+       (PHP_HTTP_URL_PARSE_TOIDN       |       0x400000)
+#endif
+#if PHP_HTTP_HAVE_IDNA2003
+#define PHP_HTTP_URL_PARSE_TOIDN_2003 \
+       (PHP_HTTP_URL_PARSE_TOIDN       |       0x800000)
+#endif
+
+/* ignore errors */
+#define PHP_HTTP_URL_IGNORE_ERRORS     0x10000000
+/* do not report errors */
+#define PHP_HTTP_URL_SILENT_ERRORS     0x20000000
+
+#define PHP_HTTP_URL_STDFLAGS          0x00332003
+
 typedef struct php_http_url {
-       /* compatible to php_url, but do not use php_url_free() */
        char *scheme;
        char *user;
        char *pass;
@@ -57,30 +72,34 @@ typedef struct php_http_url {
        char *fragment;
 } php_http_url_t;
 
-PHP_HTTP_API php_http_url_t *php_http_url_parse(const char *str, size_t len, unsigned flags TSRMLS_DC);
-PHP_HTTP_API php_http_url_t *php_http_url_parse_authority(const char *str, size_t len, unsigned flags TSRMLS_DC);
-PHP_HTTP_API php_http_url_t *php_http_url_mod(const php_http_url_t *old_url, const php_http_url_t *new_url, unsigned flags TSRMLS_DC);
+PHP_HTTP_API php_http_url_t *php_http_url_parse(const char *str, size_t len, unsigned flags);
+PHP_HTTP_API php_http_url_t *php_http_url_parse_authority(const char *str, size_t len, unsigned flags);
+PHP_HTTP_API php_http_url_t *php_http_url_mod(const php_http_url_t *old_url, const php_http_url_t *new_url, unsigned flags);
 PHP_HTTP_API php_http_url_t *php_http_url_copy(const php_http_url_t *url, zend_bool persistent);
 PHP_HTTP_API php_http_url_t *php_http_url_from_struct(HashTable *ht);
-PHP_HTTP_API php_http_url_t *php_http_url_from_zval(zval *value, unsigned flags TSRMLS_DC);
-PHP_HTTP_API HashTable *php_http_url_to_struct(const php_http_url_t *url, zval *strct TSRMLS_DC);
+PHP_HTTP_API php_http_url_t *php_http_url_from_zval(zval *value, unsigned flags);
+PHP_HTTP_API HashTable *php_http_url_to_struct(const php_http_url_t *url, zval *strct);
 PHP_HTTP_API char *php_http_url_to_string(const php_http_url_t *url, char **url_str, size_t *url_len, zend_bool persistent);
 PHP_HTTP_API char *php_http_url_authority_to_string(const php_http_url_t *url, char **url_str, size_t *url_len);
 PHP_HTTP_API void php_http_url_free(php_http_url_t **url);
 
-PHP_HTTP_API ZEND_RESULT_CODE php_http_url_encode_hash(HashTable *hash, const char *pre_encoded_str, size_t pre_encoded_len, char **encoded_str, size_t *encoded_len TSRMLS_DC);
-PHP_HTTP_API ZEND_RESULT_CODE php_http_url_encode_hash_ex(HashTable *hash, php_http_buffer_t *qstr, const char *arg_sep_str, size_t arg_sep_len, const char *val_sep_str, size_t val_sep_len, const char *pre_encoded_str, size_t pre_encoded_len TSRMLS_DC);
+PHP_HTTP_API ZEND_RESULT_CODE php_http_url_encode_hash(HashTable *hash, const char *pre_encoded_str, size_t pre_encoded_len, char **encoded_str, size_t *encoded_len);
+PHP_HTTP_API ZEND_RESULT_CODE php_http_url_encode_hash_ex(HashTable *hash, php_http_buffer_t *qstr, const char *arg_sep_str, size_t arg_sep_len, const char *val_sep_str, size_t val_sep_len, const char *pre_encoded_str, size_t pre_encoded_len);
 
-static inline void php_http_url_argsep(const char **str, size_t *len TSRMLS_DC)
+static inline void php_http_url_argsep(const char **str, size_t *len)
 {
-       php_http_ini_entry(ZEND_STRL("arg_separator.output"), str, len, 0 TSRMLS_CC);
+       if (SUCCESS != php_http_ini_entry(ZEND_STRL("arg_separator.output"), str, len, 0) || !*len) {
+               *str = PHP_HTTP_URL_ARGSEP;
+               *len = lenof(PHP_HTTP_URL_ARGSEP);
+       }
 }
 
 static inline zend_bool php_http_url_is_empty(const php_http_url_t *url) {
        return !(url->scheme || url->pass || url->user || url->host || url->port ||     url->path || url->query || url->fragment);
 }
 
-PHP_HTTP_API zend_class_entry *php_http_url_class_entry;
+PHP_HTTP_API zend_class_entry *php_http_url_get_class_entry(void);
+PHP_HTTP_API zend_class_entry *php_http_get_env_url_class_entry(void);
 PHP_MINIT_FUNCTION(http_url);
 
 #define php_http_url_object_new php_http_object_new