You are viewing a plain text version of this content. The canonical link for it is here.
Posted to rivet-dev@tcl.apache.org by pa...@apache.org on 2005/11/08 23:52:15 UTC
svn commit: r331916 - in /tcl/rivet/trunk: ChangeLog src/TclWeb.h
src/apache_request.c src/rivetCore.c win/Rivet.nsi win/makefile.vc
Author: patthoyts
Date: Tue Nov 8 14:51:59 2005
New Revision: 331916
URL: http://svn.apache.org/viewcvs?rev=331916&view=rev
Log:
* win/makefile.vc: Update for new version.
* win/Rivet.nsi: Update for new version.
* src/apache_request.c: Cast aways some warnings.
* src/rivetCore.c: Make it work with MSVC (wierd bug).
* src/TclWeb.h: Declare TclWeb_GetRawPost (MSVC complains).
Modified:
tcl/rivet/trunk/ChangeLog
tcl/rivet/trunk/src/TclWeb.h
tcl/rivet/trunk/src/apache_request.c
tcl/rivet/trunk/src/rivetCore.c
tcl/rivet/trunk/win/Rivet.nsi
tcl/rivet/trunk/win/makefile.vc
Modified: tcl/rivet/trunk/ChangeLog
URL: http://svn.apache.org/viewcvs/tcl/rivet/trunk/ChangeLog?rev=331916&r1=331915&r2=331916&view=diff
==============================================================================
--- tcl/rivet/trunk/ChangeLog (original)
+++ tcl/rivet/trunk/ChangeLog Tue Nov 8 14:51:59 2005
@@ -1,3 +1,11 @@
+2005-11-08 Pat Thoyts <pa...@users.sourceforge.net>
+
+ * win/makefile.vc: Update for new version.
+ * win/Rivet.nsi: Update for new version.
+ * src/apache_request.c: Cast aways some warnings.
+ * src/rivetCore.c: Make it work with MSVC (wierd bug).
+ * src/TclWeb.h: Declare TclWeb_GetRawPost (MSVC complains).
+
2005-11-03 David N. Welton <da...@dedasys.com>
* src/Makefile.am (lib_libexecdir): Install everything to
Modified: tcl/rivet/trunk/src/TclWeb.h
URL: http://svn.apache.org/viewcvs/tcl/rivet/trunk/src/TclWeb.h?rev=331916&r1=331915&r2=331916&view=diff
==============================================================================
--- tcl/rivet/trunk/src/TclWeb.h (original)
+++ tcl/rivet/trunk/src/TclWeb.h Tue Nov 8 14:51:59 2005
@@ -245,6 +245,8 @@
char *TclWeb_GetVirtualFile( TclWebRequest *req, char *virtualname );
+char *TclWeb_GetRawPost( TclWebRequest *req );
+
/* output/write/flush? */
/* error (log) ? */
Modified: tcl/rivet/trunk/src/apache_request.c
URL: http://svn.apache.org/viewcvs/tcl/rivet/trunk/src/apache_request.c?rev=331916&r1=331915&r2=331916&view=diff
==============================================================================
--- tcl/rivet/trunk/src/apache_request.c (original)
+++ tcl/rivet/trunk/src/apache_request.c Tue Nov 8 14:51:59 2005
@@ -409,7 +409,8 @@
return rc;
}
if (data) {
- req->raw_post = data; /* Give people a way of getting at the raw data. */
+ /* Give people a way of getting at the raw data. */
+ req->raw_post = (char *)data;
split_to_parms(req, data);
}
}
@@ -498,7 +499,7 @@
}
do {
- int blen;
+ size_t blen;
boundary = ap_getword(r->pool, &ct, '=');
if (boundary == NULL)
return DECLINED;
Modified: tcl/rivet/trunk/src/rivetCore.c
URL: http://svn.apache.org/viewcvs/tcl/rivet/trunk/src/rivetCore.c?rev=331916&r1=331915&r2=331916&view=diff
==============================================================================
--- tcl/rivet/trunk/src/rivetCore.c (original)
+++ tcl/rivet/trunk/src/rivetCore.c Tue Nov 8 14:51:59 2005
@@ -881,11 +881,7 @@
*/
static int
-TestpanicCmd(dummy, interp, argc, argv)
- ClientData dummy; /* Not used. */
- Tcl_Interp *interp; /* Current interpreter. */
- int argc; /* Number of arguments. */
- CONST char **argv; /* Argument strings. */
+TestpanicCmd(ClientData dummy, Tcl_Interp *interp, int argc, CONST char **argv)
{
CONST char *argString;
Modified: tcl/rivet/trunk/win/Rivet.nsi
URL: http://svn.apache.org/viewcvs/tcl/rivet/trunk/win/Rivet.nsi?rev=331916&r1=331915&r2=331916&view=diff
==============================================================================
--- tcl/rivet/trunk/win/Rivet.nsi (original)
+++ tcl/rivet/trunk/win/Rivet.nsi Tue Nov 8 14:51:59 2005
@@ -29,7 +29,7 @@
!include "MUI.nsh"
Name "Rivet"
-OutFile "Rivet050.exe"
+OutFile "Rivet070.exe"
SetCompressor lzma
CRCCheck on
ShowInstDetails hide
@@ -41,11 +41,11 @@
;; -------------------------------------------------------------------------
;; Version resource
;;
-ViProductVersion "0.5.0.0"
+ViProductVersion "0.7.0.0"
VIAddVersionKey ProductName "Rivet"
VIAddVersionKey CompanyName "Apache Software Foundation"
-VIAddVersionKey FileVersion "0.5.0.1"
-VIAddVersionKey ProductVersion "0.5.0.0"
+VIAddVersionKey FileVersion "0.7.0.0"
+VIAddVersionKey ProductVersion "0.7.0.0"
VIAddVersionKey LegalCopyright "Copyright (c) 2004 The Apache Software Foundation"
VIAddVersionKey FileDescription "Apache Rivet Installer"
@@ -142,15 +142,15 @@
DetailPrint "Adjusting INSTDIR to point at the library folder."
TclFalse:
- SetOutPath "$INSTDIR\rivet0.5.0"
+ SetOutPath "$INSTDIR\rivet0.7.0"
File /r "..\rivet\rivet-tcl"
File /r "..\rivet\packages"
File "..\rivet\init.tcl"
File "..\rivet\pkgIndex.tcl"
File "..\rivet\README"
- RMDir /r "$INSTDIR\rivet0.5.0\packages\CVS"
- RMDir /r "$INSTDIR\rivet0.5.0\rivet-tcl\CVS"
- SetOutPath "$INSTDIR\rivet0.5.0\packages\rivet"
+ RMDir /r "$INSTDIR\rivet0.7.0\packages\CVS"
+ RMDir /r "$INSTDIR\rivet0.7.0\rivet-tcl\CVS"
+ SetOutPath "$INSTDIR\rivet0.7.0\packages\rivet"
File "Release\rivet.dll"
File "Release\rivetparser.dll"
FileOpen $R6 "pkgIndex.tcl" "w"
@@ -159,11 +159,11 @@
FileClose $R6
SetOutPath "$APACHE_DIR\modules"
File "Release\mod_rivet.so"
- WriteUninstaller "$INSTDIR\rivet0.5.0\Uninstall.exe"
+ WriteUninstaller "$INSTDIR\rivet0.7.0\Uninstall.exe"
SectionEnd
Section "Documentation" SecDocs
- SetOutPath "$INSTDIR\rivet0.5.0"
+ SetOutPath "$INSTDIR\rivet0.7.0"
File "..\doc\Rivet.chm"
SectionEnd
@@ -177,8 +177,8 @@
FileWrite $R6 " RivetServerConf CacheSize 50$\r$\n"
FileWrite $R6 " AddType application/x-httpd-rivet .rvt$\r$\n"
FileWrite $R6 " AddType application/x-rivet-tcl .tcl$\r$\n$\r$\n"
- FileWrite $R6 " Alias /rivet/ $\"$INSTDIR/rivet0.5.0/tests/$\"$\r$\n"
- FileWrite $R6 " <Directory $\"$INSTDIR/rivet0.5.0/tests/$\">$\r$\n"
+ FileWrite $R6 " Alias /rivet/ $\"$INSTDIR/rivet0.7.0/tests/$\"$\r$\n"
+ FileWrite $R6 " <Directory $\"$INSTDIR/rivet0.7.0/tests/$\">$\r$\n"
FileWrite $R6 " Options Indexes FollowSymlinks MultiViews$\r$\n"
FileWrite $R6 " AllowOverride None$\r$\n"
FileWrite $R6 " Order allow,deny$\r$\n"
@@ -195,7 +195,7 @@
SectionEnd
Section /o "Test files" SecTests
- SetOutPath "$INSTDIR\rivet0.5.0\tests"
+ SetOutPath "$INSTDIR\rivet0.7.0\tests"
File "..\tests\*.*"
SectionEnd
Modified: tcl/rivet/trunk/win/makefile.vc
URL: http://svn.apache.org/viewcvs/tcl/rivet/trunk/win/makefile.vc?rev=331916&r1=331915&r2=331916&view=diff
==============================================================================
--- tcl/rivet/trunk/win/makefile.vc (original)
+++ tcl/rivet/trunk/win/makefile.vc Tue Nov 8 14:51:59 2005
@@ -156,7 +156,7 @@
PROJECT = rivet
!include "rules.vc"
-DOTVERSION = 0.5.0
+DOTVERSION = 0.7.0
VERSION = $(DOTVERSION:.=)
STUBPREFIX = $(PROJECT)stub
@@ -283,7 +283,7 @@
INCLUDES = $(TCL_INCLUDES) -I"$(WINDIR)" -I"$(GENERICDIR)" \
-FI$(TMP_DIR)\config-win.h
BASE_CLFAGS = $(cflags) $(cdebug) $(crt) $(INCLUDES) -I"$(APACHE_INCLUDE_DIR)" \
- -DWIN32 -D_WIN32 -D_WINDOWS -DNAMEOFEXECUTABLE="\"$(TCLSH:\=/)\""
+ -DWIN32 -D_WIN32 -D_WINDOWS -DNAMEOFEXECUTABLE="\"$(TCLSH:\=/)\"" -DTCL_THREADS
CON_CFLAGS = $(cflags) $(cdebug) $(crt) -DCONSOLE
TCL_CFLAGS = -DVERSION="\"$(DOTVERSION)\"" $(BASE_CLFAGS) $(OPTDEFINES)
---------------------------------------------------------------------
To unsubscribe, e-mail: rivet-cvs-unsubscribe@tcl.apache.org
For additional commands, e-mail: rivet-cvs-help@tcl.apache.org