  
 Index: include/httpd.h
 ===================================================================
---- include/httpd.h	(revision 1697672)
+--- include/httpd.h	(revision 1698089)
 +++ include/httpd.h	(working copy)
 @@ -518,6 +518,7 @@
  #define HTTP_UNSUPPORTED_MEDIA_TYPE          415

+    return -1;
+}
+
Index: .
===================================================================
--- .	(revision 1697672)
+++ .	(working copy)

Property changes on: .
___________________________________________________________________
Modified: svn:mergeinfo
   Merged /httpd/httpd/trunk:r1332643,1487772,1670397,1670434,1670436,1670578,1675459,1676004,1676709,1685069,1692486,1692516,1695727,1695874,1696264,1696266,1696428,1697339,1697855

 { NULL }
 };
 
@@ -4936,6 +4992,61 @@
     }
 }
 
