cvs: php4 /sapi/thttpd thttpd.c

sas Sun Sep 30 14:23:28 2001 EDT Modified files: /php4/sapi/thttpd thttpd.c Log: Add QUERY_STRING, HTTP_HOST, HTTP_ACCEPT_LANGUAGE to the script environment. Also support setting the INI path from the outside. Index: php4/sapi/thttpd/thttpd.c diff -u php4/sapi/thttpd/thttpd.c:1.57 php4/sapi/thttpd/thttpd.c:1.58 --- php4/sapi/thttpd/thttpd.c:1.57 Thu Sep 27 16:01:23 2001 +++ php4/sapi/thttpd/thttpd.c Sun Sep 30 14:23:28 2001 @@ -27,6 +27,7 @@ #include "ext/standard/php_smart_str.h" #include <sys/uio.h> +#include <stdlib.h> typedef struct { httpd_conn *hc; @@ -199,9 +200,12 @@ php_register_variable(#name, TG(hc)->field, track_vars_array TSRMLS_CC); \ } + CONDADD(QUERY_STRING, query); + CONDADD(HTTP_HOST, hdrhost); CONDADD(HTTP_REFERER, referer); CONDADD(HTTP_USER_AGENT, useragent); CONDADD(HTTP_ACCEPT, accept); + CONDADD(HTTP_ACCEPT_LANGUAGE, acceptl); CONDADD(HTTP_ACCEPT_ENCODING, accepte); CONDADD(HTTP_COOKIE, cookie); CONDADD(CONTENT_TYPE, contenttype); @@ -537,14 +541,22 @@ void thttpd_php_init(void) { + char *ini; + #ifdef ZTS tsrm_startup(1, 1, 0, NULL); ts_allocate_id(&thttpd_globals_id, sizeof(php_thttpd_globals), NULL, NULL); qr_lock = tsrm_mutex_alloc(); thttpd_register_on_close(remove_dead_conn); #endif + + if ((ini = getenv("PHP_INI_PATH"))) { + thttpd_sapi_module.php_ini_path_override = ini; + } + sapi_startup(&thttpd_sapi_module); thttpd_sapi_module.startup(&thttpd_sapi_module); + { TSRMLS_FETCH();