merge from trunk perhaps?

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@380248 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/STATUS b/STATUS
index af4c25f35a40fa4cbec12f28f99ead638980ffd0..7e5b3da9d3a045df42caf6d4d044dae0e0384311 100644 (file)
--- a/STATUS
+++ b/STATUS
@@ -170,4 +170,14 @@ PATCHES PROPOSED TO BACKPORT FROM TRUNK:
       +1: rpluem, niq
       NOTE: this also supersedes previous fix to PR#37790
 
+    * mod_speling: Don't crash if r->filename unset.
+      Trunk version of patch, which applies fine:
+        http://svn.apache.org/viewcvs?rev=373519&view=rev
+      +1: trawick
+
+    * core: Fix up botched status lines (mismatch with r->status or
+      just badly formatted)
+      Trunk version of patch, which applies fine:
+        http://svn.apache.org/viewcvs?rev=379562&view=rev
+      +1: trawick