diff --git a/harbour/ChangeLog b/harbour/ChangeLog
index 3aa26a3875..58bf0bf711 100644
--- a/harbour/ChangeLog
+++ b/harbour/ChangeLog
@@ -17,6 +17,22 @@
past entries belonging to author(s): Viktor Szakats.
*/
+2010-03-07 17:04 UTC+0100 Viktor Szakats (harbour.01 syenar.hu)
+ * utils/hbmk2/hbmk2.prg
+ ! Fixed to disregard HB_FS_STATIC functions when parsing .c files
+ for entry function name. No idea how this wasn't causing any error
+ reports so far.
+
+ * contrib/hbtip/hbtipssl/Makefile
+ ! Synced file list with non-ssl version.
+
+ * contrib/hbtip/cgi.prg
+ ! Fixed to use hb_dirTemp() instead of hard-wired *nix '/tmp/'.
+
+ * contrib/hbide/ideharbourhelp.prg
+ * contrib/hbide/idehome.prg
+ ! More HTML tag lowercasing.
+
2010-03-07 15:18 UTC+0100 Viktor Szakats (harbour.01 syenar.hu)
* contrib/hbmzip/hbmzip.c
+ HB_UNZIPFILEINFO() extended to also return CRC.
diff --git a/harbour/contrib/hbide/ideharbourhelp.prg b/harbour/contrib/hbide/ideharbourhelp.prg
index e0016cdca7..1590748f66 100644
--- a/harbour/contrib/hbide/ideharbourhelp.prg
+++ b/harbour/contrib/hbide/ideharbourhelp.prg
@@ -1038,7 +1038,7 @@ METHOD IdeHarbourHelp:buildView( oFunc )
aadd( aHtm, "" )
aadd( aHtm, ' ' )
- aadd( aHtm, ' ' )
+ aadd( aHtm, ' ' )
aadd( aHtm, ' ' )
aadd( aHtm, ' ' )
aadd( aHtm, ' ' )
diff --git a/harbour/contrib/hbide/idehome.prg b/harbour/contrib/hbide/idehome.prg
index 0353e7e002..2b9acb7354 100644
--- a/harbour/contrib/hbide/idehome.prg
+++ b/harbour/contrib/hbide/idehome.prg
@@ -73,7 +73,7 @@
/*----------------------------------------------------------------------*/
#define browserStat_anchorClicked 101
-#define browserWelcome_contextMenuRequested 102
+#define browserWelcome_contextMenuRequested 102
#define browserFaq_contextMenuRequested 103
#define tabWidget_currentChanged 104
@@ -82,14 +82,14 @@
STATIC FUNCTION hbide_htmlImgAnchor( cHref, cImg, nWidth, nHeight )
DEFAULT nWidth TO 12
DEFAULT nHeight TO 12
- RETURN '' + ' 
' + ''
+ RETURN '' + ' ' + ''
/*----------------------------------------------------------------------*/
STATIC FUNCTION hbide_htmlAnchor( cHref, cText, cTooltip )
- RETURN '' + cText + ''
+ RETURN '' + cText + ''
/*----------------------------------------------------------------------*/
@@ -409,12 +409,12 @@ METHOD IdeHome:buildSourcesInfo( cProjectTitle, aSrcInfo )
aadd( aHtm, ' 
' + ' ' + ' ' + ' ' )
aadd( aHtm, ' ' + cProjectTitle + '' )
aadd( aHtm, ' ' )
- aadd( aHtm, ' ' )
- aadd( aHtm, ' | Source | ' )
- aadd( aHtm, ' Type | ' )
- aadd( aHtm, ' Size | ' )
- aadd( aHtm, ' Last Modified | ' )
- aadd( aHtm, ' Location | ' )
+ aadd( aHtm, '
' )
+ aadd( aHtm, ' | Source | ' )
+ aadd( aHtm, ' Type | ' )
+ aadd( aHtm, ' Size | ' )
+ aadd( aHtm, ' Last Modified | ' )
+ aadd( aHtm, ' Location | ' )
AADD( aHtm, '
' )
//
FOR EACH aSrc IN aSrcInfo
diff --git a/harbour/contrib/hbtip/cgi.prg b/harbour/contrib/hbtip/cgi.prg
index 839618ba75..924243ffd3 100644
--- a/harbour/contrib/hbtip/cgi.prg
+++ b/harbour/contrib/hbtip/cgi.prg
@@ -219,8 +219,7 @@ METHOD Flush() CLASS TIpCgi
IF ::lDumpHtml
IF Empty( ::cDumpSavePath )
- /* TOFIX: *nix specific default. [vszakats] */
- ::cDumpSavePath := "/tmp/"
+ ::cDumpSavePath := hb_DirTemp()
ENDIF
IF ( nH := FCreate( ::cDumpSavePath + "dump.html", FC_NORMAL ) ) != F_ERROR
FWrite( nH, ::cHtmlPage )
@@ -399,8 +398,7 @@ METHOD StartSession( cSID ) CLASS TIpCgi
ENDIF
IF Empty( ::cSessionSavePath )
- /* TOFIX: *nix specific default. [vszakats] */
- ::cSessionSavePath := "/tmp/"
+ ::cSessionSavePath := hb_DirTemp()
ENDIF
IF ! Empty( cSID )
diff --git a/harbour/contrib/hbtip/hbtipssl/Makefile b/harbour/contrib/hbtip/hbtipssl/Makefile
index dfcef4d0e0..e19fe9cc5e 100644
--- a/harbour/contrib/hbtip/hbtipssl/Makefile
+++ b/harbour/contrib/hbtip/hbtipssl/Makefile
@@ -12,7 +12,8 @@ vpath %.prg ../
LIBNAME := hbtipssl
C_SOURCES := \
- encmthd.c \
+ encb64c.c \
+ encurlc.c \
utils.c \
PRG_SOURCES := \
diff --git a/harbour/utils/hbmk2/hbmk2.prg b/harbour/utils/hbmk2/hbmk2.prg
index d66555373e..2941b0c471 100644
--- a/harbour/utils/hbmk2/hbmk2.prg
+++ b/harbour/utils/hbmk2/hbmk2.prg
@@ -6914,7 +6914,7 @@ STATIC FUNCTION getFirstFunc( hbmk, cFile )
IF cExt == ".c"
FOR EACH cLine IN hb_ATokens( StrTran( hb_MemoRead( cFile ), Chr( 13 ), Chr( 10 ) ), Chr( 10 ) )
cLine := AllTrim( cLine )
- IF LEFTEQUAL( cLine, '{ "' ) .AND. "HB_FS_FIRST" $ cLine
+ IF LEFTEQUAL( cLine, '{ "' ) .AND. "HB_FS_FIRST" $ cLine .AND. !( "HB_FS_STATIC" $ cLine )
n := 4
DO WHILE ( c := SubStr( cLine, n++, 1 ) ) != '"'
cFuncName += c