2012-10-15 11:01 UTC+0200 Viktor Szakats (harbour syenar.net)
* contrib/gtwvg/class.prg
* contrib/gtwvg/parthdlr.prg
* contrib/gtwvg/radiobut.prg
* contrib/gtwvg/toolbar.prg
* contrib/gtwvg/wnd.prg
* contrib/hbnf/doc/en/amedian.txt
* contrib/hbnf/doc/en/ftidle.txt
* contrib/hbnf/doc/en/iamidle.txt
* contrib/hbnf/tests/datecnfg.prg
* contrib/hbsqlit3/tests/sl3_test.prg
* contrib/hbtip/tests/ftpadv.prg
* contrib/hbtip/tests/httpadv.prg
* contrib/xhb/hblog.prg
* contrib/xhb/htmutil.prg
* contrib/xhb/sprintf.prg
* doc/clipper.txt
* extras/gtwvw/tests/ebtest7.prg
* extras/gtwvw/tests/maximize.prg
* extras/gtwvw/tests/prog0.prg
* extras/gtwvw/tests/prog1.prg
* extras/gtwvw/tests/prog2.prg
* extras/gtwvw/tests/wvwmouse.prg
* extras/gtwvw/tests/wvwtest9.prg
* extras/hbdoc/hbdoc.prg
* extras/httpsrv/cookie.prg
* extras/httpsrv/session.prg
* src/rtl/tbrowse.prg
* tests/destruct.prg
* tests/switch.prg
* tests/t1.prg
* tests/testbrw.prg
* tests/tstuse.prg
* utils/hbmk2/hbmk2.prg
* utils/hbtest/rt_math.prg
* END -> END*
* other minor cleanups and formatting
This commit is contained in:
@@ -52,12 +52,6 @@
|
||||
|
||||
#include "hbclass.ch"
|
||||
|
||||
#command IF <lexpr> THEN <*statement*> =>;
|
||||
IF (<lexpr>) ; <statement> ; END
|
||||
|
||||
#command IF <lexpr> THEN <statement1> ELSE <statement2> =>;
|
||||
IF (<lexpr>) ; <statement1> ; ELSE ; <statement2> ; END
|
||||
|
||||
MEMVAR _COOKIE
|
||||
|
||||
FUNCTION uhttpd_CookieNew( cDomain, cPath, nExpireDays, nExpireSecs )
|
||||
@@ -89,10 +83,18 @@ ENDCLASS
|
||||
// ------------------------------
|
||||
|
||||
METHOD SetCookieDefaults( cDomain, cPath, nExpireDays, nExpireSecs ) CLASS uhttpd_Cookie
|
||||
IF cDomain != NIL THEN ::cDomain := cDomain
|
||||
IF cPath != NIL THEN ::cPath := cPath
|
||||
IF nExpireDays != NIL THEN ::nExpireDays := nExpireDays
|
||||
IF nExpireSecs != NIL THEN ::nExpireSecs := nExpireSecs
|
||||
IF cDomain != NIL
|
||||
::cDomain := cDomain
|
||||
ENDIF
|
||||
IF cPath != NIL
|
||||
::cPath := cPath
|
||||
ENDIF
|
||||
IF nExpireDays != NIL
|
||||
::nExpireDays := nExpireDays
|
||||
ENDIF
|
||||
IF nExpireSecs != NIL
|
||||
::nExpireSecs := nExpireSecs
|
||||
ENDIF
|
||||
RETURN NIL
|
||||
|
||||
METHOD SetCookie( cCookieName, xValue, cDomain, cPath, cExpires, lSecure, lHttpOnly ) CLASS uhttpd_Cookie
|
||||
|
||||
@@ -54,12 +54,6 @@
|
||||
#include "fileio.ch"
|
||||
#include "directry.ch"
|
||||
|
||||
#command IF <lexpr> THEN <*statement*> =>;
|
||||
IF (<lexpr>) ; <statement> ; END
|
||||
|
||||
#command IF <lexpr> THEN <statement1> ELSE <statement2> =>;
|
||||
IF (<lexpr>) ; <statement1> ; ELSE ; <statement2> ; END
|
||||
|
||||
#xtranslate SetNewValueReturnOld( <p>, <v> ) => LOCAL xOld, xOld := <p>, iif( <v> != NIL, <p> := <v>, ), xOld
|
||||
#xtranslate DEFAULT( <p>, <v> ) => ( <p> := iif( <p> == NIL, <v>, <p> ) )
|
||||
|
||||
@@ -380,10 +374,18 @@ METHOD CacheLimiter( cNewLimiter ) CLASS uhttpd_Session
|
||||
RETURN cOldLimiter
|
||||
|
||||
METHOD SetCookieParams( nLifeTime, cPath, cDomain, lSecure ) CLASS uhttpd_Session
|
||||
IF nLifeTime != NIL THEN ::nCookie_LifeTime := nLifeTime
|
||||
IF cPath != NIL THEN ::cCookie_Path := cPath
|
||||
IF cDomain != NIL THEN ::cCookie_Domain := cDomain
|
||||
IF lSecure != NIL THEN ::lCookie_Secure := lSecure
|
||||
IF nLifeTime != NIL
|
||||
::nCookie_LifeTime := nLifeTime
|
||||
ENDIF
|
||||
IF cPath != NIL
|
||||
::cCookie_Path := cPath
|
||||
ENDIF
|
||||
IF cDomain != NIL
|
||||
::cCookie_Domain := cDomain
|
||||
ENDIF
|
||||
IF lSecure != NIL
|
||||
::lCookie_Secure := lSecure
|
||||
ENDIF
|
||||
RETURN NIL
|
||||
|
||||
METHOD RegenerateID() CLASS uhttpd_Session
|
||||
@@ -566,18 +568,34 @@ METHOD CheckSID( cSID, cCRCKey ) CLASS uhttpd_Session
|
||||
// ------------------------------
|
||||
|
||||
METHOD SetSaveHandler( bOpen, bClose, bRead, bWrite, bDestroy, bGC ) CLASS uhttpd_Session
|
||||
IF bOpen != NIL THEN ::bOpen := bOpen
|
||||
IF bClose != NIL THEN ::bClose := bClose
|
||||
IF bRead != NIL THEN ::bRead := bRead
|
||||
IF bWrite != NIL THEN ::bWrite := bWrite
|
||||
IF bDestroy != NIL THEN ::bDestroy := bDestroy
|
||||
IF bGC != NIL THEN ::bGC := bGC
|
||||
IF bOpen != NIL
|
||||
::bOpen := bOpen
|
||||
ENDIF
|
||||
IF bClose != NIL
|
||||
::bClose := bClose
|
||||
ENDIF
|
||||
IF bRead != NIL
|
||||
::bRead := bRead
|
||||
ENDIF
|
||||
IF bWrite != NIL
|
||||
::bWrite := bWrite
|
||||
ENDIF
|
||||
IF bDestroy != NIL
|
||||
::bDestroy := bDestroy
|
||||
ENDIF
|
||||
IF bGC != NIL
|
||||
::bGC := bGC
|
||||
ENDIF
|
||||
RETURN NIL
|
||||
|
||||
METHOD SessionOpen( cPath, cName ) CLASS uhttpd_Session
|
||||
//TraceLog( "SessionOpen() - cName", cName )
|
||||
IF cPath != NIL THEN ::cSavePath := cPath
|
||||
IF cName != NIL THEN ::cName := cName
|
||||
IF cPath != NIL
|
||||
::cSavePath := cPath
|
||||
ENDIF
|
||||
IF cName != NIL
|
||||
::cName := cName
|
||||
ENDIF
|
||||
|
||||
RETURN .T.
|
||||
|
||||
@@ -785,7 +803,9 @@ METHOD Encode() CLASS uhttpd_Session
|
||||
|
||||
FOR EACH cKey IN _SESSION:Keys
|
||||
xVal := _SESSION[ cKey ]
|
||||
IF xVal != NIL THEN aAdd( aSerial, { cKey, xVal } )
|
||||
IF xVal != NIL
|
||||
AAdd( aSerial, { cKey, xVal } )
|
||||
ENDIF
|
||||
NEXT
|
||||
|
||||
ENDIF
|
||||
|
||||
Reference in New Issue
Block a user