thetaphi Fri Oct 31 07:20:34 2003 EDT
Modified files:
/php-src/sapi/nsapi nsapi.c
Log:
Send correct default content type from php.ini not static text/html (important for
other charsets than iso-8859-1)
Index: php-src/sapi/nsapi/nsapi.c
diff -u php-src/sapi/nsapi/nsapi.c:1.55 php-src/sapi/nsapi/nsapi.c:1.56
--- php-src/sapi/nsapi/nsapi.c:1.55 Mon Aug 4 08:46:03 2003
+++ php-src/sapi/nsapi/nsapi.c Fri Oct 31 07:20:33 2003
@@ -17,7 +17,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: nsapi.c,v 1.55 2003/08/04 12:46:03 thetaphi Exp $ */
+/* $Id: nsapi.c,v 1.56 2003/10/31 12:20:33 thetaphi Exp $ */
/*
* PHP includes
@@ -203,7 +203,7 @@
NULL,
NULL,
PHP_MINFO(nsapi),
- "$Revision: 1.55 $",
+ "$Revision: 1.56 $",
STANDARD_MODULE_PROPERTIES
};
/* }}} */
@@ -506,8 +506,11 @@
* don't know what the implication of doing it there is.
*/
if (SG(sapi_headers).send_default_content_type) {
+ char *hd;
param_free(pblock_remove("content-type", rc->rq->srvhdrs));
- pblock_nvinsert("content-type", "text/html", rc->rq->srvhdrs);
+ hd = sapi_get_default_content_type(TSRMLS_C);
+ pblock_nvinsert("content-type", hd, rc->rq->srvhdrs);
+ efree(hd);
}
protocol_status(rc->sn, rc->rq, SG(sapi_headers).http_response_code, NULL);
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
