JBoss Native SVN: r3239 - in trunk/httpd/httpd-2.4/modules: cache and 1 other directories.
by jbossnative-commits＠lists.jboss.org
Author: jfrederic.clere(a)jboss.com
Date: 2014-01-30 07:58:07 -0500 (Thu, 30 Jan 2014)
New Revision: 3239
Added:
trunk/httpd/httpd-2.4/modules/cache/NMAKEsocachememcache
Removed:
trunk/httpd/httpd-2.4/modules/aaa/NMAKEauthzdefault
trunk/httpd/httpd-2.4/modules/cache/NMAKEmemcache
Modified:
trunk/httpd/httpd-2.4/modules/aaa/NMAKEmakefile
trunk/httpd/httpd-2.4/modules/cache/NMAKEmakefile
trunk/httpd/httpd-2.4/modules/ssl/NMAKEssl
Log:
Ajust more stuff.
Deleted: trunk/httpd/httpd-2.4/modules/aaa/NMAKEauthzdefault
===================================================================
--- trunk/httpd/httpd-2.4/modules/aaa/NMAKEauthzdefault 2014-01-30 10:42:48 UTC (rev 3238)
+++ trunk/httpd/httpd-2.4/modules/aaa/NMAKEauthzdefault 2014-01-30 12:58:07 UTC (rev 3239)
@@ -1,63 +0,0 @@
-# Copyright 2001-2007 The Apache Software Foundation or its licensors, as
-# applicable.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-# ====================================================================
-#
-# NMAKEmakefile authz_default module makefile.
-#
-# Originally contributed by Mladen Turk <mturk redhat.com>
-#
-# ====================================================================
-#
-
-TARGET=DLL
-PROJECT = mod_authz_default
-
-!IF !DEFINED(SRCDIR) || "$(SRCDIR)" == ""
-SRCDIR = .
-!ENDIF
-
-!include <..\..\NMAKEcommon.inc>
-!include <..\..\NMAKEhttpd.inc>
-
-LDIRS = /libpath:"$(BUILDLIB)"
-LFLAGS = $(LFLAGS) user32.lib psapi.lib gdi32.lib shlwapi.lib wldap32.lib ole32.lib $(LIBAPR) $(LIBAPU) $(LIBHTTPD)
-CFLAGS = $(CFLAGS) -DAAA_DECLARE_EXPORT
-
-INCLUDES = -I$(SRCDIR) -I$(BUILDINC) -I..\database
-PDBFLAGS = -Fo$(WORKDIR)\ -Fd$(WORKDIR)\$(PROJECT)-src
-
-BUILDBIN = $(WORKDIR)\$(PROJECT).so
-BUILDPDB = $(WORKDIR)\$(PROJECT).pdb
-BUILDRES = $(WORKDIR)\$(PROJECT).res
-BUILDMFT = $(BUILDBIN).manifest
-
-RCFLAGS = $(RCFLAGS) /d BIN_NAME="$(PROJECT).so" /d LONG_NAME="authz_default_module for Apache"
-
-OBJECTS = \
- $(WORKDIR)\mod_authz_default.obj
-
-{$(SRCDIR)}.c{$(WORKDIR)}.obj:
- $(CC) $(CFLAGS) $(INCLUDES) $(PDBFLAGS) $<
-
-$(BUILDRES): ..\..\build\win32\httpd.rc
- $(RC) $(RCFLAGS) /i "$(BUILDINC)" /fo $(BUILDRES) ..\..\build\win32\httpd.rc
-
-$(BUILDBIN): $(OBJECTS) $(BUILDRES)
- $(LINK) $(LFLAGS) $(OBJECTS) $(BUILDRES) $(LIBS) $(LDIRS) /pdb:$(BUILDPDB) /out:$(BUILDBIN)
- IF EXIST $(BUILDMFT) \
- mt -nologo -manifest $(BUILDMFT) -outputresource:$(BUILDBIN);2
-
-install: $(BUILDBIN)
Modified: trunk/httpd/httpd-2.4/modules/aaa/NMAKEmakefile
===================================================================
--- trunk/httpd/httpd-2.4/modules/aaa/NMAKEmakefile 2014-01-30 10:42:48 UTC (rev 3238)
+++ trunk/httpd/httpd-2.4/modules/aaa/NMAKEmakefile 2014-01-30 12:58:07 UTC (rev 3239)
@@ -39,7 +39,6 @@
$(SRCDIR)\NMAKEauthnfile\~ \
$(SRCDIR)\NMAKEauthnzldap\~ \
$(SRCDIR)\NMAKEauthzdbm\~ \
- $(SRCDIR)\NMAKEauthzdefault\~ \
$(SRCDIR)\NMAKEauthzgroupfile\~ \
$(SRCDIR)\NMAKEauthzhost\~ \
$(SRCDIR)\NMAKEauthzuser\~
Modified: trunk/httpd/httpd-2.4/modules/cache/NMAKEmakefile
===================================================================
--- trunk/httpd/httpd-2.4/modules/cache/NMAKEmakefile 2014-01-30 10:42:48 UTC (rev 3238)
+++ trunk/httpd/httpd-2.4/modules/cache/NMAKEmakefile 2014-01-30 12:58:07 UTC (rev 3239)
@@ -34,7 +34,7 @@
$(SRCDIR)\NMAKEcache\~ \
$(SRCDIR)\NMAKEcachedisk\~ \
$(SRCDIR)\NMAKEfilecache\~ \
- $(SRCDIR)\NMAKEmemcache\~ \
+ $(SRCDIR)\NMAKEsocachememcache\~ \
$(SRCDIR)\NMAKEcachesocache\~ \
$(SRCDIR)\NMAKEsocachedbm\~ \
$(SRCDIR)\NMAKEsocache_dc\~
Deleted: trunk/httpd/httpd-2.4/modules/cache/NMAKEmemcache
===================================================================
--- trunk/httpd/httpd-2.4/modules/cache/NMAKEmemcache 2014-01-30 10:42:48 UTC (rev 3238)
+++ trunk/httpd/httpd-2.4/modules/cache/NMAKEmemcache 2014-01-30 12:58:07 UTC (rev 3239)
@@ -1,65 +0,0 @@
-# Copyright 2001-2007 The Apache Software Foundation or its licensors, as
-# applicable.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-# ====================================================================
-#
-# NMAKEmakefile mem_cache module makefile.
-#
-# Originally contributed by Mladen Turk <mturk redhat.com>
-#
-# ====================================================================
-#
-
-TARGET=DLL
-PROJECT = mod_mem_cache
-
-!IF !DEFINED(SRCDIR) || "$(SRCDIR)" == ""
-SRCDIR = .
-!ENDIF
-
-!include <..\..\NMAKEcommon.inc>
-!include <..\..\NMAKEhttpd.inc>
-
-LDIRS = /libpath:"$(BUILDLIB)"
-LFLAGS = $(LFLAGS) user32.lib psapi.lib gdi32.lib shlwapi.lib wldap32.lib ole32.lib $(LIBAPR) $(LIBAPU) $(LIBHTTPD) $(WORKDIR)\mod_cache.lib
-
-INCLUDES = -I$(SRCDIR) -I$(BUILDINC)
-PDBFLAGS = -Fo$(WORKDIR)\ -Fd$(WORKDIR)\$(PROJECT)-src
-
-BUILDBIN = $(WORKDIR)\$(PROJECT).so
-BUILDPDB = $(WORKDIR)\$(PROJECT).pdb
-BUILDRES = $(WORKDIR)\$(PROJECT).res
-BUILDMFT = $(BUILDBIN).manifest
-
-RCFLAGS = $(RCFLAGS) /d BIN_NAME="$(PROJECT).so" /d LONG_NAME="mem_cache_module for Apache"
-
-OBJECTS = \
- $(WORKDIR)\cache_cache.obj \
- $(WORKDIR)\cache_hash.obj \
- $(WORKDIR)\cache_pqueue.obj \
- $(WORKDIR)\mod_mem_cache.obj \
-
-{$(SRCDIR)}.c{$(WORKDIR)}.obj:
- $(CC) $(CFLAGS) $(INCLUDES) $(PDBFLAGS) $<
-
-$(BUILDRES): ..\..\build\win32\httpd.rc
- $(RC) $(RCFLAGS) /i "$(BUILDINC)" /fo $(BUILDRES) ..\..\build\win32\httpd.rc
-
-$(BUILDBIN): $(OBJECTS) $(BUILDRES)
- $(LINK) $(LFLAGS) $(OBJECTS) $(BUILDRES) $(LIBS) $(LDIRS) /pdb:$(BUILDPDB) /out:$(BUILDBIN)
- IF EXIST $(BUILDMFT) \
- mt -nologo -manifest $(BUILDMFT) -outputresource:$(BUILDBIN);2
-
-install: $(BUILDBIN)
Copied: trunk/httpd/httpd-2.4/modules/cache/NMAKEsocachememcache (from rev 3201, trunk/httpd/httpd-2.4/modules/cache/NMAKEmemcache)
===================================================================
--- trunk/httpd/httpd-2.4/modules/cache/NMAKEsocachememcache (rev 0)
+++ trunk/httpd/httpd-2.4/modules/cache/NMAKEsocachememcache 2014-01-30 12:58:07 UTC (rev 3239)
@@ -0,0 +1,62 @@
+# Copyright 2001-2007 The Apache Software Foundation or its licensors, as
+# applicable.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+# ====================================================================
+#
+# NMAKEmakefile mem_cache module makefile.
+#
+# Originally contributed by Mladen Turk <mturk redhat.com>
+#
+# ====================================================================
+#
+
+TARGET=DLL
+PROJECT = mod_socache_memcache
+
+!IF !DEFINED(SRCDIR) || "$(SRCDIR)" == ""
+SRCDIR = .
+!ENDIF
+
+!include <..\..\NMAKEcommon.inc>
+!include <..\..\NMAKEhttpd.inc>
+
+LDIRS = /libpath:"$(BUILDLIB)"
+LFLAGS = $(LFLAGS) user32.lib psapi.lib gdi32.lib shlwapi.lib wldap32.lib ole32.lib $(LIBAPR) $(LIBAPU) $(LIBHTTPD) $(WORKDIR)\mod_cache.lib
+
+INCLUDES = -I$(SRCDIR) -I$(BUILDINC)
+PDBFLAGS = -Fo$(WORKDIR)\ -Fd$(WORKDIR)\$(PROJECT)-src
+
+BUILDBIN = $(WORKDIR)\$(PROJECT).so
+BUILDPDB = $(WORKDIR)\$(PROJECT).pdb
+BUILDRES = $(WORKDIR)\$(PROJECT).res
+BUILDMFT = $(BUILDBIN).manifest
+
+RCFLAGS = $(RCFLAGS) /d BIN_NAME="$(PROJECT).so" /d LONG_NAME="mod_socache_memcache for Apache"
+
+OBJECTS = \
+ $(WORKDIR)\mod_socache_memcache.obj
+
+{$(SRCDIR)}.c{$(WORKDIR)}.obj:
+ $(CC) $(CFLAGS) $(INCLUDES) $(PDBFLAGS) $<
+
+$(BUILDRES): ..\..\build\win32\httpd.rc
+ $(RC) $(RCFLAGS) /i "$(BUILDINC)" /fo $(BUILDRES) ..\..\build\win32\httpd.rc
+
+$(BUILDBIN): $(OBJECTS) $(BUILDRES)
+ $(LINK) $(LFLAGS) $(OBJECTS) $(BUILDRES) $(LIBS) $(LDIRS) /pdb:$(BUILDPDB) /out:$(BUILDBIN)
+ IF EXIST $(BUILDMFT) \
+ mt -nologo -manifest $(BUILDMFT) -outputresource:$(BUILDBIN);2
+
+install: $(BUILDBIN)
Modified: trunk/httpd/httpd-2.4/modules/ssl/NMAKEssl
===================================================================
--- trunk/httpd/httpd-2.4/modules/ssl/NMAKEssl 2014-01-30 10:42:48 UTC (rev 3238)
+++ trunk/httpd/httpd-2.4/modules/ssl/NMAKEssl 2014-01-30 12:58:07 UTC (rev 3239)
@@ -58,8 +58,8 @@
$(WORKDIR)\ssl_engine_pphrase.obj \
$(WORKDIR)\ssl_engine_rand.obj \
$(WORKDIR)\ssl_engine_vars.obj \
- $(WORKDIR)\ssl_engine_ocsp.c \
- $(WORKDIR)\ssl_util_ocsp.c \
+ $(WORKDIR)\ssl_engine_ocsp.obj \
+ $(WORKDIR)\ssl_util_ocsp.obj \
$(WORKDIR)\ssl_scache.obj \
$(WORKDIR)\ssl_util_stapling.obj \
$(WORKDIR)\ssl_util.obj \
10 years, 2 months
JBoss Native SVN: r3238 - in trunk/httpd/httpd-2.4: modules/cluster and 1 other directories.
by jbossnative-commits＠lists.jboss.org
Author: jfrederic.clere(a)jboss.com
Date: 2014-01-30 05:42:48 -0500 (Thu, 30 Jan 2014)
New Revision: 3238
Modified:
trunk/httpd/httpd-2.4/NMAKElibhttpd
trunk/httpd/httpd-2.4/modules/cluster/NMAKEheartbeat
trunk/httpd/httpd-2.4/support/NMAKEhtpasswd
Log:
some more adjustements.
Modified: trunk/httpd/httpd-2.4/NMAKElibhttpd
===================================================================
--- trunk/httpd/httpd-2.4/NMAKElibhttpd 2014-01-30 10:28:44 UTC (rev 3237)
+++ trunk/httpd/httpd-2.4/NMAKElibhttpd 2014-01-30 10:42:48 UTC (rev 3238)
@@ -60,6 +60,7 @@
$(WORKDIR)\scoreboard.obj \
$(WORKDIR)\util.obj \
$(WORKDIR)\util_cfgtree.obj \
+ $(WORKDIR)\util_cookies.obj \
$(WORKDIR)\util_expr_eval.obj \
$(WORKDIR)\util_expr_scan.obj \
$(WORKDIR)\util_expr_parse.obj \
Modified: trunk/httpd/httpd-2.4/modules/cluster/NMAKEheartbeat
===================================================================
--- trunk/httpd/httpd-2.4/modules/cluster/NMAKEheartbeat 2014-01-30 10:28:44 UTC (rev 3237)
+++ trunk/httpd/httpd-2.4/modules/cluster/NMAKEheartbeat 2014-01-30 10:42:48 UTC (rev 3238)
@@ -34,7 +34,7 @@
LDIRS = /libpath:"$(BUILDLIB)"
LFLAGS = $(LFLAGS) user32.lib psapi.lib gdi32.lib shlwapi.lib wldap32.lib ole32.lib $(LIBAPR) $(LIBAPU) $(LIBHTTPD)
-CFLAGS = $(CFLAGS) -DCLUSTER_DECLARE_EXPORT
+CFLAGS = $(CFLAGS) -DAP_WD_DECLARE_EXPORT
INCLUDES = -I$(SRCDIR) -I$(BUILDINC) -I../proxy -I../core
PDBFLAGS = -Fo$(WORKDIR)\ -Fd$(WORKDIR)\$(PROJECT)-src
Modified: trunk/httpd/httpd-2.4/support/NMAKEhtpasswd
===================================================================
--- trunk/httpd/httpd-2.4/support/NMAKEhtpasswd 2014-01-30 10:28:44 UTC (rev 3237)
+++ trunk/httpd/httpd-2.4/support/NMAKEhtpasswd 2014-01-30 10:42:48 UTC (rev 3238)
@@ -48,6 +48,7 @@
OBJECTS = \
$(WORKDIR)\htpasswd.obj \
+ $(WORKDIR)\passwd_common.obj
{$(SRCDIR)}.c{$(WORKDIR)}.obj:
$(CC) $(CFLAGS) $(INCLUDES) $(PDBFLAGS) $<
10 years, 2 months
JBoss Native SVN: r3237 - trunk/httpd/httpd-2.4/modules/cache.
by jbossnative-commits＠lists.jboss.org
Author: jfrederic.clere(a)jboss.com
Date: 2014-01-30 05:28:44 -0500 (Thu, 30 Jan 2014)
New Revision: 3237
Added:
trunk/httpd/httpd-2.4/modules/cache/NMAKEcachedisk
Removed:
trunk/httpd/httpd-2.4/modules/cache/NMAKEdiskcache
Modified:
trunk/httpd/httpd-2.4/modules/cache/NMAKEmakefile
Log:
Rename the module.
Copied: trunk/httpd/httpd-2.4/modules/cache/NMAKEcachedisk (from rev 3201, trunk/httpd/httpd-2.4/modules/cache/NMAKEdiskcache)
===================================================================
--- trunk/httpd/httpd-2.4/modules/cache/NMAKEcachedisk (rev 0)
+++ trunk/httpd/httpd-2.4/modules/cache/NMAKEcachedisk 2014-01-30 10:28:44 UTC (rev 3237)
@@ -0,0 +1,62 @@
+# Copyright 2001-2007 The Apache Software Foundation or its licensors, as
+# applicable.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+# ====================================================================
+#
+# NMAKEmakefile disk_cache module makefile.
+#
+# Originally contributed by Mladen Turk <mturk redhat.com>
+#
+# ====================================================================
+#
+
+TARGET=DLL
+PROJECT = mod_cache_disk
+
+!IF !DEFINED(SRCDIR) || "$(SRCDIR)" == ""
+SRCDIR = .
+!ENDIF
+
+!include <..\..\NMAKEcommon.inc>
+!include <..\..\NMAKEhttpd.inc>
+
+LDIRS = /libpath:"$(BUILDLIB)"
+LFLAGS = $(LFLAGS) user32.lib psapi.lib gdi32.lib shlwapi.lib wldap32.lib ole32.lib $(LIBAPR) $(LIBAPU) $(LIBHTTPD) $(WORKDIR)\mod_cache.lib
+
+INCLUDES = -I$(SRCDIR) -I$(BUILDINC)
+PDBFLAGS = -Fo$(WORKDIR)\ -Fd$(WORKDIR)\$(PROJECT)-src
+
+BUILDBIN = $(WORKDIR)\$(PROJECT).so
+BUILDPDB = $(WORKDIR)\$(PROJECT).pdb
+BUILDRES = $(WORKDIR)\$(PROJECT).res
+BUILDMFT = $(BUILDBIN).manifest
+
+RCFLAGS = $(RCFLAGS) /d BIN_NAME="$(PROJECT).so" /d LONG_NAME="cache_disk_module for Apache"
+
+OBJECTS = \
+ $(WORKDIR)\mod_cache_disk.obj \
+
+{$(SRCDIR)}.c{$(WORKDIR)}.obj:
+ $(CC) $(CFLAGS) $(INCLUDES) $(PDBFLAGS) $<
+
+$(BUILDRES): ..\..\build\win32\httpd.rc
+ $(RC) $(RCFLAGS) /i "$(BUILDINC)" /fo $(BUILDRES) ..\..\build\win32\httpd.rc
+
+$(BUILDBIN): $(OBJECTS) $(BUILDRES)
+ $(LINK) $(LFLAGS) $(OBJECTS) $(BUILDRES) $(LIBS) $(LDIRS) /pdb:$(BUILDPDB) /out:$(BUILDBIN)
+ IF EXIST $(BUILDMFT) \
+ mt -nologo -manifest $(BUILDMFT) -outputresource:$(BUILDBIN);2
+
+install: $(BUILDBIN)
Deleted: trunk/httpd/httpd-2.4/modules/cache/NMAKEdiskcache
===================================================================
--- trunk/httpd/httpd-2.4/modules/cache/NMAKEdiskcache 2014-01-30 10:20:53 UTC (rev 3236)
+++ trunk/httpd/httpd-2.4/modules/cache/NMAKEdiskcache 2014-01-30 10:28:44 UTC (rev 3237)
@@ -1,62 +0,0 @@
-# Copyright 2001-2007 The Apache Software Foundation or its licensors, as
-# applicable.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-# ====================================================================
-#
-# NMAKEmakefile disk_cache module makefile.
-#
-# Originally contributed by Mladen Turk <mturk redhat.com>
-#
-# ====================================================================
-#
-
-TARGET=DLL
-PROJECT = mod_disk_cache
-
-!IF !DEFINED(SRCDIR) || "$(SRCDIR)" == ""
-SRCDIR = .
-!ENDIF
-
-!include <..\..\NMAKEcommon.inc>
-!include <..\..\NMAKEhttpd.inc>
-
-LDIRS = /libpath:"$(BUILDLIB)"
-LFLAGS = $(LFLAGS) user32.lib psapi.lib gdi32.lib shlwapi.lib wldap32.lib ole32.lib $(LIBAPR) $(LIBAPU) $(LIBHTTPD) $(WORKDIR)\mod_cache.lib
-
-INCLUDES = -I$(SRCDIR) -I$(BUILDINC)
-PDBFLAGS = -Fo$(WORKDIR)\ -Fd$(WORKDIR)\$(PROJECT)-src
-
-BUILDBIN = $(WORKDIR)\$(PROJECT).so
-BUILDPDB = $(WORKDIR)\$(PROJECT).pdb
-BUILDRES = $(WORKDIR)\$(PROJECT).res
-BUILDMFT = $(BUILDBIN).manifest
-
-RCFLAGS = $(RCFLAGS) /d BIN_NAME="$(PROJECT).so" /d LONG_NAME="disk_cache_module for Apache"
-
-OBJECTS = \
- $(WORKDIR)\mod_disk_cache.obj \
-
-{$(SRCDIR)}.c{$(WORKDIR)}.obj:
- $(CC) $(CFLAGS) $(INCLUDES) $(PDBFLAGS) $<
-
-$(BUILDRES): ..\..\build\win32\httpd.rc
- $(RC) $(RCFLAGS) /i "$(BUILDINC)" /fo $(BUILDRES) ..\..\build\win32\httpd.rc
-
-$(BUILDBIN): $(OBJECTS) $(BUILDRES)
- $(LINK) $(LFLAGS) $(OBJECTS) $(BUILDRES) $(LIBS) $(LDIRS) /pdb:$(BUILDPDB) /out:$(BUILDBIN)
- IF EXIST $(BUILDMFT) \
- mt -nologo -manifest $(BUILDMFT) -outputresource:$(BUILDBIN);2
-
-install: $(BUILDBIN)
Modified: trunk/httpd/httpd-2.4/modules/cache/NMAKEmakefile
===================================================================
--- trunk/httpd/httpd-2.4/modules/cache/NMAKEmakefile 2014-01-30 10:20:53 UTC (rev 3236)
+++ trunk/httpd/httpd-2.4/modules/cache/NMAKEmakefile 2014-01-30 10:28:44 UTC (rev 3237)
@@ -32,7 +32,7 @@
MODULES = \
$(SRCDIR)\NMAKEcache\~ \
- $(SRCDIR)\NMAKEdiskcache\~ \
+ $(SRCDIR)\NMAKEcachedisk\~ \
$(SRCDIR)\NMAKEfilecache\~ \
$(SRCDIR)\NMAKEmemcache\~ \
$(SRCDIR)\NMAKEcachesocache\~ \
10 years, 2 months
JBoss Native SVN: r3236 - trunk/httpd/httpd-2.4/modules/aaa.
by jbossnative-commits＠lists.jboss.org
Author: jfrederic.clere(a)jboss.com
Date: 2014-01-30 05:20:53 -0500 (Thu, 30 Jan 2014)
New Revision: 3236
Removed:
trunk/httpd/httpd-2.4/modules/aaa/NMAKEauthndefault
Modified:
trunk/httpd/httpd-2.4/modules/aaa/NMAKEmakefile
Log:
this module has been removed.
Deleted: trunk/httpd/httpd-2.4/modules/aaa/NMAKEauthndefault
===================================================================
--- trunk/httpd/httpd-2.4/modules/aaa/NMAKEauthndefault 2014-01-30 10:02:00 UTC (rev 3235)
+++ trunk/httpd/httpd-2.4/modules/aaa/NMAKEauthndefault 2014-01-30 10:20:53 UTC (rev 3236)
@@ -1,63 +0,0 @@
-# Copyright 2001-2007 The Apache Software Foundation or its licensors, as
-# applicable.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-# ====================================================================
-#
-# NMAKEmakefile authn_default module makefile.
-#
-# Originally contributed by Mladen Turk <mturk redhat.com>
-#
-# ====================================================================
-#
-
-TARGET=DLL
-PROJECT = mod_authn_default
-
-!IF !DEFINED(SRCDIR) || "$(SRCDIR)" == ""
-SRCDIR = .
-!ENDIF
-
-!include <..\..\NMAKEcommon.inc>
-!include <..\..\NMAKEhttpd.inc>
-
-LDIRS = /libpath:"$(BUILDLIB)"
-LFLAGS = $(LFLAGS) user32.lib psapi.lib gdi32.lib shlwapi.lib wldap32.lib ole32.lib $(LIBAPR) $(LIBAPU) $(LIBHTTPD)
-CFLAGS = $(CFLAGS) -DAAA_DECLARE_EXPORT
-
-INCLUDES = -I$(SRCDIR) -I$(BUILDINC)
-PDBFLAGS = -Fo$(WORKDIR)\ -Fd$(WORKDIR)\$(PROJECT)-src
-
-BUILDBIN = $(WORKDIR)\$(PROJECT).so
-BUILDPDB = $(WORKDIR)\$(PROJECT).pdb
-BUILDRES = $(WORKDIR)\$(PROJECT).res
-BUILDMFT = $(BUILDBIN).manifest
-
-RCFLAGS = $(RCFLAGS) /d BIN_NAME="$(PROJECT).so" /d LONG_NAME="authn_default_module for Apache"
-
-OBJECTS = \
- $(WORKDIR)\mod_authn_default.obj \
-
-{$(SRCDIR)}.c{$(WORKDIR)}.obj:
- $(CC) $(CFLAGS) $(INCLUDES) $(PDBFLAGS) $<
-
-$(BUILDRES): ..\..\build\win32\httpd.rc
- $(RC) $(RCFLAGS) /i "$(BUILDINC)" /fo $(BUILDRES) ..\..\build\win32\httpd.rc
-
-$(BUILDBIN): $(OBJECTS) $(BUILDRES)
- $(LINK) $(LFLAGS) $(OBJECTS) $(BUILDRES) $(LIBS) $(LDIRS) /pdb:$(BUILDPDB) /out:$(BUILDBIN)
- IF EXIST $(BUILDMFT) \
- mt -nologo -manifest $(BUILDMFT) -outputresource:$(BUILDBIN);2
-
-install: $(BUILDBIN)
Modified: trunk/httpd/httpd-2.4/modules/aaa/NMAKEmakefile
===================================================================
--- trunk/httpd/httpd-2.4/modules/aaa/NMAKEmakefile 2014-01-30 10:02:00 UTC (rev 3235)
+++ trunk/httpd/httpd-2.4/modules/aaa/NMAKEmakefile 2014-01-30 10:20:53 UTC (rev 3236)
@@ -36,7 +36,6 @@
$(SRCDIR)\NMAKEauthnanon\~ \
$(SRCDIR)\NMAKEauthndbd\~ \
$(SRCDIR)\NMAKEauthndbm\~ \
- $(SRCDIR)\NMAKEauthndefault\~ \
$(SRCDIR)\NMAKEauthnfile\~ \
$(SRCDIR)\NMAKEauthnzldap\~ \
$(SRCDIR)\NMAKEauthzdbm\~ \
10 years, 2 months
JBoss Native SVN: r3235 - trunk/httpd/httpd-2.4/srclib/apr-util.
by jbossnative-commits＠lists.jboss.org
Author: jfrederic.clere(a)jboss.com
Date: 2014-01-30 05:02:00 -0500 (Thu, 30 Jan 2014)
New Revision: 3235
Modified:
trunk/httpd/httpd-2.4/srclib/apr-util/NMAKEapu
Log:
another missing object.
Modified: trunk/httpd/httpd-2.4/srclib/apr-util/NMAKEapu
===================================================================
--- trunk/httpd/httpd-2.4/srclib/apr-util/NMAKEapu 2014-01-30 08:46:41 UTC (rev 3234)
+++ trunk/httpd/httpd-2.4/srclib/apr-util/NMAKEapu 2014-01-30 10:02:00 UTC (rev 3235)
@@ -94,6 +94,7 @@
$(WORKDIR)\apr_md4.obj \
$(WORKDIR)\apr_md5.obj \
$(WORKDIR)\apr_sha1.obj \
+ $(WORKDIR)\crypt_blowfish.obj \
$(WORKDIR)\apr_passwd.obj \
$(WORKDIR)\getuuid.obj \
$(WORKDIR)\uuid.obj \
10 years, 2 months
JBoss Native SVN: r3234 - trunk/httpd/httpd-2.4/srclib/apr-util.
by jbossnative-commits＠lists.jboss.org
Author: jfrederic.clere(a)jboss.com
Date: 2014-01-30 03:46:41 -0500 (Thu, 30 Jan 2014)
New Revision: 3234
Modified:
trunk/httpd/httpd-2.4/srclib/apr-util/NMAKEapu
Log:
typo.
Modified: trunk/httpd/httpd-2.4/srclib/apr-util/NMAKEapu
===================================================================
--- trunk/httpd/httpd-2.4/srclib/apr-util/NMAKEapu 2014-01-30 08:26:42 UTC (rev 3233)
+++ trunk/httpd/httpd-2.4/srclib/apr-util/NMAKEapu 2014-01-30 08:46:41 UTC (rev 3234)
@@ -94,7 +94,7 @@
$(WORKDIR)\apr_md4.obj \
$(WORKDIR)\apr_md5.obj \
$(WORKDIR)\apr_sha1.obj \
- $(WORKDIR)\apr_apr_passwd.obj \
+ $(WORKDIR)\apr_passwd.obj \
$(WORKDIR)\getuuid.obj \
$(WORKDIR)\uuid.obj \
$(WORKDIR)\apr_dbd.obj \
10 years, 2 months
JBoss Native SVN: r3233 - trunk/httpd/httpd-2.4/support.
by jbossnative-commits＠lists.jboss.org
Author: jfrederic.clere(a)jboss.com
Date: 2014-01-30 03:26:42 -0500 (Thu, 30 Jan 2014)
New Revision: 3233
Modified:
trunk/httpd/httpd-2.4/support/NMAKEhtdbm
Log:
Add missing object.
Modified: trunk/httpd/httpd-2.4/support/NMAKEhtdbm
===================================================================
--- trunk/httpd/httpd-2.4/support/NMAKEhtdbm 2014-01-30 08:10:03 UTC (rev 3232)
+++ trunk/httpd/httpd-2.4/support/NMAKEhtdbm 2014-01-30 08:26:42 UTC (rev 3233)
@@ -48,6 +48,7 @@
OBJECTS = \
$(WORKDIR)\htdbm.obj \
+ $(WORKDIR)\passwd_common.obj
{$(SRCDIR)}.c{$(WORKDIR)}.obj:
$(CC) $(CFLAGS) $(INCLUDES) $(PDBFLAGS) $<
10 years, 2 months
JBoss Native SVN: r3232 - in trunk/httpd/httpd-2.4/modules: filters and 3 other directories.
by jbossnative-commits＠lists.jboss.org
Author: jfrederic.clere(a)jboss.com
Date: 2014-01-30 03:10:03 -0500 (Thu, 30 Jan 2014)
New Revision: 3232
Modified:
trunk/httpd/httpd-2.4/modules/core/NMAKEwatchdog
trunk/httpd/httpd-2.4/modules/filters/NMAKEdeflate
trunk/httpd/httpd-2.4/modules/mappers/NMAKErewrite
trunk/httpd/httpd-2.4/modules/session/NMAKEsession
trunk/httpd/httpd-2.4/modules/session/NMAKEsession_cookie
trunk/httpd/httpd-2.4/modules/session/NMAKEsession_crypto
trunk/httpd/httpd-2.4/modules/session/NMAKEsession_dbd
trunk/httpd/httpd-2.4/modules/ssl/NMAKEssl
Log:
Arrange makefiles.
Modified: trunk/httpd/httpd-2.4/modules/core/NMAKEwatchdog
===================================================================
--- trunk/httpd/httpd-2.4/modules/core/NMAKEwatchdog 2014-01-30 07:54:19 UTC (rev 3231)
+++ trunk/httpd/httpd-2.4/modules/core/NMAKEwatchdog 2014-01-30 08:10:03 UTC (rev 3232)
@@ -34,7 +34,7 @@
LDIRS = /libpath:"$(BUILDLIB)"
LFLAGS = $(LFLAGS) user32.lib psapi.lib gdi32.lib shlwapi.lib wldap32.lib ole32.lib $(LIBAPR) $(LIBAPU) $(LIBHTTPD)
-CFLAGS = $(CFLAGS) -DCLUSTER_DECLARE_EXPORT
+CFLAGS = $(CFLAGS) -DAP_WD_DECLARE_EXPORT
INCLUDES = -I$(SRCDIR) -I$(BUILDINC) -I../proxy
PDBFLAGS = -Fo$(WORKDIR)\ -Fd$(WORKDIR)\$(PROJECT)-src
Modified: trunk/httpd/httpd-2.4/modules/filters/NMAKEdeflate
===================================================================
--- trunk/httpd/httpd-2.4/modules/filters/NMAKEdeflate 2014-01-30 07:54:19 UTC (rev 3231)
+++ trunk/httpd/httpd-2.4/modules/filters/NMAKEdeflate 2014-01-30 08:10:03 UTC (rev 3232)
@@ -36,7 +36,7 @@
LFLAGS = $(LFLAGS) user32.lib psapi.lib gdi32.lib shlwapi.lib wldap32.lib ole32.lib $(LIBAPR) $(LIBAPU) $(LIBHTTPD) $(ZLIB)
CFLAGS = $(CFLAGS) -DHAVE_ZUTIL_H
-INCLUDES = -I$(SRCDIR) -I$(BUILDINC)
+INCLUDES = -I$(SRCDIR) -I$(BUILDINC) -I../ssl
PDBFLAGS = -Fo$(WORKDIR)\ -Fd$(WORKDIR)\$(PROJECT)-src
BUILDBIN = $(WORKDIR)\$(PROJECT).so
Modified: trunk/httpd/httpd-2.4/modules/mappers/NMAKErewrite
===================================================================
--- trunk/httpd/httpd-2.4/modules/mappers/NMAKErewrite 2014-01-30 07:54:19 UTC (rev 3231)
+++ trunk/httpd/httpd-2.4/modules/mappers/NMAKErewrite 2014-01-30 08:10:03 UTC (rev 3232)
@@ -35,7 +35,7 @@
LDIRS = /libpath:"$(BUILDLIB)"
LFLAGS = $(LFLAGS) user32.lib psapi.lib gdi32.lib shlwapi.lib wldap32.lib ole32.lib $(LIBAPR) $(LIBAPU) $(LIBHTTPD)
-INCLUDES = -I$(SRCDIR) -I$(BUILDINC) -I..\ssl
+INCLUDES = -I$(SRCDIR) -I$(BUILDINC) -I..\ssl -I..\database
PDBFLAGS = -Fo$(WORKDIR)\ -Fd$(WORKDIR)\$(PROJECT)-src
BUILDBIN = $(WORKDIR)\$(PROJECT).so
Modified: trunk/httpd/httpd-2.4/modules/session/NMAKEsession
===================================================================
--- trunk/httpd/httpd-2.4/modules/session/NMAKEsession 2014-01-30 07:54:19 UTC (rev 3231)
+++ trunk/httpd/httpd-2.4/modules/session/NMAKEsession 2014-01-30 08:10:03 UTC (rev 3232)
@@ -34,7 +34,7 @@
LDIRS = /libpath:"$(BUILDLIB)"
LFLAGS = $(LFLAGS) user32.lib psapi.lib gdi32.lib shlwapi.lib wldap32.lib ole32.lib $(LIBAPR) $(LIBAPU) $(LIBHTTPD)
-CFLAGS = $(CFLAGS) -DCLUSTER_DECLARE_EXPORT
+CFLAGS = $(CFLAGS) -DSESSION_DECLARE_EXPORT
INCLUDES = -I$(SRCDIR) -I$(BUILDINC) -I../proxy
PDBFLAGS = -Fo$(WORKDIR)\ -Fd$(WORKDIR)\$(PROJECT)-src
Modified: trunk/httpd/httpd-2.4/modules/session/NMAKEsession_cookie
===================================================================
--- trunk/httpd/httpd-2.4/modules/session/NMAKEsession_cookie 2014-01-30 07:54:19 UTC (rev 3231)
+++ trunk/httpd/httpd-2.4/modules/session/NMAKEsession_cookie 2014-01-30 08:10:03 UTC (rev 3232)
@@ -34,7 +34,7 @@
LDIRS = /libpath:"$(BUILDLIB)"
LFLAGS = $(LFLAGS) user32.lib psapi.lib gdi32.lib shlwapi.lib wldap32.lib ole32.lib $(LIBAPR) $(LIBAPU) $(LIBHTTPD)
-CFLAGS = $(CFLAGS) -DCLUSTER_DECLARE_EXPORT
+CFLAGS = $(CFLAGS) -DSESSION_DECLARE_EXPORT
INCLUDES = -I$(SRCDIR) -I$(BUILDINC) -I../proxy
PDBFLAGS = -Fo$(WORKDIR)\ -Fd$(WORKDIR)\$(PROJECT)-src
Modified: trunk/httpd/httpd-2.4/modules/session/NMAKEsession_crypto
===================================================================
--- trunk/httpd/httpd-2.4/modules/session/NMAKEsession_crypto 2014-01-30 07:54:19 UTC (rev 3231)
+++ trunk/httpd/httpd-2.4/modules/session/NMAKEsession_crypto 2014-01-30 08:10:03 UTC (rev 3232)
@@ -34,7 +34,7 @@
LDIRS = /libpath:"$(BUILDLIB)"
LFLAGS = $(LFLAGS) user32.lib psapi.lib gdi32.lib shlwapi.lib wldap32.lib ole32.lib $(LIBAPR) $(LIBAPU) $(LIBHTTPD)
-CFLAGS = $(CFLAGS) -DCLUSTER_DECLARE_EXPORT
+CFLAGS = $(CFLAGS) -DSESSION_DECLARE_EXPORT
INCLUDES = -I$(SRCDIR) -I$(BUILDINC) -I../proxy
PDBFLAGS = -Fo$(WORKDIR)\ -Fd$(WORKDIR)\$(PROJECT)-src
Modified: trunk/httpd/httpd-2.4/modules/session/NMAKEsession_dbd
===================================================================
--- trunk/httpd/httpd-2.4/modules/session/NMAKEsession_dbd 2014-01-30 07:54:19 UTC (rev 3231)
+++ trunk/httpd/httpd-2.4/modules/session/NMAKEsession_dbd 2014-01-30 08:10:03 UTC (rev 3232)
@@ -34,7 +34,7 @@
LDIRS = /libpath:"$(BUILDLIB)"
LFLAGS = $(LFLAGS) user32.lib psapi.lib gdi32.lib shlwapi.lib wldap32.lib ole32.lib $(LIBAPR) $(LIBAPU) $(LIBHTTPD)
-CFLAGS = $(CFLAGS) -DCLUSTER_DECLARE_EXPORT
+CFLAGS = $(CFLAGS) -DSESSION_DECLARE_EXPORT
INCLUDES = -I$(SRCDIR) -I$(BUILDINC) -I../proxy
PDBFLAGS = -Fo$(WORKDIR)\ -Fd$(WORKDIR)\$(PROJECT)-src
Modified: trunk/httpd/httpd-2.4/modules/ssl/NMAKEssl
===================================================================
--- trunk/httpd/httpd-2.4/modules/ssl/NMAKEssl 2014-01-30 07:54:19 UTC (rev 3231)
+++ trunk/httpd/httpd-2.4/modules/ssl/NMAKEssl 2014-01-30 08:10:03 UTC (rev 3232)
@@ -50,7 +50,6 @@
OBJECTS = \
$(WORKDIR)\ssl_engine_config.obj \
- $(WORKDIR)\ssl_engine_dh.obj \
$(WORKDIR)\ssl_engine_init.obj \
$(WORKDIR)\ssl_engine_io.obj \
$(WORKDIR)\ssl_engine_kernel.obj \
@@ -59,14 +58,10 @@
$(WORKDIR)\ssl_engine_pphrase.obj \
$(WORKDIR)\ssl_engine_rand.obj \
$(WORKDIR)\ssl_engine_vars.obj \
- $(WORKDIR)\ssl_expr.obj \
- $(WORKDIR)\ssl_expr_eval.obj \
- $(WORKDIR)\ssl_expr_parse.obj \
- $(WORKDIR)\ssl_expr_scan.obj \
+ $(WORKDIR)\ssl_engine_ocsp.c \
+ $(WORKDIR)\ssl_util_ocsp.c \
$(WORKDIR)\ssl_scache.obj \
- $(WORKDIR)\ssl_scache_dbm.obj \
- $(WORKDIR)\ssl_scache_shmcb.obj \
- $(WORKDIR)\ssl_scache_dc.obj \
+ $(WORKDIR)\ssl_util_stapling.obj \
$(WORKDIR)\ssl_util.obj \
$(WORKDIR)\ssl_util_ssl.obj \
$(WORKDIR)\mod_ssl.obj
10 years, 2 months
JBoss Native SVN: r3231 - trunk/httpd/httpd-2.4/modules/dav/fs.
by jbossnative-commits＠lists.jboss.org
Author: jfrederic.clere(a)jboss.com
Date: 2014-01-30 02:54:19 -0500 (Thu, 30 Jan 2014)
New Revision: 3231
Modified:
trunk/httpd/httpd-2.4/modules/dav/fs/NMAKEdavfs
Log:
Add missing include.
Modified: trunk/httpd/httpd-2.4/modules/dav/fs/NMAKEdavfs
===================================================================
--- trunk/httpd/httpd-2.4/modules/dav/fs/NMAKEdavfs 2014-01-30 07:49:09 UTC (rev 3230)
+++ trunk/httpd/httpd-2.4/modules/dav/fs/NMAKEdavfs 2014-01-30 07:54:19 UTC (rev 3231)
@@ -35,7 +35,7 @@
LDIRS = /libpath:"$(BUILDLIB)"
LFLAGS = $(LFLAGS) user32.lib psapi.lib gdi32.lib shlwapi.lib wldap32.lib ole32.lib $(LIBAPR) $(LIBAPU) $(LIBHTTPD) mod_dav.lib
-INCLUDES = -I$(SRCDIR) -I$(BUILDINC)
+INCLUDES = -I$(SRCDIR) -I$(BUILDINC) -I../main
PDBFLAGS = -Fo$(WORKDIR)\ -Fd$(WORKDIR)\$(PROJECT)-src
BUILDBIN = $(WORKDIR)\$(PROJECT).so
10 years, 2 months
JBoss Native SVN: r3230 - trunk/httpd/httpd-2.4/modules/cluster.
by jbossnative-commits＠lists.jboss.org
Author: jfrederic.clere(a)jboss.com
Date: 2014-01-30 02:49:09 -0500 (Thu, 30 Jan 2014)
New Revision: 3230
Modified:
trunk/httpd/httpd-2.4/modules/cluster/NMAKEheartbeat
Log:
Add missing include.
Modified: trunk/httpd/httpd-2.4/modules/cluster/NMAKEheartbeat
===================================================================
--- trunk/httpd/httpd-2.4/modules/cluster/NMAKEheartbeat 2014-01-30 07:34:01 UTC (rev 3229)
+++ trunk/httpd/httpd-2.4/modules/cluster/NMAKEheartbeat 2014-01-30 07:49:09 UTC (rev 3230)
@@ -36,7 +36,7 @@
LFLAGS = $(LFLAGS) user32.lib psapi.lib gdi32.lib shlwapi.lib wldap32.lib ole32.lib $(LIBAPR) $(LIBAPU) $(LIBHTTPD)
CFLAGS = $(CFLAGS) -DCLUSTER_DECLARE_EXPORT
-INCLUDES = -I$(SRCDIR) -I$(BUILDINC) -I../proxy
+INCLUDES = -I$(SRCDIR) -I$(BUILDINC) -I../proxy -I../core
PDBFLAGS = -Fo$(WORKDIR)\ -Fd$(WORKDIR)\$(PROJECT)-src
BUILDBIN = $(WORKDIR)\$(PROJECT).so
10 years, 2 months