Merge branch 'branch-6-2' into wcs_contenttype

MapServer · Sep 27, 2012 · 6b68d53 · 6b68d53
2 parents e1a4b64 + 2d0f185
commit 6b68d53
Showing 1 changed file with 4 additions and 8 deletions.
diff --git a/mapio.c b/mapio.c
@@ -784,8 +784,7 @@ char *msIO_stripStdoutBufferContentType()
   /* -------------------------------------------------------------------- */
   end_of_ct = 13;
   while( end_of_ct+1 < buf->data_offset
-         && buf->data[end_of_ct+1] != '\r'
-         && buf->data[end_of_ct+1] != '\n' )
+         && buf->data[end_of_ct+1] != '\r' )
     end_of_ct++;
 
   if( end_of_ct+1 == buf->data_offset ) {
@@ -800,8 +799,7 @@ char *msIO_stripStdoutBufferContentType()
   /* -------------------------------------------------------------------- */
   start_of_data = end_of_ct+3;
   if( start_of_data  < buf->data_offset
-      && ( buf->data[start_of_data] == '\r'
-           || buf->data[start_of_data] == '\n' ) )
+      && buf->data[start_of_data] == '\r' )
     start_of_data +=2;
 
   if( start_of_data == buf->data_offset ) {
@@ -870,8 +868,7 @@ void msIO_stripStdoutBufferContentHeaders()
     /* -------------------------------------------------------------------- */
     start_of_data +=7;
     while( start_of_data+1 < buf->data_offset
-           && buf->data[start_of_data+1] != '\r'
-           && buf->data[start_of_data+1] != '\n' )
+           && buf->data[start_of_data+1] != '\r' )
       start_of_data++;
 
     if( start_of_data+1 == buf->data_offset ) {
@@ -890,8 +887,7 @@ void msIO_stripStdoutBufferContentHeaders()
   /*      Skip next line if empty.                                        */
   /* -------------------------------------------------------------------- */
   if( start_of_data  < buf->data_offset
-      && ( buf->data[start_of_data] == '\r'
-           || buf->data[start_of_data] == '\n' ) )
+      && buf->data[start_of_data] == '\r' )
     start_of_data +=2;
 
   if( start_of_data == buf->data_offset ) {