wrowe | 1 Dec 03:23 2009
Picon

svn commit: r885654 - in /httpd/httpd/trunk: Apache.dsw Makefile.win

Author: wrowe
Date: Tue Dec  1 02:22:54 2009
New Revision: 885654

URL: http://svn.apache.org/viewvc?rev=885654&view=rev
Log:
Add mod_proxy_scgi; PR 48303; Submitted by: Gregg L. Smith <lists glewis.com>

Modified:
    httpd/httpd/trunk/Apache.dsw
    httpd/httpd/trunk/Makefile.win

Modified: httpd/httpd/trunk/Apache.dsw
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/Apache.dsw?rev=885654&r1=885653&r2=885654&view=diff
==============================================================================
--- httpd/httpd/trunk/Apache.dsw (original)
+++ httpd/httpd/trunk/Apache.dsw Tue Dec  1 02:22:54 2009
 <at>  <at>  -279,6 +279,9  <at>  <at> 
     Project_Dep_Name mod_proxy_http
     End Project Dependency
     Begin Project Dependency
+    Project_Dep_Name mod_proxy_scgi
+    End Project Dependency
+    Begin Project Dependency
     Project_Dep_Name mod_ratelimit
     End Project Dependency
     Begin Project Dependency
 <at>  <at>  -2537,6 +2540,31  <at>  <at> 

 ###############################################################################
(Continue reading)

wrowe | 1 Dec 03:24 2009
Picon

svn commit: r885655 - in /httpd/httpd/trunk: modules/proxy/mod_proxy_scgi.dsp os/win32/BaseAddr.ref

Author: wrowe
Date: Tue Dec  1 02:24:31 2009
New Revision: 885655

URL: http://svn.apache.org/viewvc?rev=885655&view=rev
Log:
Add mod_proxy_scgi; PR 48303; Submitted by: Gregg L. Smith <lists glewis.com>

Added:
    httpd/httpd/trunk/modules/proxy/mod_proxy_scgi.dsp   (with props)
Modified:
    httpd/httpd/trunk/os/win32/BaseAddr.ref

Added: httpd/httpd/trunk/modules/proxy/mod_proxy_scgi.dsp
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/proxy/mod_proxy_scgi.dsp?rev=885655&view=auto
==============================================================================
--- httpd/httpd/trunk/modules/proxy/mod_proxy_scgi.dsp (added)
+++ httpd/httpd/trunk/modules/proxy/mod_proxy_scgi.dsp Tue Dec  1 02:24:31 2009
 <at>  <at>  -0,0 +1,123  <at>  <at> 
+# Microsoft Developer Studio Project File - Name="mod_proxy_scgi" - Package Owner=<4>
+# Microsoft Developer Studio Generated Build File, Format Version 6.00
+# ** DO NOT EDIT **
+
+# TARGTYPE "Win32 (x86) Dynamic-Link Library" 0x0102
+
+CFG=mod_proxy_scgi - Win32 Release
+!MESSAGE This is not a valid makefile. To build this project using NMAKE,
+!MESSAGE use the Export Makefile command and run
+!MESSAGE 
+!MESSAGE NMAKE /f "mod_proxy_scgi.mak".
(Continue reading)

wrowe | 1 Dec 09:44 2009
Picon

svn commit: r885689 - in /httpd/httpd/trunk: modules/aaa/mod_auth_digest.c modules/cache/mod_disk_cache.c modules/cluster/mod_heartmonitor.c modules/proxy/balancers/mod_lbmethod_heartbeat.c modules/proxy/mod_proxy_scgi.c server/util_script.c

Author: wrowe
Date: Tue Dec  1 08:44:11 2009
New Revision: 885689

URL: http://svn.apache.org/viewvc?rev=885689&view=rev
Log:
Elaborate on low hanging XXX fruit

Modified:
    httpd/httpd/trunk/modules/aaa/mod_auth_digest.c
    httpd/httpd/trunk/modules/cache/mod_disk_cache.c
    httpd/httpd/trunk/modules/cluster/mod_heartmonitor.c
    httpd/httpd/trunk/modules/proxy/balancers/mod_lbmethod_heartbeat.c
    httpd/httpd/trunk/modules/proxy/mod_proxy_scgi.c
    httpd/httpd/trunk/server/util_script.c

Modified: httpd/httpd/trunk/modules/aaa/mod_auth_digest.c
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/aaa/mod_auth_digest.c?rev=885689&r1=885688&r2=885689&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/aaa/mod_auth_digest.c (original)
+++ httpd/httpd/trunk/modules/aaa/mod_auth_digest.c Tue Dec  1 08:44:11 2009
 <at>  <at>  -188,8 +188,8  <at>  <at> 
 #define DEF_NUM_BUCKETS 15L
 #define HASH_DEPTH      5

