*** SAPI.c.old	Mon Mar 24 18:10:30 2003
--- SAPI.c	Mon Mar 24 18:10:34 2003
***************
*** 261,266 ****
--- 261,267 ----
  		newtype = emalloc(newlen + 1);
   		PHP_STRLCPY(newtype, *mimetype, newlen + 1, len);
  		strlcat(newtype, ";charset=", newlen + 1);
+ 		strlcat(newtype, charset, newlen + 1);
  		if (*mimetype != NULL) {
  			efree(*mimetype);
  		}
***************
*** 460,467 ****
  					strlcat(newheader, mimetype, newlen);
  					sapi_header.header = newheader;
  					sapi_header.header_len = newlen - 1;
- 					colon_offset = strchr(newheader, ':');
- 					*colon_offset = '\0';
  					efree(header_line);
  				}
  				
--- 461,466 ----