Added .xml as one of the few common file extensions known by the multipart

form generator.  Made the extensions part of the MIME type struct to reduce
the size and run-time relocations necessary to build the table.

diff --git a/CHANGES b/CHANGES
index beda69bf7e9b414b5ec2b5ad04dd19b6805f29c2..6c89a2f629c4c5f17ff7bde3314a7cfb5955adc3 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -6,6 +6,10 @@
 
                                   Changelog
 
+Daniel Fandrich (14 Nov 2008)
+- Added .xml as one of the few common file extensions known by the multipart
+  form generator.
+
 Yang Tse (13 Nov 2008)
 - Refactored configure script detection of functions used to set sockets into
   non-blocking mode, and decouple function detection from function capability.

diff --git a/lib/formdata.c b/lib/formdata.c
index a370e65a4b057ee4e6344836cb8959ec559cefef..483c9f82e5445c3c45fe60a550c3b191bce33ec1 100644 (file)
--- a/lib/formdata.c
+++ b/lib/formdata.c
@@ -267,7 +267,7 @@ static const char * ContentTypeForFilename (const char *filename,
    * extensions and pick the first we match!
    */
   struct ContentType {
-    const char *extension;
+    char extension[6];
     const char *type;
   };
   static const struct ContentType ctts[]={
@@ -275,7 +275,8 @@ static const char * ContentTypeForFilename (const char *filename,
     {".jpg",  "image/jpeg"},
     {".jpeg", "image/jpeg"},
     {".txt",  "text/plain"},
-    {".html", "text/html"}
+    {".html", "text/html"},
+    {".xml", "application/xml"}
   };
 
   if(prevtype)
@@ -1733,7 +1734,7 @@ char *Curl_FormBoundary(void)
                               the same form won't be identical */
   size_t i;
 
-  static const char table16[]="abcdef0123456789";
+  static const char table16[]="0123456789abcdef";
 
   retstring = malloc(BOUNDARY_LENGTH+1);