-static long shmem_size  = DEF_SHMEM_SIZE;
-static long num_buckets = DEF_NUM_BUCKETS;
+static apr_size_t shmem_size  = DEF_SHMEM_SIZE;
+static unsigned long num_buckets = DEF_NUM_BUCKETS;

(Continue reading)

wrowe | 1 Dec 09:59 2009
Picon

svn commit: r885694 - /httpd/httpd/trunk/modules/cache/mod_disk_cache.c

Author: wrowe
Date: Tue Dec  1 08:59:41 2009
New Revision: 885694

URL: http://svn.apache.org/viewvc?rev=885694&view=rev
Log:
Revert nonsense I introduced in r885689; solve cl test correctly

Modified:
    httpd/httpd/trunk/modules/cache/mod_disk_cache.c

Modified: httpd/httpd/trunk/modules/cache/mod_disk_cache.c
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/cache/mod_disk_cache.c?rev=885694&r1=885693&r2=885694&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/cache/mod_disk_cache.c (original)
+++ httpd/httpd/trunk/modules/cache/mod_disk_cache.c Tue Dec  1 08:59:41 2009
 <at>  <at>  -1082,8 +1082,8  <at>  <at> 
             file_cache_errorcleanup(dobj, r);
             return APR_EGENERAL;
         }
