Author: mturk
Date: Tue Jan 19 10:41:04 2010
New Revision: 900719
URL: http://svn.apache.org/viewvc?rev=900719&view=rev
Log:
Add --enable-suexec to the configure
Modified:
commons/sandbox/runtime/trunk/src/main/native/Makefile.msc.in
commons/sandbox/runtime/trunk/src/main/native/configure
commons/sandbox/runtime/trunk/src/main/native/include/arch/windows/acr_arch_private.h
Modified: commons/sandbox/runtime/trunk/src/main/native/Makefile.msc.in
URL:
http://svn.apache.org/viewvc/commons/sandbox/runtime/trunk/src/main/native/Makefile.msc.in?rev=900719&r1=900718&r2=900719&view=diff
==============================================================================
--- commons/sandbox/runtime/trunk/src/main/native/Makefile.msc.in (original)
+++ commons/sandbox/runtime/trunk/src/main/native/Makefile.msc.in Tue Jan 19
10:41:04 2010
@@ -309,14 +309,10 @@
test: $(TESTSUITE)
-tools: $(WINSUEXEC)
-
clean:
-...@del /Q $(SRCDIR)\port\*.$(OBJ) 2>NUL
-...@del /Q $(SRCDIR)\shared\*.$(OBJ) 2>NUL
- -...@del /Q $(SRCDIR)\test\*.$(OBJ) 2>NUL
-...@del /Q $(SRCDIR)\os\win32\*.$(OBJ) 2>NUL
- -...@del /Q $(SRCDIR)\os\win32\*.res 2>NUL
-...@del /Q $(SRCDIR)\modules\network\ssl\*.$(OBJ) 2>NUL
-...@del /Q $(SRCDIR)\modules\util\sqlite\*.$(OBJ) 2>NUL
-...@del /Q $(SRCDIR)\srclib\bzip2\*.$(OBJ) 2>NUL
@@ -324,6 +320,7 @@
-...@del /Q $(SRCDIR)\srclib\regex\*.$(OBJ) 2>NUL
-...@del /Q $(SRCDIR)\srclib\zlib\*.$(OBJ) 2>NUL
-...@del /Q $(SRCDIR)\support\win32\*.$(OBJ) 2>NUL
+ -...@del /Q $(SRCDIR)\test\*.$(OBJ) 2>NUL
-...@del /Q *.dll 2>NUL
-...@del /Q *.lib 2>NUL
-...@del /Q *.pdb 2>NUL
Modified: commons/sandbox/runtime/trunk/src/main/native/configure
URL:
http://svn.apache.org/viewvc/commons/sandbox/runtime/trunk/src/main/native/configure?rev=900719&r1=900718&r2=900719&view=diff
==============================================================================
--- commons/sandbox/runtime/trunk/src/main/native/configure (original)
+++ commons/sandbox/runtime/trunk/src/main/native/configure Tue Jan 19 10:41:04
2010
@@ -102,6 +102,7 @@
has_cygwin=no
has_embedded_sqlite=no
+has_suexec=no
has_sqlite=no
have_sqlite3=0
has_openssl=no
@@ -219,6 +220,25 @@
has_sqlite=yes
shift
;;
+ --with-suexec-*=* )
+ p=`echo "$o" | sed -e 's/--with-suexec-//' -e 's/-/_/'`
+ a=""
+ v=""
+ case "$p" in
+ *=* )
+ a=`echo "$p" | sed 's/=.*//'`
+ v=`echo "$p" | sed 's/.*=//'`
+ ;;
+ * )
+ cat 1>&2 << EOH
+Invalid --with-suexec-$p option
+EOH
+ exit 1
+ ;;
+ esac
+ eval with_suexec_$a=$v
+ eval with_suexec_$a_set=yes
+ ;;
CC=*) cc="$a" ; shift ;;
CXX=*) cxx="$a" ; shift ;;
CPP=*) cpp="$a" ; shift ;;
@@ -1117,6 +1137,10 @@
sqliteobjs=""
fi
+if [ ".$has_sqlite" = .yes ]; then
+ varadds modules '??(WINSUEXEC)'
+fi
+
if [ ".$cc" = .gcc ]; then
if [ ${cc_ver_major}${cc_ver_minor}0 -gt 400 ]; then
varadds cppopts -DUSE_ATOMICS_BUILTINS
Modified:
commons/sandbox/runtime/trunk/src/main/native/include/arch/windows/acr_arch_private.h
URL:
http://svn.apache.org/viewvc/commons/sandbox/runtime/trunk/src/main/native/include/arch/windows/acr_arch_private.h?rev=900719&r1=900718&r2=900719&view=diff
==============================================================================
---
commons/sandbox/runtime/trunk/src/main/native/include/arch/windows/acr_arch_private.h
(original)
+++
commons/sandbox/runtime/trunk/src/main/native/include/arch/windows/acr_arch_private.h
Tue Jan 19 10:41:04 2010
@@ -123,21 +123,21 @@
OVERLAPPED o;
DWORD stat;
DWORD size;
- char buff[ACR_SBUFF_SIZ];
+ char buff[512];
} OVERLAPPED_SBUFF;
typedef struct OVERLAPPED_HBUFF {
OVERLAPPED o;
DWORD stat;
DWORD size;
- char buff[ACR_HBUFF_SIZ];
+ char buff[512];
} OVERLAPPED_HBUFF;
typedef struct OVERLAPPED_VBUFF {
OVERLAPPED o;
DWORD stat;
DWORD size;
- char buff[];
+ char buff[1];
} OVERLAPPED_VBUFF;
/**
