fix up templates for lab to ensure that they work smoothly and contain no traps

cewing · cewing · commit bc76e85d1499 · 2013-01-26T14:23:23.000-08:00
diff --git a/assignments/week04/lab/src/lab1_cgi_template.py b/assignments/week04/lab/src/lab1_cgi_template.py
@@ -5,38 +5,37 @@
 import os
 import datetime
 
+
 print "Content-Type: text/html"
 print
 
 body = """<html>
 <head>
-<title>Lab A - CGI experiments</title>
+<title>Lab 1 - CGI experiments</title>
 </head>
 <body>
-
-The server IP address is %s:%s.<br>
-<br>
 The server name is %s. (if an IP address, then a DNS problem) <br>
 <br>
-You are coming from  %s:%s.<br>
+The server address is %s:%s.<br>
 <br>
 Your hostname is %s.  <br>
 <br>
+You are coming from  %s:%s.<br>
+<br>
 The currenly executing script is %s<br>
 <br>
 The request arrived at %s<br>
 
-
 </body>
 </html>""" % (
-        os.environ['SERVER_ADDR'], # server IP
+        os.environ['SERVER_NAME'], # Server Hostname
+        'aaaa', # server IP
         'bbbb', # server port
-        'cccc', # client IP
-        'dddd', # client port
-        'eeee', # client hostname
-        'ffff', # server hostname
-        'gggg', # this script name
-        'hhhh', # time
+        'cccc', # client hostname
+        'dddd', # client IP
+        'eeee', # client port
+        'ffff', # this script name
+        'gggg', # time
         )
 
 print body,
diff --git a/assignments/week04/lab/src/lab2_wsgi_template.py b/assignments/week04/lab/src/lab2_wsgi_template.py
@@ -3,35 +3,32 @@
 
 body = """<html>
 <head>
-<title>Lab A - CGI experiments</title>
+<title>Lab 2 - WSGI experiments</title>
 </head>
 <body>
 
-The server address is %s.<br>
-<br>
 The server name is %s. (if an IP address, then a DNS problem) <br>
 <br>
-You are coming from  %s:%s.<br>
+The server address is %s:%s.<br>
 <br>
-Your hostname is %s.  <br>
+You are coming from  %s:%s.<br>
 <br>
-The currenly executing script is %s<br>
+The URI we are serving is %s.<br>
 <br>
 The request arrived at %s<br>
 
-
 </body>
 </html>"""
 
 def application(environ, start_response):
     response_body = body % (
-         environ['HTTP_HOST'], # server IP
-         'bbbb', # client IP
-         'cccc', # client port
-         'dddd', # client hostname
-         'eeee', # server hostname
-         'ffff', # this script name
-         'gggg', # time
+         environ.get('SERVER_NAME', 'Unset'), # server name
+         'aaaa', # server IP
+         'bbbb', # server port
+         'cccc', # client IP
+         'dddd', # client port
+         'eeee', # this script name
+         'ffff', # time
          )
     status = '200 OK'
 