-        if (cl_header > 0) {
-            apr_size_t cl = (apr_size_t) apr_atoi64(cl_header);
+        if (cl_header) {
+            apr_off_t cl = (apr_off_t) apr_atoi64(cl_header);
             if ((errno == 0) && (dobj->file_size != cl)) {
                 ap_log_error(APLOG_MARK, APLOG_DEBUG, 0, r->server,
                              "disk_cache: URL %s didn't receive complete response, not caching",

fuankg | 1 Dec 15:24 2009
Picon

svn commit: r885766 - in /httpd/httpd/trunk/modules/proxy: NWGNUmakefile NWGNUproxy

Author: fuankg
Date: Tue Dec  1 14:24:27 2009
New Revision: 885766

URL: http://svn.apache.org/viewvc?rev=885766&view=rev
Log:
fixed NetWare proxy export list;
only build mod_serf if we have zlib.

Modified:
    httpd/httpd/trunk/modules/proxy/NWGNUmakefile
    httpd/httpd/trunk/modules/proxy/NWGNUproxy

Modified: httpd/httpd/trunk/modules/proxy/NWGNUmakefile
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/proxy/NWGNUmakefile?rev=885766&r1=885765&r2=885766&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/proxy/NWGNUmakefile (original)
+++ httpd/httpd/trunk/modules/proxy/NWGNUmakefile Tue Dec  1 14:24:27 2009
 <at>  <at>  -165,11 +165,13  <at>  <at> 
 # If WITH_MOD_SERF and SERFSRC have been defined then build the mod_serf module
 ifdef WITH_MOD_SERF
 ifneq "$(SERFSRC)" ""
+ifneq "$(ZLIBSDK)" ""
 TARGET_nlm += \
 	$(OBJDIR)/serf.nlm \
 	$(EOLIST)
 endif
 endif
+endif

(Continue reading)

fuankg | 1 Dec 15:42 2009
Picon

svn commit: r885774 - in /httpd/httpd/trunk/support: NWGNUab NWGNUmakefile

Author: fuankg
Date: Tue Dec  1 14:42:26 2009
New Revision: 885774

URL: http://svn.apache.org/viewvc?rev=885774&view=rev
Log:
more NetWare makefile fixes and cleanups.

Modified:
    httpd/httpd/trunk/support/NWGNUab
    httpd/httpd/trunk/support/NWGNUmakefile

Modified: httpd/httpd/trunk/support/NWGNUab
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/support/NWGNUab?rev=885774&r1=885773&r2=885774&view=diff
==============================================================================
--- httpd/httpd/trunk/support/NWGNUab (original)
+++ httpd/httpd/trunk/support/NWGNUab Tue Dec  1 14:42:26 2009
 <at>  <at>  -1,14 +1,10  <at>  <at> 
 #
-# Make sure all needed macro's are defined
-#
-
-#
 # Get the 'head' of the build environment if necessary.  This includes default
 # targets and paths to tools
 #

 ifndef EnvironmentDefined
-include $(AP_WORK)\build\NWGNUhead.inc
+include $(AP_WORK)/build/NWGNUhead.inc
(Continue reading)

fuankg | 1 Dec 15:49 2009
Picon

svn commit: r885775 - /httpd/httpd/trunk/NWGNUmakefile

Author: fuankg
Date: Tue Dec  1 14:49:58 2009
New Revision: 885775

URL: http://svn.apache.org/viewvc?rev=885775&view=rev
Log:
fixed pcre NetWare makefile var.

Modified:
    httpd/httpd/trunk/NWGNUmakefile

Modified: httpd/httpd/trunk/NWGNUmakefile
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/NWGNUmakefile?rev=885775&r1=885774&r2=885775&view=diff
==============================================================================
--- httpd/httpd/trunk/NWGNUmakefile (original)
+++ httpd/httpd/trunk/NWGNUmakefile Tue Dec  1 14:49:58 2009
 <at>  <at>  -73,7 +73,7  <at>  <at> 
 			$(AP_WORK)/modules/ssl/ \
 			$(AP_WORK)/os/NetWare \
 			$(AP_WORK)/server/mpm/NetWare \
-			$(PCRESDK) \
+			$(PCRE) \
 			$(NWOS) \
 			$(EOLIST)

 <at>  <at>  -406,10 +406,10  <at>  <at> 

 prebuild :: FORCE
 	$(MAKE) -C server -f NWGNUMakefile
-	$(MAKE) -C $(PCRESDK) -f NWGNUMakefile
(Continue reading)

fuankg | 1 Dec 15:51 2009
Picon

svn commit: r885777 - /httpd/httpd/trunk/os/netware/modules.c

Author: fuankg
Date: Tue Dec  1 14:51:47 2009
New Revision: 885777

URL: http://svn.apache.org/viewvc?rev=885777&view=rev
Log:
added watchdog module to NetWare internal module list.

Modified:
    httpd/httpd/trunk/os/netware/modules.c

Modified: httpd/httpd/trunk/os/netware/modules.c
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/os/netware/modules.c?rev=885777&r1=885776&r2=885777&view=diff
==============================================================================
--- httpd/httpd/trunk/os/netware/modules.c (original)
+++ httpd/httpd/trunk/os/netware/modules.c Tue Dec  1 14:51:47 2009
 <at>  <at>  -38,6 +38,7  <at>  <at> 
 extern module env_module;
 extern module log_config_module;
 extern module setenvif_module;
+extern module watchdog_module;
 #ifdef USE_WINSOCK
 extern module nwssl_module;
 #endif
 <at>  <at>  -59,6 +60,7  <at>  <at> 
   &env_module,
   &log_config_module,
   &setenvif_module,
+  &watchdog_module,
 #ifdef USE_WINSOCK
(Continue reading)

fuankg | 1 Dec 16:00 2009
Picon

svn commit: r885781 - in /httpd/httpd/trunk: ./ build/ modules/cache/ modules/dav/fs/ modules/dav/lock/ modules/dav/main/

Author: fuankg
Date: Tue Dec  1 15:00:11 2009
New Revision: 885781

URL: http://svn.apache.org/viewvc?rev=885781&view=rev
Log:
more NetWare makefile cleanups.

Modified:
    httpd/httpd/trunk/NWGNUmakefile
    httpd/httpd/trunk/build/NWGNUenvironment.inc
    httpd/httpd/trunk/modules/cache/NWGNUdsk_cach
    httpd/httpd/trunk/modules/cache/NWGNUmod_cach
    httpd/httpd/trunk/modules/cache/NWGNUsocachdbm
    httpd/httpd/trunk/modules/cache/NWGNUsocachshmcb
    httpd/httpd/trunk/modules/dav/fs/NWGNUmakefile
    httpd/httpd/trunk/modules/dav/lock/NWGNUmakefile
    httpd/httpd/trunk/modules/dav/main/NWGNUmakefile

Modified: httpd/httpd/trunk/NWGNUmakefile
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/NWGNUmakefile?rev=885781&r1=885780&r2=885781&view=diff
==============================================================================
--- httpd/httpd/trunk/NWGNUmakefile (original)
+++ httpd/httpd/trunk/NWGNUmakefile Tue Dec  1 15:00:11 2009
 <at>  <at>  -71,8 +71,7  <at>  <at> 
 			$(AP_WORK)/modules/mappers/ \
 			$(AP_WORK)/modules/proxy/ \
 			$(AP_WORK)/modules/ssl/ \
-			$(AP_WORK)/os/NetWare \
-			$(AP_WORK)/server/mpm/NetWare \
(Continue reading)

trawick | 1 Dec 16:08 2009
Picon

svn commit: r885784 - /httpd/httpd/trunk/include/util_mutex.h

Author: trawick
Date: Tue Dec  1 15:08:30 2009
New Revision: 885784

URL: http://svn.apache.org/viewvc?rev=885784&view=rev
Log:
include definition of cmd_parms

Modified:
    httpd/httpd/trunk/include/util_mutex.h

Modified: httpd/httpd/trunk/include/util_mutex.h
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/include/util_mutex.h?rev=885784&r1=885783&r2=885784&view=diff
==============================================================================
--- httpd/httpd/trunk/include/util_mutex.h (original)
+++ httpd/httpd/trunk/include/util_mutex.h Tue Dec  1 15:08:30 2009
 <at>  <at>  -27,6 +27,7  <at>  <at> 
 #define UTIL_MUTEX_H

 #include "httpd.h"
+#include "http_config.h"
 #include "apr_global_mutex.h"

 #if APR_HAS_FLOCK_SERIALIZE


Gmane