Merge branch 'master' of git.distorted.org.uk:~mdw/publish/public-git/disorder

[disorder] / lib / url.c

diff --git a/lib/url.c b/lib/url.c
index e1740ac31cb389b74e83fd218cad29c9ece10b25..7ee1f456295ca4037eb0746a33c51d8dd42d0ff8 100644 (file)
--- a/lib/url.c
+++ b/lib/url.c
@@ -47,7 +47,7 @@ char *infer_url(int include_path_info) {
   /* Figure out the server.  'MUST' be set and we don't cope if it
    * is not. */
   if(!(server = getenv("SERVER_NAME")))
   /* Figure out the server.  'MUST' be set and we don't cope if it
    * is not. */
   if(!(server = getenv("SERVER_NAME")))

-    fatal(0, "SERVER_NAME is not set");
+    disorder_fatal(0, "SERVER_NAME is not set");

   server = xstrdup(server);
   
   /* Figure out the port.  'MUST' be set but we cope if it is not. */
   server = xstrdup(server);
   
   /* Figure out the port.  'MUST' be set but we cope if it is not. */


@@ -67,7 +67,7 @@ char *infer_url(int include_path_info) {
   } else {
     /* RFC3875 s4.1.13 */
     if(!(script = getenv("SCRIPT_NAME")))
   } else {
     /* RFC3875 s4.1.13 */
     if(!(script = getenv("SCRIPT_NAME")))

-      fatal(0, "SCRIPT_NAME is not set");
+      disorder_fatal(0, "SCRIPT_NAME is not set");

     /* SCRIPT_NAME may be "" */
     if(!*script)
       script = "/";
     /* SCRIPT_NAME may be "" */
     if(!*script)
       script = "/";


@@ -78,7 +78,7 @@ char *infer_url(int include_path_info) {
                      script, urlencodestring(path_info));
   }
   if(script[0] != '/')
                      script, urlencodestring(path_info));
   }
   if(script[0] != '/')

-    fatal(0, "SCRIPT_NAME does not start with a '/'");
+    disorder_fatal(0, "SCRIPT_NAME does not start with a '/'");

   script = xstrdup(script);
   
   if(port == 80)
   script = xstrdup(script);
   
   if(port == 80)