diff options
| author | Andrei Zmievski <andrei@php.net> | 2005-08-11 23:36:07 +0000 |
|---|---|---|
| committer | Andrei Zmievski <andrei@php.net> | 2005-08-11 23:36:07 +0000 |
| commit | 264cec8be641d1c2ea0c95d915d506c4fdbc751a (patch) | |
| tree | e9f980e16f707842248125cf22efabec782cfece /sapi/apache_hooks/mod_php5.c | |
| parent | b80cb7bd2f721dad13a97a1300c6dc56934daaf7 (diff) | |
| download | php-git-264cec8be641d1c2ea0c95d915d506c4fdbc751a.tar.gz | |
Unicode support.
Diffstat (limited to 'sapi/apache_hooks/mod_php5.c')
| -rw-r--r-- | sapi/apache_hooks/mod_php5.c | 16 |
1 files changed, 6 insertions, 10 deletions
diff --git a/sapi/apache_hooks/mod_php5.c b/sapi/apache_hooks/mod_php5.c index 2a0a633f59..4df43c220c 100644 --- a/sapi/apache_hooks/mod_php5.c +++ b/sapi/apache_hooks/mod_php5.c @@ -616,16 +616,12 @@ static char *php_apache_get_default_mimetype(request_rec *r TSRMLS_DC) { char *mimetype; - if (SG(default_mimetype) || SG(default_charset)) { - /* Assume output will be of the default MIME type. Individual - scripts may change this later. */ - char *tmpmimetype; - tmpmimetype = sapi_get_default_content_type(TSRMLS_C); - mimetype = pstrdup(r->pool, tmpmimetype); - efree(tmpmimetype); - } else { - mimetype = SAPI_DEFAULT_MIMETYPE "; charset=" SAPI_DEFAULT_CHARSET; - } + /* Assume output will be of the default MIME type. Individual + scripts may change this later. */ + char *tmpmimetype; + tmpmimetype = sapi_get_default_content_type(TSRMLS_C); + mimetype = pstrdup(r->pool, tmpmimetype); + efree(tmpmimetype); return mimetype; } /* }}} */ |