Fix RINIT/RSHUTDOWN functions and add url_adapt_ext()

2 files changed, 14 insertions, 0 deletions

diff --git a/ext/standard/url_scanner.c b/ext/standard/url_scanner.c
index 3109a0a5f1..2a79ee97bd 100644
--- a/ext/standard/url_scanner.c
+++ b/ext/standard/url_scanner.c
@@ -37,10 +37,12 @@
 
 PHP_RINIT_FUNCTION(url_scanner) {
 	url_adapt(NULL,0,NULL,NULL);
+	return SUCCESS;
 }
 
 PHP_RSHUTDOWN_FUNCTION(url_scanner) {
 	url_adapt(NULL,0,NULL,NULL);
+	return SUCCESS;
 }
 
 
@@ -81,6 +83,15 @@ static char *url_attr_addon(const char *tag,const char *attr,const char *val,con
 
 #define US BG(url_adapt_state)
 
+char *url_adapt_ext(const char *src, size_t srclen, const char *name, const char *val, size_t *newlen)
+{
+	char buf[1024];
+
+	snprintf(buf, sizeof(buf)-1, "%s=%s", name, val);
+
+	return url_adapt(src, srclen, buf, newlen);
+}
+
 char *url_adapt(const char *src, size_t srclen, const char *data, size_t *newlen)
 {
 	char *out,*outp;
diff --git a/ext/standard/url_scanner.h b/ext/standard/url_scanner.h
index 44ef2a6bbc..f204ad5136 100644
--- a/ext/standard/url_scanner.h
+++ b/ext/standard/url_scanner.h
@@ -20,6 +20,9 @@
 #ifndef URI_SCANNER_H
 #define URI_SCANNER_H
 
+PHP_RINIT_FUNCTION(url_scanner);
+PHP_RSHUTDOWN_FUNCTION(url_scanner);
+
 char *url_adapt(const char *src, size_t srclen, const char *data, size_t *newlen);
 
 enum url_state {