r15339@tombo: nickm | 2008-04-29 14:03:48 -0400

 Note that evhttp_hostportfile is not threadsafe, and so its usage will change.  Mark its first argument const. Remove a now-redundant declaration for it in http-internal.h.

svn:r743

diff --git a/evhttp.h b/evhttp.h
index 01d6395a3c770ee4d68495d380038c6d5d503cbc..3b88111017312d43ed3a9b8e0807be7e76f041a9 100644 (file)
--- a/evhttp.h
+++ b/evhttp.h
@@ -364,6 +364,7 @@ char *evhttp_htmlescape(const char *html);
 
 /**
  * Separate the host, port and path component from a URL.
+ * XXXX This interface will change before release to become threadsafe.
  *
  * @param url the url for which to separate the components
  * @param phost pointer in which to store the pointer to the host
@@ -371,7 +372,7 @@ char *evhttp_htmlescape(const char *html);
  * @param pfile pointer in which to store the pointer to the path
  * @return 0 on success and -1 on failure
  */
-int evhttp_hostportfile(char *url, char **phost, u_short *pport, char **pfile);
+int evhttp_hostportfile(const char *url, char **phost, u_short *pport, char **pfile);
 
 #ifdef __cplusplus
 }

diff --git a/http-internal.h b/http-internal.h
index 48860f0f242d51cafd2a18b8d333d108915abb9d..96d1f77080303d8f3bbe500bccc250168a99f78d 100644 (file)
--- a/http-internal.h
+++ b/http-internal.h
@@ -117,8 +117,6 @@ void evhttp_connection_fail(struct evhttp_connection *,
 
 void evhttp_get_request(struct evhttp *, evutil_socket_t, struct sockaddr *, socklen_t);
 
-int evhttp_hostportfile(char *, char **, u_short *, char **);
-
 int evhttp_parse_lines(struct evhttp_request *, struct evbuffer*);
 
 void evhttp_start_read(struct evhttp_connection *);

diff --git a/http.c b/http.c
index dd2790c41c3eff206f9beff142c9c311f27cf628..a29bf036e825e6007fefc899921c67b14c5176d6 100644 (file)
--- a/http.c
+++ b/http.c
@@ -469,7 +469,7 @@ evhttp_make_header(struct evhttp_connection *evcon, struct evhttp_request *req)
 /* Separate host, port and file from URI */
 
 int
-evhttp_hostportfile(char *url, char **phost, u_short *pport, char **pfile)
+evhttp_hostportfile(const char *url, char **phost, u_short *pport, char **pfile)
 {
        /* XXX not threadsafe. */
        static char host[1024];

diff --git a/test/regress_http.c b/test/regress_http.c
index c696b1c05f2ea1e65e678e623531782d15ed66ec..c6a1d140476cceaa10e44b1870fdab9fc7b7ac69 100644 (file)
--- a/test/regress_http.c
+++ b/test/regress_http.c
@@ -1372,7 +1372,7 @@ http_chunked_request_done(struct evhttp_request *req, void *arg)
 }
 
 static void
-http_chunked_test()
+http_chunked_test(void)
 {
        struct bufferevent *bev;
        int fd;