X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=php_http_url.c;h=b55b7d7028d109532fe25d5f13e8da9751b20423;hb=707ee66a824e2bb5daad723f75682aea777b09a3;hp=58250234751bb2c15bd481313dc5df8856c0ba0d;hpb=dedad9f35cbeaee56e7cca145e378cc6548198e3;p=m6w6%2Fext-http

diff --git a/php_http_url.c b/php_http_url.c
index 5825023..b55b7d7 100644
--- a/php_http_url.c
+++ b/php_http_url.c
@@ -6,16 +6,11 @@
     | 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-2011, Michael Wallner <mike@php.net>            |
     +--------------------------------------------------------------------+
 */
 
-/* $Id: http_url_api.c 292841 2009-12-31 08:48:57Z mike $ */
-
-#include "php_http.h"
-
-#include <main/SAPI.h>
-#include <ext/standard/php_string.h>
+#include "php_http_api.h"
 
 static inline char *localhostname(void)
 {
@@ -248,7 +243,7 @@ PHP_HTTP_API void php_http_url(int flags, const php_url *old_url, const php_url
 						/* .. at the end */
 						ptr[1] = '\0';
 					}
-					/* fallthrough */
+					/* no break */
 				
 				default:
 					/* something else */
@@ -337,7 +332,7 @@ PHP_HTTP_API STATUS php_http_url_encode_hash(HashTable *hash, const char *pre_en
 		php_http_buffer_append(qstr, pre_encoded_str, pre_encoded_len);
 	}
 
-	if (SUCCESS != php_http_url_encode_hash_ex(hash, qstr, arg_sep_str, arg_sep_len, ZEND_STRS("="), NULL, 0 TSRMLS_CC)) {
+	if (SUCCESS != php_http_url_encode_hash_ex(hash, qstr, arg_sep_str, arg_sep_len, ZEND_STRL("="), NULL, 0 TSRMLS_CC)) {
 		php_http_buffer_free(&qstr);
 		return FAILURE;
 	}