2004-07-28 Gonzalo Paniagua Javier <gonzalo@ximian.com>

* configure.in: s/apr-0/apr/ * INSTALL: * man/mod_mono.8.in: documented MonoMaxMemory and MonoMaxCPUTime and other minor updates. svn path=/trunk/mod_mono/; revision=31589
nephaste · Jul 28, 2004 · b87cc53 · b87cc53
1 parent dfb5abd
commit b87cc53
Show file tree

Hide file tree

Showing 4 changed files with 74 additions and 5 deletions.
diff --git a/ChangeLog b/ChangeLog
@@ -1,3 +1,11 @@
+2004-07-28 Gonzalo Paniagua Javier <gonzalo@ximian.com>
+
+	* configure.in: s/apr-0/apr/
+
+	* INSTALL:
+	* man/mod_mono.8.in: documented MonoMaxMemory and MonoMaxCPUTime and
+	other minor updates.
+
 2004-07-14 Gonzalo Paniagua Javier <gonzalo@ximian.com>
 
 	* src/mod_mono.c: set filename and listen_address defaults in the

diff --git a/INSTALL b/INSTALL
@@ -1,4 +1,4 @@
-Last updated: Jun 12, 2004
+Last updated: Jun 28, 2004
 
 Index
 -------
@@ -159,6 +159,20 @@ APPENDIX A: Typical configuration without virtual hosts
               SetHandler mono
       </Location>
 
+  If you prefer to .webapp configuration  file(s)  (see  manual  page
+  of xsp), you can change MonoApplications in the above samples by:
+
+      MonoApplicationsConfigFile "/var/www/applications.webapp"
+
+  replacing the path to the file with yours.
+
+  If you want to use several .webapp files, use this instead:
+
+      MonoApplicationsConfigDir "/var/www/webapp"
+
+  and  all  the .webapp files found in the directory /var/www/webapp
+  will be loaded.
+
   If you don't want mod-mono-server to handle all the files, but only
   ASP.NET ones, you can replace the 'SetHandler mono' by:
 
@@ -217,6 +231,24 @@ APPENDIX B: Configuration directives for mod_mono
     tells mod-mono-server to change the directory to the value specified
     before doing anything else.
 
+  MonoMaxCPUTime
+
+    If MonoRunXSP is True, CPU time limit in seconds allowed for the
+    spawned mono process. Beyond that, it will be restarted. If this
+    capability is not available on your system, the directive will be
+    ignored.
+    Default value: system default
+
+  MonoMaxMemory
+
+    If MonoRunXSP is True, the maximum size of the process's virtual
+    memory (address space) in bytes allowed for the spawned mono process.
+    It will be restarted when the limit is reached. If this capability
+    is not available on your system, the directive will be ignored.
+    Default value: system default
+    Note: under MacOS, this directive limits the resident segment size
+    (RSS) instead of the address space.
+
   MonoApplications (used only when MonoRunXSP is True)
 
     This value will be passed to mod-mono-server.exe in the

diff --git a/configure.in b/configure.in
@@ -273,7 +273,7 @@ AC_C_BIGENDIAN
 AC_CHECK_FUNCS([setenv putenv setrlimit])
 
 found_apr_socket_connect=no
-AC_CHECK_LIB(apr-0, apr_socket_connect, found_apr_socket_connect=yes)
+AC_CHECK_LIB(apr, apr_socket_connect, found_apr_socket_connect=yes)
 if test x$found_apr_socket_connect = xyes ; then
 	AC_DEFINE([HAVE_APR_SOCKET_CONNECT],,[apr_socket_connect is present])
 fi

diff --git a/man/mod_mono.8.in b/man/mod_mono.8.in
@@ -9,7 +9,7 @@
 .if n .sp
 ..
 
-.TH mod_mono "8" "10 Jul 2004" "mod_mono @VERSION@" "ASP.NET Support for Apache"
+.TH mod_mono "8" "28 Jul 2004" "mod_mono @VERSION@" "ASP.NET Support for Apache"
 .SH NAME
 mod_mono \- apache module that enables ASP.NET pages. Works together with mod-mono-server.exe
 .SH DESCRIPTION
@@ -65,6 +65,22 @@ Default value: "/tmp"
 .I "MonoDocumentRootDir (used only when MonoRunXSP is True)"
 The directory passed in --root argument when launching mod-mono-server.
 .TP
+.I "MonoMaxCPUTime"
+If MonoRunXSP is True, CPU time limit in seconds allowed for the
+spawned mono process. Beyond that, it will be restarted. If this
+capability is not available on your system, the directive will be
+ignored.
+Default value: system default
+.TP
+.I "MonoMaxMemory"
+If MonoRunXSP is True, the maximum size of the process's virtual
+memory (address space) in bytes allowed for the spawned mono process.
+It will be restarted when the limit is reached. If this capability
+is not available on your system, the directive will be ignored.
+Default value: system default
+Note: under MacOS, this directive limits the resident segment size
+(RSS) instead of the address space.
+.TP
 .I "MonoApplications (used only when MonoRunXSP is True)"
 This value will be passed to mod-mono-server.exe in the
 --applications option. See xsp(1) manual page for details.
@@ -98,6 +114,7 @@ prefix=/usr:
 For Apache 2.0, with mod-mono-server.exe from package xsp installed in
 prefix=/usr:
 .nf
+
       LoadModule mono_module modules/libmod_mono.so
       Alias /mono "/usr/share/doc/xsp/test"
       MonoApplications "/mono:/usr/share/doc/xsp/test"
@@ -106,6 +123,18 @@ prefix=/usr:
       </Directory>
 .fi
 .PP
+or the preferred:
+.nf
+
+      LoadModule mono_module modules/libmod_mono.so
+      Alias /demo "/usr/share/doc/xsp/test"
+      MonoApplications "/demo:/usr/share/doc/xsp/test"
+      <Location /demo>
+              SetHandler mono
+      </Location>
+
+.fi
+.PP
 If you prefer to .webapp configuration file(s)
 (see manual page of xsp), you can change MonoApplications in the above
 samples by:
@@ -135,9 +164,9 @@ httpd.conf
 mod_mono was written by Daniel Ridruejo (daniel rawbyte com) and Gonzalo
 Paniagua Javier (gonzalo@ximian.com).
 .SH MAILING LISTS
-Visit http://mail.ximian.com/mailman/mono-list for details.
+See http://mail.ximian.com/mailman/mono-list for details.
 .SH WEB SITE
-Visit: http://www.go-mono.com for details
+Visit http://www.go-mono.com for details.
 .SH SEE ALSO
 .BR xsp (1), mod-mono-server (1), mono (1), mcs (1)