Correct ordering of configuration key table.

[disorder] / libtests / t-url.c

diff --git a/libtests/t-url.c b/libtests/t-url.c
index dcff4bf642b86927f37b481c530edf1c90b284c9..cf680ea782c1fc54b59d9b16f6f67dd8bde96880 100644 (file)
--- a/libtests/t-url.c
+++ b/libtests/t-url.c
@@ -2,20 +2,18 @@
  * This file is part of DisOrder.
  * Copyright (C) 2005, 2007, 2008 Richard Kettlewell
  *
  * This file is part of DisOrder.
  * Copyright (C) 2005, 2007, 2008 Richard Kettlewell
  *

- * This program is free software; you can redistribute it and/or modify
+ * 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
  * it under the terms of the GNU General Public License as published by

- * the Free Software Foundation; either version 2 of the License, or
+ * the Free Software Foundation, either version 3 of the License, or

  * (at your option) any later version.
  * (at your option) any later version.

- *
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 

  * You should have received a copy of the GNU General Public License
  * You should have received a copy of the GNU General Public License

- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
- * USA
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.

  */
 #include "test.h"
 
  */
 #include "test.h"
 


@@ -48,24 +46,29 @@ static void test_url(void) {
   insist(parse_url("http://www.example.com/example%2zpath", &p) == -1);
 
   setenv("SERVER_NAME", "www.anjou.terraraq.org.uk", 1);
   insist(parse_url("http://www.example.com/example%2zpath", &p) == -1);
 
   setenv("SERVER_NAME", "www.anjou.terraraq.org.uk", 1);

-  setenv("SERVER_PORT", "80", 1);

   setenv("SCRIPT_NAME", "/~richard/env.cgi", 1);
   setenv("SCRIPT_NAME", "/~richard/env.cgi", 1);

-  check_string(infer_url(),
+  check_string(infer_url(1),
+               "http://www.anjou.terraraq.org.uk/~richard/env.cgi");
+  setenv("SERVER_PORT", "80", 1);
+  check_string(infer_url(1),

                "http://www.anjou.terraraq.org.uk/~richard/env.cgi");
   setenv("HTTPS", "on", 1);
                "http://www.anjou.terraraq.org.uk/~richard/env.cgi");
   setenv("HTTPS", "on", 1);

-  check_string(infer_url(),
+  check_string(infer_url(1),

                "https://www.anjou.terraraq.org.uk/~richard/env.cgi");
   setenv("QUERY_STRING", "foo", 1);
                "https://www.anjou.terraraq.org.uk/~richard/env.cgi");
   setenv("QUERY_STRING", "foo", 1);

-  check_string(infer_url(),
+  check_string(infer_url(1),

                "https://www.anjou.terraraq.org.uk/~richard/env.cgi");
                "https://www.anjou.terraraq.org.uk/~richard/env.cgi");

+  setenv("SCRIPT_NAME", "", 1);
+  check_string(infer_url(1),
+               "https://www.anjou.terraraq.org.uk/");

   setenv("REQUEST_URI", "/~richard/env%2ecgi", 1);
   setenv("REQUEST_URI", "/~richard/env%2ecgi", 1);

-  check_string(infer_url(),
+  check_string(infer_url(1),

                "https://www.anjou.terraraq.org.uk/~richard/env%2ecgi");
   setenv("REQUEST_URI", "/~richard/env%2ecgi?foo", 1);
                "https://www.anjou.terraraq.org.uk/~richard/env%2ecgi");
   setenv("REQUEST_URI", "/~richard/env%2ecgi?foo", 1);

-  check_string(infer_url(),
+  check_string(infer_url(1),

                "https://www.anjou.terraraq.org.uk/~richard/env%2ecgi");
   setenv("SERVER_PORT", "8080", 1);
                "https://www.anjou.terraraq.org.uk/~richard/env%2ecgi");
   setenv("SERVER_PORT", "8080", 1);

-  check_string(infer_url(),
+  check_string(infer_url(1),

                "https://www.anjou.terraraq.org.uk:8080/~richard/env%2ecgi");
 }
 
                "https://www.anjou.terraraq.org.uk:8080/~richard/env%2ecgi");
 }