fivedev/harbour-core
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

2009-07-31 10:26 UTC+0200 Francesco Saverio Giudice (info/at/fsgiudice.com)

Browse Source 
* harbour/examples/httpsrv/uhttpd.prg
    * Uploaded Handler_HrbScript() changes missed in previous upload.
      I need vacations!
This commit is contained in:
Francesco Saverio Giudice
2009-07-31 08:28:22 +00:00
parent a66d739f24
commit 14bb643a9a
2 changed files with 31 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

49
harbour/examples/httpsrv/uhttpd.prg
View File

@@ -2814,37 +2814,40 @@ STATIC FUNCTION Handler_HrbScript( cFileName )
cHRBBody := HRB_LoadFromFile( uhttpd_OSFileName( cFileName ) )
ENDIF
IF hb_mutexLock( s_hmtxHRB )
IF HRB_ACTIVATE_CACHE
// caching modules
IF !hb_HHasKey( s_hHRBModules, cFileName )
hb_HSet( s_hHRBModules, cFileName, HRB_LoadFromFile( uhttpd_OSFileName( cFileName ) ) )
BEGIN SEQUENCE
IF HRB_ACTIVATE_CACHE
// caching modules
IF !hb_HHasKey( s_hHRBModules, cFileName )
hb_HSet( s_hHRBModules, cFileName, HRB_LoadFromFile( uhttpd_OSFileName( cFileName ) ) )
ENDIF
cHRBBody := s_hHRBModules[ cFileName ]
ENDIF
cHRBBody := s_hHRBModules[ cFileName ]
ENDIF
WriteToConsole( "Executing: " + cFileName )
IF !EMPTY( pHRB := HB_HRBLOAD( cHRBBody ) )
WriteToConsole( "Executing: " + cFileName )
IF !EMPTY( pHRB := HB_HRBLOAD( cHRBBody ) )
// save current directory
cCurPath := CurDrive() + hb_osDriveSeparator() + HB_OSPathSeparator() + CurDir()
// Change dir to document root
DirChange( s_cDocumentRoot )
// save current directory
cCurPath := CurDrive() + hb_osDriveSeparator() + HB_OSPathSeparator() + CurDir()
// Change dir to document root
DirChange( s_cDocumentRoot )
xResult := HRBMAIN()
xResult := HRBMAIN()
#ifdef DEBUG_ACTIVE
hb_ToOutDebug( "Handler_HrbScript(): cFileName = %s,\n\rcCurPath = %s,\n\rs_cDocumentRoot = %s,\n\rpHRB = %s,\n\rxResult = %s\n\r", ;
cFileName, cCurPath, s_cDocumentRoot, pHRB, xResult )
hb_ToOutDebug( "Handler_HrbScript(): cFileName = %s,\n\rcCurPath = %s,\n\rs_cDocumentRoot = %s,\n\rpHRB = %s,\n\rxResult = %s\n\r", ;
cFileName, cCurPath, s_cDocumentRoot, pHRB, xResult )
#endif
// return to original folder
DirChange( cCurPath )
// return to original folder
DirChange( cCurPath )
HB_HRBUNLOAD( pHRB )
ELSE
uhttpd_SetStatusCode( 404 )
t_cErrorMsg := "File does not exist: " + cFileName
ENDIF
hb_mutexUnlock( s_hmtxHRB )
HB_HRBUNLOAD( pHRB )
ELSE
uhttpd_SetStatusCode( 404 )
t_cErrorMsg := "File does not exist: " + cFileName
ENDIF
ALWAYS
hb_mutexUnlock( s_hmtxHRB )
END SEQUENCE
ENDIF