Hi Stefan,
Yes, that did it. Builds vc6/9 and answers http/s.
Thank you for your attention to this.
While you commit win3.diff, it seems mod_disk_cache was changed to
mod_cache_disk and I remember seeing mention of it. The patch attached
is some clean ups needed for it.
Cheers
Gregg
Stefan Fritsch wrote:
Hi,
On Thursday 25 November 2010, Gregg L. Smith wrote:
Much better, results seem to be the same as Guenter's;
\server\util_expr_eval.c(350) : error C2440: ':' : cannot convert
from 'int (__stdcall *)(ap_expr_lookup_parms *)' to
'ap_expr_lookup_fn (__cdecl *)'
\server\util_expr_eval.c(350) : error C2440: '=' : cannot convert
from 'ap_expr_lookup_fn (__stdcall *)' to 'ap_expr_lookup_fn
(__cdecl *)'
ok, patch number three is attached. I have commited the other changes
to trunk.
Cheers,
Stefan
Index: makefile.win
================================================================================
--- makefile.win 2010-11-04 15:58:48.000000000 -0700
+++ makefile.win 2010-11-25 23:01:31.049875000 -0800
@@ -377,8 +377,8 @@
cd ..\..\..
cd modules\cache
$(MAKE) $(MAKEOPT) -f mod_cache.mak CFG="mod_cache - Win32
$(LONG)" RECURSE=0 $(CTARGET)
+ $(MAKE) $(MAKEOPT) -f mod_cache_disk.mak CFG="mod_cache_disk - Win32
$(LONG)" RECURSE=0 $(CTARGET)
$(MAKE) $(MAKEOPT) -f mod_file_cache.mak CFG="mod_file_cache - Win32
$(LONG)" RECURSE=0 $(CTARGET)
- $(MAKE) $(MAKEOPT) -f mod_disk_cache.mak CFG="mod_disk_cache - Win32
$(LONG)" RECURSE=0 $(CTARGET)
$(MAKE) $(MAKEOPT) -f mod_socache_dbm.mak CFG="mod_socache_dbm - Win32
$(LONG)" RECURSE=0 $(CTARGET)
# $(MAKE) $(MAKEOPT) -f mod_socache_dc.mak CFG="mod_socache_dc - Win32
$(LONG)" RECURSE=0 $(CTARGET)
$(MAKE) $(MAKEOPT) -f mod_socache_memcache.mak
CFG="mod_socache_memcache - Win32 $(LONG)" RECURSE=0 $(CTARGET)
@@ -637,8 +637,8 @@
copy modules\aaa\$(LONG)\mod_authz_user.$(src_so) "$(inst_so)" <.y
copy modules\arch\win32\$(LONG)\mod_isapi.$(src_so) "$(inst_so)" <.y
copy modules\cache\$(LONG)\mod_cache.$(src_so) "$(inst_so)" <.y
+ copy modules\cache\$(LONG)\mod_cache_disk.$(src_so) "$(inst_so)" <.y
copy modules\cache\$(LONG)\mod_file_cache.$(src_so) "$(inst_so)" <.y
- copy modules\cache\$(LONG)\mod_disk_cache.$(src_so) "$(inst_so)" <.y
copy modules\cache\$(LONG)\mod_socache_dbm.$(src_so) "$(inst_so)" <.y
# copy modules\cache\$(LONG)\mod_socache_dc.$(src_so) "$(inst_so)" <.y
copy modules\cache\$(LONG)\mod_socache_memcache.$(src_so) "$(inst_so)"
<.y
Index: build/installwinconf.awk
================================================================================
--- build/installwinconf.awk 2010-11-25 23:04:46.565500000 -0800
+++ build/installwinconf.awk 2010-11-26 00:12:02.487375000 -0800
@@ -112,6 +112,7 @@
print "LoadModule authz_user_module modules/mod_authz_user.so" >
dstfl;
print "LoadModule autoindex_module modules/mod_autoindex.so" > dstfl;
print "#LoadModule cache_module modules/mod_cache.so" > dstfl;
+ print "#LoadModule cache_disk_module modules/mod_cache_disk.so" >
dstfl;
print "#LoadModule cern_meta_module modules/mod_cern_meta.so" > dstfl;
print "LoadModule cgi_module modules/mod_cgi.so" > dstfl;
print "#LoadModule charset_lite_module modules/mod_charset_lite.so" >
dstfl;
@@ -121,7 +122,6 @@
print "#LoadModule dbd_module modules/mod_dbd.so" > dstfl;
print "#LoadModule deflate_module modules/mod_deflate.so" > dstfl;
print "LoadModule dir_module modules/mod_dir.so" > dstfl;
- print "#LoadModule disk_cache_module modules/mod_disk_cache.so" >
dstfl;
print "#LoadModule dumpio_module modules/mod_dumpio.so" > dstfl;
print "LoadModule env_module modules/mod_env.so" > dstfl;
print "#LoadModule expires_module modules/mod_expires.so" > dstfl;
Index: os/win32/baseaddr.ref
================================================================================
--- os/win32/baseaddr.ref 2010-11-25 23:58:41.253000000 -0800
+++ os/win32/baseaddr.ref 2010-11-25 23:58:57.393625000 -0800
@@ -45,7 +45,7 @@
mod_setenvif.so 0x6FC00000 0x00010000
mod_userdir.so 0x6FBF0000 0x00010000
mod_cache.so 0x6FBE0000 0x00010000
-mod_disk_cache.so 0x6FBD0000 0x00010000
+mod_cache_disk.so 0x6FBD0000 0x00010000
mod_buffer.so 0x6FBC0000 0x00010000
mod_deflate.so 0x6FBA0000 0x00020000
mod_ext_filter.so 0x6FB90000 0x00010000
