From 9479f812fb0202cdfcdf0d5d98cbefafa4a8186d Mon Sep 17 00:00:00 2001
From: Fabian Keil <fk@fabiankeil.de>
Date: Sun, 4 May 2008 16:18:32 +0000
Subject: [PATCH] Provide parse_http_url() with a third parameter to specify
 whether or not URLs without protocol are acceptable.

---
 cgisimple.c |  7 +++++--
 urlmatch.c  | 13 +++++++++----
 urlmatch.h  | 10 ++++++++--
 3 files changed, 22 insertions(+), 8 deletions(-)

diff --git a/cgisimple.c b/cgisimple.c
index a93e7bb8..cdb96e83 100644
--- a/cgisimple.c
+++ b/cgisimple.c
@@ -1,4 +1,4 @@
-const char cgisimple_rcs[] = "$Id: cgisimple.c,v 1.78 2008/05/03 16:50:11 fabiankeil Exp $";
+const char cgisimple_rcs[] = "$Id: cgisimple.c,v 1.79 2008/05/04 13:30:56 fabiankeil Exp $";
 /*********************************************************************
  *
  * File        :  $Source: /cvsroot/ijbswa/current/cgisimple.c,v $
@@ -36,6 +36,9 @@ const char cgisimple_rcs[] = "$Id: cgisimple.c,v 1.78 2008/05/03 16:50:11 fabian
  *
  * Revisions   :
  *    $Log: cgisimple.c,v $
+ *    Revision 1.79  2008/05/04 13:30:56  fabiankeil
+ *    Streamline parse_http_url()'s prototype.
+ *
  *    Revision 1.78  2008/05/03 16:50:11  fabiankeil
  *    Leverage content_filters_enabled() in cgi_show_url_info().
  *
@@ -1473,7 +1476,7 @@ jb_err cgi_show_url_info(struct client_state *csp,
       }
 
       memset(url_to_query, '\0', sizeof(url_to_query));
-      err = parse_http_url(url_param, url_to_query);
+      err = parse_http_url(url_param, url_to_query, REQUIRE_PROTOCOL);
       assert(url_to_query->ssl == !strncmp(url_param, "https://", 8));
 
       free(url_param);
diff --git a/urlmatch.c b/urlmatch.c
index 4ba17cf1..98cecf2c 100644
--- a/urlmatch.c
+++ b/urlmatch.c
@@ -1,4 +1,4 @@
-const char urlmatch_rcs[] = "$Id: urlmatch.c,v 1.42 2008/05/04 13:24:16 fabiankeil Exp $";
+const char urlmatch_rcs[] = "$Id: urlmatch.c,v 1.43 2008/05/04 13:30:55 fabiankeil Exp $";
 /*********************************************************************
  *
  * File        :  $Source: /cvsroot/ijbswa/current/urlmatch.c,v $
@@ -33,6 +33,9 @@ const char urlmatch_rcs[] = "$Id: urlmatch.c,v 1.42 2008/05/04 13:24:16 fabianke
  *
  * Revisions   :
  *    $Log: urlmatch.c,v $
+ *    Revision 1.43  2008/05/04 13:30:55  fabiankeil
+ *    Streamline parse_http_url()'s prototype.
+ *
  *    Revision 1.42  2008/05/04 13:24:16  fabiankeil
  *    If the method isn't CONNECT, reject URLs without protocol.
  *
@@ -371,6 +374,8 @@ jb_err init_domain_components(struct http_request *http)
  *          1  :  url = URL (or is it URI?) to break down
  *          2  :  http = pointer to the http structure to hold elements.
  *                       Must be initialized with valid values (like NULLs).
+ *          3  :  require_protocol = Whether or not URLs without
+ *                                   protocol are acceptable.
  *
  * Returns     :  JB_ERR_OK on success
  *                JB_ERR_MEMORY on out of memory
@@ -378,7 +383,7 @@ jb_err init_domain_components(struct http_request *http)
  *                             or >100 domains deep.
  *
  *********************************************************************/
-jb_err parse_http_url(const char * url, struct http_request *http)
+jb_err parse_http_url(const char *url, struct http_request *http, int require_protocol)
 {
    int host_available = 1; /* A proxy can dream. */
 
@@ -448,7 +453,7 @@ jb_err parse_http_url(const char * url, struct http_request *http)
          http->host = NULL;
          host_available = 0;
       }
-      else if (!http->ssl)
+      else if (require_protocol)
       {
          freez(buf);
          return JB_ERR_PARSE;
@@ -668,7 +673,7 @@ jb_err parse_http_request(const char *req,
 
    http->ssl = !strcmpic(v[0], "CONNECT");
 
-   err = parse_http_url(v[1], http);
+   err = parse_http_url(v[1], http, !http->ssl);
    if (err)
    {
       freez(buf);
diff --git a/urlmatch.h b/urlmatch.h
index b83ae721..10edcba8 100644
--- a/urlmatch.h
+++ b/urlmatch.h
@@ -1,6 +1,6 @@
 #ifndef URLMATCH_H_INCLUDED
 #define URLMATCH_H_INCLUDED
-#define URLMATCH_H_VERSION "$Id: urlmatch.h,v 1.10 2008/04/14 18:11:21 fabiankeil Exp $"
+#define URLMATCH_H_VERSION "$Id: urlmatch.h,v 1.11 2008/05/04 13:30:55 fabiankeil Exp $"
 /*********************************************************************
  *
  * File        :  $Source: /cvsroot/ijbswa/current/urlmatch.h,v $
@@ -35,6 +35,9 @@
  *
  * Revisions   :
  *    $Log: urlmatch.h,v $
+ *    Revision 1.11  2008/05/04 13:30:55  fabiankeil
+ *    Streamline parse_http_url()'s prototype.
+ *
  *    Revision 1.10  2008/04/14 18:11:21  fabiankeil
  *    The compiler might not notice it, but the buffer passed to
  *    create_url_spec() is modified later on and thus shouldn't
@@ -97,7 +100,10 @@ extern jb_err init_domain_components(struct http_request *http);
 extern jb_err parse_http_request(const char *req,
                                  struct http_request *http,
                                  const struct client_state *csp);
-extern jb_err parse_http_url(const char *url, struct http_request *http);
+extern jb_err parse_http_url(const char *url,
+                             struct http_request *http,
+                             int require_protocol);
+#define REQUIRE_PROTOCOL 1
 
 extern int url_match(const struct url_spec *pattern,
                      const struct http_request *http);
-- 
2.39.2