[mapserver-commits] r7767 - trunk/mapserver

[svn at osgeo.org]

Author: sdlime
Date: 2008-07-02 01:01:38 -0400 (Wed, 02 Jul 2008)
New Revision: 7767

Modified:
   trunk/mapserver/HISTORY.TXT
   trunk/mapserver/maptemplate.c
Log:
maptemplate.c: removed extra line feeds from mime header output. (#2672)

Modified: trunk/mapserver/HISTORY.TXT
===================================================================
--- trunk/mapserver/HISTORY.TXT	2008-06-30 21:25:33 UTC (rev 7766)
+++ trunk/mapserver/HISTORY.TXT	2008-07-02 05:01:38 UTC (rev 7767)
@@ -11,6 +11,9 @@
 
 Current Version (SVN trunk):
 ----------------------------
+
+- maptemplate.c: removed extra line feeds from mime header output. (#2672)
+
 - mapresample.c: fix for bug 2540 when using raster resampling and AGG.
 
 - mapsde.c: Check at compile time that we have SE_connection_test_server, 

Modified: trunk/mapserver/maptemplate.c
===================================================================
--- trunk/mapserver/maptemplate.c	2008-06-30 21:25:33 UTC (rev 7766)
+++ trunk/mapserver/maptemplate.c	2008-07-02 05:01:38 UTC (rev 7767)
@@ -235,7 +235,7 @@
       return MS_FAILURE;
     }
 
-    if(mapserv->sendheaders) msIO_printf("Content-type: %s%c%c\n", outputFormat->mimetype, 10, 10);
+    if(mapserv->sendheaders) msIO_printf("Content-type: %s%c%c", outputFormat->mimetype, 10, 10);
     if((status = msReturnPage(mapserv, (char *) file, BROWSE, papszBuffer)) != MS_SUCCESS)
       return status;
   } else {
@@ -3609,7 +3609,7 @@
   ** so why should this. Note that new-style templates don't buffer the mime-type either.
   */
   if(papszBuffer && mapserv->sendheaders) {
-    sprintf(buffer, "Content-type: %s%c%c\n", pszMimeType, 10, 10);
+    sprintf(buffer, "Content-type: %s%c%c", pszMimeType, 10, 10);
     if(nBufferSize <= (int)(nCurrentSize + strlen(buffer) + 1)) {
       nExpandBuffer++;
       (*papszBuffer) = (char *)realloc((*papszBuffer), MS_TEMPLATE_BUFFER*nExpandBuffer);
@@ -3618,7 +3618,7 @@
     strcat((*papszBuffer), buffer);
     nCurrentSize += strlen(buffer);
   } else if(mapserv->sendheaders) {
-    msIO_printf("Content-type: %s%c%c\n", pszMimeType, 10, 10);
+    msIO_printf("Content-type: %s%c%c", pszMimeType, 10, 10);
     fflush(stdout);
   }