Compute absolute path to script

diff --git a/sapi/thttpd/thttpd.c b/sapi/thttpd/thttpd.c
index d4249232d382ae3db2ae891a5b6315f69d92b275..b0b0e71f0b0a3ccfa6f60b60e35da9a79226ac46 100644 (file)
--- a/sapi/thttpd/thttpd.c
+++ b/sapi/thttpd/thttpd.c
@@ -191,12 +191,18 @@ static sapi_module_struct sapi_module = {
 static void thttpd_module_main(TLS_D SLS_DC)
 {
        zend_file_handle file_handle;
+       char cwd[4096];
+       char *filename;
        CLS_FETCH();
        ELS_FETCH();
        PLS_FETCH();
 
+       V_GETCWD(cwd, sizeof(cwd));
+       filename = alloca(strlen(cwd) + strlen(TG(hc)->expnfilename) + 2);
+       sprintf(filename, "%s%c%s", cwd, PHP_DIR_SEPARATOR, TG(hc)->expnfilename); /* SAFE */
+       
        file_handle.type = ZEND_HANDLE_FILENAME;
-       file_handle.filename = TG(hc)->expnfilename;
+       file_handle.filename = filename;
        file_handle.free_filename = 0;
        file_handle.opened_path = NULL;