Columns are now resizable and wide columns are ellipsized. Columns

[disorder] / lib / url.c

diff --git a/lib/url.c b/lib/url.c
index 2579ec1238721a51c2ed284baeb54363fcabcdf3..b7772829e64a293a30ec21ba8fc25ce9004527f2 100644 (file)
--- a/lib/url.c
+++ b/lib/url.c
@@ -1,6 +1,6 @@
 /*
  * This file is part of DisOrder
- * Copyright (C) 2007 Richard Kettlewell
+ * Copyright (C) 2007, 2008 Richard Kettlewell
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -21,13 +21,9 @@
  * @brief URL support functions
  */
 
-#include <config.h>
-#include "types.h"
+#include "common.h"
 
-#include <stdio.h>
-#include <stdlib.h>
 #include <errno.h>
-#include <string.h>
 
 #include "mem.h"
 #include "log.h"
@@ -44,6 +40,10 @@ char *infer_url(void) {
   const char *scheme = "http", *server, *script, *e, *request_uri;
   char *url;
   int port;
+
+  /* mod_ssl sets HTTPS=on if the scheme is https */
+  if((e = getenv("HTTPS")) && !strcmp(e, "on"))
+    scheme = "https";
   
   /* Figure out the server.  'MUST' be set and we don't cope if it
    * is not. */