diff -N -c -r -X exclude_files squid-1.0.beta9/src/mime.c squid-1.0.beta9.henrik/src/mime.c
*** squid-1.0.beta9/src/mime.c	Tue May 28 01:54:59 1996
--- squid-1.0.beta9.henrik/src/mime.c	Tue May 28 01:53:48 1996
***************
*** 51,58 ****
  }
  
  /* need to take the lowest, non-zero pointer to the end of the headers.
!  * some objects have \n\n separating header and body, but \r\n\r\n in
!  * body text. */
  char *mime_headers_end(char *mime)
  {
      char *p1,*p2;
--- 51,57 ----
  }
  
  /* need to take the lowest, non-zero pointer to the end of the headers.
!  * The headers end at the first empty line */
  char *mime_headers_end(char *mime)
  {
      char *p1,*p2;
***************
*** 61,70 ****
      p1=strstr(mime,"\r\n\r\n");
      p2=strstr(mime,"\n\n");
      
!     if(p1)
! 	end=p1+4;
!     if(p2 && p2<p1)
!     	end=p2+2;
      return end;
  }
  
--- 60,72 ----
      p1=strstr(mime,"\r\n\r\n");
      p2=strstr(mime,"\n\n");
      
!     if(p1 && p2)
! 	end = p1 < p2 ? p1 : p2;
!     else
!     	end = p1 ? p1 : p2;
!     if(end)
! 	end += (end == p1 ? 4 : 2);
! 
      return end;
  }