projects
/
m6w6
/
ext-http
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
|
github
raw
|
inline
| side by side
ditch libneon experiment; it's not a viable path for our usage pattern: handles are...
[m6w6/ext-http]
/
php_http_url.c
diff --git
a/php_http_url.c
b/php_http_url.c
index 8170bc3e728894d2129f99c227a9d8d729e81cd0..b55b7d7028d109532fe25d5f13e8da9751b20423 100644
(file)
--- a/
php_http_url.c
+++ b/
php_http_url.c
@@
-10,10
+10,7
@@
+--------------------------------------------------------------------+
*/
+--------------------------------------------------------------------+
*/
-#include "php_http.h"
-
-#include <main/SAPI.h>
-#include <ext/standard/php_string.h>
+#include "php_http_api.h"
static inline char *localhostname(void)
{
static inline char *localhostname(void)
{
@@
-246,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';
}
/* .. at the end */
ptr[1] = '\0';
}
- /*
fallthrough
*/
+ /*
no break
*/
default:
/* something else */
default:
/* something else */
@@
-335,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);
}
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_STR
S
("="), NULL, 0 TSRMLS_CC)) {
+ if (SUCCESS != php_http_url_encode_hash_ex(hash, qstr, arg_sep_str, arg_sep_len, ZEND_STR
L
("="), NULL, 0 TSRMLS_CC)) {
php_http_buffer_free(&qstr);
return FAILURE;
}
php_http_buffer_free(&qstr);
return FAILURE;
}