From da65eb85266245c1434ff149822a762329c66069 Mon Sep 17 00:00:00 2001 From: Francesco Saverio Giudice Date: Tue, 27 Jan 2009 09:15:49 +0000 Subject: [PATCH] 2009-01-27 10:14 UTC+0100 Francesco Saverio Giudice (info/at/fsgiudice.com) * harbour/contrib/examples/uhttpd/uhttpd.prg * Fixed APP_NAME that causes wrong ini file name and than error loading aliases from uhttpd.ini --- harbour/ChangeLog | 5 +++++ harbour/contrib/examples/uhttpd/uhttpd.prg | 8 ++++++-- 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/harbour/ChangeLog b/harbour/ChangeLog index 795285e46d..cc445993e2 100644 --- a/harbour/ChangeLog +++ b/harbour/ChangeLog @@ -8,6 +8,11 @@ 2008-12-31 13:59 UTC+0100 Foo Bar (foo.bar foobar.org) */ +2009-01-27 10:14 UTC+0100 Francesco Saverio Giudice (info/at/fsgiudice.com) + * harbour/contrib/examples/uhttpd/uhttpd.prg + * Fixed APP_NAME that causes wrong ini file name and than error + loading aliases from uhttpd.ini + 2009-01-27 09:38 UTC+0100 Viktor Szakats (harbour.01 syenar hu) * contrib/hbssl/sslctx.c * contrib/hbssl/ssl.c diff --git a/harbour/contrib/examples/uhttpd/uhttpd.prg b/harbour/contrib/examples/uhttpd/uhttpd.prg index 63bc7beec2..c898e3ab80 100644 --- a/harbour/contrib/examples/uhttpd/uhttpd.prg +++ b/harbour/contrib/examples/uhttpd/uhttpd.prg @@ -102,8 +102,8 @@ #define APP_INET_SUPPORT "" #endif -#define APP_NAME "uhttpd_inet" -#define APP_VER_NUM "0.3" +#define APP_NAME "uhttpd" +#define APP_VER_NUM "0.4" #define APP_VERSION APP_VER_NUM + APP_GD_SUPPORT + APP_INET_SUPPORT #define AF_INET 2 @@ -269,6 +269,8 @@ LOCAL cCmdPort, cCmdDocumentRoot, lCmdIndexes, nCmdStartThreads, nCmdMaxThreads // ----------------- Parse ini file ---------------------------------------- + //hb_toOutDebug( "cConfig = %s\n\r", cConfig ) + hDefault := ParseIni( cConfig ) // ------------------- Parameters changeable from ini file ---------------- @@ -1518,6 +1520,8 @@ LOCAL cExt, xResult, pHRB, oError cFileName := _SERVER[ "DOCUMENT_ROOT" ] + hb_hGet( s_hFileAliases, _SERVER[ "SCRIPT_NAME" ] ) ENDIF + //hb_toOutDebug( "cFileName = %s, uOSFileName( cFileName ) = %s,\n\r s_hFileAliases = %s\n\r", cFileName, uOSFileName( cFileName ), hb_ValToExp( s_hFileAliases ) ) + IF Upper( _SERVER[ "SCRIPT_NAME" ] ) == "/SERVERSTATUS" ShowServerStatus() ELSEIF HB_FileExists( uOSFileName( cFileName ) )