Merge branch 'master' into jython

diff --git a/wrw/form.py b/wrw/form.py
index 1f0e530..9f1e6d4 100644 (file)
--- a/wrw/form.py
+++ b/wrw/form.py
@@ -111,6 +111,7 @@ class formpart(object):
         return self
 
     def __exit__(self, *excinfo):
+        self.close()
         return False
 
     def parsehead(self):

diff --git a/wrw/req.py b/wrw/req.py
index 861454b..4f93eb9 100644 (file)
--- a/wrw/req.py
+++ b/wrw/req.py
@@ -73,6 +73,10 @@ class origrequest(request):
         self.servername = env["SERVER_NAME"]
         self.https = "HTTPS" in env
         self.ihead = headdict()
+        if "CONTENT_TYPE" in env:
+            self.ihead["Content-Type"] = env["CONTENT_TYPE"]
+        if "CONTENT_LENGTH" in env:
+            self.ihead["Content-Length"] = env["CONTENT_LENGTH"]
         self.ohead = headdict()
         for k, v in env.items():
             if k[:5] == "HTTP_":

diff --git a/wrw/sp/xhtml.py b/wrw/sp/xhtml.py
index abf4b96..928dcd9 100644 (file)
--- a/wrw/sp/xhtml.py
+++ b/wrw/sp/xhtml.py
@@ -30,7 +30,7 @@ def head(title=None, css=None):
     return head
 
 class htmlformatter(util.formatter):
-    allowshort = set([u"br", u"hr", u"img", u"input"])
+    allowshort = set([u"br", u"hr", u"img", u"input", u"meta", u"link"])
     def element(self, el, **extra):
         if el.name in self.allowshort:
             super(htmlformatter, self).element(el, **extra)