[tomcat-connectors] branch master updated: Make pcre.lib as pseudotarget, so nmake can check for changes

2020-06-15 Thread mturk
This is an automated email from the ASF dual-hosted git repository.

mturk pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/tomcat-connectors.git


The following commit(s) were added to refs/heads/master by this push:
 new d06318a  Make pcre.lib as pseudotarget, so nmake can check for changes
d06318a is described below

commit d06318a17009cd86f7e83700df8a3f6de09e1619
Author: Mladen Turk 
AuthorDate: Mon Jun 15 19:32:40 2020 +0200

Make pcre.lib as pseudotarget, so nmake can check for changes
---
 native/iis/Makefile.vc | 12 +---
 1 file changed, 5 insertions(+), 7 deletions(-)

diff --git a/native/iis/Makefile.vc b/native/iis/Makefile.vc
index 21c7f87..4422af0 100644
--- a/native/iis/Makefile.vc
+++ b/native/iis/Makefile.vc
@@ -74,7 +74,7 @@ OBJECTS = \
$(WORKDIR)\jk_util.obj \
$(WORKDIR)\jk_worker.obj
 
-all : $(WORKDIR) $(PCRELIB) $(BUILDBIN)
+all : libpcre $(WORKDIR) $(BUILDBIN)
 
 $(WORKDIR) :
@$(MAKEWORKDIR)
@@ -88,20 +88,18 @@ $(WORKDIR) :
 $(BUILDRES): ..\common\jk.rc
$(RC) /l 0x409 /n /i ..\common /d JK_ISAPI /d NDEBUG /fo $(BUILDRES) 
..\common\jk.rc
 
-$(PCRELIB):
+libpcre:
@cd .\pcre
-   $(MAKE) -f Makefile.vc WINVER=$(WINVER) BUILD_CPU=$(BUILD_CPU) 
CPUFLAGS="$(CPUFLAGS)"
-   @if not ERRORLEVEL 0 exit /B 1
+   @$(MAKE) -f Makefile.vc WINVER=$(WINVER) BUILD_CPU=$(BUILD_CPU) 
CPUFLAGS="$(CPUFLAGS)"
@cd ..
 
-$(BUILDBIN): $(PCRELIB) $(WORKDIR) $(OBJECTS) $(BUILDRES)
+$(BUILDBIN): $(WORKDIR) $(OBJECTS) $(BUILDRES)
$(LINK) $(LFLAGS) $(OBJECTS) $(PCRELIB) $(BUILDRES) $(LDLIBS) 
/def:isapi.def /out:$(BUILDBIN) /pdb:$(BUILDPDB)
@if exist $(BUILDMFT) \
$(MT) -nologo -manifest $(BUILDMFT) 
-outputresource:$(BUILDBIN);2
 
 clean:
@cd .\pcre
-   $(MAKE) -f Makefile.vc clean
-   @if not ERRORLEVEL 0 exit /B 1
+   @$(MAKE) -f Makefile.vc clean
@cd ..
@-$(CLEANTARGET) 2>NUL


-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org



[tomcat-connectors] branch master updated: Drop all that beta, rc, release bloatware from jk_version.h. We use git, and release should be as simple as clicking on the webpage

2020-06-13 Thread mturk
This is an automated email from the ASF dual-hosted git repository.

mturk pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/tomcat-connectors.git


The following commit(s) were added to refs/heads/master by this push:
 new 0ff7479  Drop all that beta,rc,release bloatware from jk_version.h. We 
use git, and release should be as simple as clicking on the webpage
0ff7479 is described below

commit 0ff7479904e1a5447736b020a267b897ff826e1f
Author: Mladen Turk 
AuthorDate: Sat Jun 13 19:07:26 2020 +0200

Drop all that beta,rc,release bloatware from jk_version.h. We use git, and 
release should be as simple as clicking on the webpage
---
 native/apache-2.0/Makefile.vc |  2 +-
 native/common/jk.rc   | 35 +
 native/common/jk_version.h| 52 ---
 native/iis/Makefile.vc|  2 +-
 4 files changed, 31 insertions(+), 60 deletions(-)

diff --git a/native/apache-2.0/Makefile.vc b/native/apache-2.0/Makefile.vc
index 13d6980..e3d5bbe 100644
--- a/native/apache-2.0/Makefile.vc
+++ b/native/apache-2.0/Makefile.vc
@@ -105,7 +105,7 @@ $(WORKDIR) :
$(CC) $(CLOPTS) $(CFLAGS) $(INCDIR) $(PDBFLAGS) $<
 
 $(BUILDRES): ..\common\jk.rc
-   $(RC) /l 0x409 /i ..\common /d NDEBUG /fo $(BUILDRES) $@
+   $(RC) /l 0x409 /n /i ..\common /d NDEBUG /fo $(BUILDRES) ..\common\jk.rc
 
 $(BUILDBIN): $(WORKDIR) $(OBJECTS) $(BUILDRES)
$(LINK) $(LFLAGS) $(OBJECTS) $(BUILDRES) $(LDLIBS) /out:$(BUILDBIN) 
/pdb:$(BUILDPDB)
diff --git a/native/common/jk.rc b/native/common/jk.rc
index e0eae36..a51a385 100644
--- a/native/common/jk.rc
+++ b/native/common/jk.rc
@@ -39,31 +39,27 @@
 
 
 1 VERSIONINFO
- FILEVERSION JK_VERSIONCSV
- PRODUCTVERSION JK_VERSIONCSV
- FILEFLAGSMASK 0x3fL
-#if defined(_DEBUG)
- FILEFLAGS 0x01L
-#else
- FILEFLAGS 0x00L
-#endif
- FILEOS 0x40004L
- FILETYPE 0x1L
+ FILEVERSION JK_VERSIONCSV,0
+ PRODUCTVERSION JK_VERSIONCSV,0
+ FILEFLAGSMASK VS_FFI_FILEFLAGSMASK
+ FILEFLAGS 0x0L
+ FILEOS VOS_NT_WINDOWS32
+ FILETYPE VFT_APP
  FILESUBTYPE 0x0L
 BEGIN
   BLOCK "StringFileInfo"
   BEGIN
 BLOCK "040904b0"
 BEGIN
-VALUE "Comments", ASF_LICENSE "\0"
-  VALUE "CompanyName", "Apache Software Foundation\0"
-  VALUE "FileDescription", "Apache Tomcat Connector\0"
-  VALUE "FileVersion", JK_VERSTRING "\0"
-  VALUE "InternalName", PACKAGE "\0"
-  VALUE "LegalCopyright", ASF_COPYRIGHT "\0"
-  VALUE "OriginalFilename", PACKAGE "." JK_DLL_SUFFIX "\0"
-  VALUE "ProductName", "Apache Tomcat " PACKAGE " Connector\0"
-  VALUE "ProductVersion", JK_VERSTRING "\0"
+  VALUE "Comments", ASF_LICENSE
+  VALUE "CompanyName", "Apache Software Foundation"
+  VALUE "FileDescription", "Apache Tomcat Connector"
+  VALUE "FileVersion", JK_VERSTRING
+  VALUE "InternalName", JK_DISTNAME
+  VALUE "LegalCopyright", ASF_COPYRIGHT
+  VALUE "OriginalFilename", JK_DISTNAME "." JK_DLL_SUFFIX
+  VALUE "ProductName", "Apache Tomcat " JK_DISTNAME " Connector"
+  VALUE "ProductVersion", JK_EXPOSED_VERSION
 END
   END
   BLOCK "VarFileInfo"
@@ -71,4 +67,3 @@ BEGIN
 VALUE "Translation", 0x409, 1200
   END
 END
-
diff --git a/native/common/jk_version.h b/native/common/jk_version.h
index 8ac54cd..a4d06f0 100644
--- a/native/common/jk_version.h
+++ b/native/common/jk_version.h
@@ -22,57 +22,34 @@
 #ifndef __JK_VERSION_H
 #define __JK_VERSION_H
 
-/** START OF AREA TO MODIFY BEFORE RELEASING */
 #define JK_VERMAJOR 1
 #define JK_VERMINOR 2
-#define JK_VERFIX   49
+#define JK_VERMICRO 49
 
-/* set JK_VERISRELEASE to 1 when release (do not forget to commit!) */
-#define JK_VERISRELEASE 0
-/* Beta number */
-#define JK_VERBETA  0
-#define JK_BETASTRING   "0"
-/* Release candidate */
-#define JK_VERRC0
-#define JK_RCSTRING "0"
-
-/** END OF AREA TO MODIFY BEFORE RELEASING */
-
-#if !defined(PACKAGE)
 #if defined(JK_ISAPI)
-#define PACKAGE "isapi_redirector"
+#define JK_DISTNAME "isapi_redirector"
 #define JK_DLL_SUFFIX "dll"
 #elif defined(JK_NSAPI)
-#define PACKAGE "nsapi_redirector"
+#define JK_DISTNAME "nsapi_redirector"
 #define JK_DLL_SUFFIX "dll"
 #else
-#define PACKAGE "mod_jk"
+#define JK_DISTNAME "mod_jk"
 #define JK_DLL_SUFFIX "so"
 #endif
-#endif
 
 /* Build JK_EXPOSED_VERSION and JK_VERSION */
-#define JK_EXPOSED_VERSION_INT PACKAGE "/" JK_VERSTRING
+#define JK_EXP

[tomcat-connectors] branch master updated: Add install task defaults to APACHE2_HOME/modules unless PREFIX is defined on command line

2020-06-13 Thread mturk
This is an automated email from the ASF dual-hosted git repository.

mturk pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/tomcat-connectors.git


The following commit(s) were added to refs/heads/master by this push:
 new ae75fe5  Add install task defaults to APACHE2_HOME/modules unless 
PREFIX is defined on command line
ae75fe5 is described below

commit ae75fe5daa80afe90fed83456045c1b7f6891063
Author: Mladen Turk 
AuthorDate: Sat Jun 13 17:54:56 2020 +0200

Add install task defaults to APACHE2_HOME/modules unless PREFIX is defined 
on command line
---
 native/apache-2.0/Makefile.vc | 7 +++
 1 file changed, 7 insertions(+)

diff --git a/native/apache-2.0/Makefile.vc b/native/apache-2.0/Makefile.vc
index 72f3cdf..13d6980 100644
--- a/native/apache-2.0/Makefile.vc
+++ b/native/apache-2.0/Makefile.vc
@@ -29,6 +29,9 @@ APACHE2_LDIR=$(APACHE2_HOME)\lib
 !IF !DEFINED(APACHE2_IDIR) || "$(APACHE2_IDIR)" == ""
 APACHE2_IDIR=$(APACHE2_HOME)\include
 !ENDIF
+!IF !DEFINED(PREFIX) || "$PREFIX)" == ""
+PREFIX=$(APACHE2_HOME)\modules
+!ENDIF
 
 LIB = $(LIB);$(APACHE2_LDIR)
 INCLUDE = $(INCLUDE);$(APACHE2_IDIR)
@@ -109,5 +112,9 @@ $(BUILDBIN): $(WORKDIR) $(OBJECTS) $(BUILDRES)
@if exist $(BUILDMFT) \
$(MT) -nologo -manifest $(BUILDMFT) 
-outputresource:$(BUILDBIN);2
 
+install : all
+   @-xcopy /I /Y /Q "$(WORKDIR)\*.so"  "$(PREFIX)"
+   @-xcopy /I /Y /Q "$(WORKDIR)\*.pdb" "$(PREFIX)"
+
 clean:
@-$(CLEANTARGET) 2>NUL


-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org



[tomcat-connectors] branch master updated: Use correct windows WINVER

2020-06-13 Thread mturk
This is an automated email from the ASF dual-hosted git repository.

mturk pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/tomcat-connectors.git


The following commit(s) were added to refs/heads/master by this push:
 new faec73d  Use correct windows WINVER
faec73d is described below

commit faec73d7d76a9fc51c9689397286710ce198da61
Author: Mladen Turk 
AuthorDate: Sat Jun 13 17:28:02 2020 +0200

Use correct windows WINVER
---
 native/apache-2.0/Makefile.vc | 6 --
 native/iis/Makefile.vc| 8 +---
 native/iis/pcre/Makefile.vc   | 2 +-
 3 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/native/apache-2.0/Makefile.vc b/native/apache-2.0/Makefile.vc
index 8084f7d..72f3cdf 100644
--- a/native/apache-2.0/Makefile.vc
+++ b/native/apache-2.0/Makefile.vc
@@ -43,6 +43,9 @@ MACHINE = X86
 CPUFLAGS = -DWIN64 -D_WIN64
 MACHINE = AMD64
 !ENDIF
+!IF !DEFINED(WINVER) || "$(WINVER)" == ""
+WINVER = 0x0601
+!ENDIF
 
 # Modify library names or list them when calling nmake
 APACHE2_LIBS = libhttpd.lib libapr-1.lib libaprutil-1.lib
@@ -55,9 +58,8 @@ BUILDMFT = $(BUILDBIN).manifest
 WORKDIR = $(BUILD_CPU)_RELEASE
 CLEANTARGET = rd /s /q $(WORKDIR)
 MAKEWORKDIR = md $(WORKDIR)
-NMAKE_WINVER=0x0700
 
-CFLAGS = $(CFLAGS) -DNDEBUG -DWIN32 -D_WINNT -DWINNT 
-D_WIN32_WINNT=$(NMAKE_WINVER) -DWINVER=$(NMAKE_WINVER) $(CPUFLAGS)
+CFLAGS = $(CFLAGS) -DNDEBUG -DWIN32 -D_WINNT -DWINNT -D_WIN32_WINNT=$(WINVER) 
-DWINVER=$(WINVER) $(CPUFLAGS)
 CFLAGS = $(CFLAGS) $(EXTRA_CFLAGS)
 CLOPTS = /c /nologo -MD -W3 -O2 -Ob2 -Zi -EHsc
 PDBFLAGS = -Fo$(WORKDIR)\ -Fd$(WORKDIR)\$(PROJECT)
diff --git a/native/iis/Makefile.vc b/native/iis/Makefile.vc
index 817ab50..c745481 100644
--- a/native/iis/Makefile.vc
+++ b/native/iis/Makefile.vc
@@ -30,6 +30,9 @@ MACHINE = X86
 CPUFLAGS = -DWIN64 -D_WIN64
 MACHINE = AMD64
 !ENDIF
+!IF !DEFINED(WINVER) || "$(WINVER)" == ""
+WINVER = 0x0601
+!ENDIF
 
 BUILDBIN = $(WORKDIR)\$(PROJECT).dll
 BUILDRES = $(WORKDIR)\$(PROJECT).res
@@ -40,8 +43,7 @@ PCRELIB  = .\pcre\$(WORKDIR)\pcre.lib
 WORKDIR = $(BUILD_CPU)_RELEASE
 CLEANTARGET = rd /s /q $(WORKDIR)
 MAKEWORKDIR = md $(WORKDIR)
-NMAKE_WINVER=0x0700
-CFLAGS = $(CFLAGS) -DNDEBUG -DWIN32 -D_WINNT -DWINNT 
-D_WIN32_WINNT=$(NMAKE_WINVER) -DWINVER=$(NMAKE_WINVER) -DHAVE_CONFIG_H 
$(CPUFLAGS)
+CFLAGS = $(CFLAGS) -DNDEBUG -DWIN32 -D_WINNT -DWINNT -D_WIN32_WINNT=$(WINVER) 
-DWINVER=$(WINVER) -DHAVE_CONFIG_H $(CPUFLAGS)
 CFLAGS = $(CFLAGS) -DPCRE_STATIC -DJK_ISAPI -DISAPI_EXPORTS $(EXTRA_CFLAGS)
 CLOPTS = /c /nologo -MD -W3 -O2 -Ob2 -Zi -EHsc
 PDBFLAGS = -Fo$(WORKDIR)\ -Fd$(WORKDIR)\$(PROJECT)
@@ -88,7 +90,7 @@ $(BUILDRES): ..\common\jk.rc
 
 $(PCRELIB):
@cd .\pcre
-   $(MAKE) -f Makefile.vc NMAKE_WINVER=$(NMAKE_WINVER) 
BUILD_CPU=$(BUILD_CPU) CPUFLAGS="$(CPUFLAGS)"
+   $(MAKE) -f Makefile.vc WINVER=$(WINVER) BUILD_CPU=$(BUILD_CPU) 
CPUFLAGS="$(CPUFLAGS)"
@if not ERRORLEVEL 0 exit /B 1
@cd ..
 
diff --git a/native/iis/pcre/Makefile.vc b/native/iis/pcre/Makefile.vc
index 25b05a8..9fb9306 100644
--- a/native/iis/pcre/Makefile.vc
+++ b/native/iis/pcre/Makefile.vc
@@ -28,7 +28,7 @@ WORKDIR = $(BUILD_CPU)_RELEASE
 BUILDLIB = $(WORKDIR)\$(PROJECT).lib
 CLEANTARGET = rd /s /q $(WORKDIR)
 MAKEWORKDIR = md $(WORKDIR)
-CFLAGS = $(CFLAGS) -DNDEBUG -DWIN32 -D_WINNT -DWINNT 
-D_WIN32_WINNT=$(NMAKE_WINVER) -DWINVER=$(NMAKE_WINVER)
+CFLAGS = $(CFLAGS) -DNDEBUG -DWIN32 -D_WINNT -DWINNT -D_WIN32_WINNT=$(WINVER) 
-DWINVER=$(WINVER)
 CFLAGS = $(CFLAGS) -DPCRE_STATIC -DHAVE_CONFIG_H $(CPUFLAGS) $(EXTRA_CFLAGS)
 CLOPTS = /c /nologo -MD -W3 -O2 -Ob2 -Zi -EHsc
 PDBFLAGS = -Fo$(WORKDIR)\ -Fd$(WORKDIR)\$(PROJECT)


-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org



[tomcat-connectors] branch master updated: Pass common flags to pcre makefile

2020-06-13 Thread mturk
This is an automated email from the ASF dual-hosted git repository.

mturk pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/tomcat-connectors.git


The following commit(s) were added to refs/heads/master by this push:
 new ef416f7  Pass common flags to pcre makefile
ef416f7 is described below

commit ef416f7a6c5500b3f1232907097b9325b6379b38
Author: Mladen Turk 
AuthorDate: Sat Jun 13 16:59:38 2020 +0200

Pass common flags to pcre makefile
---
 native/iis/Makefile.vc  |  8 
 native/iis/pcre/Makefile.vc | 12 +++-
 2 files changed, 7 insertions(+), 13 deletions(-)

diff --git a/native/iis/Makefile.vc b/native/iis/Makefile.vc
index 4d3de57..817ab50 100644
--- a/native/iis/Makefile.vc
+++ b/native/iis/Makefile.vc
@@ -42,10 +42,10 @@ CLEANTARGET = rd /s /q $(WORKDIR)
 MAKEWORKDIR = md $(WORKDIR)
 NMAKE_WINVER=0x0700
 CFLAGS = $(CFLAGS) -DNDEBUG -DWIN32 -D_WINNT -DWINNT 
-D_WIN32_WINNT=$(NMAKE_WINVER) -DWINVER=$(NMAKE_WINVER) -DHAVE_CONFIG_H 
$(CPUFLAGS)
-CFLAGS = $(CFLAGS) -DPCRE_STATIC -DJK_ISAPI -DISAPI_EXPORTS
+CFLAGS = $(CFLAGS) -DPCRE_STATIC -DJK_ISAPI -DISAPI_EXPORTS $(EXTRA_CFLAGS)
 CLOPTS = /c /nologo -MD -W3 -O2 -Ob2 -Zi -EHsc
 PDBFLAGS = -Fo$(WORKDIR)\ -Fd$(WORKDIR)\$(PROJECT)
-LFLAGS = /nologo /DLL /INCREMENTAL:NO /DEBUG /OPT:REF /SUBSYSTEM:WINDOWS 
/MACHINE:$(MACHINE)
+LFLAGS = /nologo /DLL /INCREMENTAL:NO /DEBUG /OPT:REF /SUBSYSTEM:WINDOWS 
/MACHINE:$(MACHINE) $(EXTRA_LDFLAGS)
 LDLIBS = kernel32.lib user32.lib advapi32.lib ws2_32.lib mswsock.lib 
strsafe.lib $(EXTRA_LIBS)
 INCDIR = -I.\pcre -I..\common
 
@@ -84,11 +84,11 @@ $(WORKDIR) :
$(CC) $(CLOPTS) $(CFLAGS) $(INCDIR) $(PDBFLAGS) $<
 
 $(BUILDRES): ..\common\jk.rc
-   $(RC)/l 0x409 /i "..\common" /d "JK_ISAPI" /d "NDEBUG" /fo $(BUILDRES) 
..\common\jk.rc
+   $(RC)/l 0x409 /i ..\common /d JK_ISAPI /d NDEBUG /fo $(BUILDRES) $@
 
 $(PCRELIB):
@cd .\pcre
-   $(MAKE) -f Makefile.vc
+   $(MAKE) -f Makefile.vc NMAKE_WINVER=$(NMAKE_WINVER) 
BUILD_CPU=$(BUILD_CPU) CPUFLAGS="$(CPUFLAGS)"
@if not ERRORLEVEL 0 exit /B 1
@cd ..
 
diff --git a/native/iis/pcre/Makefile.vc b/native/iis/pcre/Makefile.vc
index da07d88..25b05a8 100644
--- a/native/iis/pcre/Makefile.vc
+++ b/native/iis/pcre/Makefile.vc
@@ -23,22 +23,16 @@ MT = mt.exe
 !IF !DEFINED(BUILD_CPU) || "$(BUILD_CPU)" == ""
 !ERROR Must specify BUILD_CPU matching compiler x86 or x64
 !ENDIF
-!IF "$(BUILD_CPU)" == "z86"
-CPUFLAGS = -D_X86_=1
-!ELSE
-CPUFLAGS = -DWIN64 -D_WIN64
-!ENDIF
 
-BUILDLIB = $(WORKDIR)\$(PROJECT).lib
 WORKDIR = $(BUILD_CPU)_RELEASE
+BUILDLIB = $(WORKDIR)\$(PROJECT).lib
 CLEANTARGET = rd /s /q $(WORKDIR)
 MAKEWORKDIR = md $(WORKDIR)
-NMAKE_WINVER=0x0700
 CFLAGS = $(CFLAGS) -DNDEBUG -DWIN32 -D_WINNT -DWINNT 
-D_WIN32_WINNT=$(NMAKE_WINVER) -DWINVER=$(NMAKE_WINVER)
-CFLAGS = $(CFLAGS) -DPCRE_STATIC -DHAVE_CONFIG_H $(CPUFLAGS)
+CFLAGS = $(CFLAGS) -DPCRE_STATIC -DHAVE_CONFIG_H $(CPUFLAGS) $(EXTRA_CFLAGS)
 CLOPTS = /c /nologo -MD -W3 -O2 -Ob2 -Zi -EHsc
 PDBFLAGS = -Fo$(WORKDIR)\ -Fd$(WORKDIR)\$(PROJECT)
-LFLAGS = -lib /nologo
+LFLAGS = -lib /nologo $(EXTRA_LFLAGS)
 
 OBJECTS = \
$(WORKDIR)\pcre_byte_order.obj \


-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org



[tomcat-connectors] branch master updated: Add support for EXTRA_LDFLAGS nad EXTRA_CFLAGS

2020-06-13 Thread mturk
This is an automated email from the ASF dual-hosted git repository.

mturk pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/tomcat-connectors.git


The following commit(s) were added to refs/heads/master by this push:
 new b765083  Add support for EXTRA_LDFLAGS nad EXTRA_CFLAGS
b765083 is described below

commit b7650833fa497cb24317d7981a48255be4d408b9
Author: Mladen Turk 
AuthorDate: Sat Jun 13 16:48:24 2020 +0200

Add support for EXTRA_LDFLAGS nad EXTRA_CFLAGS
---
 native/apache-2.0/Makefile.vc | 12 ++--
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/native/apache-2.0/Makefile.vc b/native/apache-2.0/Makefile.vc
index ad8f18b..8084f7d 100644
--- a/native/apache-2.0/Makefile.vc
+++ b/native/apache-2.0/Makefile.vc
@@ -26,12 +26,12 @@ MT = mt.exe
 !IF !DEFINED(APACHE2_LDIR) || "$(APACHE2_LDIR)" == ""
 APACHE2_LDIR=$(APACHE2_HOME)\lib
 !ENDIF
-!IF !DEFINED(APACHE2_INCS) || "$(APACHE2_INCS)" == ""
-APACHE2_INCS=$(APACHE2_HOME)\include
+!IF !DEFINED(APACHE2_IDIR) || "$(APACHE2_IDIR)" == ""
+APACHE2_IDIR=$(APACHE2_HOME)\include
 !ENDIF
 
 LIB = $(LIB);$(APACHE2_LDIR)
-INCLUDE = $(INCLUDE);$(APACHE2_INCS)
+INCLUDE = $(INCLUDE);$(APACHE2_IDIR)
 
 !IF !DEFINED(BUILD_CPU) || "$(BUILD_CPU)" == ""
 !ERROR Must specify BUILD_CPU matching compiler x86 or x64
@@ -58,10 +58,10 @@ MAKEWORKDIR = md $(WORKDIR)
 NMAKE_WINVER=0x0700
 
 CFLAGS = $(CFLAGS) -DNDEBUG -DWIN32 -D_WINNT -DWINNT 
-D_WIN32_WINNT=$(NMAKE_WINVER) -DWINVER=$(NMAKE_WINVER) $(CPUFLAGS)
-CFLAGS = $(CFLAGS)
+CFLAGS = $(CFLAGS) $(EXTRA_CFLAGS)
 CLOPTS = /c /nologo -MD -W3 -O2 -Ob2 -Zi -EHsc
 PDBFLAGS = -Fo$(WORKDIR)\ -Fd$(WORKDIR)\$(PROJECT)
-LFLAGS = /nologo /DLL /INCREMENTAL:NO /DEBUG /OPT:REF /SUBSYSTEM:WINDOWS 
/MACHINE:$(MACHINE)
+LFLAGS = /nologo /DLL /INCREMENTAL:NO /DEBUG /OPT:REF /SUBSYSTEM:WINDOWS 
/MACHINE:$(MACHINE) $(EXTRA_LDLAGS)
 LDLIBS = kernel32.lib user32.lib advapi32.lib ws2_32.lib mswsock.lib 
$(APACHE2_LIBS) $(EXTRA_LIBS)
 INCDIR = -I..\common
 
@@ -100,7 +100,7 @@ $(WORKDIR) :
$(CC) $(CLOPTS) $(CFLAGS) $(INCDIR) $(PDBFLAGS) $<
 
 $(BUILDRES): ..\common\jk.rc
-   $(RC) /l 0x409 /i "..\common" /d "MOD_JK" /d "NDEBUG" /fo $(BUILDRES) $@
+   $(RC) /l 0x409 /i ..\common /d NDEBUG /fo $(BUILDRES) $@
 
 $(BUILDBIN): $(WORKDIR) $(OBJECTS) $(BUILDRES)
$(LINK) $(LFLAGS) $(OBJECTS) $(BUILDRES) $(LDLIBS) /out:$(BUILDBIN) 
/pdb:$(BUILDPDB)


-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org



[tomcat-connectors] branch master updated: Add httpd lib and include to system paths

2020-06-13 Thread mturk
This is an automated email from the ASF dual-hosted git repository.

mturk pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/tomcat-connectors.git


The following commit(s) were added to refs/heads/master by this push:
 new 15a6fd0  Add httpd lib and include to system paths
15a6fd0 is described below

commit 15a6fd099f8a640f36b12064ee9db4d76408aaa8
Author: Mladen Turk 
AuthorDate: Sat Jun 13 16:38:37 2020 +0200

Add httpd lib and include to system paths
---
 native/apache-2.0/Makefile.vc | 13 +++--
 1 file changed, 11 insertions(+), 2 deletions(-)

diff --git a/native/apache-2.0/Makefile.vc b/native/apache-2.0/Makefile.vc
index 28f0e8f..ad8f18b 100644
--- a/native/apache-2.0/Makefile.vc
+++ b/native/apache-2.0/Makefile.vc
@@ -23,6 +23,15 @@ MT = mt.exe
 !IF !DEFINED(APACHE2_HOME) || "$(APACHE2_HOME)" == ""
 !ERROR Cannot find APACHE2_HOME. Use nmake -f Makefile.vc APACHE2_HOME=dir
 !ENDIF
+!IF !DEFINED(APACHE2_LDIR) || "$(APACHE2_LDIR)" == ""
+APACHE2_LDIR=$(APACHE2_HOME)\lib
+!ENDIF
+!IF !DEFINED(APACHE2_INCS) || "$(APACHE2_INCS)" == ""
+APACHE2_INCS=$(APACHE2_HOME)\include
+!ENDIF
+
+LIB = $(LIB);$(APACHE2_LDIR)
+INCLUDE = $(INCLUDE);$(APACHE2_INCS)
 
 !IF !DEFINED(BUILD_CPU) || "$(BUILD_CPU)" == ""
 !ERROR Must specify BUILD_CPU matching compiler x86 or x64
@@ -52,9 +61,9 @@ CFLAGS = $(CFLAGS) -DNDEBUG -DWIN32 -D_WINNT -DWINNT 
-D_WIN32_WINNT=$(NMAKE_WINV
 CFLAGS = $(CFLAGS)
 CLOPTS = /c /nologo -MD -W3 -O2 -Ob2 -Zi -EHsc
 PDBFLAGS = -Fo$(WORKDIR)\ -Fd$(WORKDIR)\$(PROJECT)
-LFLAGS = /nologo /DLL /INCREMENTAL:NO /DEBUG /OPT:REF /SUBSYSTEM:WINDOWS 
/MACHINE:$(MACHINE) /libpath:$(APACHE2_HOME)\lib
+LFLAGS = /nologo /DLL /INCREMENTAL:NO /DEBUG /OPT:REF /SUBSYSTEM:WINDOWS 
/MACHINE:$(MACHINE)
 LDLIBS = kernel32.lib user32.lib advapi32.lib ws2_32.lib mswsock.lib 
$(APACHE2_LIBS) $(EXTRA_LIBS)
-INCDIR = -I..\common -I$(APACHE2_HOME)\include
+INCDIR = -I..\common
 
 OBJECTS = \
$(WORKDIR)\jk_ajp12_worker.obj \


-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org



[tomcat-connectors] branch master updated: Use simple Makefile instead generated one

2020-06-13 Thread mturk
This is an automated email from the ASF dual-hosted git repository.

mturk pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/tomcat-connectors.git


The following commit(s) were added to refs/heads/master by this push:
 new 4748de1  Use simple Makefile instead generated one
4748de1 is described below

commit 4748de1482e7da5f27f0a3ea16128e72c579a361
Author: Mladen Turk 
AuthorDate: Sat Jun 13 16:16:01 2020 +0200

Use simple Makefile instead generated one
---
 native/apache-2.0/Makefile.vc | 352 ++
 1 file changed, 84 insertions(+), 268 deletions(-)

diff --git a/native/apache-2.0/Makefile.vc b/native/apache-2.0/Makefile.vc
index 5ebf402..28f0e8f 100644
--- a/native/apache-2.0/Makefile.vc
+++ b/native/apache-2.0/Makefile.vc
@@ -12,275 +12,91 @@
 # 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.
-
-!IFDEF APACHE20_HOME
-APR_LIB=libapr.lib
-APU_LIB=libaprutil.lib
-OUTDIR=.\Release20
-INTDIR=.\Release20
-APACHE2_HOME=$(APACHE20_HOME)
-!ELSE
-!IFDEF APACHE24_HOME
-APACHE2_HOME=$(APACHE24_HOME)
-OUTDIR=.\Release24
-INTDIR=.\Release24
-!ELSE
-!IFDEF APACHE22_HOME
-APACHE2_HOME=$(APACHE22_HOME)
-OUTDIR=.\Release22
-INTDIR=.\Release22
-!ENDIF
+#
+PROJECT = mod_jk
+# Tools
+CC = cl.exe
+LINK = link.exe
+RC = rc.exe
+MT = mt.exe
+
+!IF !DEFINED(APACHE2_HOME) || "$(APACHE2_HOME)" == ""
+!ERROR Cannot find APACHE2_HOME. Use nmake -f Makefile.vc APACHE2_HOME=dir
 !ENDIF
-APR_LIB=libapr-1.lib
-APU_LIB=libaprutil-1.lib
+
+!IF !DEFINED(BUILD_CPU) || "$(BUILD_CPU)" == ""
+!ERROR Must specify BUILD_CPU matching compiler x86 or x64
 !ENDIF
-!IFNDEF APACHE2_HOME
-!ERROR Missing APACHE2_HOME environment variable.
+!IF "$(BUILD_CPU)" == "x86"
+CPUFLAGS = -D_X86_=1
+MACHINE = X86
+!ELSE
+CPUFLAGS = -DWIN64 -D_WIN64
+MACHINE = AMD64
 !ENDIF
 
-TARGET=mod_jk$(SO_VERSION)$(SO_HTTPD_VERSION)
-CPP=cl.exe
-MTL=midl.exe
-RSC=rc.exe
-ARCH=X86
-
-ALL : "$(OUTDIR)\$(TARGET).so"
-
-
-CLEAN :
-   -@erase "$(INTDIR)\jk.res"
-   -@erase "$(INTDIR)\jk_ajp12_worker.obj"
-   -@erase "$(INTDIR)\jk_ajp13.obj"
-   -@erase "$(INTDIR)\jk_ajp13_worker.obj"
-   -@erase "$(INTDIR)\jk_ajp14.obj"
-   -@erase "$(INTDIR)\jk_ajp14_worker.obj"
-   -@erase "$(INTDIR)\jk_ajp_common.obj"
-   -@erase "$(INTDIR)\jk_connect.obj"
-   -@erase "$(INTDIR)\jk_context.obj"
-   -@erase "$(INTDIR)\jk_lb_worker.obj"
-   -@erase "$(INTDIR)\jk_map.obj"
-   -@erase "$(INTDIR)\jk_md5.obj"
-   -@erase "$(INTDIR)\jk_msg_buff.obj"
-   -@erase "$(INTDIR)\jk_pool.obj"
-   -@erase "$(INTDIR)\jk_shm.obj"
-   -@erase "$(INTDIR)\jk_sockbuf.obj"
-   -@erase "$(INTDIR)\jk_status.obj"
-   -@erase "$(INTDIR)\jk_uri_worker_map.obj"
-   -@erase "$(INTDIR)\jk_url.obj"
-   -@erase "$(INTDIR)\jk_util.obj"
-   -@erase "$(INTDIR)\jk_worker.obj"
-   -@erase "$(INTDIR)\mod_jk.obj"
-   -@erase "$(INTDIR)\mod_jk_src.idb"
-   -@erase "$(INTDIR)\mod_jk_src.pdb"
-   -@erase "$(OUTDIR)\mod_jk.exp"
-   -@erase "$(OUTDIR)\mod_jk.lib"
-   -@erase "$(OUTDIR)\$(TARGET).pdb"
-   -@erase "$(OUTDIR)\$(TARGET).so"
-
-"$(OUTDIR)" :
-if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
-
-BSC32=bscmake.exe
-BSC32_FLAGS=/nologo /o"$(OUTDIR)\$(TARGET).bsc"
-BSC32_SBRS= \
-
-LINK32=link.exe
-LINK32_FLAGS=libhttpd.lib $(APR_LIB) $(APU_LIB) kernel32.lib user32.lib 
advapi32.lib mswsock.lib ws2_32.lib $(EXTRA_LIBS) /nologo /base:"0x6A6B" 
/subsystem:windows /dll /incremental:no /pdb:"$(OUTDIR)\$(TARGET).pdb" /debug 
/machine:$(ARCH) /out:"$(OUTDIR)\$(TARGET).so" /implib:"$(OUTDIR)\mod_jk.lib" 
/libpath:"$(APACHE2_HOME)\lib" /opt:ref
-LINK32_OBJS= \
-   "$(INTDIR)\jk_ajp12_worker.obj" \
-   "$(INTDIR)\jk_ajp13.obj" \
-   "$(INTDIR)\jk_ajp13_worker.obj" \
-   "$(INTDIR)\jk_ajp14.obj" \
-   "$(INTDIR)\jk_ajp14_worker.obj" \
-   "$(INTDIR)\jk_ajp_common.obj" \
-   "$(INTDIR)\jk_connect.obj" \
-   "$(INTDIR)\jk_context.obj" \
-   "$(INTDIR)\jk_lb_worker.obj" \
-   "$(INTDIR)\jk_map.obj" \
-   "$(INTDIR)\jk_md5.obj" \
-   "$(INTDIR)\jk_msg_buff.obj" \
-   "$(INTDIR)\jk_pool.obj" \
-   "$(INTDIR)\jk_shm.obj" \
-   "$(INTDIR)\jk_sockbuf.obj" \
-   "$(INTDIR)\

[tomcat-connectors] branch master updated: Use .vc suffix for windows makefile

2020-06-13 Thread mturk
This is an automated email from the ASF dual-hosted git repository.

mturk pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/tomcat-connectors.git


The following commit(s) were added to refs/heads/master by this push:
 new cf2f96c  Use .vc suffix for windows makefile
cf2f96c is described below

commit cf2f96cb8595b57ff7b2bd52cea7fd1d1c501a88
Author: Mladen Turk 
AuthorDate: Sat Jun 13 15:40:24 2020 +0200

Use .vc suffix for windows makefile
---
 native/iis/{Makefile => Makefile.vc}  | 4 ++--
 native/iis/README | 4 ++--
 native/iis/pcre/{Makefile => Makefile.vc} | 0
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/native/iis/Makefile b/native/iis/Makefile.vc
similarity index 95%
rename from native/iis/Makefile
rename to native/iis/Makefile.vc
index 9572e19..4d3de57 100644
--- a/native/iis/Makefile
+++ b/native/iis/Makefile.vc
@@ -88,7 +88,7 @@ $(BUILDRES): ..\common\jk.rc
 
 $(PCRELIB):
@cd .\pcre
-   $(MAKE)
+   $(MAKE) -f Makefile.vc
@if not ERRORLEVEL 0 exit /B 1
@cd ..
 
@@ -99,7 +99,7 @@ $(BUILDBIN): $(PCRELIB) $(WORKDIR) $(OBJECTS) $(BUILDRES)
 
 clean:
@cd .\pcre
-   $(MAKE) clean
+   $(MAKE) -f Makefile.vc clean
@if not ERRORLEVEL 0 exit /B 1
@cd ..
@-$(CLEANTARGET) 2>NUL
diff --git a/native/iis/README b/native/iis/README
index ac25a2d..2826220 100644
--- a/native/iis/README
+++ b/native/iis/README
@@ -29,12 +29,12 @@ Obtain the source code:
 Build  isapi_redirector.dll:
 
 c:\cmsc-15.0_28\setenv.bat x86
-nmake
+nmake -f Makefile.vc
 
 open new cmd.exe
 
 c:\cmsc-15.0_28\setenv.bat x64
-nmake
+nmake -f Makefile.vc
 
 Tomcat isapi_redirect DLLs may then be found in
 tomcat-connectors\native\iis\[x86|x64]_RELEASE
diff --git a/native/iis/pcre/Makefile b/native/iis/pcre/Makefile.vc
similarity index 100%
rename from native/iis/pcre/Makefile
rename to native/iis/pcre/Makefile.vc


-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org



[tomcat-connectors] branch master updated: Simplify docs

2020-06-13 Thread mturk
This is an automated email from the ASF dual-hosted git repository.

mturk pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/tomcat-connectors.git


The following commit(s) were added to refs/heads/master by this push:
 new a74758c  Simplify docs
a74758c is described below

commit a74758cfa676a1e27635e804cb367c362bbbf708
Author: Mladen Turk 
AuthorDate: Sat Jun 13 14:13:16 2020 +0200

Simplify docs
---
 native/iis/README | 18 --
 1 file changed, 8 insertions(+), 10 deletions(-)

diff --git a/native/iis/README b/native/iis/README
index d3d6f7b..ac25a2d 100644
--- a/native/iis/README
+++ b/native/iis/README
@@ -22,24 +22,22 @@ BUILDING
 
 Obtain the source code:
 
-  c:
-  cd \
-  git clone  https://github.com/apache/tomcat-connectors.git tomcat-jk-1.2.x
-  cd tomcat-jk-1.2.x\native\iis
+  git clone https://github.com/apache/tomcat-connectors.git
+  cd tomcat-connectors\native\iis
 
 
 Build  isapi_redirector.dll:
 
-  c:\cmsc-15.0_28\setenv.bat x86
-  nmake
+c:\cmsc-15.0_28\setenv.bat x86
+nmake
 
-  open new cmd.exe
+open new cmd.exe
 
-  c:\cmsc-15.0_28\setenv.bat x64
-  nmake
+c:\cmsc-15.0_28\setenv.bat x64
+nmake
 
 Tomcat isapi_redirect DLLs may then be found in
-C:\tomcat-jk-1.2.x\native\iis\[x86|x64]_RELEASE
+tomcat-connectors\native\iis\[x86|x64]_RELEASE
 
 
 


-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org



[tomcat-connectors] branch master updated: Fix typos

2020-06-13 Thread mturk
This is an automated email from the ASF dual-hosted git repository.

mturk pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/tomcat-connectors.git


The following commit(s) were added to refs/heads/master by this push:
 new 1e51bff  Fix typos
1e51bff is described below

commit 1e51bff4960891cf6af8c3454d9dbdb0713d11fa
Author: Mladen Turk 
AuthorDate: Sat Jun 13 14:08:54 2020 +0200

Fix typos
---
 native/iis/README | 8 +---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/native/iis/README b/native/iis/README
index d86298f..d3d6f7b 100644
--- a/native/iis/README
+++ b/native/iis/README
@@ -19,22 +19,24 @@ environment:
 
 BUILDING
 
- 
+
 Obtain the source code:
 
   c:
   cd \
   git clone  https://github.com/apache/tomcat-connectors.git tomcat-jk-1.2.x
   cd tomcat-jk-1.2.x\native\iis
- 
+
 
 Build  isapi_redirector.dll:
 
   c:\cmsc-15.0_28\setenv.bat x86
   nmake
 
+  open new cmd.exe
+
   c:\cmsc-15.0_28\setenv.bat x64
-  nmake -f
+  nmake
 
 Tomcat isapi_redirect DLLs may then be found in
 C:\tomcat-jk-1.2.x\native\iis\[x86|x64]_RELEASE


-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org



[tomcat-connectors] branch master updated: Add pcre/Makefile

2020-06-13 Thread mturk
This is an automated email from the ASF dual-hosted git repository.

mturk pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/tomcat-connectors.git


The following commit(s) were added to refs/heads/master by this push:
 new e98b2ec  Add pcre/Makefile
e98b2ec is described below

commit e98b2ec1b4d1b0c90156c46803892c6eded3df30
Author: Mladen Turk 
AuthorDate: Sat Jun 13 14:04:54 2020 +0200

Add pcre/Makefile
---
 native/iis/pcre/Makefile | 80 
 1 file changed, 80 insertions(+)

diff --git a/native/iis/pcre/Makefile b/native/iis/pcre/Makefile
new file mode 100644
index 000..da07d88
--- /dev/null
+++ b/native/iis/pcre/Makefile
@@ -0,0 +1,80 @@
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements.  See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You 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.
+#
+PROJECT = pcre
+# Tools
+CC = cl.exe
+LINK = link.exe
+RC = rc.exe
+MT = mt.exe
+
+!IF !DEFINED(BUILD_CPU) || "$(BUILD_CPU)" == ""
+!ERROR Must specify BUILD_CPU matching compiler x86 or x64
+!ENDIF
+!IF "$(BUILD_CPU)" == "z86"
+CPUFLAGS = -D_X86_=1
+!ELSE
+CPUFLAGS = -DWIN64 -D_WIN64
+!ENDIF
+
+BUILDLIB = $(WORKDIR)\$(PROJECT).lib
+WORKDIR = $(BUILD_CPU)_RELEASE
+CLEANTARGET = rd /s /q $(WORKDIR)
+MAKEWORKDIR = md $(WORKDIR)
+NMAKE_WINVER=0x0700
+CFLAGS = $(CFLAGS) -DNDEBUG -DWIN32 -D_WINNT -DWINNT 
-D_WIN32_WINNT=$(NMAKE_WINVER) -DWINVER=$(NMAKE_WINVER)
+CFLAGS = $(CFLAGS) -DPCRE_STATIC -DHAVE_CONFIG_H $(CPUFLAGS)
+CLOPTS = /c /nologo -MD -W3 -O2 -Ob2 -Zi -EHsc
+PDBFLAGS = -Fo$(WORKDIR)\ -Fd$(WORKDIR)\$(PROJECT)
+LFLAGS = -lib /nologo
+
+OBJECTS = \
+   $(WORKDIR)\pcre_byte_order.obj \
+   $(WORKDIR)\pcre_chartables.obj \
+   $(WORKDIR)\pcre_compile.obj \
+   $(WORKDIR)\pcre_config.obj \
+   $(WORKDIR)\pcre_dfa_exec.obj \
+   $(WORKDIR)\pcre_exec.obj \
+   $(WORKDIR)\pcre_fullinfo.obj \
+   $(WORKDIR)\pcre_get.obj \
+   $(WORKDIR)\pcre_globals.obj \
+   $(WORKDIR)\pcre_jit_compile.obj \
+   $(WORKDIR)\pcre_maketables.obj \
+   $(WORKDIR)\pcre_newline.obj \
+   $(WORKDIR)\pcre_ord2utf8.obj \
+   $(WORKDIR)\pcre_refcount.obj \
+   $(WORKDIR)\pcre_string_utils.obj \
+   $(WORKDIR)\pcre_study.obj \
+   $(WORKDIR)\pcre_tables.obj \
+   $(WORKDIR)\pcre_ucd.obj \
+   $(WORKDIR)\pcre_valid_utf8.obj \
+   $(WORKDIR)\pcre_version.obj \
+   $(WORKDIR)\pcre_xclass.obj
+
+
+
+all : $(WORKDIR) $(BUILDLIB)
+
+$(WORKDIR) :
+   @$(MAKEWORKDIR)
+
+.c{$(WORKDIR)}.obj:
+   $(CC) $(CLOPTS) $(CFLAGS) $(PDBFLAGS) $<
+
+$(BUILDLIB): $(WORKDIR) $(OBJECTS)
+   $(LINK) $(LFLAGS) $(OBJECTS) /out:$(BUILDLIB)
+
+clean:
+   @-$(CLEANTARGET) 2>NUL


-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org



[tomcat-connectors] branch master updated: Silence The system cannot find the file specified message

2020-06-13 Thread mturk
This is an automated email from the ASF dual-hosted git repository.

mturk pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/tomcat-connectors.git


The following commit(s) were added to refs/heads/master by this push:
 new 26248d8  Silence The system cannot find the file specified message
26248d8 is described below

commit 26248d8a5df9594c637e0e61f8b53297ec747cb2
Author: Mladen Turk 
AuthorDate: Sat Jun 13 13:36:52 2020 +0200

Silence The system cannot find the file specified message
---
 native/iis/Makefile | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/native/iis/Makefile b/native/iis/Makefile
index a84190b..9572e19 100644
--- a/native/iis/Makefile
+++ b/native/iis/Makefile
@@ -102,5 +102,4 @@ clean:
$(MAKE) clean
@if not ERRORLEVEL 0 exit /B 1
@cd ..
-   @-$(CLEANTARGET)
-
+   @-$(CLEANTARGET) 2>NUL


-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org



[tomcat-connectors] branch master updated: Use simple rmdir/mkdir

2020-06-13 Thread mturk
This is an automated email from the ASF dual-hosted git repository.

mturk pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/tomcat-connectors.git


The following commit(s) were added to refs/heads/master by this push:
 new 8fc2706  Use simple rmdir/mkdir
8fc2706 is described below

commit 8fc2706cbee516aa330768ad19aefff2e91dafbb
Author: Mladen Turk 
AuthorDate: Sat Jun 13 13:30:25 2020 +0200

Use simple rmdir/mkdir
---
 native/iis/Makefile | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/native/iis/Makefile b/native/iis/Makefile
index 7e22e48..a84190b 100644
--- a/native/iis/Makefile
+++ b/native/iis/Makefile
@@ -38,8 +38,8 @@ BUILDMFT = $(BUILDBIN).manifest
 PCRELIB  = .\pcre\$(WORKDIR)\pcre.lib
 
 WORKDIR = $(BUILD_CPU)_RELEASE
-CLEANTARGET=if exist "$(WORKDIR)" rd /s /q $(WORKDIR)
-MAKEWORKDIR=if not exist "$(WORKDIR)" md $(WORKDIR)
+CLEANTARGET = rd /s /q $(WORKDIR)
+MAKEWORKDIR = md $(WORKDIR)
 NMAKE_WINVER=0x0700
 CFLAGS = $(CFLAGS) -DNDEBUG -DWIN32 -D_WINNT -DWINNT 
-D_WIN32_WINNT=$(NMAKE_WINVER) -DWINVER=$(NMAKE_WINVER) -DHAVE_CONFIG_H 
$(CPUFLAGS)
 CFLAGS = $(CFLAGS) -DPCRE_STATIC -DJK_ISAPI -DISAPI_EXPORTS
@@ -102,5 +102,5 @@ clean:
$(MAKE) clean
@if not ERRORLEVEL 0 exit /B 1
@cd ..
-   @$(CLEANTARGET)
+   @-$(CLEANTARGET)
 


-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org



[tomcat-connectors] branch master updated: Check for return value from subtask

2020-06-13 Thread mturk
This is an automated email from the ASF dual-hosted git repository.

mturk pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/tomcat-connectors.git


The following commit(s) were added to refs/heads/master by this push:
 new ab91bce  Check for return value from subtask
ab91bce is described below

commit ab91bced3b7077075395e5a279d5b9e153a329cc
Author: Mladen Turk 
AuthorDate: Sat Jun 13 13:16:24 2020 +0200

Check for return value from subtask
---
 native/iis/Makefile | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/native/iis/Makefile b/native/iis/Makefile
index d92a1d4..7e22e48 100644
--- a/native/iis/Makefile
+++ b/native/iis/Makefile
@@ -89,6 +89,7 @@ $(BUILDRES): ..\common\jk.rc
 $(PCRELIB):
@cd .\pcre
$(MAKE)
+   @if not ERRORLEVEL 0 exit /B 1
@cd ..
 
 $(BUILDBIN): $(PCRELIB) $(WORKDIR) $(OBJECTS) $(BUILDRES)
@@ -97,8 +98,9 @@ $(BUILDBIN): $(PCRELIB) $(WORKDIR) $(OBJECTS) $(BUILDRES)
$(MT) -nologo -manifest $(BUILDMFT) 
-outputresource:$(BUILDBIN);2
 
 clean:
-   @$(CLEANTARGET)
@cd .\pcre
$(MAKE) clean
+   @if not ERRORLEVEL 0 exit /B 1
@cd ..
+   @$(CLEANTARGET)
 


-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org



[tomcat-connectors] branch master updated: Embedd manifest file

2020-06-13 Thread mturk
This is an automated email from the ASF dual-hosted git repository.

mturk pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/tomcat-connectors.git


The following commit(s) were added to refs/heads/master by this push:
 new 45d624d  Embedd manifest file
45d624d is described below

commit 45d624df2a8c2b3a2aca33500b8aa3d3d08a09ed
Author: Mladen Turk 
AuthorDate: Sat Jun 13 13:01:19 2020 +0200

Embedd manifest file
---
 native/iis/Makefile | 14 +-
 1 file changed, 9 insertions(+), 5 deletions(-)

diff --git a/native/iis/Makefile b/native/iis/Makefile
index f46844c..d92a1d4 100644
--- a/native/iis/Makefile
+++ b/native/iis/Makefile
@@ -34,6 +34,7 @@ MACHINE = AMD64
 BUILDBIN = $(WORKDIR)\$(PROJECT).dll
 BUILDRES = $(WORKDIR)\$(PROJECT).res
 BUILDPDB = $(WORKDIR)\$(PROJECT).pdb
+BUILDMFT = $(BUILDBIN).manifest
 PCRELIB  = .\pcre\$(WORKDIR)\pcre.lib
 
 WORKDIR = $(BUILD_CPU)_RELEASE
@@ -71,7 +72,7 @@ OBJECTS = \
$(WORKDIR)\jk_util.obj \
$(WORKDIR)\jk_worker.obj
 
-all : pcre $(WORKDIR) $(BUILDBIN)
+all : $(WORKDIR) $(PCRELIB) $(BUILDBIN)
 
 $(WORKDIR) :
@$(MAKEWORKDIR)
@@ -86,15 +87,18 @@ $(BUILDRES): ..\common\jk.rc
$(RC)/l 0x409 /i "..\common" /d "JK_ISAPI" /d "NDEBUG" /fo $(BUILDRES) 
..\common\jk.rc
 
 $(PCRELIB):
-   cd .\pcre
+   @cd .\pcre
$(MAKE)
-   cd ..
+   @cd ..
+
 $(BUILDBIN): $(PCRELIB) $(WORKDIR) $(OBJECTS) $(BUILDRES)
$(LINK) $(LFLAGS) $(OBJECTS) $(PCRELIB) $(BUILDRES) $(LDLIBS) 
/def:isapi.def /out:$(BUILDBIN) /pdb:$(BUILDPDB)
+   @if exist $(BUILDMFT) \
+   $(MT) -nologo -manifest $(BUILDMFT) 
-outputresource:$(BUILDBIN);2
 
 clean:
@$(CLEANTARGET)
-   cd .\pcre
+   @cd .\pcre
$(MAKE) clean
-   cd ..
+   @cd ..
 


-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org



[tomcat-connectors] branch master updated: Remove useless .gitignore

2020-06-13 Thread mturk
This is an automated email from the ASF dual-hosted git repository.

mturk pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/tomcat-connectors.git


The following commit(s) were added to refs/heads/master by this push:
 new 25f9102  Remove useless .gitignore
25f9102 is described below

commit 25f91022e446e9095a42f3d5248424dffeb7f94f
Author: Mladen Turk 
AuthorDate: Sat Jun 13 12:29:23 2020 +0200

Remove useless .gitignore
---
 native/iis/.gitignore | 6 --
 1 file changed, 6 deletions(-)

diff --git a/native/iis/.gitignore b/native/iis/.gitignore
deleted file mode 100644
index 502b31a..000
--- a/native/iis/.gitignore
+++ /dev/null
@@ -1,6 +0,0 @@
-Debug
-Release
-*.ncb
-*.opt
-*.plg
-Release_amd64


-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org



[tomcat-connectors] branch master updated: Update build instructions

2020-06-13 Thread mturk
This is an automated email from the ASF dual-hosted git repository.

mturk pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/tomcat-connectors.git


The following commit(s) were added to refs/heads/master by this push:
 new 4abc9ce  Update build instructions
4abc9ce is described below

commit 4abc9ce38d0c8a5665d09ce43c329b62725f6511
Author: Mladen Turk 
AuthorDate: Sat Jun 13 12:25:57 2020 +0200

Update build instructions
---
 native/iis/README | 26 --
 1 file changed, 8 insertions(+), 18 deletions(-)

diff --git a/native/iis/README b/native/iis/README
index 397b886..d86298f 100644
--- a/native/iis/README
+++ b/native/iis/README
@@ -12,19 +12,9 @@ To build the ISAPI redirector you will need to create the 
following build
 environment:
 
 - Git client
-- Subversion client
 - Mladen's Custom Microsoft Compiler Toolkit Compilation  
-https://github.com/mturk/cmsc (cb6be932c8c95a46262a64a89e68aae620dfdcee)  
-- Windows SDK  
-No documentation  
-No samples  
-Complete set of developer tools  
-- Windows DDK  
-Build environments  
-Tools  
-- Compile as per /tools/README.txt  
-- Install Perl as per /tools/README.txt  
-- Java 7 (releases only, can be replaced with any zip tool)
+https://github.com/mturk/cmsc/releases/tag/v15.0.28
+download cmsc-15.0_28-win7-x86_x64.zip and unzip in C:
 
 
 BUILDING
@@ -40,14 +30,14 @@ Obtain the source code:
 
 Build  isapi_redirector.dll:
 
-  c:\cmsc\setenv.bat /x86 
-  nmake -f Makefile.x86
- 
-  c:\cmsc\setenv.bat /x64
-  nmake -f Makefile.amd64
+  c:\cmsc-15.0_28\setenv.bat x86
+  nmake
+
+  c:\cmsc-15.0_28\setenv.bat x64
+  nmake -f
 
 Tomcat isapi_redirect DLLs may then be found in
-C:\tomcat-jk-1.2.x\native\iis\Release_[amd64|x86].
+C:\tomcat-jk-1.2.x\native\iis\[x86|x64]_RELEASE
 
 
 


-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org



[tomcat-connectors] branch master updated: Add windows makefile

2020-06-13 Thread mturk
This is an automated email from the ASF dual-hosted git repository.

mturk pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/tomcat-connectors.git


The following commit(s) were added to refs/heads/master by this push:
 new 4c9af8c  Add windows makefile
4c9af8c is described below

commit 4c9af8c2180ad84116e3d367ff26ff0ba715d4ef
Author: Mladen Turk 
AuthorDate: Sat Jun 13 12:16:05 2020 +0200

Add windows makefile
---
 native/iis/Makefile | 100 
 1 file changed, 100 insertions(+)

diff --git a/native/iis/Makefile b/native/iis/Makefile
new file mode 100644
index 000..f46844c
--- /dev/null
+++ b/native/iis/Makefile
@@ -0,0 +1,100 @@
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements.  See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You 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.
+#
+PROJECT = isapi_redirect
+# Tools
+CC = cl.exe
+LINK = link.exe
+RC = rc.exe
+MT = mt.exe
+
+!IF !DEFINED(BUILD_CPU) || "$(BUILD_CPU)" == ""
+!ERROR Must specify BUILD_CPU matching compiler x86 or x64
+!ENDIF
+!IF "$(BUILD_CPU)" == "x86"
+CPUFLAGS = -D_X86_=1
+MACHINE = X86
+!ELSE
+CPUFLAGS = -DWIN64 -D_WIN64
+MACHINE = AMD64
+!ENDIF
+
+BUILDBIN = $(WORKDIR)\$(PROJECT).dll
+BUILDRES = $(WORKDIR)\$(PROJECT).res
+BUILDPDB = $(WORKDIR)\$(PROJECT).pdb
+PCRELIB  = .\pcre\$(WORKDIR)\pcre.lib
+
+WORKDIR = $(BUILD_CPU)_RELEASE
+CLEANTARGET=if exist "$(WORKDIR)" rd /s /q $(WORKDIR)
+MAKEWORKDIR=if not exist "$(WORKDIR)" md $(WORKDIR)
+NMAKE_WINVER=0x0700
+CFLAGS = $(CFLAGS) -DNDEBUG -DWIN32 -D_WINNT -DWINNT 
-D_WIN32_WINNT=$(NMAKE_WINVER) -DWINVER=$(NMAKE_WINVER) -DHAVE_CONFIG_H 
$(CPUFLAGS)
+CFLAGS = $(CFLAGS) -DPCRE_STATIC -DJK_ISAPI -DISAPI_EXPORTS
+CLOPTS = /c /nologo -MD -W3 -O2 -Ob2 -Zi -EHsc
+PDBFLAGS = -Fo$(WORKDIR)\ -Fd$(WORKDIR)\$(PROJECT)
+LFLAGS = /nologo /DLL /INCREMENTAL:NO /DEBUG /OPT:REF /SUBSYSTEM:WINDOWS 
/MACHINE:$(MACHINE)
+LDLIBS = kernel32.lib user32.lib advapi32.lib ws2_32.lib mswsock.lib 
strsafe.lib $(EXTRA_LIBS)
+INCDIR = -I.\pcre -I..\common
+
+OBJECTS = \
+   $(WORKDIR)\jk_ajp12_worker.obj \
+   $(WORKDIR)\jk_ajp13.obj \
+   $(WORKDIR)\jk_ajp13_worker.obj \
+   $(WORKDIR)\jk_ajp14.obj \
+   $(WORKDIR)\jk_ajp14_worker.obj \
+   $(WORKDIR)\jk_ajp_common.obj \
+   $(WORKDIR)\jk_connect.obj \
+   $(WORKDIR)\jk_context.obj \
+   $(WORKDIR)\jk_isapi_plugin.obj \
+   $(WORKDIR)\jk_lb_worker.obj \
+   $(WORKDIR)\jk_map.obj \
+   $(WORKDIR)\jk_md5.obj \
+   $(WORKDIR)\jk_msg_buff.obj \
+   $(WORKDIR)\jk_pool.obj \
+   $(WORKDIR)\jk_shm.obj \
+   $(WORKDIR)\jk_sockbuf.obj \
+   $(WORKDIR)\jk_status.obj \
+   $(WORKDIR)\jk_uri_worker_map.obj \
+   $(WORKDIR)\jk_url.obj \
+   $(WORKDIR)\jk_util.obj \
+   $(WORKDIR)\jk_worker.obj
+
+all : pcre $(WORKDIR) $(BUILDBIN)
+
+$(WORKDIR) :
+   @$(MAKEWORKDIR)
+
+.c{$(WORKDIR)}.obj:
+   $(CC) $(CLOPTS) $(CFLAGS) $(INCDIR) $(PDBFLAGS) $<
+
+{..\common}.c{$(WORKDIR)}.obj:
+   $(CC) $(CLOPTS) $(CFLAGS) $(INCDIR) $(PDBFLAGS) $<
+
+$(BUILDRES): ..\common\jk.rc
+   $(RC)/l 0x409 /i "..\common" /d "JK_ISAPI" /d "NDEBUG" /fo $(BUILDRES) 
..\common\jk.rc
+
+$(PCRELIB):
+   cd .\pcre
+   $(MAKE)
+   cd ..
+$(BUILDBIN): $(PCRELIB) $(WORKDIR) $(OBJECTS) $(BUILDRES)
+   $(LINK) $(LFLAGS) $(OBJECTS) $(PCRELIB) $(BUILDRES) $(LDLIBS) 
/def:isapi.def /out:$(BUILDBIN) /pdb:$(BUILDPDB)
+
+clean:
+   @$(CLEANTARGET)
+   cd .\pcre
+   $(MAKE) clean
+   cd ..
+


-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org



[tomcat-connectors] branch master updated: Allow Makefile for iis

2020-06-13 Thread mturk
This is an automated email from the ASF dual-hosted git repository.

mturk pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/tomcat-connectors.git


The following commit(s) were added to refs/heads/master by this push:
 new 89b2976  Allow Makefile for iis
89b2976 is described below

commit 89b29767f5305caf825ff5603c672af400f8c357
Author: Mladen Turk 
AuthorDate: Sat Jun 13 12:15:29 2020 +0200

Allow Makefile for iis
---
 native/.gitignore | 1 -
 1 file changed, 1 deletion(-)

diff --git a/native/.gitignore b/native/.gitignore
index 72ab134..850aacf 100644
--- a/native/.gitignore
+++ b/native/.gitignore
@@ -2,7 +2,6 @@ Makefile.in
 aclocal.m4
 configure
 config.log
-Makefile
 config.cache
 libtool
 config.status


-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org



[tomcat-native] branch master updated: Use new OpenSSL v1.1+ initialization API

2019-08-28 Thread mturk
This is an automated email from the ASF dual-hosted git repository.

mturk pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/tomcat-native.git


The following commit(s) were added to refs/heads/master by this push:
 new b8649e8  Use new OpenSSL v1.1+ initialization API
b8649e8 is described below

commit b8649e81458194d70667952d9e26df82a79c773f
Author: Mladen Turk 
AuthorDate: Wed Aug 28 18:38:58 2019 +0200

Use new OpenSSL v1.1+ initialization API
---
 native/src/ssl.c | 16 ++--
 1 file changed, 14 insertions(+), 2 deletions(-)

diff --git a/native/src/ssl.c b/native/src/ssl.c
index 9dbdcd4..473ca49 100644
--- a/native/src/ssl.c
+++ b/native/src/ssl.c
@@ -371,6 +371,11 @@ static apr_status_t ssl_init_cleanup(void *data)
 #endif
 free_dh_params();
 
+#if OPENSSL_VERSION_NUMBER >= 0x1010L && !defined(LIBRESSL_VERSION_NUMBER)
+/* Openssl v1.1+ handles all termination automatically. Do
+ * nothing in this case.
+ */
+#else
 /*
  * Try to kill the internals of the SSL library.
  */
@@ -393,6 +398,7 @@ static apr_status_t ssl_init_cleanup(void *data)
 #if OPENSSL_VERSION_NUMBER < 0x1010L || defined(LIBRESSL_VERSION_NUMBER)
 ERR_remove_thread_state(NULL);
 #endif
+#endif
 
 #ifdef HAVE_KEYLOG_CALLBACK
 if (key_log_file) {
@@ -783,7 +789,14 @@ TCN_IMPLEMENT_CALL(jint, SSL, initialize)(TCN_STDARGS, 
jstring engine)
 TCN_FREE_CSTRING(engine);
 return (jint)APR_SUCCESS;
 }
-
+#if OPENSSL_VERSION_NUMBER >= 0x1010L && !defined(LIBRESSL_VERSION_NUMBER)
+/* Openssl v1.1+ handles all initialisation automatically, apart
+ * from hints as to how we want to use the library.
+ *
+ * We tell openssl we want to include engine support.
+ */
+OPENSSL_init_ssl(OPENSSL_INIT_ENGINE_ALL_BUILTIN, NULL);
+#else
 /* We must register the library in full, to ensure our configuration
  * code can successfully test the SSL environment.
  */
@@ -797,7 +810,6 @@ TCN_IMPLEMENT_CALL(jint, SSL, initialize)(TCN_STDARGS, 
jstring engine)
 #endif
 OPENSSL_load_builtin_modules();
 
-#if OPENSSL_VERSION_NUMBER < 0x1010L
 #if ! (defined(WIN32) || defined(WIN64))
 err = apr_threadkey_private_create(_exit_key, _ssl_thread_exit,
tcn_global_pool);


-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org



svn commit: r1602115 - /tomcat/jk/trunk/native/common/jk_connect.c

2014-06-12 Thread mturk
Author: mturk
Date: Thu Jun 12 10:42:55 2014
New Revision: 1602115

URL: http://svn.apache.org/r1602115
Log:
Make sure we have prefer_ipv6 set for hostnames containig colon

Modified:
tomcat/jk/trunk/native/common/jk_connect.c

Modified: tomcat/jk/trunk/native/common/jk_connect.c
URL: 
http://svn.apache.org/viewvc/tomcat/jk/trunk/native/common/jk_connect.c?rev=1602115r1=1602114r2=1602115view=diff
==
--- tomcat/jk/trunk/native/common/jk_connect.c (original)
+++ tomcat/jk/trunk/native/common/jk_connect.c Thu Jun 12 10:42:55 2014
@@ -443,7 +443,14 @@ int jk_resolve(const char *host, int por
 memset(hints, 0, sizeof(hints));
 hints.ai_socktype = SOCK_STREAM;
 hints.ai_protocol = IPPROTO_TCP;
+
 #if JK_HAVE_IPV6
+if (strchr(host, ':')) {
+/* If host name contains collon this must be IPV6 address.
+ * Set prefer_ipv6 flag in this case if it wasn't set already
+ */
+prefer_ipv6 = 1;
+}
 if (prefer_ipv6)
 hints.ai_family = JK_INET6;
 else



-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org



svn commit: r1599095 - in /tomcat/jk/trunk: native/common/jk_connect.c xdocs/miscellaneous/changelog.xml

2014-06-02 Thread mturk
Author: mturk
Date: Mon Jun  2 06:44:28 2014
New Revision: 1599095

URL: http://svn.apache.org/r1599095
Log:
Fix BZ56565

Modified:
tomcat/jk/trunk/native/common/jk_connect.c
tomcat/jk/trunk/xdocs/miscellaneous/changelog.xml

Modified: tomcat/jk/trunk/native/common/jk_connect.c
URL: 
http://svn.apache.org/viewvc/tomcat/jk/trunk/native/common/jk_connect.c?rev=1599095r1=1599094r2=1599095view=diff
==
--- tomcat/jk/trunk/native/common/jk_connect.c (original)
+++ tomcat/jk/trunk/native/common/jk_connect.c Mon Jun  2 06:44:28 2014
@@ -400,6 +400,13 @@ int jk_resolve(const char *host, int por
 else {
 while ((NULL != temp_sa)  (APR_INET != temp_sa-family))
 temp_sa = temp_sa-next;
+#if APR_HAVE_IPV6
+if (NULL == temp_sa) {
+temp_sa = remote_sa;
+while ((NULL != temp_sa)  (APR_INET6 != temp_sa-family))
+temp_sa = temp_sa-next;
+}
+#endif
 }
 /* if temp_sa is set, we have a valid address otherwise, just 
return */
 if (NULL != temp_sa) {

Modified: tomcat/jk/trunk/xdocs/miscellaneous/changelog.xml
URL: 
http://svn.apache.org/viewvc/tomcat/jk/trunk/xdocs/miscellaneous/changelog.xml?rev=1599095r1=1599094r2=1599095view=diff
==
--- tomcat/jk/trunk/xdocs/miscellaneous/changelog.xml (original)
+++ tomcat/jk/trunk/xdocs/miscellaneous/changelog.xml Mon Jun  2 06:44:28 2014
@@ -45,6 +45,10 @@
   subsection name=Native
 changelog
   fix
+bug56565/bug: Fix IPV6 address resolve on non-dual
+  network stacks. (mturk)
+  /fix
+  fix
 Reduce log level for OPTIONS * requests from warning to debug.
 (rjung)
   /fix



-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org



svn commit: r1588429 - /tomcat/native/branches/1.1.x/native/src/ssl.c

2014-04-18 Thread mturk
Author: mturk
Date: Fri Apr 18 09:10:48 2014
New Revision: 1588429

URL: http://svn.apache.org/r1588429
Log:
Bz56396. Some OpenSSL versions do not fail, so ensure we recover only if 
actually failed to generate 512-bit keys

Modified:
tomcat/native/branches/1.1.x/native/src/ssl.c

Modified: tomcat/native/branches/1.1.x/native/src/ssl.c
URL: 
http://svn.apache.org/viewvc/tomcat/native/branches/1.1.x/native/src/ssl.c?rev=1588429r1=1588428r2=1588429view=diff
==
--- tomcat/native/branches/1.1.x/native/src/ssl.c (original)
+++ tomcat/native/branches/1.1.x/native/src/ssl.c Fri Apr 18 09:10:48 2014
@@ -221,19 +221,22 @@ static const jint supported_ssl_opts = 0
 
 static int ssl_tmp_key_init_rsa(int bits, int idx)
 {
+if (!(SSL_temp_keys[idx] =
+  RSA_generate_key(bits, RSA_F4, NULL, NULL))) {
 #ifdef OPENSSL_FIPS
-/**
- * With FIPS mode short RSA keys cannot be
- * generated.
- */
-if (bits  1024)
-return 0;
+/**
+ * With FIPS mode short RSA keys cannot be
+ * generated.
+ */
+if (bits  1024)
+return 0;
+else
 #endif
-if (!(SSL_temp_keys[idx] =
-  RSA_generate_key(bits, RSA_F4, NULL, NULL)))
 return 1;
-else
+}
+else {
 return 0;
+}
 }
 
 static int ssl_tmp_key_init_dh(int bits, int idx)



-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org



svn commit: r1587896 - in /tomcat/native/branches/1.1.x: native/src/ssl.c xdocs/miscellaneous/changelog.xml

2014-04-16 Thread mturk
Author: mturk
Date: Wed Apr 16 12:52:16 2014
New Revision: 1587896

URL: http://svn.apache.org/r1587896
Log:
Fix Bz56396. Be tolerant on RSA keys  1024 bits

Modified:
tomcat/native/branches/1.1.x/native/src/ssl.c
tomcat/native/branches/1.1.x/xdocs/miscellaneous/changelog.xml

Modified: tomcat/native/branches/1.1.x/native/src/ssl.c
URL: 
http://svn.apache.org/viewvc/tomcat/native/branches/1.1.x/native/src/ssl.c?rev=1587896r1=1587895r2=1587896view=diff
==
--- tomcat/native/branches/1.1.x/native/src/ssl.c (original)
+++ tomcat/native/branches/1.1.x/native/src/ssl.c Wed Apr 16 12:52:16 2014
@@ -221,6 +221,14 @@ static const jint supported_ssl_opts = 0
 
 static int ssl_tmp_key_init_rsa(int bits, int idx)
 {
+#ifdef OPENSSL_FIPS
+/**
+ * With FIPS mode short RSA keys cannot be
+ * generated.
+ */
+if (bits  1024)
+return 0;
+#endif
 if (!(SSL_temp_keys[idx] =
   RSA_generate_key(bits, RSA_F4, NULL, NULL)))
 return 1;

Modified: tomcat/native/branches/1.1.x/xdocs/miscellaneous/changelog.xml
URL: 
http://svn.apache.org/viewvc/tomcat/native/branches/1.1.x/xdocs/miscellaneous/changelog.xml?rev=1587896r1=1587895r2=1587896view=diff
==
--- tomcat/native/branches/1.1.x/xdocs/miscellaneous/changelog.xml (original)
+++ tomcat/native/branches/1.1.x/xdocs/miscellaneous/changelog.xml Wed Apr 16 
12:52:16 2014
@@ -36,6 +36,14 @@
   new documentation project for Tomcat Native was started.
   /p
 /section
+section name=Changes between 1.1.30 and 1.1.31
+  changelog
+fix
+  bug56396/bug: Do not create RSA keys shorter the 1024 bits
+  if inside FIPS mode. (mturk)
+/fix  
+  /changelog
+/section
 section name=Changes between 1.1.29 and 1.1.30
   changelog
 fix



-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org



svn commit: r1587437 - in /tomcat/jk/trunk: native/STATUS.txt xdocs/index.xml xdocs/news/20140201.xml

2014-04-15 Thread mturk
Author: mturk
Date: Tue Apr 15 06:08:48 2014
New Revision: 1587437

URL: http://svn.apache.org/r1587437
Log:
Add 1.2.40 announcement and release sections

Modified:
tomcat/jk/trunk/native/STATUS.txt
tomcat/jk/trunk/xdocs/index.xml
tomcat/jk/trunk/xdocs/news/20140201.xml

Modified: tomcat/jk/trunk/native/STATUS.txt
URL: 
http://svn.apache.org/viewvc/tomcat/jk/trunk/native/STATUS.txt?rev=1587437r1=1587436r2=1587437view=diff
==
--- tomcat/jk/trunk/native/STATUS.txt (original)
+++ tomcat/jk/trunk/native/STATUS.txt Tue Apr 15 06:08:48 2014
@@ -19,7 +19,7 @@ Last modified at [$Date$]
 Release:
 
 1.2.41  : in development
-1.2.40  : released April 14, 2014
+1.2.40  : released April 15, 2014
 1.2.39  : released March 11, 2014
 1.2.38  : not released
 1.2.37  : released May 31, 2012

Modified: tomcat/jk/trunk/xdocs/index.xml
URL: 
http://svn.apache.org/viewvc/tomcat/jk/trunk/xdocs/index.xml?rev=1587437r1=1587436r2=1587437view=diff
==
--- tomcat/jk/trunk/xdocs/index.xml (original)
+++ tomcat/jk/trunk/xdocs/index.xml Tue Apr 15 06:08:48 2014
@@ -45,7 +45,18 @@ manual is described in more detail below
 section name=Headlines
 br /
 ul
-lia href=news/20140201.html#11 March - JK-1.2.39 released11 March 2014 - 
bJK-1.2.39 released/b/a
+lia href=news/20140415.html#1 March - JK-1.2.40 released15 April 2014 - 
bJK-1.2.40 released/b/a
+pThe Apache Tomcat team is proud to announce the immediate availability
+of Tomcat Connectors 1.2.40 Stable. This release contains bug fixes found 
in previous releases.
+/p
+pDownload the a 
href=http://www.apache.org/dist/tomcat/tomcat-connectors/jk/tomcat-connectors-1.2.40-src.tar.gz;JK
 1.2.40 release sources/a
+| a 
href=http://www.apache.org/dist/tomcat/tomcat-connectors/jk/tomcat-connectors-1.2.40-src.tar.gz.asc;PGP
 signature/a
+/p
+pDownload the a 
href=http://www.apache.org/dist/tomcat/tomcat-connectors/jk/binaries/;binaries/a
 for selected platforms.
+/p
+/li
+
+lia href=news/20140201.html#2 March - JK-1.2.39 released11 March 2014 - 
bJK-1.2.39 released/b/a
 pThe Apache Tomcat team is proud to announce the immediate availability
 of Tomcat Connectors 1.2.39 Stable. This release contains bug fixes found 
in previous releases
 and few new features.

Modified: tomcat/jk/trunk/xdocs/news/20140201.xml
URL: 
http://svn.apache.org/viewvc/tomcat/jk/trunk/xdocs/news/20140201.xml?rev=1587437r1=1587436r2=1587437view=diff
==
--- tomcat/jk/trunk/xdocs/news/20140201.xml (original)
+++ tomcat/jk/trunk/xdocs/news/20140201.xml Tue Apr 15 06:08:48 2014
@@ -31,8 +31,22 @@
 
 section name=2014 News amp; Status
 br /
+subsection name=15 April - JK-1.2.40 released
+a name=20140415.1/a
+br /
+pThe Apache Tomcat team is proud to announce the immediate availability
+of Tomcat Connectors 1.2.40. This is a stable release concentrating 
mainly on
+bug fixes.
+/pp
+Please see the a href=../miscellaneous/changelog.htmlChangeLog/a 
for a full list of changes.
+/p
+pIf you find any bugs while using this release, please fill in the
+a 
href=https://issues.apache.org/bugzilla/enter_bug.cgi?product=Tomcat%20Connectors;Bugzilla/a
+Bug Report.
+/p
+/subsection
 subsection name=11 March - JK-1.2.39 released
-a name=20140201.1/a
+a name=20140201.2/a
 br /
 pThe Apache Tomcat team is proud to announce the immediate availability
 of Tomcat Connectors 1.2.39. This is a stable release containing both 
bug fixes and



-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org



svn commit: r1587439 - in /tomcat/jk/trunk/xdocs: index.xml news/20140201.xml

2014-04-15 Thread mturk
Author: mturk
Date: Tue Apr 15 06:11:31 2014
New Revision: 1587439

URL: http://svn.apache.org/r1587439
Log:
Oops. Use correct document link

Modified:
tomcat/jk/trunk/xdocs/index.xml
tomcat/jk/trunk/xdocs/news/20140201.xml

Modified: tomcat/jk/trunk/xdocs/index.xml
URL: 
http://svn.apache.org/viewvc/tomcat/jk/trunk/xdocs/index.xml?rev=1587439r1=1587438r2=1587439view=diff
==
--- tomcat/jk/trunk/xdocs/index.xml (original)
+++ tomcat/jk/trunk/xdocs/index.xml Tue Apr 15 06:11:31 2014
@@ -45,7 +45,7 @@ manual is described in more detail below
 section name=Headlines
 br /
 ul
-lia href=news/20140415.html#1 March - JK-1.2.40 released15 April 2014 - 
bJK-1.2.40 released/b/a
+lia href=news/20140201.html#1 March - JK-1.2.40 released15 April 2014 - 
bJK-1.2.40 released/b/a
 pThe Apache Tomcat team is proud to announce the immediate availability
 of Tomcat Connectors 1.2.40 Stable. This release contains bug fixes found 
in previous releases.
 /p

Modified: tomcat/jk/trunk/xdocs/news/20140201.xml
URL: 
http://svn.apache.org/viewvc/tomcat/jk/trunk/xdocs/news/20140201.xml?rev=1587439r1=1587438r2=1587439view=diff
==
--- tomcat/jk/trunk/xdocs/news/20140201.xml (original)
+++ tomcat/jk/trunk/xdocs/news/20140201.xml Tue Apr 15 06:11:31 2014
@@ -32,7 +32,7 @@
 section name=2014 News amp; Status
 br /
 subsection name=15 April - JK-1.2.40 released
-a name=20140415.1/a
+a name=20140201.1/a
 br /
 pThe Apache Tomcat team is proud to announce the immediate availability
 of Tomcat Connectors 1.2.40. This is a stable release concentrating 
mainly on



-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org



svn commit: r1587444 - in /tomcat/native/branches/1.1.x/xdocs: index.xml news/2014.xml

2014-04-15 Thread mturk
Author: mturk
Date: Tue Apr 15 06:14:23 2014
New Revision: 1587444

URL: http://svn.apache.org/r1587444
Log:
Fix typos in anchor names

Modified:
tomcat/native/branches/1.1.x/xdocs/index.xml
tomcat/native/branches/1.1.x/xdocs/news/2014.xml

Modified: tomcat/native/branches/1.1.x/xdocs/index.xml
URL: 
http://svn.apache.org/viewvc/tomcat/native/branches/1.1.x/xdocs/index.xml?rev=1587444r1=1587443r2=1587444view=diff
==
--- tomcat/native/branches/1.1.x/xdocs/index.xml (original)
+++ tomcat/native/branches/1.1.x/xdocs/index.xml Tue Apr 15 06:14:23 2014
@@ -64,7 +64,7 @@ manual is described in more detail below
 section name=Headlines
 ul
 
-lia href=news/2014.html#20140115.115 April 2014 - bTC-Native-1.1.30 
released/b/a
+lia href=news/2014.html#20140415.115 April 2014 - bTC-Native-1.1.30 
released/b/a
 pThe Apache Tomcat team is proud to announce the immediate availability of 
Tomcat Native 1.1.30 Stable.
 /p
 p

Modified: tomcat/native/branches/1.1.x/xdocs/news/2014.xml
URL: 
http://svn.apache.org/viewvc/tomcat/native/branches/1.1.x/xdocs/news/2014.xml?rev=1587444r1=1587443r2=1587444view=diff
==
--- tomcat/native/branches/1.1.x/xdocs/news/2014.xml (original)
+++ tomcat/native/branches/1.1.x/xdocs/news/2014.xml Tue Apr 15 06:14:23 2014
@@ -30,7 +30,7 @@
 body
 
 section name=2014 News amp; Status
- subsection anchor=20140515.1 name=15 April - TC-Native-1.1.30 released
+ subsection anchor=20140415.1 name=15 April - TC-Native-1.1.30 released
   pThe Apache Tomcat team is proud to announce the immediate availability
   of Tomcat Native 1.1.30. This is a bug fixing release with added support for
   EC ciphers if supported by OpenSSL.



-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org



svn commit: r1587515 [2/2] - in /tomcat/site/trunk/docs/native-doc: index.html miscellaneous/changelog.html news/2008.html news/2009.html news/2010.html news/2011.html news/2012.html news/2013.html ne

2014-04-15 Thread mturk
Added: tomcat/site/trunk/docs/native-doc/news/2014.html
URL: 
http://svn.apache.org/viewvc/tomcat/site/trunk/docs/native-doc/news/2014.html?rev=1587515view=auto
==
--- tomcat/site/trunk/docs/native-doc/news/2014.html (added)
+++ tomcat/site/trunk/docs/native-doc/news/2014.html Tue Apr 15 11:11:02 2014
@@ -0,0 +1,11 @@
+!DOCTYPE html SYSTEM about:legacy-compat
+html lang=enheadMETA http-equiv=Content-Type content=text/html; 
charset=UTF-8link href=../images/docs-stylesheet.css rel=stylesheet 
type=text/csslink href=../images/style.css rel=stylesheet 
type=text/csstitleThe Apache Tomcat Native - News - 2014 News and 
Status/titlemeta name=author content=Apache Tomcat Native 
Project/headbodydiv id=wrapperheaderdiv id=headerdivdivdiv 
class=logo noPrinta href=http://tomcat.apache.org/;img alt=Tomcat Home 
src=../images/tomcat.png/a/divdiv style=height: 1px;/divdiv 
class=asfLogo noPrinta href=http://www.apache.org/; target=_blankimg 
src=../images/asf-feather.png alt=The Apache Software Foundation 
style=width: 266px; height: 83px;/a/divh1The Apache Tomcat Native - 
News/h1div style=height: 1px;/divdiv style=clear: 
left;/div/div/div/div/headerdiv id=middledivdiv 
id=mainLeft class=noprintdivnavdivh2strongLinks
 /strong/h2ullia href=../index.htmlDocs 
Home/a/li/ul/divdivh2strongMiscellaneous 
Documentation/strong/h2ullia 
href=../miscellaneous/changelog.htmlChangelog/a/li/ul/divdivh2strongNews/strong/h2ullia
 href=../news/2014.html2014/a/lilia 
href=../news/2013.html2013/a/lilia 
href=../news/2012.html2012/a/lilia 
href=../news/2011.html2011/a/lilia 
href=../news/2010.html2010/a/lilia 
href=../news/2009.html2009/a/lilia 
href=../news/2008.html2008/a/li/ul/div/nav/div/divdiv 
id=mainRightdiv id=contenth22014 News and Status/h2h3 
id=2014_News_amp;_Status2014 News amp; Status/h3div class=text
+ div class=subsectionh4 id=20140515.115 April - TC-Native-1.1.30 
released/h4div class=text
+  pThe Apache Tomcat team is proud to announce the immediate availability
+  of Tomcat Native 1.1.30. This is a bug fixing release with added support for
+  EC ciphers if supported by OpenSSL.
+  /p
+ /div/div
+/div/div/div/div/divfooterdiv id=footer
+Copyright copy; 2008-2014, The Apache Software Foundation
+  /div/footer/div/body/html
\ No newline at end of file

Propchange: tomcat/site/trunk/docs/native-doc/news/2014.html
--
svn:eol-style = native



-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org



svn commit: r1587519 - in /tomcat/site/trunk/docs/connectors-doc: index.html miscellaneous/changelog.html miscellaneous/printer/changelog.html news/20140201.html news/printer/20140201.html printer/ind

2014-04-15 Thread mturk
Author: mturk
Date: Tue Apr 15 11:20:08 2014
New Revision: 1587519

URL: http://svn.apache.org/r1587519
Log:
Update connectors site with new release

Modified:
tomcat/site/trunk/docs/connectors-doc/index.html
tomcat/site/trunk/docs/connectors-doc/miscellaneous/changelog.html
tomcat/site/trunk/docs/connectors-doc/miscellaneous/printer/changelog.html
tomcat/site/trunk/docs/connectors-doc/news/20140201.html
tomcat/site/trunk/docs/connectors-doc/news/printer/20140201.html
tomcat/site/trunk/docs/connectors-doc/printer/index.html

Modified: tomcat/site/trunk/docs/connectors-doc/index.html
URL: 
http://svn.apache.org/viewvc/tomcat/site/trunk/docs/connectors-doc/index.html?rev=1587519r1=1587518r2=1587519view=diff
==
--- tomcat/site/trunk/docs/connectors-doc/index.html (original)
+++ tomcat/site/trunk/docs/connectors-doc/index.html Tue Apr 15 11:20:08 2014
@@ -12,7 +12,18 @@ manual is described in more detail below
 /blockquote/td/tr/tabletable border=0 cellspacing=0 
cellpadding=2 width=100%trtd bgcolor=#525D76font color=#ff 
face=arial,helvetica.sanserifa 
name=HeadlinesstrongHeadlines/strong/a/font/td/trtrtdblockquote
 br
 ul
-lia href=news/20140201.html#11 March - JK-1.2.39 released11 March 2014 - 
bJK-1.2.39 released/b/a
+lia href=news/20140201.html#1 March - JK-1.2.40 released15 April 2014 - 
bJK-1.2.40 released/b/a
+pThe Apache Tomcat team is proud to announce the immediate availability
+of Tomcat Connectors 1.2.40 Stable. This release contains bug fixes found 
in previous releases.
+/p
+pDownload the a 
href=http://www.apache.org/dist/tomcat/tomcat-connectors/jk/tomcat-connectors-1.2.40-src.tar.gz;JK
 1.2.40 release sources/a
+| a 
href=http://www.apache.org/dist/tomcat/tomcat-connectors/jk/tomcat-connectors-1.2.40-src.tar.gz.asc;PGP
 signature/a
+/p
+pDownload the a 
href=http://www.apache.org/dist/tomcat/tomcat-connectors/jk/binaries/;binaries/a
 for selected platforms.
+/p
+/li
+
+lia href=news/20140201.html#2 March - JK-1.2.39 released11 March 2014 - 
bJK-1.2.39 released/b/a
 pThe Apache Tomcat team is proud to announce the immediate availability
 of Tomcat Connectors 1.2.39 Stable. This release contains bug fixes found 
in previous releases
 and few new features.

Modified: tomcat/site/trunk/docs/connectors-doc/miscellaneous/changelog.html
URL: 
http://svn.apache.org/viewvc/tomcat/site/trunk/docs/connectors-doc/miscellaneous/changelog.html?rev=1587519r1=1587518r2=1587519view=diff
==
--- tomcat/site/trunk/docs/connectors-doc/miscellaneous/changelog.html 
(original)
+++ tomcat/site/trunk/docs/connectors-doc/miscellaneous/changelog.html Tue Apr 
15 11:20:08 2014
@@ -6,6 +6,36 @@
   It should contain fixes made only after November 10th 2004, when the
   new documentation project for JK was started.
   /p
+/blockquote/td/tr/tabletable border=0 cellspacing=0 
cellpadding=2 width=100%trtd bgcolor=#525D76font color=#ff 
face=arial,helvetica.sanserifa name=Changes between 1.2.39 and 
1.2.40strongChanges between 1.2.39 and 
1.2.40/strong/a/font/td/trtrtdblockquote
+  br
+  table border=0 cellspacing=0 cellpadding=2 width=100%trtd 
bgcolor=#828DA6font color=#ff face=arial,helvetica.sanserifa 
name=NativestrongNative/strong/a/font/td/trtrtdblockquote
+table border=0 cellpadding=2 cellspacing=2
+  trtd valign=topimg alt=fix class=icon 
src=../images/fix.gif/tdtd
+Fix forwarding of chunked requests, which is broken in version 1.2.39.
+(rjung)
+  /td/tr
+  trtd valign=topimg alt=fix class=icon 
src=../images/fix.gif/tdtd
+a 
href=http://issues.apache.org/bugzilla/show_bug.cgi?id=56352;56352/a: Fix 
regression in memory release. (mturk)
+  /td/tr
+  trtd valign=topimg alt=fix class=icon 
src=../images/fix.gif/tdtd
+Fix status worker display of worker IP address after name or port
+was changed. (rjung)
+  /td/tr
+  trtd valign=topimg alt=update class=icon 
src=../images/update.gif/tdtd
+a 
href=http://issues.apache.org/bugzilla/show_bug.cgi?id=56297;56297/a: 
Improve key hash function. Copied from APR. (rjung)
+  /td/tr
+  trtd valign=topimg alt=fix class=icon 
src=../images/fix.gif/tdtd
+a 
href=http://issues.apache.org/bugzilla/show_bug.cgi?id=55683;55683/a: 
Remove quotes from quoted session cookies. (rjung)
+  /td/tr
+  trtd valign=topimg alt=fix class=icon 
src=../images/fix.gif/tdtd
+a 
href=http://issues.apache.org/bugzilla/show_bug.cgi?id=53542;53542/a: 
ISAPI: Fix grammar in 503 error page. (rjung)
+  /td/tr
+  trtd valign=topimg alt=fix class=icon 
src=../images/fix.gif/tdtd
+a 
href=http://issues.apache.org/bugzilla/show_bug.cgi?id=55696;55696/a: Crash 
on Mac OS X 10.9 during config parsing.
+(rjung)
+  /td/tr
+/table
+  /blockquote/td/tr/table
 /blockquote/td

svn commit: r1587520 - in /tomcat/site/trunk/docs/native-doc: images/ index.html miscellaneous/ news/ printer/ style.css

2014-04-15 Thread mturk
Author: mturk
Date: Tue Apr 15 11:21:44 2014
New Revision: 1587520

URL: http://svn.apache.org/r1587520
Log:
Delete native docs

Removed:
tomcat/site/trunk/docs/native-doc/images/
tomcat/site/trunk/docs/native-doc/index.html
tomcat/site/trunk/docs/native-doc/miscellaneous/
tomcat/site/trunk/docs/native-doc/news/
tomcat/site/trunk/docs/native-doc/printer/
tomcat/site/trunk/docs/native-doc/style.css


-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org



svn commit: r1587523 - /tomcat/site/trunk/xdocs/download-connectors.xml

2014-04-15 Thread mturk
Author: mturk
Date: Tue Apr 15 11:24:41 2014
New Revision: 1587523

URL: http://svn.apache.org/r1587523
Log:
Use new connectors version

Modified:
tomcat/site/trunk/xdocs/download-connectors.xml

Modified: tomcat/site/trunk/xdocs/download-connectors.xml
URL: 
http://svn.apache.org/viewvc/tomcat/site/trunk/xdocs/download-connectors.xml?rev=1587523r1=1587522r2=1587523view=diff
==
--- tomcat/site/trunk/xdocs/download-connectors.xml (original)
+++ tomcat/site/trunk/xdocs/download-connectors.xml Tue Apr 15 11:24:41 2014
@@ -50,28 +50,28 @@
   div class=linksspan class=labelSource (please choose the 
correct format for your platform)/span/div
   ul
 li class=download
-  a 
href=[preferred]/tomcat/tomcat-connectors/jk/tomcat-connectors-1.2.39-src.tar.gz
 rel=nofollow
-JK 1.2.39 Source Release tar.gz
+  a 
href=[preferred]/tomcat/tomcat-connectors/jk/tomcat-connectors-1.2.40-src.tar.gz
 rel=nofollow
+JK 1.2.40 Source Release tar.gz
   /a (e.g. Unix, Linux, Mac OS)
 ul class=attributes
   lispan class=pgp
-[a 
href=https://www.apache.org/dist/tomcat/tomcat-connectors/jk/tomcat-connectors-1.2.39-src.tar.gz.asc;PGP/a]
+[a 
href=https://www.apache.org/dist/tomcat/tomcat-connectors/jk/tomcat-connectors-1.2.40-src.tar.gz.asc;PGP/a]
   /span/li
   lispan class=md5
-[a 
href=https://www.apache.org/dist/tomcat/tomcat-connectors/jk/tomcat-connectors-1.2.39-src.tar.gz.md5;MD5/a]
+[a 
href=https://www.apache.org/dist/tomcat/tomcat-connectors/jk/tomcat-connectors-1.2.40-src.tar.gz.md5;MD5/a]
   /span/li
 /ul
 /li
 li class=download
-  a 
href=[preferred]/tomcat/tomcat-connectors/jk/tomcat-connectors-1.2.39-src.zip 
rel=nofollow
-JK 1.2.39 Source Release zip
+  a 
href=[preferred]/tomcat/tomcat-connectors/jk/tomcat-connectors-1.2.40-src.zip 
rel=nofollow
+JK 1.2.40 Source Release zip
   /a (e.g. Windows)
 ul class=attributes
   lispan class=pgp
-[a 
href=https://www.apache.org/dist/tomcat/tomcat-connectors/jk/tomcat-connectors-1.2.39-src.zip.asc;PGP/a]
+[a 
href=https://www.apache.org/dist/tomcat/tomcat-connectors/jk/tomcat-connectors-1.2.40-src.zip.asc;PGP/a]
   /span/li
   lispan class=md5
-[a 
href=https://www.apache.org/dist/tomcat/tomcat-connectors/jk/tomcat-connectors-1.2.39-src.zip.md5;MD5/a]
+[a 
href=https://www.apache.org/dist/tomcat/tomcat-connectors/jk/tomcat-connectors-1.2.40-src.zip.md5;MD5/a]
   /span/li
 /ul
 /li
@@ -88,7 +88,7 @@
   /li
 /ul
 
-ptomcat-connectors-1.2.39-src.* is signed by Mladen Turk 
(code0D498E23/code)./p
+ptomcat-connectors-1.2.40-src.* is signed by Mladen Turk 
(code0D498E23/code)./p
 
   /subsection
 



-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org



svn commit: r1587522 - /tomcat/site/trunk/xdocs/download-native.xml

2014-04-15 Thread mturk
Author: mturk
Date: Tue Apr 15 11:24:08 2014
New Revision: 1587522

URL: http://svn.apache.org/r1587522
Log:
Use new native version

Modified:
tomcat/site/trunk/xdocs/download-native.xml

Modified: tomcat/site/trunk/xdocs/download-native.xml
URL: 
http://svn.apache.org/viewvc/tomcat/site/trunk/xdocs/download-native.xml?rev=1587522r1=1587521r2=1587522view=diff
==
--- tomcat/site/trunk/xdocs/download-native.xml (original)
+++ tomcat/site/trunk/xdocs/download-native.xml Tue Apr 15 11:24:08 2014
@@ -49,28 +49,28 @@
   div class=linksspan class=labelSource (please choose the 
correct format for your platform)/span/div
   ul
 li class=download
-  a 
href=[preferred]/tomcat/tomcat-connectors/native/1.1.29/source/tomcat-native-1.1.29-src.tar.gz
 rel=nofollow
-Native 1.1.29 Source Release tar.gz
+  a 
href=[preferred]/tomcat/tomcat-connectors/native/1.1.30/source/tomcat-native-1.1.30-src.tar.gz
 rel=nofollow
+Native 1.1.30 Source Release tar.gz
   /a (e.g. Unix, Linux, Mac OS)
 ul class=attributes
   lispan class=pgp
-[a 
href=https://www.apache.org/dist/tomcat/tomcat-connectors/native/1.1.29/source/tomcat-native-1.1.29-src.tar.gz.asc;PGP/a]
+[a 
href=https://www.apache.org/dist/tomcat/tomcat-connectors/native/1.1.30/source/tomcat-native-1.1.30-src.tar.gz.asc;PGP/a]
   /span/li
   lispan class=md5
-[a 
href=https://www.apache.org/dist/tomcat/tomcat-connectors/native/1.1.29/source/tomcat-native-1.1.29-src.tar.gz.md5;MD5/a]
+[a 
href=https://www.apache.org/dist/tomcat/tomcat-connectors/native/1.1.30/source/tomcat-native-1.1.30-src.tar.gz.md5;MD5/a]
   /span/li
 /ul
 /li
 li class=download
-  a 
href=[preferred]/tomcat/tomcat-connectors/native/1.1.29/source/tomcat-native-1.1.29-win32-src.zip
 rel=nofollow
-Native 1.1.29 Source Release zip
+  a 
href=[preferred]/tomcat/tomcat-connectors/native/1.1.30/source/tomcat-native-1.1.30-win32-src.zip
 rel=nofollow
+Native 1.1.30 Source Release zip
   /a (e.g. Windows)
 ul class=attributes
   lispan class=pgp
-[a 
href=https://www.apache.org/dist/tomcat/tomcat-connectors/native/1.1.29/source/tomcat-native-1.1.29-win32-src.zip.asc;PGP/a]
+[a 
href=https://www.apache.org/dist/tomcat/tomcat-connectors/native/1.1.30/source/tomcat-native-1.1.30-win32-src.zip.asc;PGP/a]
   /span/li
   lispan class=md5
-[a 
href=https://www.apache.org/dist/tomcat/tomcat-connectors/native/1.1.29/source/tomcat-native-1.1.29-win32-src.zip.md5;MD5/a]
+[a 
href=https://www.apache.org/dist/tomcat/tomcat-connectors/native/1.1.30/source/tomcat-native-1.1.30-win32-src.zip.md5;MD5/a]
   /span/li
 /ul
 /li
@@ -79,7 +79,7 @@
 /ul
 pYou can find binaries release too/p
 pYou may download them from
-  a 
href=[preferred]/tomcat/tomcat-connectors/native/1.1.29/binaries 
rel=nofollowHERE/a
+  a 
href=[preferred]/tomcat/tomcat-connectors/native/1.1.30/binaries 
rel=nofollowHERE/a
 /p
 
   /subsection



-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org



svn commit: r1587524 - in /tomcat/site/trunk/docs: download-connectors.html download-native.html

2014-04-15 Thread mturk
Author: mturk
Date: Tue Apr 15 11:25:27 2014
New Revision: 1587524

URL: http://svn.apache.org/r1587524
Log:
Rebuild with new native and connectors

Modified:
tomcat/site/trunk/docs/download-connectors.html
tomcat/site/trunk/docs/download-native.html

Modified: tomcat/site/trunk/docs/download-connectors.html
URL: 
http://svn.apache.org/viewvc/tomcat/site/trunk/docs/download-connectors.html?rev=1587524r1=1587523r2=1587524view=diff
==
--- tomcat/site/trunk/docs/download-connectors.html (original)
+++ tomcat/site/trunk/docs/download-connectors.html Tue Apr 15 11:25:27 2014
@@ -266,20 +266,20 @@
 
 li class=download
   
-a 
href=[preferred]/tomcat/tomcat-connectors/jk/tomcat-connectors-1.2.39-src.tar.gz
 rel=nofollow
-JK 1.2.39 Source Release tar.gz
+a 
href=[preferred]/tomcat/tomcat-connectors/jk/tomcat-connectors-1.2.40-src.tar.gz
 rel=nofollow
+JK 1.2.40 Source Release tar.gz
   /a (e.g. Unix, Linux, Mac OS)
 ul class=attributes
   
 li
 span class=pgp
-[a 
href=https://www.apache.org/dist/tomcat/tomcat-connectors/jk/tomcat-connectors-1.2.39-src.tar.gz.asc;PGP/a]
+[a 
href=https://www.apache.org/dist/tomcat/tomcat-connectors/jk/tomcat-connectors-1.2.40-src.tar.gz.asc;PGP/a]
   /span
 /li
   
 li
 span class=md5
-[a 
href=https://www.apache.org/dist/tomcat/tomcat-connectors/jk/tomcat-connectors-1.2.39-src.tar.gz.md5;MD5/a]
+[a 
href=https://www.apache.org/dist/tomcat/tomcat-connectors/jk/tomcat-connectors-1.2.40-src.tar.gz.md5;MD5/a]
   /span
 /li
 
@@ -289,20 +289,20 @@
 
 li class=download
   
-a 
href=[preferred]/tomcat/tomcat-connectors/jk/tomcat-connectors-1.2.39-src.zip 
rel=nofollow
-JK 1.2.39 Source Release zip
+a 
href=[preferred]/tomcat/tomcat-connectors/jk/tomcat-connectors-1.2.40-src.zip 
rel=nofollow
+JK 1.2.40 Source Release zip
   /a (e.g. Windows)
 ul class=attributes
   
 li
 span class=pgp
-[a 
href=https://www.apache.org/dist/tomcat/tomcat-connectors/jk/tomcat-connectors-1.2.39-src.zip.asc;PGP/a]
+[a 
href=https://www.apache.org/dist/tomcat/tomcat-connectors/jk/tomcat-connectors-1.2.40-src.zip.asc;PGP/a]
   /span
 /li
   
 li
 span class=md5
-[a 
href=https://www.apache.org/dist/tomcat/tomcat-connectors/jk/tomcat-connectors-1.2.39-src.zip.md5;MD5/a]
+[a 
href=https://www.apache.org/dist/tomcat/tomcat-connectors/jk/tomcat-connectors-1.2.40-src.zip.md5;MD5/a]
   /span
 /li
 
@@ -335,7 +335,7 @@
 /ul
 
 
-ptomcat-connectors-1.2.39-src.* is signed by Mladen Turk 
(code0D498E23/code)./p
+ptomcat-connectors-1.2.40-src.* is signed by Mladen Turk 
(code0D498E23/code)./p
 
   
 /div

Modified: tomcat/site/trunk/docs/download-native.html
URL: 
http://svn.apache.org/viewvc/tomcat/site/trunk/docs/download-native.html?rev=1587524r1=1587523r2=1587524view=diff
==
--- tomcat/site/trunk/docs/download-native.html (original)
+++ tomcat/site/trunk/docs/download-native.html Tue Apr 15 11:25:27 2014
@@ -265,20 +265,20 @@
 
 li class=download
   
-a 
href=[preferred]/tomcat/tomcat-connectors/native/1.1.29/source/tomcat-native-1.1.29-src.tar.gz
 rel=nofollow
-Native 1.1.29 Source Release tar.gz
+a 
href=[preferred]/tomcat/tomcat-connectors/native/1.1.30/source/tomcat-native-1.1.30-src.tar.gz
 rel=nofollow
+Native 1.1.30 Source Release tar.gz
   /a (e.g. Unix, Linux, Mac OS)
 ul class=attributes
   
 li
 span class=pgp
-[a 
href=https://www.apache.org/dist/tomcat/tomcat-connectors/native/1.1.29/source/tomcat-native-1.1.29-src.tar.gz.asc;PGP/a]
+[a 
href=https://www.apache.org/dist/tomcat/tomcat-connectors/native/1.1.30/source/tomcat-native-1.1.30-src.tar.gz.asc;PGP/a]
   /span
 /li
   
 li
 span class=md5
-[a 
href=https://www.apache.org/dist/tomcat/tomcat-connectors/native/1.1.29/source/tomcat-native-1.1.29-src.tar.gz.md5;MD5/a]
+[a 
href=https://www.apache.org/dist/tomcat/tomcat-connectors/native/1.1.30/source/tomcat-native-1.1.30-src.tar.gz.md5;MD5/a]
   /span
 /li
 
@@ -288,20 +288,20 @@
 
 li class=download
   
-a 
href=[preferred]/tomcat/tomcat-connectors/native/1.1.29/source/tomcat-native-1.1.29-win32-src.zip
 rel=nofollow
-Native 1.1.29 Source Release zip
+a 
href=[preferred]/tomcat/tomcat-connectors/native/1.1.30/source/tomcat-native-1.1.30-win32-src.zip
 rel=nofollow
+Native

svn commit: r1587175 - in /tomcat/native/branches/1.1.x: build.properties.default native/include/tcn_version.h native/os/win32/libtcnative.rc

2014-04-14 Thread mturk
Author: mturk
Date: Mon Apr 14 10:38:10 2014
New Revision: 1587175

URL: http://svn.apache.org/r1587175
Log:
Bump versions to 1.1.31

Modified:
tomcat/native/branches/1.1.x/build.properties.default
tomcat/native/branches/1.1.x/native/include/tcn_version.h
tomcat/native/branches/1.1.x/native/os/win32/libtcnative.rc

Modified: tomcat/native/branches/1.1.x/build.properties.default
URL: 
http://svn.apache.org/viewvc/tomcat/native/branches/1.1.x/build.properties.default?rev=1587175r1=1587174r2=1587175view=diff
==
--- tomcat/native/branches/1.1.x/build.properties.default (original)
+++ tomcat/native/branches/1.1.x/build.properties.default Mon Apr 14 10:38:10 
2014
@@ -18,9 +18,9 @@
 # - Version Control Flags -
 version.major=1
 version.minor=1
-version.build=30
-version.patch=0
-#version.suffix=-dev
+version.build=31
+#version.patch=0
+version.suffix=-dev
 version.suffix=
 
 # - Default Base Path for Dependent Packages -

Modified: tomcat/native/branches/1.1.x/native/include/tcn_version.h
URL: 
http://svn.apache.org/viewvc/tomcat/native/branches/1.1.x/native/include/tcn_version.h?rev=1587175r1=1587174r2=1587175view=diff
==
--- tomcat/native/branches/1.1.x/native/include/tcn_version.h (original)
+++ tomcat/native/branches/1.1.x/native/include/tcn_version.h Mon Apr 14 
10:38:10 2014
@@ -69,13 +69,13 @@ extern C {
 #define TCN_MINOR_VERSION   1
 
 /** patch level */
-#define TCN_PATCH_VERSION   30
+#define TCN_PATCH_VERSION   31
 
 /**
  *  This symbol is defined for internal, development copies of TCN. This
  *  symbol will be #undef'd for releases.
  */
-#define TCN_IS_DEV_VERSION  0
+#define TCN_IS_DEV_VERSION  1
 
 
 /** The formatted string of APU's version */

Modified: tomcat/native/branches/1.1.x/native/os/win32/libtcnative.rc
URL: 
http://svn.apache.org/viewvc/tomcat/native/branches/1.1.x/native/os/win32/libtcnative.rc?rev=1587175r1=1587174r2=1587175view=diff
==
--- tomcat/native/branches/1.1.x/native/os/win32/libtcnative.rc (original)
+++ tomcat/native/branches/1.1.x/native/os/win32/libtcnative.rc Mon Apr 14 
10:38:10 2014
@@ -20,7 +20,7 @@ LANGUAGE 0x9,0x1
  See the License for the specific language governing  \
  permissions and limitations under the License.
 
-#define TCN_VERSION 1.1.30
+#define TCN_VERSION 1.1.31
 1000 ICON apache.ico
 
 1001 DIALOGEX 0, 0, 252, 51
@@ -36,8 +36,8 @@ BEGIN
 END
 
 1 VERSIONINFO
- FILEVERSION 1,1,30,0
- PRODUCTVERSION 1,1,30,0
+ FILEVERSION 1,1,31,0
+ PRODUCTVERSION 1,1,31,0
  FILEFLAGSMASK 0x3fL
 #ifdef _DEBUG
  FILEFLAGS 0x1L



-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org



svn commit: r1587176 - in /tomcat/jk/trunk: native/STATUS.txt native/common/jk_version.h native/configure.ac native/iis/installer/isapi-redirector-win32-msi.ism tools/jkbindist.sh

2014-04-14 Thread mturk
Author: mturk
Date: Mon Apr 14 10:41:49 2014
New Revision: 1587176

URL: http://svn.apache.org/r1587176
Log:
Bump versions to 1.2.41

Modified:
tomcat/jk/trunk/native/STATUS.txt
tomcat/jk/trunk/native/common/jk_version.h
tomcat/jk/trunk/native/configure.ac
tomcat/jk/trunk/native/iis/installer/isapi-redirector-win32-msi.ism
tomcat/jk/trunk/tools/jkbindist.sh

Modified: tomcat/jk/trunk/native/STATUS.txt
URL: 
http://svn.apache.org/viewvc/tomcat/jk/trunk/native/STATUS.txt?rev=1587176r1=1587175r2=1587176view=diff
==
--- tomcat/jk/trunk/native/STATUS.txt (original)
+++ tomcat/jk/trunk/native/STATUS.txt Mon Apr 14 10:41:49 2014
@@ -18,7 +18,8 @@ Last modified at [$Date$]
 
 Release:
 
-1.2.40  : in development
+1.2.41  : in development
+1.2.40  : released April 14, 2014
 1.2.39  : released March 11, 2014
 1.2.38  : not released
 1.2.37  : released May 31, 2012

Modified: tomcat/jk/trunk/native/common/jk_version.h
URL: 
http://svn.apache.org/viewvc/tomcat/jk/trunk/native/common/jk_version.h?rev=1587176r1=1587175r2=1587176view=diff
==
--- tomcat/jk/trunk/native/common/jk_version.h (original)
+++ tomcat/jk/trunk/native/common/jk_version.h Mon Apr 14 10:41:49 2014
@@ -26,10 +26,10 @@
 /** START OF AREA TO MODIFY BEFORE RELEASING */
 #define JK_VERMAJOR 1
 #define JK_VERMINOR 2
-#define JK_VERFIX   40
+#define JK_VERFIX   41
 
 /* set JK_VERISRELEASE to 1 when release (do not forget to commit!) */
-#define JK_VERISRELEASE 1
+#define JK_VERISRELEASE 0
 /* Beta number */
 #define JK_VERBETA  0
 #define JK_BETASTRING   0

Modified: tomcat/jk/trunk/native/configure.ac
URL: 
http://svn.apache.org/viewvc/tomcat/jk/trunk/native/configure.ac?rev=1587176r1=1587175r2=1587176view=diff
==
--- tomcat/jk/trunk/native/configure.ac (original)
+++ tomcat/jk/trunk/native/configure.ac Mon Apr 14 10:41:49 2014
@@ -23,7 +23,7 @@ AC_PREREQ(2.59)
 
 dnl package and version.
 dnl synchronization with common/jk_version.h ?
-AC_INIT([mod_jk], [1.2.40])
+AC_INIT([mod_jk], [1.2.41])
 
 AC_CONFIG_SRCDIR([common/jk_worker.h])
 AC_CONFIG_HEADER(common/config.h)

Modified: tomcat/jk/trunk/native/iis/installer/isapi-redirector-win32-msi.ism
URL: 
http://svn.apache.org/viewvc/tomcat/jk/trunk/native/iis/installer/isapi-redirector-win32-msi.ism?rev=1587176r1=1587175r2=1587176view=diff
==
--- tomcat/jk/trunk/native/iis/installer/isapi-redirector-win32-msi.ism 
(original)
+++ tomcat/jk/trunk/native/iis/installer/isapi-redirector-win32-msi.ism Mon Apr 
14 10:41:49 2014
@@ -3425,7 +3425,7 @@ TQBzAGkAAQBSAGUAbABlAGEAcwBlAA==
rowtdProductID/tdtdnone/tdtd//row
rowtdProductLanguage/tdtd1033/tdtd//row
rowtdProductName/tdtdTomcat Isapi 
Redirector/tdtd//row
-   rowtdProductVersion/tdtd1.2.40/tdtd//row
+   rowtdProductVersion/tdtd1.2.41/tdtd//row
rowtdProgressType0/tdtdinstall/tdtd//row
rowtdProgressType1/tdtdInstalling/tdtd//row
rowtdProgressType2/tdtdinstalled/tdtd//row

Modified: tomcat/jk/trunk/tools/jkbindist.sh
URL: 
http://svn.apache.org/viewvc/tomcat/jk/trunk/tools/jkbindist.sh?rev=1587176r1=1587175r2=1587176view=diff
==
--- tomcat/jk/trunk/tools/jkbindist.sh (original)
+++ tomcat/jk/trunk/tools/jkbindist.sh Mon Apr 14 10:41:49 2014
@@ -123,7 +123,7 @@ do
 unix2dos $i
 done
 unix2dos README
-chmod 755 $1
+#chmod 755 $1
 # Pack
 archive=${dist}.zip
 zip -9 -j ${archive} $@ README ${copy}



-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org



svn commit: r5030 - in /release/tomcat/tomcat-connectors/jk: ./ binaries/windows/

2014-04-14 Thread mturk
Author: mturk
Date: Mon Apr 14 19:34:04 2014
New Revision: 5030

Log:
Remove old artefacts

Removed:

release/tomcat/tomcat-connectors/jk/binaries/windows/tomcat-connectors-1.2.37-windows-i386-httpd-2.0.x.zip

release/tomcat/tomcat-connectors/jk/binaries/windows/tomcat-connectors-1.2.37-windows-i386-httpd-2.0.x.zip.asc

release/tomcat/tomcat-connectors/jk/binaries/windows/tomcat-connectors-1.2.37-windows-i386-httpd-2.0.x.zip.md5

release/tomcat/tomcat-connectors/jk/binaries/windows/tomcat-connectors-1.2.37-windows-i386-httpd-2.0.x.zip.sha1

release/tomcat/tomcat-connectors/jk/binaries/windows/tomcat-connectors-1.2.37-windows-i386-httpd-2.2.x.zip

release/tomcat/tomcat-connectors/jk/binaries/windows/tomcat-connectors-1.2.37-windows-i386-httpd-2.2.x.zip.asc

release/tomcat/tomcat-connectors/jk/binaries/windows/tomcat-connectors-1.2.37-windows-i386-httpd-2.2.x.zip.md5

release/tomcat/tomcat-connectors/jk/binaries/windows/tomcat-connectors-1.2.37-windows-i386-httpd-2.2.x.zip.sha1

release/tomcat/tomcat-connectors/jk/binaries/windows/tomcat-connectors-1.2.37-windows-i386-httpd-2.4.x.zip

release/tomcat/tomcat-connectors/jk/binaries/windows/tomcat-connectors-1.2.37-windows-i386-httpd-2.4.x.zip.asc

release/tomcat/tomcat-connectors/jk/binaries/windows/tomcat-connectors-1.2.37-windows-i386-httpd-2.4.x.zip.md5

release/tomcat/tomcat-connectors/jk/binaries/windows/tomcat-connectors-1.2.37-windows-i386-httpd-2.4.x.zip.sha1

release/tomcat/tomcat-connectors/jk/binaries/windows/tomcat-connectors-1.2.37-windows-i386-iis.zip

release/tomcat/tomcat-connectors/jk/binaries/windows/tomcat-connectors-1.2.37-windows-i386-iis.zip.asc

release/tomcat/tomcat-connectors/jk/binaries/windows/tomcat-connectors-1.2.37-windows-i386-iis.zip.md5

release/tomcat/tomcat-connectors/jk/binaries/windows/tomcat-connectors-1.2.37-windows-i386-iis.zip.sha1

release/tomcat/tomcat-connectors/jk/binaries/windows/tomcat-connectors-1.2.37-windows-i386-iplanet.zip

release/tomcat/tomcat-connectors/jk/binaries/windows/tomcat-connectors-1.2.37-windows-i386-iplanet.zip.asc

release/tomcat/tomcat-connectors/jk/binaries/windows/tomcat-connectors-1.2.37-windows-i386-iplanet.zip.md5

release/tomcat/tomcat-connectors/jk/binaries/windows/tomcat-connectors-1.2.37-windows-i386-iplanet.zip.sha1

release/tomcat/tomcat-connectors/jk/binaries/windows/tomcat-connectors-1.2.37-windows-x86_64-httpd-2.4.x.zip

release/tomcat/tomcat-connectors/jk/binaries/windows/tomcat-connectors-1.2.37-windows-x86_64-httpd-2.4.x.zip.asc

release/tomcat/tomcat-connectors/jk/binaries/windows/tomcat-connectors-1.2.37-windows-x86_64-httpd-2.4.x.zip.md5

release/tomcat/tomcat-connectors/jk/binaries/windows/tomcat-connectors-1.2.37-windows-x86_64-httpd-2.4.x.zip.sha1

release/tomcat/tomcat-connectors/jk/binaries/windows/tomcat-connectors-1.2.37-windows-x86_64-iis.zip

release/tomcat/tomcat-connectors/jk/binaries/windows/tomcat-connectors-1.2.37-windows-x86_64-iis.zip.asc

release/tomcat/tomcat-connectors/jk/binaries/windows/tomcat-connectors-1.2.37-windows-x86_64-iis.zip.md5

release/tomcat/tomcat-connectors/jk/binaries/windows/tomcat-connectors-1.2.37-windows-x86_64-iis.zip.sha1
release/tomcat/tomcat-connectors/jk/tomcat-connectors-1.2.37-src.tar.gz
release/tomcat/tomcat-connectors/jk/tomcat-connectors-1.2.37-src.tar.gz.asc
release/tomcat/tomcat-connectors/jk/tomcat-connectors-1.2.37-src.tar.gz.md5
release/tomcat/tomcat-connectors/jk/tomcat-connectors-1.2.37-src.tar.gz.sha1
release/tomcat/tomcat-connectors/jk/tomcat-connectors-1.2.37-src.zip
release/tomcat/tomcat-connectors/jk/tomcat-connectors-1.2.37-src.zip.asc
release/tomcat/tomcat-connectors/jk/tomcat-connectors-1.2.37-src.zip.md5
release/tomcat/tomcat-connectors/jk/tomcat-connectors-1.2.37-src.zip.sha1


-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org



svn commit: r5032 - in /release/tomcat/tomcat-connectors/jk: ./ binaries/windows/ binaries/windows/symbols/

2014-04-14 Thread mturk
Author: mturk
Date: Mon Apr 14 19:40:10 2014
New Revision: 5032

Log:
Upload 1.2.40 release

Added:

release/tomcat/tomcat-connectors/jk/binaries/windows/symbols/tomcat-connectors-1.2.40-windows-i386-symbols.zip
   (with props)

release/tomcat/tomcat-connectors/jk/binaries/windows/symbols/tomcat-connectors-1.2.40-windows-i386-symbols.zip.asc
   (with props)

release/tomcat/tomcat-connectors/jk/binaries/windows/symbols/tomcat-connectors-1.2.40-windows-i386-symbols.zip.md5

release/tomcat/tomcat-connectors/jk/binaries/windows/symbols/tomcat-connectors-1.2.40-windows-i386-symbols.zip.sha1

release/tomcat/tomcat-connectors/jk/binaries/windows/symbols/tomcat-connectors-1.2.40-windows-x86_64-symbols.zip
   (with props)

release/tomcat/tomcat-connectors/jk/binaries/windows/symbols/tomcat-connectors-1.2.40-windows-x86_64-symbols.zip.asc
   (with props)

release/tomcat/tomcat-connectors/jk/binaries/windows/symbols/tomcat-connectors-1.2.40-windows-x86_64-symbols.zip.md5

release/tomcat/tomcat-connectors/jk/binaries/windows/symbols/tomcat-connectors-1.2.40-windows-x86_64-symbols.zip.sha1

release/tomcat/tomcat-connectors/jk/binaries/windows/tomcat-connectors-1.2.40-windows-i386-httpd-2.0.x.zip
   (with props)

release/tomcat/tomcat-connectors/jk/binaries/windows/tomcat-connectors-1.2.40-windows-i386-httpd-2.0.x.zip.asc
   (with props)

release/tomcat/tomcat-connectors/jk/binaries/windows/tomcat-connectors-1.2.40-windows-i386-httpd-2.0.x.zip.md5

release/tomcat/tomcat-connectors/jk/binaries/windows/tomcat-connectors-1.2.40-windows-i386-httpd-2.0.x.zip.sha1

release/tomcat/tomcat-connectors/jk/binaries/windows/tomcat-connectors-1.2.40-windows-i386-httpd-2.2.x.zip
   (with props)

release/tomcat/tomcat-connectors/jk/binaries/windows/tomcat-connectors-1.2.40-windows-i386-httpd-2.2.x.zip.asc
   (with props)

release/tomcat/tomcat-connectors/jk/binaries/windows/tomcat-connectors-1.2.40-windows-i386-httpd-2.2.x.zip.md5

release/tomcat/tomcat-connectors/jk/binaries/windows/tomcat-connectors-1.2.40-windows-i386-httpd-2.2.x.zip.sha1

release/tomcat/tomcat-connectors/jk/binaries/windows/tomcat-connectors-1.2.40-windows-i386-httpd-2.4.x.zip
   (with props)

release/tomcat/tomcat-connectors/jk/binaries/windows/tomcat-connectors-1.2.40-windows-i386-httpd-2.4.x.zip.asc
   (with props)

release/tomcat/tomcat-connectors/jk/binaries/windows/tomcat-connectors-1.2.40-windows-i386-httpd-2.4.x.zip.md5

release/tomcat/tomcat-connectors/jk/binaries/windows/tomcat-connectors-1.2.40-windows-i386-httpd-2.4.x.zip.sha1

release/tomcat/tomcat-connectors/jk/binaries/windows/tomcat-connectors-1.2.40-windows-i386-iis.zip
   (with props)

release/tomcat/tomcat-connectors/jk/binaries/windows/tomcat-connectors-1.2.40-windows-i386-iis.zip.asc
   (with props)

release/tomcat/tomcat-connectors/jk/binaries/windows/tomcat-connectors-1.2.40-windows-i386-iis.zip.md5

release/tomcat/tomcat-connectors/jk/binaries/windows/tomcat-connectors-1.2.40-windows-i386-iis.zip.sha1

release/tomcat/tomcat-connectors/jk/binaries/windows/tomcat-connectors-1.2.40-windows-i386-iplanet.zip
   (with props)

release/tomcat/tomcat-connectors/jk/binaries/windows/tomcat-connectors-1.2.40-windows-i386-iplanet.zip.asc
   (with props)

release/tomcat/tomcat-connectors/jk/binaries/windows/tomcat-connectors-1.2.40-windows-i386-iplanet.zip.md5

release/tomcat/tomcat-connectors/jk/binaries/windows/tomcat-connectors-1.2.40-windows-i386-iplanet.zip.sha1

release/tomcat/tomcat-connectors/jk/binaries/windows/tomcat-connectors-1.2.40-windows-x86_64-httpd-2.4.x.zip
   (with props)

release/tomcat/tomcat-connectors/jk/binaries/windows/tomcat-connectors-1.2.40-windows-x86_64-httpd-2.4.x.zip.asc
   (with props)

release/tomcat/tomcat-connectors/jk/binaries/windows/tomcat-connectors-1.2.40-windows-x86_64-httpd-2.4.x.zip.md5

release/tomcat/tomcat-connectors/jk/binaries/windows/tomcat-connectors-1.2.40-windows-x86_64-httpd-2.4.x.zip.sha1

release/tomcat/tomcat-connectors/jk/binaries/windows/tomcat-connectors-1.2.40-windows-x86_64-iis.zip
   (with props)

release/tomcat/tomcat-connectors/jk/binaries/windows/tomcat-connectors-1.2.40-windows-x86_64-iis.zip.asc
   (with props)

release/tomcat/tomcat-connectors/jk/binaries/windows/tomcat-connectors-1.2.40-windows-x86_64-iis.zip.md5

release/tomcat/tomcat-connectors/jk/binaries/windows/tomcat-connectors-1.2.40-windows-x86_64-iis.zip.sha1
release/tomcat/tomcat-connectors/jk/tomcat-connectors-1.2.40-src.tar.gz   
(with props)
release/tomcat/tomcat-connectors/jk/tomcat-connectors-1.2.40-src.tar.gz.asc 
  (with props)
release/tomcat/tomcat-connectors/jk/tomcat-connectors-1.2.40-src.tar.gz.md5
release/tomcat/tomcat-connectors/jk/tomcat-connectors-1.2.40-src.tar.gz.sha1
release/tomcat/tomcat-connectors/jk/tomcat-connectors-1.2.40-src.zip   
(with props)
release/tomcat/tomcat-connectors/jk/tomcat

svn commit: r5033 - in /release/tomcat/tomcat-connectors/native: ./ 1.1.30/ 1.1.30/binaries/ 1.1.30/source/

2014-04-14 Thread mturk
Author: mturk
Date: Mon Apr 14 19:46:58 2014
New Revision: 5033

Log:
Upload 1.1.30 release

Added:
release/tomcat/tomcat-connectors/native/1.1.30/
release/tomcat/tomcat-connectors/native/1.1.30/binaries/

release/tomcat/tomcat-connectors/native/1.1.30/binaries/tomcat-native-1.1.30-ocsp-win32-bin.zip
   (with props)

release/tomcat/tomcat-connectors/native/1.1.30/binaries/tomcat-native-1.1.30-ocsp-win32-bin.zip.asc
   (with props)

release/tomcat/tomcat-connectors/native/1.1.30/binaries/tomcat-native-1.1.30-ocsp-win32-bin.zip.md5

release/tomcat/tomcat-connectors/native/1.1.30/binaries/tomcat-native-1.1.30-ocsp-win32-bin.zip.sha1

release/tomcat/tomcat-connectors/native/1.1.30/binaries/tomcat-native-1.1.30-win32-bin.zip
   (with props)

release/tomcat/tomcat-connectors/native/1.1.30/binaries/tomcat-native-1.1.30-win32-bin.zip.asc
   (with props)

release/tomcat/tomcat-connectors/native/1.1.30/binaries/tomcat-native-1.1.30-win32-bin.zip.md5

release/tomcat/tomcat-connectors/native/1.1.30/binaries/tomcat-native-1.1.30-win32-bin.zip.sha1
release/tomcat/tomcat-connectors/native/1.1.30/source/

release/tomcat/tomcat-connectors/native/1.1.30/source/tomcat-native-1.1.30-src.tar.gz
   (with props)

release/tomcat/tomcat-connectors/native/1.1.30/source/tomcat-native-1.1.30-src.tar.gz.asc
   (with props)

release/tomcat/tomcat-connectors/native/1.1.30/source/tomcat-native-1.1.30-src.tar.gz.md5

release/tomcat/tomcat-connectors/native/1.1.30/source/tomcat-native-1.1.30-src.tar.gz.sha1

release/tomcat/tomcat-connectors/native/1.1.30/source/tomcat-native-1.1.30-win32-src.zip
   (with props)

release/tomcat/tomcat-connectors/native/1.1.30/source/tomcat-native-1.1.30-win32-src.zip.asc
   (with props)

release/tomcat/tomcat-connectors/native/1.1.30/source/tomcat-native-1.1.30-win32-src.zip.md5

release/tomcat/tomcat-connectors/native/1.1.30/source/tomcat-native-1.1.30-win32-src.zip.sha1
Modified:
release/tomcat/tomcat-connectors/native/README.html

Added: 
release/tomcat/tomcat-connectors/native/1.1.30/binaries/tomcat-native-1.1.30-ocsp-win32-bin.zip
==
Binary file - no diff available.

Propchange: 
release/tomcat/tomcat-connectors/native/1.1.30/binaries/tomcat-native-1.1.30-ocsp-win32-bin.zip
--
svn:mime-type = application/zip

Added: 
release/tomcat/tomcat-connectors/native/1.1.30/binaries/tomcat-native-1.1.30-ocsp-win32-bin.zip.asc
==
--- 
release/tomcat/tomcat-connectors/native/1.1.30/binaries/tomcat-native-1.1.30-ocsp-win32-bin.zip.asc
 (added)
+++ 
release/tomcat/tomcat-connectors/native/1.1.30/binaries/tomcat-native-1.1.30-ocsp-win32-bin.zip.asc
 Mon Apr 14 19:46:58 2014
@@ -0,0 +1,7 @@
+-BEGIN PGP SIGNATURE-
+Version: GnuPG v2.0.22 (GNU/Linux)
+
+iF4EABEIAAYFAlNGfagACgkQNc0jwQ1JjiPX0gD/e0A9rK99LD/LgvoLuWoj4cwo
+QmDjoVFbNvXyiYY88koA/313udnrEOpLwbUdV4EnL6tPAc3IX71dqLkXaXjgU+ds
+=CL4Z
+-END PGP SIGNATURE-

Propchange: 
release/tomcat/tomcat-connectors/native/1.1.30/binaries/tomcat-native-1.1.30-ocsp-win32-bin.zip.asc
--
svn:eol-style = native

Propchange: 
release/tomcat/tomcat-connectors/native/1.1.30/binaries/tomcat-native-1.1.30-ocsp-win32-bin.zip.asc
--
svn:mime-type = text/plain

Added: 
release/tomcat/tomcat-connectors/native/1.1.30/binaries/tomcat-native-1.1.30-ocsp-win32-bin.zip.md5
==
--- 
release/tomcat/tomcat-connectors/native/1.1.30/binaries/tomcat-native-1.1.30-ocsp-win32-bin.zip.md5
 (added)
+++ 
release/tomcat/tomcat-connectors/native/1.1.30/binaries/tomcat-native-1.1.30-ocsp-win32-bin.zip.md5
 Mon Apr 14 19:46:58 2014
@@ -0,0 +1 @@
+98961d2d6ddd9ffe4b5bac3638562c7c *tomcat-native-1.1.30-ocsp--win32-bin.zip

Added: 
release/tomcat/tomcat-connectors/native/1.1.30/binaries/tomcat-native-1.1.30-ocsp-win32-bin.zip.sha1
==
--- 
release/tomcat/tomcat-connectors/native/1.1.30/binaries/tomcat-native-1.1.30-ocsp-win32-bin.zip.sha1
 (added)
+++ 
release/tomcat/tomcat-connectors/native/1.1.30/binaries/tomcat-native-1.1.30-ocsp-win32-bin.zip.sha1
 Mon Apr 14 19:46:58 2014
@@ -0,0 +1 @@
+43551caf40750aca7712a071e709f9c8e846a80e 
*tomcat-native-1.1.30-ocsp--win32-bin.zip

Added: 
release/tomcat/tomcat-connectors/native/1.1.30/binaries/tomcat-native-1.1.30-win32-bin.zip
==
Binary file - no diff available.

Propchange: 
release/tomcat/tomcat-connectors/native/1.1.30/binaries/tomcat-native-1.1.30-win32-bin.zip

svn commit: r1587427 - in /tomcat/native/branches/1.1.x/xdocs: index.xml news/2014.xml

2014-04-14 Thread mturk
Author: mturk
Date: Tue Apr 15 05:31:55 2014
New Revision: 1587427

URL: http://svn.apache.org/r1587427
Log:
Add 1.1.30 announcement

Modified:
tomcat/native/branches/1.1.x/xdocs/index.xml
tomcat/native/branches/1.1.x/xdocs/news/2014.xml

Modified: tomcat/native/branches/1.1.x/xdocs/index.xml
URL: 
http://svn.apache.org/viewvc/tomcat/native/branches/1.1.x/xdocs/index.xml?rev=1587427r1=1587426r2=1587427view=diff
==
--- tomcat/native/branches/1.1.x/xdocs/index.xml (original)
+++ tomcat/native/branches/1.1.x/xdocs/index.xml Tue Apr 15 05:31:55 2014
@@ -64,8 +64,8 @@ manual is described in more detail below
 section name=Headlines
 ul
 
-lia href=news/2013.html#20131015.115 October 2013 - bTC-Native-1.1.29 
released/b/a
-pThe Apache Tomcat team is proud to announce the immediate availability of 
Tomcat Native 1.1.29 Stable.
+lia href=news/2014.html#20140115.115 April 2014 - bTC-Native-1.1.30 
released/b/a
+pThe Apache Tomcat team is proud to announce the immediate availability of 
Tomcat Native 1.1.30 Stable.
 /p
 p
  The sources and the binaries for selected platforms are available from the

Modified: tomcat/native/branches/1.1.x/xdocs/news/2014.xml
URL: 
http://svn.apache.org/viewvc/tomcat/native/branches/1.1.x/xdocs/news/2014.xml?rev=1587427r1=1587426r2=1587427view=diff
==
--- tomcat/native/branches/1.1.x/xdocs/news/2014.xml (original)
+++ tomcat/native/branches/1.1.x/xdocs/news/2014.xml Tue Apr 15 05:31:55 2014
@@ -30,6 +30,12 @@
 body
 
 section name=2014 News amp; Status
+ subsection anchor=20140515.1 name=15 April - TC-Native-1.1.30 released
+  pThe Apache Tomcat team is proud to announce the immediate availability
+  of Tomcat Native 1.1.30. This is a bug fixing release with added support for
+  EC ciphers if supported by OpenSSL.
+  /p
+ /subsection
 /section
 /body
 /document



-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org



svn commit: r1586618 - /tomcat/jk/trunk/native/common/jk_version.h

2014-04-11 Thread mturk
Author: mturk
Date: Fri Apr 11 12:08:47 2014
New Revision: 1586618

URL: http://svn.apache.org/r1586618
Log:
Promote to release before tagging

Modified:
tomcat/jk/trunk/native/common/jk_version.h

Modified: tomcat/jk/trunk/native/common/jk_version.h
URL: 
http://svn.apache.org/viewvc/tomcat/jk/trunk/native/common/jk_version.h?rev=1586618r1=1586617r2=1586618view=diff
==
--- tomcat/jk/trunk/native/common/jk_version.h (original)
+++ tomcat/jk/trunk/native/common/jk_version.h Fri Apr 11 12:08:47 2014
@@ -29,7 +29,7 @@
 #define JK_VERFIX   40
 
 /* set JK_VERISRELEASE to 1 when release (do not forget to commit!) */
-#define JK_VERISRELEASE 0
+#define JK_VERISRELEASE 1
 /* Beta number */
 #define JK_VERBETA  0
 #define JK_BETASTRING   0



-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org



svn commit: r1586619 - /tomcat/jk/tags/JK_1_2_40/

2014-04-11 Thread mturk
Author: mturk
Date: Fri Apr 11 12:09:57 2014
New Revision: 1586619

URL: http://svn.apache.org/r1586619
Log:
Tag 1.2.40

Added:
tomcat/jk/tags/JK_1_2_40/
  - copied from r1586618, tomcat/jk/trunk/


-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org



svn commit: r1586623 - /tomcat/jk/tags/JK_1_2_40/

2014-04-11 Thread mturk
Author: mturk
Date: Fri Apr 11 12:16:52 2014
New Revision: 1586623

URL: http://svn.apache.org/r1586623
Log:
Axe tag

Removed:
tomcat/jk/tags/JK_1_2_40/


-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org



svn commit: r1586627 - /tomcat/jk/trunk/native/common/jk_connect.c

2014-04-11 Thread mturk
Author: mturk
Date: Fri Apr 11 12:23:44 2014
New Revision: 1586627

URL: http://svn.apache.org/r1586627
Log:
Cannot do pointer arithmetic on void

Modified:
tomcat/jk/trunk/native/common/jk_connect.c

Modified: tomcat/jk/trunk/native/common/jk_connect.c
URL: 
http://svn.apache.org/viewvc/tomcat/jk/trunk/native/common/jk_connect.c?rev=1586627r1=1586626r2=1586627view=diff
==
--- tomcat/jk/trunk/native/common/jk_connect.c (original)
+++ tomcat/jk/trunk/native/common/jk_connect.c Fri Apr 11 12:23:44 2014
@@ -339,7 +339,7 @@ void jk_clone_sockaddr(jk_sockaddr_t *ou
  * Do not copy the pointer but use the same offset relative
  * to the struct start
  */
-out-ipaddr_ptr = (void *)out + (in-ipaddr_ptr - (void *)in);
+out-ipaddr_ptr = (char *)out + ((char *)in-ipaddr_ptr - (char *)in);
 }
 
 /** Resolve the host IP
@@ -443,7 +443,7 @@ int jk_resolve(const char *host, int por
 #endif
 hints.ai_family = JK_INET;
 if (port  0) {
-snprintf(pbuf, port, sizeof(pbuf));
+snprintf(pbuf, sizeof(pbuf), %d, port);
 pbufptr = pbuf;
 }
 error = getaddrinfo(host, pbufptr, hints, ai_list);



-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org



svn commit: r1586629 - /tomcat/jk/tags/JK_1_2_40/

2014-04-11 Thread mturk
Author: mturk
Date: Fri Apr 11 12:25:41 2014
New Revision: 1586629

URL: http://svn.apache.org/r1586629
Log:
Tag 1.2.40

Added:
tomcat/jk/tags/JK_1_2_40/
  - copied from r1586628, tomcat/jk/trunk/


-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org



svn commit: r1586227 - /tomcat/native/branches/1.1.x/xdocs/miscellaneous/changelog.xml

2014-04-10 Thread mturk
Author: mturk
Date: Thu Apr 10 06:55:27 2014
New Revision: 1586227

URL: http://svn.apache.org/r1586227
Log:
Resolve 56363 bug

Modified:
tomcat/native/branches/1.1.x/xdocs/miscellaneous/changelog.xml

Modified: tomcat/native/branches/1.1.x/xdocs/miscellaneous/changelog.xml
URL: 
http://svn.apache.org/viewvc/tomcat/native/branches/1.1.x/xdocs/miscellaneous/changelog.xml?rev=1586227r1=1586226r2=1586227view=diff
==
--- tomcat/native/branches/1.1.x/xdocs/miscellaneous/changelog.xml (original)
+++ tomcat/native/branches/1.1.x/xdocs/miscellaneous/changelog.xml Thu Apr 10 
06:55:27 2014
@@ -39,6 +39,9 @@
 section name=Changes between 1.1.29 and 1.1.30
   changelog
 fix
+  bug56363/bug: Use OpenSSL 1.0.1g with Windows binaries. (mturk)
+/fix  
+fix
   bug55915/bug: Apply Mike Noordermeer's patch for ECDHE support. 
(mturk)
 /fix
 fix



-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org



svn commit: r1586252 - /tomcat/native/branches/1.1.x/java/org/apache/tomcat/

2014-04-10 Thread mturk
Author: mturk
Date: Thu Apr 10 09:47:07 2014
New Revision: 1586252

URL: http://svn.apache.org/r1586252
Log:
Update externals

Modified:
tomcat/native/branches/1.1.x/java/org/apache/tomcat/   (props changed)

Propchange: tomcat/native/branches/1.1.x/java/org/apache/tomcat/
--
--- svn:externals (original)
+++ svn:externals Thu Apr 10 09:47:07 2014
@@ -1 +1 @@
-^/tomcat/trunk/java/org/apache/tomcat/jni@1528407 jni
+^/tomcat/trunk/java/org/apache/tomcat/jni@1561162 jni



-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org



svn commit: r1586254 - in /tomcat/native/branches/1.1.x/xdocs: miscellaneous/project.xml news/2014.xml news/project.xml project.xml

2014-04-10 Thread mturk
Author: mturk
Date: Thu Apr 10 10:00:23 2014
New Revision: 1586254

URL: http://svn.apache.org/r1586254
Log:
Add year 2014 news section

Added:
tomcat/native/branches/1.1.x/xdocs/news/2014.xml   (with props)
Modified:
tomcat/native/branches/1.1.x/xdocs/miscellaneous/project.xml
tomcat/native/branches/1.1.x/xdocs/news/project.xml
tomcat/native/branches/1.1.x/xdocs/project.xml

Modified: tomcat/native/branches/1.1.x/xdocs/miscellaneous/project.xml
URL: 
http://svn.apache.org/viewvc/tomcat/native/branches/1.1.x/xdocs/miscellaneous/project.xml?rev=1586254r1=1586253r2=1586254view=diff
==
--- tomcat/native/branches/1.1.x/xdocs/miscellaneous/project.xml (original)
+++ tomcat/native/branches/1.1.x/xdocs/miscellaneous/project.xml Thu Apr 10 
10:00:23 2014
@@ -34,6 +34,7 @@
 /menu
 
 menu name=News
+item name=2014   href=../news/2014.html/
 item name=2013   href=../news/2013.html/
 item name=2012   href=../news/2012.html/
 item name=2011   href=../news/2011.html/

Added: tomcat/native/branches/1.1.x/xdocs/news/2014.xml
URL: 
http://svn.apache.org/viewvc/tomcat/native/branches/1.1.x/xdocs/news/2014.xml?rev=1586254view=auto
==
--- tomcat/native/branches/1.1.x/xdocs/news/2014.xml (added)
+++ tomcat/native/branches/1.1.x/xdocs/news/2014.xml Thu Apr 10 10:00:23 2014
@@ -0,0 +1,35 @@
+?xml version=1.0 encoding=UTF-8?
+!--
+  Licensed to the Apache Software Foundation (ASF) under one or more
+  contributor license agreements.  See the NOTICE file distributed with
+  this work for additional information regarding copyright ownership.
+  The ASF licenses this file to You 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.
+--
+!DOCTYPE document [
+  !ENTITY project SYSTEM project.xml
+]
+document url=2014.html
+
+  project;
+
+  properties
+author email=general.AT.tomcat.DOT.apache.DOT.orgApache Tomcat Native 
Project/author
+title2013 News and Status/title
+  /properties
+
+body
+
+section name=2014 News amp; Status
+/section
+/body
+/document

Propchange: tomcat/native/branches/1.1.x/xdocs/news/2014.xml
--
svn:eol-style = native

Propchange: tomcat/native/branches/1.1.x/xdocs/news/2014.xml
--
svn:mime-type = text/xml

Modified: tomcat/native/branches/1.1.x/xdocs/news/project.xml
URL: 
http://svn.apache.org/viewvc/tomcat/native/branches/1.1.x/xdocs/news/project.xml?rev=1586254r1=1586253r2=1586254view=diff
==
--- tomcat/native/branches/1.1.x/xdocs/news/project.xml (original)
+++ tomcat/native/branches/1.1.x/xdocs/news/project.xml Thu Apr 10 10:00:23 2014
@@ -34,6 +34,7 @@
 /menu
 
 menu name=News
+item name=2014   href=../news/2014.html/
 item name=2013   href=../news/2013.html/
 item name=2012   href=../news/2012.html/
 item name=2011   href=../news/2011.html/

Modified: tomcat/native/branches/1.1.x/xdocs/project.xml
URL: 
http://svn.apache.org/viewvc/tomcat/native/branches/1.1.x/xdocs/project.xml?rev=1586254r1=1586253r2=1586254view=diff
==
--- tomcat/native/branches/1.1.x/xdocs/project.xml (original)
+++ tomcat/native/branches/1.1.x/xdocs/project.xml Thu Apr 10 10:00:23 2014
@@ -34,6 +34,7 @@
 /menu
 
 menu name=News
+item name=2014   href=news/2014.html/
 item name=2013   href=news/2013.html/
 item name=2012   href=news/2012.html/
 item name=2011   href=news/2011.html/



-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org



svn commit: r1586258 - /tomcat/native/branches/1.1.x/jnirelease.sh

2014-04-10 Thread mturk
Author: mturk
Date: Thu Apr 10 10:19:54 2014
New Revision: 1586258

URL: http://svn.apache.org/r1586258
Log:
No more docs/printer files

Modified:
tomcat/native/branches/1.1.x/jnirelease.sh

Modified: tomcat/native/branches/1.1.x/jnirelease.sh
URL: 
http://svn.apache.org/viewvc/tomcat/native/branches/1.1.x/jnirelease.sh?rev=1586258r1=1586257r2=1586258view=diff
==
--- tomcat/native/branches/1.1.x/jnirelease.sh (original)
+++ tomcat/native/branches/1.1.x/jnirelease.sh Thu Apr 10 10:19:54 2014
@@ -21,7 +21,7 @@
 #native/include/tcn_version.h
 #native/os/win32/libtcnative.rc
 
-# Default place to look for apr source.  Can be overridden with 
+# Default place to look for apr source.  Can be overridden with
 #   --with-apr=[directory]
 apr_src_dir=`pwd`/srclib/apr
 JKJNIEXT=
@@ -62,7 +62,7 @@ else
 echo 
 echo Problem finding apr source in: \`$apr_src_dir'
 echo Use:
-echo   --with-apr=directory 
+echo   --with-apr=directory
 echo 
 exit 1
 fi
@@ -182,13 +182,17 @@ fi
 top=`pwd`
 cd ${JKJNIDIST}/jni/xdocs
 ant
-$EXPTOOL $EXPOPTS ../build/docs/miscellaneous/printer/changelog.html  
../../CHANGELOG.txt 2/dev/null
+$EXPTOOL $EXPOPTS ../build/docs/miscellaneous/changelog.html  
../../CHANGELOG.txt 2/dev/null
 if [ $? -ne 0 ]; then
 echo 
-echo $EXPTOOL $EXPOPTS ../build/docs/miscellaneous/printer/changelog.html 
failed
+echo $EXPTOOL $EXPOPTS ../build/docs/miscellaneous/changelog.html failed
 echo 
 exit 1
 fi
+# Remove first 25 lines from converted file which contains
+# page navagation data.
+# Remember to increase the lines when new file is added to news.
+sed -i '1,25d' ../../CHANGELOG.txt
 cd $top
 mv ${JKJNIDIST}/jni/build/docs ${JKJNIDIST}/jni/docs
 rm -rf ${JKJNIDIST}/jni/build
@@ -233,14 +237,8 @@ if [ $? -ne 0 ]; then
 echo 
 exit 1
 fi
-$EXPTOOL $EXPOPTS ../build/docs/miscellaneous/printer/changelog.html  
../../CHANGELOG.txt 2/dev/null
-if [ $? -ne 0 ]; then
-echo 
-echo $EXPTOOL $EXPOPTS ../build/docs/miscellaneous/printer/changelog.html 
failed
-echo 
-exit 1
-fi
 cd $top
+cp ${JKJNIDIST}/CHANGELOG.txt ${JKWINDIST}
 
 mv ${JKWINDIST}/jni/build/docs ${JKWINDIST}/jni/docs
 rm -rf ${JKWINDIST}/jni/build



-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org



svn commit: r1586263 - in /tomcat/native/branches/1.1.x: build.properties.default build.xml native/include/tcn_version.h

2014-04-10 Thread mturk
Author: mturk
Date: Thu Apr 10 10:27:08 2014
New Revision: 1586263

URL: http://svn.apache.org/r1586263
Log:
Prepare versions for 1.1.30 release

Modified:
tomcat/native/branches/1.1.x/build.properties.default
tomcat/native/branches/1.1.x/build.xml
tomcat/native/branches/1.1.x/native/include/tcn_version.h

Modified: tomcat/native/branches/1.1.x/build.properties.default
URL: 
http://svn.apache.org/viewvc/tomcat/native/branches/1.1.x/build.properties.default?rev=1586263r1=1586262r2=1586263view=diff
==
--- tomcat/native/branches/1.1.x/build.properties.default (original)
+++ tomcat/native/branches/1.1.x/build.properties.default Thu Apr 10 10:27:08 
2014
@@ -18,7 +18,7 @@
 # - Version Control Flags -
 version.major=1
 version.minor=1
-version.build=29
+version.build=30
 version.patch=0
 #version.suffix=-dev
 version.suffix=

Modified: tomcat/native/branches/1.1.x/build.xml
URL: 
http://svn.apache.org/viewvc/tomcat/native/branches/1.1.x/build.xml?rev=1586263r1=1586262r2=1586263view=diff
==
--- tomcat/native/branches/1.1.x/build.xml (original)
+++ tomcat/native/branches/1.1.x/build.xml Thu Apr 10 10:27:08 2014
@@ -33,7 +33,7 @@
 property name=year  value=2014 /
 property name=version.major value=1 /
 property name=version.minor value=1 /
-property name=version.build value=29 /
+property name=version.build value=30 /
 property name=version.patch value=0 /
 property name=version.suffixvalue= /
 

Modified: tomcat/native/branches/1.1.x/native/include/tcn_version.h
URL: 
http://svn.apache.org/viewvc/tomcat/native/branches/1.1.x/native/include/tcn_version.h?rev=1586263r1=1586262r2=1586263view=diff
==
--- tomcat/native/branches/1.1.x/native/include/tcn_version.h (original)
+++ tomcat/native/branches/1.1.x/native/include/tcn_version.h Thu Apr 10 
10:27:08 2014
@@ -75,7 +75,7 @@ extern C {
  *  This symbol is defined for internal, development copies of TCN. This
  *  symbol will be #undef'd for releases.
  */
-#define TCN_IS_DEV_VERSION  1
+#define TCN_IS_DEV_VERSION  0
 
 
 /** The formatted string of APU's version */



-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org



svn commit: r1586266 - /tomcat/native/tags/TOMCAT_NATIVE_1_1_30/

2014-04-10 Thread mturk
Author: mturk
Date: Thu Apr 10 10:36:32 2014
New Revision: 1586266

URL: http://svn.apache.org/r1586266
Log:
Tag 1.1.30

Added:
tomcat/native/tags/TOMCAT_NATIVE_1_1_30/   (props changed)
  - copied from r1586265, tomcat/native/branches/1.1.x/

Propchange: tomcat/native/tags/TOMCAT_NATIVE_1_1_30/
--
--- svn:ignore (added)
+++ svn:ignore Thu Apr 10 10:36:32 2014
@@ -0,0 +1 @@
+dist

Propchange: tomcat/native/tags/TOMCAT_NATIVE_1_1_30/
--
--- svn:mergeinfo (added)
+++ svn:mergeinfo Thu Apr 10 10:36:32 2014
@@ -0,0 +1,3 @@
+/tomcat/native/trunk:815411,1342003,1342008,1342013,1342020,1342024,1394258,1394342,1424947,1424971,1430753,1437081,1438342,1439337,1441884,1441886,1442579,1442581,1445972,1507113,1532577,1532590,1539594,1555184,1559180
+/tomcat/tc7.0.x/trunk:1199985,1200164,1349932,1434887,1435769
+/tomcat/trunk:815418,832198,1001939,1033916,1043103,1044729,1078522,1145209,1145285,1149092,1241356,1241406-1241407,1242254,1292671,1299980,1300102,1434905,1437083



-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org



svn commit: r1586578 - /tomcat/jk/trunk/native/common/jk_connect.c

2014-04-10 Thread mturk
Author: mturk
Date: Fri Apr 11 05:56:38 2014
New Revision: 1586578

URL: http://svn.apache.org/r1586578
Log:
Ensure that we use port buffer with getaddrinfo call

Modified:
tomcat/jk/trunk/native/common/jk_connect.c

Modified: tomcat/jk/trunk/native/common/jk_connect.c
URL: 
http://svn.apache.org/viewvc/tomcat/jk/trunk/native/common/jk_connect.c?rev=1586578r1=1586577r2=1586578view=diff
==
--- tomcat/jk/trunk/native/common/jk_connect.c (original)
+++ tomcat/jk/trunk/native/common/jk_connect.c Fri Apr 11 05:56:38 2014
@@ -454,7 +454,7 @@ int jk_resolve(const char *host, int por
  */
 if (error == EAI_FAMILY  prefer_ipv6) {
 hints.ai_family = JK_INET;
-error = getaddrinfo(host, NULL, hints, ai_list);
+error = getaddrinfo(host, pbufptr, hints, ai_list);
 }
 #endif
 if (error) {
@@ -466,7 +466,7 @@ int jk_resolve(const char *host, int por
 if (prefer_ipv6) {
 ai = ai_list;
 while (ai) {
-if (ai-ai_family == AF_INET6) {
+if (ai-ai_family == JK_INET6) {
 /* ignore elements without required address info */
 if((ai-ai_addr != NULL)  (ai-ai_addrlen  0)) {

 family = JK_INET6;
@@ -480,7 +480,7 @@ int jk_resolve(const char *host, int por
 if (ai == NULL) {
 ai = ai_list;
 while (ai) {
-if (ai-ai_family == AF_INET) {
+if (ai-ai_family == JK_INET) {
 /* ignore elements without required address info */
 if((ai-ai_addr != NULL)  (ai-ai_addrlen  0)) {

 family = JK_INET;



-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org



svn commit: r1585898 - in /tomcat/native/branches/1.1.x: native/src/sslcontext.c xdocs/miscellaneous/changelog.xml

2014-04-09 Thread mturk
Author: mturk
Date: Wed Apr  9 07:32:29 2014
New Revision: 1585898

URL: http://svn.apache.org/r1585898
Log:
Apply Ognjen's patch for bz55915

Modified:
tomcat/native/branches/1.1.x/native/src/sslcontext.c
tomcat/native/branches/1.1.x/xdocs/miscellaneous/changelog.xml

Modified: tomcat/native/branches/1.1.x/native/src/sslcontext.c
URL: 
http://svn.apache.org/viewvc/tomcat/native/branches/1.1.x/native/src/sslcontext.c?rev=1585898r1=1585897r2=1585898view=diff
==
--- tomcat/native/branches/1.1.x/native/src/sslcontext.c (original)
+++ tomcat/native/branches/1.1.x/native/src/sslcontext.c Wed Apr  9 07:32:29 
2014
@@ -151,6 +151,10 @@ TCN_IMPLEMENT_CALL(jlong, SSLContext, ma
(unsigned long)((sizeof SSL_DEFAULT_VHOST_NAME) - 1),
(c-context_id[0]), NULL, EVP_sha1(), NULL);
 if (mode) {
+/* Set default (nistp256) elliptic curve for ephemeral ECDH keys */
+EC_KEY *ecdh = EC_KEY_new_by_curve_name(NID_X9_62_prime256v1);
+SSL_CTX_set_tmp_ecdh(c-ctx, ecdh);
+EC_KEY_free(ecdh);
 SSL_CTX_set_tmp_rsa_callback(c-ctx, SSL_callback_tmp_RSA);
 SSL_CTX_set_tmp_dh_callback(c-ctx,  SSL_callback_tmp_DH);
 }

Modified: tomcat/native/branches/1.1.x/xdocs/miscellaneous/changelog.xml
URL: 
http://svn.apache.org/viewvc/tomcat/native/branches/1.1.x/xdocs/miscellaneous/changelog.xml?rev=1585898r1=1585897r2=1585898view=diff
==
--- tomcat/native/branches/1.1.x/xdocs/miscellaneous/changelog.xml (original)
+++ tomcat/native/branches/1.1.x/xdocs/miscellaneous/changelog.xml Wed Apr  9 
07:32:29 2014
@@ -39,6 +39,9 @@
 section name=Changes between 1.1.29 and 1.1.30
   changelog
 fix
+  bug55915/bug: Apply Ognjen's patch for ECDHE support. (mturk)
+/fix
+fix
   bug55663/bug: Minor correction to the wording of the NOTICE file
   to align it with the a
   href=http://www.apache.org/legal/src-headers.html#notice;requirements



-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org



svn commit: r1585903 - /tomcat/native/branches/1.1.x/native/srclib/VERSIONS

2014-04-09 Thread mturk
Author: mturk
Date: Wed Apr  9 08:31:42 2014
New Revision: 1585903

URL: http://svn.apache.org/r1585903
Log:
Update OpenSSL version

Modified:
tomcat/native/branches/1.1.x/native/srclib/VERSIONS

Modified: tomcat/native/branches/1.1.x/native/srclib/VERSIONS
URL: 
http://svn.apache.org/viewvc/tomcat/native/branches/1.1.x/native/srclib/VERSIONS?rev=1585903r1=1585902r2=1585903view=diff
==
--- tomcat/native/branches/1.1.x/native/srclib/VERSIONS (original)
+++ tomcat/native/branches/1.1.x/native/srclib/VERSIONS Wed Apr  9 08:31:42 2014
@@ -1,4 +1,4 @@
 Use the following version of the libraries
 
 - APR 1.4.8, http://apr.apache.org
-- OpenSSL 1.0.1e, http://www.openssl.org
+- OpenSSL 1.0.1g, http://www.openssl.org



-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org



svn commit: r1585923 - in /tomcat/native/branches/1.1.x/native: include/ssl_private.h src/sslcontext.c

2014-04-09 Thread mturk
Author: mturk
Date: Wed Apr  9 09:52:40 2014
New Revision: 1585923

URL: http://svn.apache.org/r1585923
Log:
As per Tom's suggestion. Set SSL_OP_SINGLE_ECDH_USE to context

Modified:
tomcat/native/branches/1.1.x/native/include/ssl_private.h
tomcat/native/branches/1.1.x/native/src/sslcontext.c

Modified: tomcat/native/branches/1.1.x/native/include/ssl_private.h
URL: 
http://svn.apache.org/viewvc/tomcat/native/branches/1.1.x/native/include/ssl_private.h?rev=1585923r1=1585922r2=1585923view=diff
==
--- tomcat/native/branches/1.1.x/native/include/ssl_private.h (original)
+++ tomcat/native/branches/1.1.x/native/include/ssl_private.h Wed Apr  9 
09:52:40 2014
@@ -40,6 +40,12 @@
 #endif
 
 /* OpenSSL headers */
+/* OpenSSL headers */
+#include openssl/opensslv.h
+#if (OPENSSL_VERSION_NUMBER = 0x10001000)
+/* must be defined before including ssl.h */
+#define OPENSSL_NO_SSL_INTERN
+#endif
 #include openssl/ssl.h
 #include openssl/err.h
 #include openssl/x509.h
@@ -208,6 +214,11 @@
 #define OCSP_STATUS_UNKNOWN   2
 
 
+/* ECC: make sure we have at least 1.0.0 */
+#if !defined(OPENSSL_NO_EC)  defined(TLSEXT_ECPOINTFORMAT_uncompressed)
+#define HAVE_ECC  1
+#endif
+
 extern void *SSL_temp_keys[SSL_TMP_KEY_MAX];
 
 typedef struct {

Modified: tomcat/native/branches/1.1.x/native/src/sslcontext.c
URL: 
http://svn.apache.org/viewvc/tomcat/native/branches/1.1.x/native/src/sslcontext.c?rev=1585923r1=1585922r2=1585923view=diff
==
--- tomcat/native/branches/1.1.x/native/src/sslcontext.c (original)
+++ tomcat/native/branches/1.1.x/native/src/sslcontext.c Wed Apr  9 09:52:40 
2014
@@ -137,6 +137,9 @@ TCN_IMPLEMENT_CALL(jlong, SSLContext, ma
  * Configure additional context ingredients
  */
 SSL_CTX_set_options(c-ctx, SSL_OP_SINGLE_DH_USE);
+#ifdef HAVE_ECC
+SSL_CTX_set_options(c-ctx, SSL_OP_SINGLE_ECDH_USE);
+#endif
 
 #ifdef SSL_OP_NO_SESSION_RESUMPTION_ON_RENEGOTIATION
 /*



-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org



svn commit: r1585957 - /tomcat/native/branches/1.1.x/native/src/sslcontext.c

2014-04-09 Thread mturk
Author: mturk
Date: Wed Apr  9 12:54:25 2014
New Revision: 1585957

URL: http://svn.apache.org/r1585957
Log:
Ensure we have the needed ECDH with the OpenSSL used

Modified:
tomcat/native/branches/1.1.x/native/src/sslcontext.c

Modified: tomcat/native/branches/1.1.x/native/src/sslcontext.c
URL: 
http://svn.apache.org/viewvc/tomcat/native/branches/1.1.x/native/src/sslcontext.c?rev=1585957r1=1585956r2=1585957view=diff
==
--- tomcat/native/branches/1.1.x/native/src/sslcontext.c (original)
+++ tomcat/native/branches/1.1.x/native/src/sslcontext.c Wed Apr  9 12:54:25 
2014
@@ -154,10 +154,12 @@ TCN_IMPLEMENT_CALL(jlong, SSLContext, ma
(unsigned long)((sizeof SSL_DEFAULT_VHOST_NAME) - 1),
(c-context_id[0]), NULL, EVP_sha1(), NULL);
 if (mode) {
+#ifdef HAVE_ECC
 /* Set default (nistp256) elliptic curve for ephemeral ECDH keys */
 EC_KEY *ecdh = EC_KEY_new_by_curve_name(NID_X9_62_prime256v1);
 SSL_CTX_set_tmp_ecdh(c-ctx, ecdh);
 EC_KEY_free(ecdh);
+#endif
 SSL_CTX_set_tmp_rsa_callback(c-ctx, SSL_callback_tmp_RSA);
 SSL_CTX_set_tmp_dh_callback(c-ctx,  SSL_callback_tmp_DH);
 }



-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org



svn commit: r1585966 - /tomcat/native/branches/1.1.x/xdocs/miscellaneous/changelog.xml

2014-04-09 Thread mturk
Author: mturk
Date: Wed Apr  9 13:38:42 2014
New Revision: 1585966

URL: http://svn.apache.org/r1585966
Log:
Change patch author

Modified:
tomcat/native/branches/1.1.x/xdocs/miscellaneous/changelog.xml

Modified: tomcat/native/branches/1.1.x/xdocs/miscellaneous/changelog.xml
URL: 
http://svn.apache.org/viewvc/tomcat/native/branches/1.1.x/xdocs/miscellaneous/changelog.xml?rev=1585966r1=1585965r2=1585966view=diff
==
--- tomcat/native/branches/1.1.x/xdocs/miscellaneous/changelog.xml (original)
+++ tomcat/native/branches/1.1.x/xdocs/miscellaneous/changelog.xml Wed Apr  9 
13:38:42 2014
@@ -39,7 +39,7 @@
 section name=Changes between 1.1.29 and 1.1.30
   changelog
 fix
-  bug55915/bug: Apply Ognjen's patch for ECDHE support. (mturk)
+  bug55915/bug: Apply Mike Noordermeer's patch for ECDHE support. 
(mturk)
 /fix
 fix
   bug55663/bug: Minor correction to the wording of the NOTICE file



-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org



svn commit: r1586221 - /tomcat/native/branches/1.1.x/native/include/ssl_private.h

2014-04-09 Thread mturk
Author: mturk
Date: Thu Apr 10 05:44:09 2014
New Revision: 1586221

URL: http://svn.apache.org/r1586221
Log:
Revert NO_SSL_INTERN define. We need direct struct access for sslinfo

Modified:
tomcat/native/branches/1.1.x/native/include/ssl_private.h

Modified: tomcat/native/branches/1.1.x/native/include/ssl_private.h
URL: 
http://svn.apache.org/viewvc/tomcat/native/branches/1.1.x/native/include/ssl_private.h?rev=1586221r1=1586220r2=1586221view=diff
==
--- tomcat/native/branches/1.1.x/native/include/ssl_private.h (original)
+++ tomcat/native/branches/1.1.x/native/include/ssl_private.h Thu Apr 10 
05:44:09 2014
@@ -40,12 +40,7 @@
 #endif
 
 /* OpenSSL headers */
-/* OpenSSL headers */
 #include openssl/opensslv.h
-#if (OPENSSL_VERSION_NUMBER = 0x10001000)
-/* must be defined before including ssl.h */
-#define OPENSSL_NO_SSL_INTERN
-#endif
 #include openssl/ssl.h
 #include openssl/err.h
 #include openssl/x509.h



-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org



svn commit: r1585654 - /tomcat/jk/trunk/native/common/jk_connect.c

2014-04-08 Thread mturk
Author: mturk
Date: Tue Apr  8 07:31:31 2014
New Revision: 1585654

URL: http://svn.apache.org/r1585654
Log:
Be more specific with getaddrinfo call

Modified:
tomcat/jk/trunk/native/common/jk_connect.c

Modified: tomcat/jk/trunk/native/common/jk_connect.c
URL: 
http://svn.apache.org/viewvc/tomcat/jk/trunk/native/common/jk_connect.c?rev=1585654r1=1585653r2=1585654view=diff
==
--- tomcat/jk/trunk/native/common/jk_connect.c (original)
+++ tomcat/jk/trunk/native/common/jk_connect.c Tue Apr  8 07:31:31 2014
@@ -433,6 +433,7 @@ int jk_resolve(const char *host, int por
 
 memset(hints, 0, sizeof(hints));
 hints.ai_socktype = SOCK_STREAM;
+hints.ai_protocol = IPPROTO_TCP;
 #if JK_HAVE_IPV6
 if (prefer_ipv6)
 hints.ai_family = JK_INET6;



-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org



svn commit: r1585657 - /tomcat/jk/trunk/native/common/jk_connect.c

2014-04-08 Thread mturk
Author: mturk
Date: Tue Apr  8 07:52:56 2014
New Revision: 1585657

URL: http://svn.apache.org/r1585657
Log:
Use port when calling getaddrinfo and skip bogus addresses

Modified:
tomcat/jk/trunk/native/common/jk_connect.c

Modified: tomcat/jk/trunk/native/common/jk_connect.c
URL: 
http://svn.apache.org/viewvc/tomcat/jk/trunk/native/common/jk_connect.c?rev=1585657r1=1585656r2=1585657view=diff
==
--- tomcat/jk/trunk/native/common/jk_connect.c (original)
+++ tomcat/jk/trunk/native/common/jk_connect.c Tue Apr  8 07:52:56 2014
@@ -430,6 +430,8 @@ int jk_resolve(const char *host, int por
  */
 struct addrinfo hints, *ai_list, *ai = NULL;
 int error;
+char  pbuf[12];
+char *pbufptr = NULL;
 
 memset(hints, 0, sizeof(hints));
 hints.ai_socktype = SOCK_STREAM;
@@ -440,7 +442,11 @@ int jk_resolve(const char *host, int por
 else
 #endif
 hints.ai_family = JK_INET;
-error = getaddrinfo(host, NULL, hints, ai_list);
+if (port  0) {
+snprintf(pbuf, port, sizeof(pbuf));
+pbufptr = pbuf;
+}
+error = getaddrinfo(host, pbufptr, hints, ai_list);
 #if JK_HAVE_IPV6
 /* XXX:
  * Is the check for EAI_FAMILY/WSAEAFNOSUPPORT correct
@@ -461,12 +467,13 @@ int jk_resolve(const char *host, int por
 ai = ai_list;
 while (ai) {
 if (ai-ai_family == AF_INET6) {
-family = JK_INET6;
-break;
-}
-else {
-ai = ai-ai_next;
+/* ignore elements without required address info */
+if((ai-ai_addr != NULL)  (ai-ai_addrlen  0)) {

+family = JK_INET6;
+break;
+}
 }
+ai = ai-ai_next;
 }
 }
 #endif
@@ -474,12 +481,13 @@ int jk_resolve(const char *host, int por
 ai = ai_list;
 while (ai) {
 if (ai-ai_family == AF_INET) {
-family = JK_INET;
-break;
-}
-else {
-ai = ai-ai_next;
+/* ignore elements without required address info */
+if((ai-ai_addr != NULL)  (ai-ai_addrlen  0)) {

+family = JK_INET;
+break;
+}
 }
+ai = ai-ai_next;
 }
 }
 if (ai == NULL) {



-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org



svn commit: r1585452 - in /tomcat/jk/trunk: native/common/jk_connect.c xdocs/miscellaneous/changelog.xml

2014-04-07 Thread mturk
Author: mturk
Date: Mon Apr  7 11:00:06 2014
New Revision: 1585452

URL: http://svn.apache.org/r1585452
Log:
Bz56352: Fix regression in memory free

Modified:
tomcat/jk/trunk/native/common/jk_connect.c
tomcat/jk/trunk/xdocs/miscellaneous/changelog.xml

Modified: tomcat/jk/trunk/native/common/jk_connect.c
URL: 
http://svn.apache.org/viewvc/tomcat/jk/trunk/native/common/jk_connect.c?rev=1585452r1=1585451r2=1585452view=diff
==
--- tomcat/jk/trunk/native/common/jk_connect.c (original)
+++ tomcat/jk/trunk/native/common/jk_connect.c Mon Apr  7 11:00:06 2014
@@ -481,16 +481,17 @@ int jk_resolve(const char *host, int por
 }
 }
 }
-freeaddrinfo(ai_list);
 if (ai == NULL) {
 /* No address found
  * XXX: Use better error code?
  */
+freeaddrinfo(ai_list);
 JK_TRACE_EXIT(l);
 errno = ENOENT;
 return JK_FALSE;
 }
 memcpy((saddr-sa), ai-ai_addr, ai-ai_addrlen);
+freeaddrinfo(ai_list);
 #else /* HAVE_GETADDRINFO */
 struct hostent *hoste;
 

Modified: tomcat/jk/trunk/xdocs/miscellaneous/changelog.xml
URL: 
http://svn.apache.org/viewvc/tomcat/jk/trunk/xdocs/miscellaneous/changelog.xml?rev=1585452r1=1585451r2=1585452view=diff
==
--- tomcat/jk/trunk/xdocs/miscellaneous/changelog.xml (original)
+++ tomcat/jk/trunk/xdocs/miscellaneous/changelog.xml Mon Apr  7 11:00:06 2014
@@ -45,6 +45,9 @@
   subsection name=Native
 changelog
   fix
+bug56352/bug: Fix regression in memory release. (mturk)
+  /fix
+  fix
 Fix status worker display of worker IP address after name or port
 was changed. (rjung)
   /fix



-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org



svn commit: r1576234 - in /tomcat/jk/trunk: native/STATUS.txt xdocs/index.xml xdocs/news/20140201.xml

2014-03-11 Thread mturk
Author: mturk
Date: Tue Mar 11 08:54:52 2014
New Revision: 1576234

URL: http://svn.apache.org/r1576234
Log:
Add release notes

Modified:
tomcat/jk/trunk/native/STATUS.txt
tomcat/jk/trunk/xdocs/index.xml
tomcat/jk/trunk/xdocs/news/20140201.xml

Modified: tomcat/jk/trunk/native/STATUS.txt
URL: 
http://svn.apache.org/viewvc/tomcat/jk/trunk/native/STATUS.txt?rev=1576234r1=1576233r2=1576234view=diff
==
--- tomcat/jk/trunk/native/STATUS.txt (original)
+++ tomcat/jk/trunk/native/STATUS.txt Tue Mar 11 08:54:52 2014
@@ -19,7 +19,7 @@ Last modified at [$Date$]
 Release:
 
 1.2.40  : in development
-1.2.39  : in release process
+1.2.39  : released March 11, 2014
 1.2.38  : not released
 1.2.37  : released May 31, 2012
 1.2.36  : released May 14, 2012

Modified: tomcat/jk/trunk/xdocs/index.xml
URL: 
http://svn.apache.org/viewvc/tomcat/jk/trunk/xdocs/index.xml?rev=1576234r1=1576233r2=1576234view=diff
==
--- tomcat/jk/trunk/xdocs/index.xml (original)
+++ tomcat/jk/trunk/xdocs/index.xml Tue Mar 11 08:54:52 2014
@@ -45,6 +45,18 @@ manual is described in more detail below
 section name=Headlines
 br /
 ul
+lia href=news/20140201.html#11 March - JK-1.2.39 released11 March 2014 - 
bJK-1.2.39 released/b/a
+pThe Apache Tomcat team is proud to announce the immediate availability
+of Tomcat Connectors 1.2.39 Stable. This release contains bug fixes found 
in previous releases
+and few new features.
+/p
+pDownload the a 
href=http://www.apache.org/dist/tomcat/tomcat-connectors/jk/tomcat-connectors-1.2.39-src.tar.gz;JK
 1.2.39 release sources/a
+| a 
href=http://www.apache.org/dist/tomcat/tomcat-connectors/jk/tomcat-connectors-1.2.39-src.tar.gz.asc;PGP
 signature/a
+/p
+pDownload the a 
href=http://www.apache.org/dist/tomcat/tomcat-connectors/jk/binaries/;binaries/a
 for selected platforms.
+/p
+/li
+
 lia href=news/20120301.html#31 May - JK-1.2.37 released31 May 2012 - 
bJK-1.2.37 released/b/a
 pThe Apache Tomcat team is proud to announce the immediate availability
 of Tomcat Connectors 1.2.37 Stable. This release contains bug fixes found 
in previous release.

Modified: tomcat/jk/trunk/xdocs/news/20140201.xml
URL: 
http://svn.apache.org/viewvc/tomcat/jk/trunk/xdocs/news/20140201.xml?rev=1576234r1=1576233r2=1576234view=diff
==
--- tomcat/jk/trunk/xdocs/news/20140201.xml (original)
+++ tomcat/jk/trunk/xdocs/news/20140201.xml Tue Mar 11 08:54:52 2014
@@ -31,6 +31,21 @@
 
 section name=2014 News amp; Status
 br /
+subsection name=11 March - JK-1.2.39 released
+a name=20140201.1/a
+br /
+pThe Apache Tomcat team is proud to announce the immediate availability
+of Tomcat Connectors 1.2.39. This is a stable release containing both 
bug fixes and
+few new features like IPV6 support. Note that version 1.2.38 was not 
released due to
+some minor issues found in release process.
+/pp
+Please see the a href=../miscellaneous/changelog.htmlChangeLog/a 
for a full list of changes.
+/p
+pIf you find any bugs while using this release, please fill in the
+a 
href=https://issues.apache.org/bugzilla/enter_bug.cgi?product=Tomcat%20Connectors;Bugzilla/a
+Bug Report.
+/p
+/subsection
 
 /section
 /body



-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org



svn commit: r1576235 - /tomcat/site/trunk/xdocs/download-connectors.xml

2014-03-11 Thread mturk
Author: mturk
Date: Tue Mar 11 09:01:56 2014
New Revision: 1576235

URL: http://svn.apache.org/r1576235
Log:
Update connectors download versions and signing key

Modified:
tomcat/site/trunk/xdocs/download-connectors.xml

Modified: tomcat/site/trunk/xdocs/download-connectors.xml
URL: 
http://svn.apache.org/viewvc/tomcat/site/trunk/xdocs/download-connectors.xml?rev=1576235r1=1576234r2=1576235view=diff
==
--- tomcat/site/trunk/xdocs/download-connectors.xml (original)
+++ tomcat/site/trunk/xdocs/download-connectors.xml Tue Mar 11 09:01:56 2014
@@ -50,28 +50,28 @@
   div class=linksspan class=labelSource (please choose the 
correct format for your platform)/span/div
   ul
 li class=download
-  a 
href=[preferred]/tomcat/tomcat-connectors/jk/tomcat-connectors-1.2.37-src.tar.gz
 rel=nofollow
-JK 1.2.37 Source Release tar.gz
+  a 
href=[preferred]/tomcat/tomcat-connectors/jk/tomcat-connectors-1.2.39-src.tar.gz
 rel=nofollow
+JK 1.2.39 Source Release tar.gz
   /a (e.g. Unix, Linux, Mac OS)
 ul class=attributes
   lispan class=pgp
-[a 
href=https://www.apache.org/dist/tomcat/tomcat-connectors/jk/tomcat-connectors-1.2.37-src.tar.gz.asc;PGP/a]
+[a 
href=https://www.apache.org/dist/tomcat/tomcat-connectors/jk/tomcat-connectors-1.2.39-src.tar.gz.asc;PGP/a]
   /span/li
   lispan class=md5
-[a 
href=https://www.apache.org/dist/tomcat/tomcat-connectors/jk/tomcat-connectors-1.2.37-src.tar.gz.md5;MD5/a]
+[a 
href=https://www.apache.org/dist/tomcat/tomcat-connectors/jk/tomcat-connectors-1.2.39-src.tar.gz.md5;MD5/a]
   /span/li
 /ul
 /li
 li class=download
-  a 
href=[preferred]/tomcat/tomcat-connectors/jk/tomcat-connectors-1.2.37-src.zip 
rel=nofollow
-JK 1.2.37 Source Release zip
+  a 
href=[preferred]/tomcat/tomcat-connectors/jk/tomcat-connectors-1.2.39-src.zip 
rel=nofollow
+JK 1.2.39 Source Release zip
   /a (e.g. Windows)
 ul class=attributes
   lispan class=pgp
-[a 
href=https://www.apache.org/dist/tomcat/tomcat-connectors/jk/tomcat-connectors-1.2.37-src.zip.asc;PGP/a]
+[a 
href=https://www.apache.org/dist/tomcat/tomcat-connectors/jk/tomcat-connectors-1.2.39-src.zip.asc;PGP/a]
   /span/li
   lispan class=md5
-[a 
href=https://www.apache.org/dist/tomcat/tomcat-connectors/jk/tomcat-connectors-1.2.37-src.zip.md5;MD5/a]
+[a 
href=https://www.apache.org/dist/tomcat/tomcat-connectors/jk/tomcat-connectors-1.2.39-src.zip.md5;MD5/a]
   /span/li
 /ul
 /li
@@ -88,7 +88,7 @@
   /li
 /ul
 
-ptomcat-connectors-1.2.37-src.* is signed by Mladen Turk 
(code564C17A3/code)./p
+ptomcat-connectors-1.2.39-src.* is signed by Mladen Turk 
(code0D498E23/code)./p
 
   /subsection
 



-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org



svn commit: r1576237 [7/7] - in /tomcat/site/trunk/docs/connectors-doc: ./ ajp/ ajp/printer/ generic_howto/ generic_howto/printer/ miscellaneous/ miscellaneous/printer/ news/ news/printer/ printer/ re

2014-03-11 Thread mturk
Modified: tomcat/site/trunk/docs/connectors-doc/webserver_howto/printer/nes.html
URL: 
http://svn.apache.org/viewvc/tomcat/site/trunk/docs/connectors-doc/webserver_howto/printer/nes.html?rev=1576237r1=1576236r2=1576237view=diff
==
--- tomcat/site/trunk/docs/connectors-doc/webserver_howto/printer/nes.html 
(original)
+++ tomcat/site/trunk/docs/connectors-doc/webserver_howto/printer/nes.html Tue 
Mar 11 09:04:46 2014
@@ -1,4 +1,4 @@
-htmlheadMETA http-equiv=Content-Type content=text/html; 
charset=iso-8859-1titleThe Apache Tomcat Connector - Webserver HowTo - 
SunOne -- Netscape/iPlanet HowTo/titlemeta name=author value=Henri 
Gomezmeta name=email value=hgo...@apache.orgmeta name=author 
value=Jim Jagielskimeta name=email value=j...@apache.orgmeta 
name=author value=Gal Shachormeta name=email 
value=shac...@il.ibm.commeta name=author value=Mladen Turkmeta 
name=email value=mt...@apache.orglink href=../../style.css 
type=text/css rel=stylesheet/headbody bgcolor=#ff text=#00 
link=#525D76 alink=#525D76 vlink=#525D76table border=0 width=100% 
cellspacing=4!--PAGE HEADER--trtd colspan=2!--TOMCAT LOGO--a 
href=http://tomcat.apache.org/;img src=../../images/tomcat.gif 
align=left alt=Apache Tomcat border=0/a!--APACHE LOGO--a 
href=http://www.apache.org/;img 
src=http://www.apache.org/images/asf-logo.gif
  align=right alt= :: Apache Software Foundation 
border=0/a/td/tr!--HEADER SEPARATOR--trtd colspan=2hr noshade 
size=1/td/trtr!--RIGHT SIDE MAIN BODY--td width=80% valign=top 
align=lefttable border=0 width=100% cellspacing=4trtd 
align=left valign=toph1The Apache Tomcat Connector - Webserver 
HowTo/h1h2SunOne -- Netscape/iPlanet HowTo/h2/tdtd align=right 
valign=top nowrap=trueimg src=../../images/void.gif width=1 
height=1 vspace=0 hspace=0 border=0 alt= /td/tr/tabletable 
border=0 cellspacing=0 cellpadding=2 width=100%trtd 
bgcolor=#525D76font color=#ff face=arial,helvetica.sanserifa 
name=IntroductionstrongIntroduction/strong/a/font/td/trtrtdblockquote
+htmlheadMETA http-equiv=Content-Type content=text/html; 
charset=ISO-8859-1titleThe Apache Tomcat Connector - Webserver HowTo - 
SunOne -- Netscape/iPlanet HowTo/titlemeta name=author value=Henri 
Gomezmeta name=email value=hgo...@apache.orgmeta name=author 
value=Jim Jagielskimeta name=email value=j...@apache.orgmeta 
name=author value=Gal Shachormeta name=email 
value=shac...@il.ibm.commeta name=author value=Mladen Turkmeta 
name=email value=mt...@apache.orglink href=../../style.css 
type=text/css rel=stylesheet/headbody bgcolor=#ff text=#00 
link=#525D76 alink=#525D76 vlink=#525D76table border=0 width=100% 
cellspacing=4!--PAGE HEADER--trtd colspan=2!--TOMCAT LOGO--a 
href=http://tomcat.apache.org/;img src=../../images/tomcat.gif 
align=left alt=Apache Tomcat border=0/a!--APACHE LOGO--a 
href=http://www.apache.org/;img 
src=http://www.apache.org/images/asf-logo.gif
  align=right alt= :: Apache Software Foundation 
border=0/a/td/tr!--HEADER SEPARATOR--trtd colspan=2hr noshade 
size=1/td/trtr!--RIGHT SIDE MAIN BODY--td width=80% valign=top 
align=lefttable border=0 width=100% cellspacing=4trtd 
align=left valign=toph1The Apache Tomcat Connector - Webserver 
HowTo/h1h2SunOne -- Netscape/iPlanet HowTo/h2/tdtd align=right 
valign=top nowrap=trueimg src=../../images/void.gif width=1 
height=1 vspace=0 hspace=0 border=0 alt= /td/tr/tabletable 
border=0 cellspacing=0 cellpadding=2 width=100%trtd 
bgcolor=#525D76font color=#ff face=arial,helvetica.sanserifa 
name=IntroductionstrongIntroduction/strong/a/font/td/trtrtdblockquote
 p
 This document explains how to set up Sun ONE Web Server previously known as
 Netscape web servers to cooperate with Tomcat. 
@@ -51,7 +51,7 @@ WINNT 2000/XP/2003 (should be able to wo
 Sun ONE Web Server 6.1
 /li
 li
-Tomcat 4.1.x , Tomcat 5.0.x and Tomcat 5.5.x
+Tomcat 4.1 to Tomcat 8.
 /li
 /ul
 /p
@@ -70,7 +70,7 @@ The ajp12 protocol is only available in 
 
 p
 The bajp12/b has been bdeprecated/b with Tomcat 3.3.x and you should 
use instead 
-bajp13/b which is the only ajp protocol known by Tomcat 4.0.x, 4.1.x, 
5.0.x, 5.5.x and 6.
+bajp13/b which is the only ajp protocol known by Tomcat 4 and above.
 /p
 
 p
@@ -478,5 +478,5 @@ Make the source with gmake.
 After the build, you will have the required nsapi_redirector.so plugin.
 /p
 /blockquote/td/tr/table/td/tr!--FOOTER SEPARATOR--trtd 
colspan=2hr noshade size=1/td/tr!--PAGE FOOTER--trtd 
colspan=2div align=centerfont color=#525D76 size=-1em
-Copyright copy; 1999-2012, Apache Software Foundation
+Copyright copy; 1999-2014, Apache Software Foundation
 /em/font/div/td/tr/table/body/html
\ No newline at end of file



-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org



svn commit: r4615 - in /release/tomcat/tomcat-connectors/jk: ./ binaries/windows/ binaries/windows/symbols/

2014-03-10 Thread mturk
Author: mturk
Date: Mon Mar 10 19:09:26 2014
New Revision: 4615

Log:
Upload 1.2.39 artefacts

Added:

release/tomcat/tomcat-connectors/jk/binaries/windows/symbols/tomcat-connectors-1.2.39-windows-i386-symbols.zip
   (with props)

release/tomcat/tomcat-connectors/jk/binaries/windows/symbols/tomcat-connectors-1.2.39-windows-i386-symbols.zip.asc
   (with props)

release/tomcat/tomcat-connectors/jk/binaries/windows/symbols/tomcat-connectors-1.2.39-windows-i386-symbols.zip.md5

release/tomcat/tomcat-connectors/jk/binaries/windows/symbols/tomcat-connectors-1.2.39-windows-i386-symbols.zip.sha1

release/tomcat/tomcat-connectors/jk/binaries/windows/symbols/tomcat-connectors-1.2.39-windows-x86_64-symbols.zip
   (with props)

release/tomcat/tomcat-connectors/jk/binaries/windows/symbols/tomcat-connectors-1.2.39-windows-x86_64-symbols.zip.asc
   (with props)

release/tomcat/tomcat-connectors/jk/binaries/windows/symbols/tomcat-connectors-1.2.39-windows-x86_64-symbols.zip.md5

release/tomcat/tomcat-connectors/jk/binaries/windows/symbols/tomcat-connectors-1.2.39-windows-x86_64-symbols.zip.sha1

release/tomcat/tomcat-connectors/jk/binaries/windows/tomcat-connectors-1.2.39-windows-i386-httpd-2.0.x.zip
   (with props)

release/tomcat/tomcat-connectors/jk/binaries/windows/tomcat-connectors-1.2.39-windows-i386-httpd-2.0.x.zip.asc
   (with props)

release/tomcat/tomcat-connectors/jk/binaries/windows/tomcat-connectors-1.2.39-windows-i386-httpd-2.0.x.zip.md5

release/tomcat/tomcat-connectors/jk/binaries/windows/tomcat-connectors-1.2.39-windows-i386-httpd-2.0.x.zip.sha1

release/tomcat/tomcat-connectors/jk/binaries/windows/tomcat-connectors-1.2.39-windows-i386-httpd-2.2.x.zip
   (with props)

release/tomcat/tomcat-connectors/jk/binaries/windows/tomcat-connectors-1.2.39-windows-i386-httpd-2.2.x.zip.asc
   (with props)

release/tomcat/tomcat-connectors/jk/binaries/windows/tomcat-connectors-1.2.39-windows-i386-httpd-2.2.x.zip.md5

release/tomcat/tomcat-connectors/jk/binaries/windows/tomcat-connectors-1.2.39-windows-i386-httpd-2.2.x.zip.sha1

release/tomcat/tomcat-connectors/jk/binaries/windows/tomcat-connectors-1.2.39-windows-i386-httpd-2.4.x.zip
   (with props)

release/tomcat/tomcat-connectors/jk/binaries/windows/tomcat-connectors-1.2.39-windows-i386-httpd-2.4.x.zip.asc
   (with props)

release/tomcat/tomcat-connectors/jk/binaries/windows/tomcat-connectors-1.2.39-windows-i386-httpd-2.4.x.zip.md5

release/tomcat/tomcat-connectors/jk/binaries/windows/tomcat-connectors-1.2.39-windows-i386-httpd-2.4.x.zip.sha1

release/tomcat/tomcat-connectors/jk/binaries/windows/tomcat-connectors-1.2.39-windows-i386-iis.zip
   (with props)

release/tomcat/tomcat-connectors/jk/binaries/windows/tomcat-connectors-1.2.39-windows-i386-iis.zip.asc
   (with props)

release/tomcat/tomcat-connectors/jk/binaries/windows/tomcat-connectors-1.2.39-windows-i386-iis.zip.md5

release/tomcat/tomcat-connectors/jk/binaries/windows/tomcat-connectors-1.2.39-windows-i386-iis.zip.sha1

release/tomcat/tomcat-connectors/jk/binaries/windows/tomcat-connectors-1.2.39-windows-i386-iplanet.zip
   (with props)

release/tomcat/tomcat-connectors/jk/binaries/windows/tomcat-connectors-1.2.39-windows-i386-iplanet.zip.asc
   (with props)

release/tomcat/tomcat-connectors/jk/binaries/windows/tomcat-connectors-1.2.39-windows-i386-iplanet.zip.md5

release/tomcat/tomcat-connectors/jk/binaries/windows/tomcat-connectors-1.2.39-windows-i386-iplanet.zip.sha1

release/tomcat/tomcat-connectors/jk/binaries/windows/tomcat-connectors-1.2.39-windows-x86_64-httpd-2.4.x.zip
   (with props)

release/tomcat/tomcat-connectors/jk/binaries/windows/tomcat-connectors-1.2.39-windows-x86_64-httpd-2.4.x.zip.asc
   (with props)

release/tomcat/tomcat-connectors/jk/binaries/windows/tomcat-connectors-1.2.39-windows-x86_64-httpd-2.4.x.zip.md5

release/tomcat/tomcat-connectors/jk/binaries/windows/tomcat-connectors-1.2.39-windows-x86_64-httpd-2.4.x.zip.sha1

release/tomcat/tomcat-connectors/jk/binaries/windows/tomcat-connectors-1.2.39-windows-x86_64-iis.zip
   (with props)

release/tomcat/tomcat-connectors/jk/binaries/windows/tomcat-connectors-1.2.39-windows-x86_64-iis.zip.asc
   (with props)

release/tomcat/tomcat-connectors/jk/binaries/windows/tomcat-connectors-1.2.39-windows-x86_64-iis.zip.md5

release/tomcat/tomcat-connectors/jk/binaries/windows/tomcat-connectors-1.2.39-windows-x86_64-iis.zip.sha1
release/tomcat/tomcat-connectors/jk/tomcat-connectors-1.2.39-src.tar.gz   
(with props)
release/tomcat/tomcat-connectors/jk/tomcat-connectors-1.2.39-src.tar.gz.asc 
  (with props)
release/tomcat/tomcat-connectors/jk/tomcat-connectors-1.2.39-src.tar.gz.md5
release/tomcat/tomcat-connectors/jk/tomcat-connectors-1.2.39-src.tar.gz.sha1
release/tomcat/tomcat-connectors/jk/tomcat-connectors-1.2.39-src.zip   
(with props)
release/tomcat/tomcat-connectors/jk

svn commit: r1572659 - /tomcat/jk/trunk/native/common/jk_version.h

2014-02-27 Thread mturk
Author: mturk
Date: Thu Feb 27 17:18:49 2014
New Revision: 1572659

URL: http://svn.apache.org/r1572659
Log:
Prepare for release

Modified:
tomcat/jk/trunk/native/common/jk_version.h

Modified: tomcat/jk/trunk/native/common/jk_version.h
URL: 
http://svn.apache.org/viewvc/tomcat/jk/trunk/native/common/jk_version.h?rev=1572659r1=1572658r2=1572659view=diff
==
--- tomcat/jk/trunk/native/common/jk_version.h (original)
+++ tomcat/jk/trunk/native/common/jk_version.h Thu Feb 27 17:18:49 2014
@@ -29,7 +29,7 @@
 #define JK_VERFIX   39
 
 /* set JK_VERISRELEASE to 1 when release (do not forget to commit!) */
-#define JK_VERISRELEASE 0
+#define JK_VERISRELEASE 1
 /* Beta number */
 #define JK_VERBETA  0
 #define JK_BETASTRING   0



-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org



svn commit: r1572661 - /tomcat/jk/tags/JK_1_2_39/

2014-02-27 Thread mturk
Author: mturk
Date: Thu Feb 27 17:20:08 2014
New Revision: 1572661

URL: http://svn.apache.org/r1572661
Log:
Tag Tomcat Connectors 1.2.39

Added:
tomcat/jk/tags/JK_1_2_39/
  - copied from r1572660, tomcat/jk/trunk/


-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org



svn commit: r1572662 - in /tomcat/jk/trunk/native: STATUS.txt common/jk_version.h configure.ac iis/installer/isapi-redirector-win32-msi.ism

2014-02-27 Thread mturk
Author: mturk
Date: Thu Feb 27 17:22:03 2014
New Revision: 1572662

URL: http://svn.apache.org/r1572662
Log:
Bump version numbers

Modified:
tomcat/jk/trunk/native/STATUS.txt
tomcat/jk/trunk/native/common/jk_version.h
tomcat/jk/trunk/native/configure.ac
tomcat/jk/trunk/native/iis/installer/isapi-redirector-win32-msi.ism

Modified: tomcat/jk/trunk/native/STATUS.txt
URL: 
http://svn.apache.org/viewvc/tomcat/jk/trunk/native/STATUS.txt?rev=1572662r1=1572661r2=1572662view=diff
==
--- tomcat/jk/trunk/native/STATUS.txt (original)
+++ tomcat/jk/trunk/native/STATUS.txt Thu Feb 27 17:22:03 2014
@@ -18,7 +18,8 @@ Last modified at [$Date$]
 
 Release:
 
-1.2.39  : in development
+1.2.40  : in development
+1.2.39  : in release process
 1.2.38  : not released
 1.2.37  : released May 31, 2012
 1.2.36  : released May 14, 2012

Modified: tomcat/jk/trunk/native/common/jk_version.h
URL: 
http://svn.apache.org/viewvc/tomcat/jk/trunk/native/common/jk_version.h?rev=1572662r1=1572661r2=1572662view=diff
==
--- tomcat/jk/trunk/native/common/jk_version.h (original)
+++ tomcat/jk/trunk/native/common/jk_version.h Thu Feb 27 17:22:03 2014
@@ -26,10 +26,10 @@
 /** START OF AREA TO MODIFY BEFORE RELEASING */
 #define JK_VERMAJOR 1
 #define JK_VERMINOR 2
-#define JK_VERFIX   39
+#define JK_VERFIX   40
 
 /* set JK_VERISRELEASE to 1 when release (do not forget to commit!) */
-#define JK_VERISRELEASE 1
+#define JK_VERISRELEASE 0
 /* Beta number */
 #define JK_VERBETA  0
 #define JK_BETASTRING   0

Modified: tomcat/jk/trunk/native/configure.ac
URL: 
http://svn.apache.org/viewvc/tomcat/jk/trunk/native/configure.ac?rev=1572662r1=1572661r2=1572662view=diff
==
--- tomcat/jk/trunk/native/configure.ac (original)
+++ tomcat/jk/trunk/native/configure.ac Thu Feb 27 17:22:03 2014
@@ -23,7 +23,7 @@ AC_PREREQ(2.59)
 
 dnl package and version.
 dnl synchronization with common/jk_version.h ?
-AC_INIT([mod_jk], [1.2.39])
+AC_INIT([mod_jk], [1.2.40])
 
 AC_CONFIG_SRCDIR([common/jk_worker.h])
 AC_CONFIG_HEADER(common/config.h)

Modified: tomcat/jk/trunk/native/iis/installer/isapi-redirector-win32-msi.ism
URL: 
http://svn.apache.org/viewvc/tomcat/jk/trunk/native/iis/installer/isapi-redirector-win32-msi.ism?rev=1572662r1=1572661r2=1572662view=diff
==
--- tomcat/jk/trunk/native/iis/installer/isapi-redirector-win32-msi.ism 
(original)
+++ tomcat/jk/trunk/native/iis/installer/isapi-redirector-win32-msi.ism Thu Feb 
27 17:22:03 2014
@@ -3425,7 +3425,7 @@ TQBzAGkAAQBSAGUAbABlAGEAcwBlAA==
rowtdProductID/tdtdnone/tdtd//row
rowtdProductLanguage/tdtd1033/tdtd//row
rowtdProductName/tdtdTomcat Isapi 
Redirector/tdtd//row
-   rowtdProductVersion/tdtd1.2.39/tdtd//row
+   rowtdProductVersion/tdtd1.2.40/tdtd//row
rowtdProgressType0/tdtdinstall/tdtd//row
rowtdProgressType1/tdtdInstalling/tdtd//row
rowtdProgressType2/tdtdinstalled/tdtd//row



-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org



svn commit: r1572120 - /tomcat/jk/trunk/native/common/jk_global.h

2014-02-26 Thread mturk
Author: mturk
Date: Wed Feb 26 16:04:58 2014
New Revision: 1572120

URL: http://svn.apache.org/r1572120
Log:
Ensure JK_INET6 is APR_INET6

Modified:
tomcat/jk/trunk/native/common/jk_global.h

Modified: tomcat/jk/trunk/native/common/jk_global.h
URL: 
http://svn.apache.org/viewvc/tomcat/jk/trunk/native/common/jk_global.h?rev=1572120r1=1572119r2=1572120view=diff
==
--- tomcat/jk/trunk/native/common/jk_global.h (original)
+++ tomcat/jk/trunk/native/common/jk_global.h Wed Feb 26 16:04:58 2014
@@ -411,6 +411,7 @@ typedef int jk_sock_t;
 #if defined(HAVE_APR)
 #define JK_HAVE_IPV6APR_HAVE_IPV6
 #define JK_INET APR_INET
+#define JK_INET6APR_INET6
 #define JK_UNSPEC   APR_UNSPEC
 #else
 #if defined(WIN32) || defined(HAVE_AF_INET6)
@@ -424,9 +425,11 @@ typedef int jk_sock_t;
 #else
 #define JK_UNSPEC   0
 #endif
-#endif
 #if JK_HAVE_IPV6
 #define JK_INET6AF_INET6
+#else
+#define JK_INET60
+#endif
 #endif
 
 typedef struct jk_sockaddr_t jk_sockaddr_t;



-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org



svn commit: r1572128 - in /tomcat/jk/trunk/tools: jkbindist.sh signfile.sh

2014-02-26 Thread mturk
Author: mturk
Date: Wed Feb 26 16:11:53 2014
New Revision: 1572128

URL: http://svn.apache.org/r1572128
Log:
Ensure we use the same shell for all the toools

Modified:
tomcat/jk/trunk/tools/jkbindist.sh
tomcat/jk/trunk/tools/signfile.sh

Modified: tomcat/jk/trunk/tools/jkbindist.sh
URL: 
http://svn.apache.org/viewvc/tomcat/jk/trunk/tools/jkbindist.sh?rev=1572128r1=1572127r2=1572128view=diff
==
--- tomcat/jk/trunk/tools/jkbindist.sh (original)
+++ tomcat/jk/trunk/tools/jkbindist.sh Wed Feb 26 16:11:53 2014
@@ -1,5 +1,4 @@
-#!/bin/ksh
-
+#!/bin/bash
 # Licensed to the Apache Software Foundation (ASF) under one or more
 # contributor license agreements.  See the NOTICE file distributed with
 # this work for additional information regarding copyright ownership.
@@ -126,11 +125,10 @@ done
 unix2dos README
 chmod 755 $1
 # Pack
-zip -9 -j ${dist}.zip $@ LICENSE README NOTICE ${copy}
-
-# Sign
 archive=${dist}.zip
-. ${tools}/signfile.sh ${sign} $archive
+zip -9 -j ${archive} $@ README ${copy}
+# Sign
+. ${tools}/signfile.sh ${sign} ${archive}
 
 # Cleanup
 rm -f README ${copy} 2/dev/null

Modified: tomcat/jk/trunk/tools/signfile.sh
URL: 
http://svn.apache.org/viewvc/tomcat/jk/trunk/tools/signfile.sh?rev=1572128r1=1572127r2=1572128view=diff
==
--- tomcat/jk/trunk/tools/signfile.sh (original)
+++ tomcat/jk/trunk/tools/signfile.sh Wed Feb 26 16:11:53 2014
@@ -1,5 +1,4 @@
-#!/bin/sh
-
+#!/bin/bash
 # Licensed to the Apache Software Foundation (ASF) under one or more
 # contributor license agreements.  See the NOTICE file distributed with
 # this work for additional information regarding copyright ownership.



-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org



svn commit: r1572132 - /tomcat/jk/trunk/xdocs/miscellaneous/changelog.xml

2014-02-26 Thread mturk
Author: mturk
Date: Wed Feb 26 16:16:21 2014
New Revision: 1572132

URL: http://svn.apache.org/r1572132
Log:
Add IPV6 to changelog

Modified:
tomcat/jk/trunk/xdocs/miscellaneous/changelog.xml

Modified: tomcat/jk/trunk/xdocs/miscellaneous/changelog.xml
URL: 
http://svn.apache.org/viewvc/tomcat/jk/trunk/xdocs/miscellaneous/changelog.xml?rev=1572132r1=1572131r2=1572132view=diff
==
--- tomcat/jk/trunk/xdocs/miscellaneous/changelog.xml (original)
+++ tomcat/jk/trunk/xdocs/miscellaneous/changelog.xml Wed Feb 26 16:16:21 2014
@@ -57,6 +57,11 @@
 Patch contributed by areese yahoo-inc.com. (rjung)
   /fix
   add
+Add IPV6 support for connection to webserver.
+New directive prefer_ipv6 has been added to control the hostame 
resolution
+and preserve backward compatibility. (mturk)
+  /add
+  add
 Add --disable-sock-cloexec to configure to disable use of SOCK_CLOEXEC
 (using FD_CLOEXEC + fnctl instead) so built modules will work with
 Linux kernels prior to 2.6.27. (timw)



-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org



svn commit: r1572148 - /tomcat/jk/trunk/native/nt_service/

2014-02-26 Thread mturk
Author: mturk
Date: Wed Feb 26 16:28:37 2014
New Revision: 1572148

URL: http://svn.apache.org/r1572148
Log:
Deprecate nt_service

Removed:
tomcat/jk/trunk/native/nt_service/


-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org



svn commit: r1572154 - /tomcat/jk/trunk/xdocs/miscellaneous/changelog.xml

2014-02-26 Thread mturk
Author: mturk
Date: Wed Feb 26 16:33:27 2014
New Revision: 1572154

URL: http://svn.apache.org/r1572154
Log:
Add a note about deprecating nt_service

Modified:
tomcat/jk/trunk/xdocs/miscellaneous/changelog.xml

Modified: tomcat/jk/trunk/xdocs/miscellaneous/changelog.xml
URL: 
http://svn.apache.org/viewvc/tomcat/jk/trunk/xdocs/miscellaneous/changelog.xml?rev=1572154r1=1572153r2=1572154view=diff
==
--- tomcat/jk/trunk/xdocs/miscellaneous/changelog.xml (original)
+++ tomcat/jk/trunk/xdocs/miscellaneous/changelog.xml Wed Feb 26 16:33:27 2014
@@ -44,6 +44,9 @@
   br /
   subsection name=Native
 changelog
+  update
+Deprecate nt_service from Tomcat Connectors. (mturk) 
+  /update
   fix
 bug56133/bug: Fix possible crash when a request fails during
 request body transfer to the back end and reply_timeout was set.



-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org



svn commit: r1572171 - in /tomcat/jk/trunk: native/STATUS.txt native/common/jk_version.h native/configure.ac native/iis/installer/isapi-redirector-win32-msi.ism xdocs/miscellaneous/changelog.xml

2014-02-26 Thread mturk
Author: mturk
Date: Wed Feb 26 17:35:38 2014
New Revision: 1572171

URL: http://svn.apache.org/r1572171
Log:
Update version numbers

Modified:
tomcat/jk/trunk/native/STATUS.txt
tomcat/jk/trunk/native/common/jk_version.h
tomcat/jk/trunk/native/configure.ac
tomcat/jk/trunk/native/iis/installer/isapi-redirector-win32-msi.ism
tomcat/jk/trunk/xdocs/miscellaneous/changelog.xml

Modified: tomcat/jk/trunk/native/STATUS.txt
URL: 
http://svn.apache.org/viewvc/tomcat/jk/trunk/native/STATUS.txt?rev=1572171r1=1572170r2=1572171view=diff
==
--- tomcat/jk/trunk/native/STATUS.txt (original)
+++ tomcat/jk/trunk/native/STATUS.txt Wed Feb 26 17:35:38 2014
@@ -19,6 +19,7 @@ Last modified at [$Date$]
 Release:
 
 1.2.38  : in development
+1.2.38  : not released
 1.2.37  : released May 31, 2012
 1.2.36  : released May 14, 2012
 1.2.35  : released March 24, 2012

Modified: tomcat/jk/trunk/native/common/jk_version.h
URL: 
http://svn.apache.org/viewvc/tomcat/jk/trunk/native/common/jk_version.h?rev=1572171r1=1572170r2=1572171view=diff
==
--- tomcat/jk/trunk/native/common/jk_version.h (original)
+++ tomcat/jk/trunk/native/common/jk_version.h Wed Feb 26 17:35:38 2014
@@ -26,7 +26,7 @@
 /** START OF AREA TO MODIFY BEFORE RELEASING */
 #define JK_VERMAJOR 1
 #define JK_VERMINOR 2
-#define JK_VERFIX   38
+#define JK_VERFIX   39
 
 /* set JK_VERISRELEASE to 1 when release (do not forget to commit!) */
 #define JK_VERISRELEASE 0

Modified: tomcat/jk/trunk/native/configure.ac
URL: 
http://svn.apache.org/viewvc/tomcat/jk/trunk/native/configure.ac?rev=1572171r1=1572170r2=1572171view=diff
==
--- tomcat/jk/trunk/native/configure.ac (original)
+++ tomcat/jk/trunk/native/configure.ac Wed Feb 26 17:35:38 2014
@@ -23,7 +23,7 @@ AC_PREREQ(2.59)
 
 dnl package and version.
 dnl synchronization with common/jk_version.h ?
-AC_INIT([mod_jk], [1.2.38])
+AC_INIT([mod_jk], [1.2.39])
 
 AC_CONFIG_SRCDIR([common/jk_worker.h])
 AC_CONFIG_HEADER(common/config.h)

Modified: tomcat/jk/trunk/native/iis/installer/isapi-redirector-win32-msi.ism
URL: 
http://svn.apache.org/viewvc/tomcat/jk/trunk/native/iis/installer/isapi-redirector-win32-msi.ism?rev=1572171r1=1572170r2=1572171view=diff
==
--- tomcat/jk/trunk/native/iis/installer/isapi-redirector-win32-msi.ism 
(original)
+++ tomcat/jk/trunk/native/iis/installer/isapi-redirector-win32-msi.ism Wed Feb 
26 17:35:38 2014
@@ -3425,7 +3425,7 @@ TQBzAGkAAQBSAGUAbABlAGEAcwBlAA==
rowtdProductID/tdtdnone/tdtd//row
rowtdProductLanguage/tdtd1033/tdtd//row
rowtdProductName/tdtdTomcat Isapi 
Redirector/tdtd//row
-   rowtdProductVersion/tdtd1.2.38/tdtd//row
+   rowtdProductVersion/tdtd1.2.39/tdtd//row
rowtdProgressType0/tdtdinstall/tdtd//row
rowtdProgressType1/tdtdInstalling/tdtd//row
rowtdProgressType2/tdtdinstalled/tdtd//row

Modified: tomcat/jk/trunk/xdocs/miscellaneous/changelog.xml
URL: 
http://svn.apache.org/viewvc/tomcat/jk/trunk/xdocs/miscellaneous/changelog.xml?rev=1572171r1=1572170r2=1572171view=diff
==
--- tomcat/jk/trunk/xdocs/miscellaneous/changelog.xml (original)
+++ tomcat/jk/trunk/xdocs/miscellaneous/changelog.xml Wed Feb 26 17:35:38 2014
@@ -40,7 +40,7 @@
   new documentation project for JK was started.
   /p
 /section
-section name=Changes between 1.2.37 and 1.2.38
+section name=Changes between 1.2.37 and 1.2.39
   br /
   subsection name=Native
 changelog



-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org



svn commit: r1572177 - /tomcat/jk/trunk/native/STATUS.txt

2014-02-26 Thread mturk
Author: mturk
Date: Wed Feb 26 17:55:38 2014
New Revision: 1572177

URL: http://svn.apache.org/r1572177
Log:
Fix copy/past typo

Modified:
tomcat/jk/trunk/native/STATUS.txt

Modified: tomcat/jk/trunk/native/STATUS.txt
URL: 
http://svn.apache.org/viewvc/tomcat/jk/trunk/native/STATUS.txt?rev=1572177r1=1572176r2=1572177view=diff
==
--- tomcat/jk/trunk/native/STATUS.txt (original)
+++ tomcat/jk/trunk/native/STATUS.txt Wed Feb 26 17:55:38 2014
@@ -18,7 +18,7 @@ Last modified at [$Date$]
 
 Release:
 
-1.2.38  : in development
+1.2.39  : in development
 1.2.38  : not released
 1.2.37  : released May 31, 2012
 1.2.36  : released May 14, 2012



-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org



svn commit: r1571718 - /tomcat/jk/tags/JK_1_2_38/

2014-02-25 Thread mturk
Author: mturk
Date: Tue Feb 25 15:10:05 2014
New Revision: 1571718

URL: http://svn.apache.org/r1571718
Log:
Tag Tomcat Connectors 1.2.38

Added:
tomcat/jk/tags/JK_1_2_38/
  - copied from r1571717, tomcat/jk/trunk/


-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org



svn commit: r1571190 - /tomcat/jk/trunk/native/scripts/build/unix/config.guess

2014-02-24 Thread mturk
Author: mturk
Date: Mon Feb 24 09:09:25 2014
New Revision: 1571190

URL: http://svn.apache.org/r1571190
Log:
Update GNU's config.guess to the one used with APR

Modified:
tomcat/jk/trunk/native/scripts/build/unix/config.guess

Modified: tomcat/jk/trunk/native/scripts/build/unix/config.guess
URL: 
http://svn.apache.org/viewvc/tomcat/jk/trunk/native/scripts/build/unix/config.guess?rev=1571190r1=1571189r2=1571190view=diff
==
--- tomcat/jk/trunk/native/scripts/build/unix/config.guess (original)
+++ tomcat/jk/trunk/native/scripts/build/unix/config.guess Mon Feb 24 09:09:25 
2014
@@ -1,14 +1,12 @@
 #! /bin/sh
 # Attempt to guess a canonical system name.
-#   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
-#   2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010,
-#   2011, 2012 Free Software Foundation, Inc.
+#   Copyright 1992-2013 Free Software Foundation, Inc.
 
-timestamp='2012-02-10'
+timestamp='2013-06-10'
 
 # This file is free software; you can redistribute it and/or modify it
 # under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
+# the Free Software Foundation; either version 3 of the License, or
 # (at your option) any later version.
 #
 # This program is distributed in the hope that it will be useful, but
@@ -22,19 +20,17 @@ timestamp='2012-02-10'
 # As a special exception to the GNU General Public License, if you
 # distribute this file as part of a program that contains a
 # configuration script generated by Autoconf, you may include it under
-# the same distribution terms that you use for the rest of that program.
-
-
-# Originally written by Per Bothner.  Please send patches (context
-# diff format) to config-patc...@gnu.org and include a ChangeLog
-# entry.
+# the same distribution terms that you use for the rest of that
+# program.  This Exception is an additional permission under section 7
+# of the GNU General Public License, version 3 (GPLv3).
 #
-# This script attempts to guess a canonical system name similar to
-# config.sub.  If it succeeds, it prints the system name on stdout, and
-# exits with 0.  Otherwise, it exits with 1.
+# Originally written by Per Bothner.
 #
 # You can get the latest version of this script from:
 # 
http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess;hb=HEAD
+#
+# Please send patches with a ChangeLog entry to config-patc...@gnu.org.
+
 
 me=`echo $0 | sed -e 's,.*/,,'`
 
@@ -54,9 +50,7 @@ version=\
 GNU config.guess ($timestamp)
 
 Originally written by Per Bothner.
-Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000,
-2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012
-Free Software Foundation, Inc.
+Copyright 1992-2013 Free Software Foundation, Inc.
 
 This is free software; see the source for copying conditions.  There is NO
 warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
@@ -138,6 +132,27 @@ UNAME_RELEASE=`(uname -r) 2/dev/null` |
 UNAME_SYSTEM=`(uname -s) 2/dev/null`  || UNAME_SYSTEM=unknown
 UNAME_VERSION=`(uname -v) 2/dev/null` || UNAME_VERSION=unknown
 
+case ${UNAME_SYSTEM} in
+Linux|GNU|GNU/*)
+   # If the system lacks a compiler, then just pick glibc.
+   # We could probably try harder.
+   LIBC=gnu
+
+   eval $set_cc_for_build
+   cat -EOF  $dummy.c
+   #include features.h
+   #if defined(__UCLIBC__)
+   LIBC=uclibc
+   #elif defined(__dietlibc__)
+   LIBC=dietlibc
+   #else
+   LIBC=gnu
+   #endif
+   EOF
+   eval `$CC_FOR_BUILD -E $dummy.c 2/dev/null | grep '^LIBC'`
+   ;;
+esac
+
 # Note: order is significant - the case branches are not exclusive.
 
 case ${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION} in
@@ -200,6 +215,10 @@ case ${UNAME_MACHINE}:${UNAME_SYSTEM}:$
# CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM is used.
echo ${machine}-${os}${release}
exit ;;
+*:Bitrig:*:*)
+   UNAME_MACHINE_ARCH=`arch | sed 's/Bitrig.//'`
+   echo ${UNAME_MACHINE_ARCH}-unknown-bitrig${UNAME_RELEASE}
+   exit ;;
 *:OpenBSD:*:*)
UNAME_MACHINE_ARCH=`arch | sed 's/OpenBSD.//'`
echo ${UNAME_MACHINE_ARCH}-unknown-openbsd${UNAME_RELEASE}
@@ -302,7 +321,7 @@ case ${UNAME_MACHINE}:${UNAME_SYSTEM}:$
 arm:RISC*:1.[012]*:*|arm:riscix:1.[012]*:*)
echo arm-acorn-riscix${UNAME_RELEASE}
exit ;;
-arm:riscos:*:*|arm:RISCOS:*:*)
+arm*:riscos:*:*|arm*:RISCOS:*:*)
echo arm-unknown-riscos
exit ;;
 SR2?01:HI-UX/MPP:*:* | SR8000:HI-UX/MPP:*:*)
@@ -801,6 +820,9 @@ EOF
 i*:CYGWIN*:*)
echo ${UNAME_MACHINE}-pc-cygwin
exit ;;
+*:MINGW64*:*)
+   echo ${UNAME_MACHINE}-pc-mingw64
+   exit ;;
 *:MINGW*:*)
echo ${UNAME_MACHINE}-pc-mingw32
exit ;;
@@ -852,21 +874,21 @@ EOF
exit

svn commit: r1571191 - /tomcat/jk/trunk/native/scripts/build/unix/config.sub

2014-02-24 Thread mturk
Author: mturk
Date: Mon Feb 24 09:10:22 2014
New Revision: 1571191

URL: http://svn.apache.org/r1571191
Log:
Update GNU's config.sub to the one used with APR

Modified:
tomcat/jk/trunk/native/scripts/build/unix/config.sub

Modified: tomcat/jk/trunk/native/scripts/build/unix/config.sub
URL: 
http://svn.apache.org/viewvc/tomcat/jk/trunk/native/scripts/build/unix/config.sub?rev=1571191r1=1571190r2=1571191view=diff
==
--- tomcat/jk/trunk/native/scripts/build/unix/config.sub (original)
+++ tomcat/jk/trunk/native/scripts/build/unix/config.sub Mon Feb 24 09:10:22 
2014
@@ -1,24 +1,18 @@
 #! /bin/sh
 # Configuration validation subroutine script.
-#   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
-#   2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010,
-#   2011, 2012 Free Software Foundation, Inc.
-
-timestamp='2012-04-18'
-
-# This file is (in principle) common to ALL GNU software.
-# The presence of a machine in this file suggests that SOME GNU software
-# can handle that machine.  It does not imply ALL GNU software can.
-#
-# This file is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
+#   Copyright 1992-2013 Free Software Foundation, Inc.
+
+timestamp='2013-10-01'
+
+# This file is free software; you can redistribute it and/or modify it
+# under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 3 of the License, or
 # (at your option) any later version.
 #
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
+# This program is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+# General Public License for more details.
 #
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, see http://www.gnu.org/licenses/.
@@ -26,11 +20,12 @@ timestamp='2012-04-18'
 # As a special exception to the GNU General Public License, if you
 # distribute this file as part of a program that contains a
 # configuration script generated by Autoconf, you may include it under
-# the same distribution terms that you use for the rest of that program.
+# the same distribution terms that you use for the rest of that
+# program.  This Exception is an additional permission under section 7
+# of the GNU General Public License, version 3 (GPLv3).
 
 
-# Please send patches to config-patc...@gnu.org.  Submit a context
-# diff and a properly formatted GNU ChangeLog entry.
+# Please send patches with a ChangeLog entry to config-patc...@gnu.org.
 #
 # Configuration subroutine to validate and canonicalize a configuration type.
 # Supply the specified configuration type as an argument.
@@ -73,9 +68,7 @@ Report bugs and patches to config-patch
 version=\
 GNU config.sub ($timestamp)
 
-Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000,
-2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012
-Free Software Foundation, Inc.
+Copyright 1992-2013 Free Software Foundation, Inc.
 
 This is free software; see the source for copying conditions.  There is NO
 warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
@@ -123,7 +116,7 @@ esac
 maybe_os=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'`
 case $maybe_os in
   nto-qnx* | linux-gnu* | linux-android* | linux-dietlibc | linux-newlib* | \
-  linux-uclibc* | uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | \
+  linux-musl* | linux-uclibc* | uclinux-uclibc* | uclinux-gnu* | 
kfreebsd*-gnu* | \
   knetbsd*-gnu* | netbsd*-gnu* | \
   kopensolaris*-gnu* | \
   storm-chaos* | os2-emx* | rtmk-nova*)
@@ -156,7 +149,7 @@ case $os in
-convergent* | -ncr* | -news | -32* | -3600* | -3100* | -hitachi* |\
-c[123]* | -convex* | -sun | -crds | -omron* | -dg | -ultra | -tti* | \
-harris | -dolphin | -highlevel | -gould | -cbm | -ns | -masscomp | \
-   -apple | -axis | -knuth | -cray | -microblaze)
+   -apple | -axis | -knuth | -cray | -microblaze*)
os=
basic_machine=$1
;;
@@ -259,10 +252,12 @@ case $basic_machine in
| alpha | alphaev[4-8] | alphaev56 | alphaev6[78] | alphapca5[67] \
| alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] | 
alpha64pca5[67] \
| am33_2.0 \
-   | arc | arm | arm[bl]e | arme[lb] | armv[2345] | armv[345][lb] | avr | 
avr32 \
-| be32 | be64 \
+   | arc | arceb \
+   | arm | arm[bl]e | arme[lb] | armv[2-8] | armv[3-8][lb] | armv7[arm

svn commit: r1571158 - /tomcat/jk/trunk/xdocs/reference/workers.xml

2014-02-23 Thread mturk
Author: mturk
Date: Mon Feb 24 07:24:44 2014
New Revision: 1571158

URL: http://svn.apache.org/r1571158
Log:
Explain new prefer_ipv6 directive

Modified:
tomcat/jk/trunk/xdocs/reference/workers.xml

Modified: tomcat/jk/trunk/xdocs/reference/workers.xml
URL: 
http://svn.apache.org/viewvc/tomcat/jk/trunk/xdocs/reference/workers.xml?rev=1571158r1=1571157r2=1571158view=diff
==
--- tomcat/jk/trunk/xdocs/reference/workers.xml (original)
+++ tomcat/jk/trunk/xdocs/reference/workers.xml Mon Feb 24 07:24:44 2014
@@ -1101,6 +1101,17 @@ This feature has been added in bjk 1.2
 /p
 /directive
 
+directive name=prefer_ipv6 workers=AJP default=0 required=false
+When compiled with IPV6 support, this directive forces IPV6 address
+resolution for host names which have both IPV6 and IPV4 addresses. In case 
there is
+no IPV6 address defined for the given hostname this directive in ineffective. 
This directive will
+be also ineffective if there is only IPV6 address defined or if IP address is 
used for host,
+either in IPV4 or IPV6 notation.
+p
+This feature has been added in bjk 1.2.38/b.
+/p
+/directive
+
 /advanceddirectives
 /subsection
 



-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org



svn commit: r1564668 - /tomcat/jk/trunk/native/common/jk_connect.c

2014-02-05 Thread mturk
Author: mturk
Date: Wed Feb  5 08:18:47 2014
New Revision: 1564668

URL: http://svn.apache.org/r1564668
Log:
Ensure proper HAVE_IPV6 define is used

Modified:
tomcat/jk/trunk/native/common/jk_connect.c

Modified: tomcat/jk/trunk/native/common/jk_connect.c
URL: 
http://svn.apache.org/viewvc/tomcat/jk/trunk/native/common/jk_connect.c?rev=1564668r1=1564667r2=1564668view=diff
==
--- tomcat/jk/trunk/native/common/jk_connect.c (original)
+++ tomcat/jk/trunk/native/common/jk_connect.c Wed Feb  5 08:18:47 2014
@@ -1194,7 +1194,7 @@ char *jk_dump_hinfo(jk_sockaddr_t *saddr
 if (saddr-family == JK_INET) {
 inet_ntop4(saddr-ipaddr_ptr, buf, 16);
 }
-#if APR_HAVE_IPV6
+#if JK_HAVE_IPV6
 else {
 inet_ntop6(saddr-ipaddr_ptr, buf, 64);
 }
@@ -1222,7 +1222,7 @@ char *jk_dump_sinfo(jk_sock_t sd, char *
 inet_ntop4((unsigned char *)sa-sin_addr,  buf, 16);
 sprintf(pb, :%d, (unsigned int)htons(sa-sin_port));
 }
-#if APR_HAVE_IPV6
+#if JK_HAVE_IPV6
 else {
 struct sockaddr_in6 *sa = (struct sockaddr_in6 *)lsaddr;
 inet_ntop6((unsigned char *)sa-sin6_addr, buf, 64);
@@ -1237,7 +1237,7 @@ char *jk_dump_sinfo(jk_sock_t sd, char *
 inet_ntop4((unsigned char *)sa-sin_addr,  buf + ps, 16);
 sprintf(pb, :%d, (unsigned int)htons(sa-sin_port));
 }
-#if APR_HAVE_IPV6
+#if JK_HAVE_IPV6
 else {
 struct sockaddr_in6 *sa = (struct sockaddr_in6 *)rsaddr;
 inet_ntop6((unsigned char *)sa-sin6_addr, buf + ps, 64);



-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org



svn commit: r1564656 - in /tomcat/jk/trunk/xdocs: ajp/project.xml generic_howto/project.xml index.xml miscellaneous/project.xml news/20140201.xml news/project.xml project.xml reference/project.xml web

2014-02-04 Thread mturk
Author: mturk
Date: Wed Feb  5 07:51:43 2014
New Revision: 1564656

URL: http://svn.apache.org/r1564656
Log:
Add year 2014 news document

Added:
tomcat/jk/trunk/xdocs/news/20140201.xml   (with props)
Modified:
tomcat/jk/trunk/xdocs/ajp/project.xml
tomcat/jk/trunk/xdocs/generic_howto/project.xml
tomcat/jk/trunk/xdocs/index.xml
tomcat/jk/trunk/xdocs/miscellaneous/project.xml
tomcat/jk/trunk/xdocs/news/project.xml
tomcat/jk/trunk/xdocs/project.xml
tomcat/jk/trunk/xdocs/reference/project.xml
tomcat/jk/trunk/xdocs/webserver_howto/project.xml

Modified: tomcat/jk/trunk/xdocs/ajp/project.xml
URL: 
http://svn.apache.org/viewvc/tomcat/jk/trunk/xdocs/ajp/project.xml?rev=1564656r1=1564655r2=1564656view=diff
==
--- tomcat/jk/trunk/xdocs/ajp/project.xml (original)
+++ tomcat/jk/trunk/xdocs/ajp/project.xml Wed Feb  5 07:51:43 2014
@@ -67,6 +67,7 @@
 /menu
 
 menu name=News
+item name=2014   href=../news/20140201.html/
 item name=2012   href=../news/20120301.html/
 item name=2011   href=../news/20110701.html/
 item name=2010   href=../news/20100101.html/

Modified: tomcat/jk/trunk/xdocs/generic_howto/project.xml
URL: 
http://svn.apache.org/viewvc/tomcat/jk/trunk/xdocs/generic_howto/project.xml?rev=1564656r1=1564655r2=1564656view=diff
==
--- tomcat/jk/trunk/xdocs/generic_howto/project.xml (original)
+++ tomcat/jk/trunk/xdocs/generic_howto/project.xml Wed Feb  5 07:51:43 2014
@@ -67,6 +67,7 @@
 /menu
 
 menu name=News
+item name=2014   href=../news/20140201.html/
 item name=2012   href=../news/20120301.html/
 item name=2011   href=../news/20110701.html/
 item name=2010   href=../news/20100101.html/

Modified: tomcat/jk/trunk/xdocs/index.xml
URL: 
http://svn.apache.org/viewvc/tomcat/jk/trunk/xdocs/index.xml?rev=1564656r1=1564655r2=1564656view=diff
==
--- tomcat/jk/trunk/xdocs/index.xml (original)
+++ tomcat/jk/trunk/xdocs/index.xml Wed Feb  5 07:51:43 2014
@@ -327,6 +327,8 @@ This page contains information, on some 
 /p
 
 ul
+lia href=news/20140201.htmlb2014/b/a
+/li
 lia href=news/20120301.htmlb2012/b/a
 /li
 lia href=news/20110701.htmlb2011/b/a

Modified: tomcat/jk/trunk/xdocs/miscellaneous/project.xml
URL: 
http://svn.apache.org/viewvc/tomcat/jk/trunk/xdocs/miscellaneous/project.xml?rev=1564656r1=1564655r2=1564656view=diff
==
--- tomcat/jk/trunk/xdocs/miscellaneous/project.xml (original)
+++ tomcat/jk/trunk/xdocs/miscellaneous/project.xml Wed Feb  5 07:51:43 2014
@@ -67,6 +67,7 @@
 /menu
 
 menu name=News
+item name=2014   href=../news/20140201.html/
 item name=2012   href=../news/20120301.html/
 item name=2011   href=../news/20110701.html/
 item name=2010   href=../news/20100101.html/

Added: tomcat/jk/trunk/xdocs/news/20140201.xml
URL: 
http://svn.apache.org/viewvc/tomcat/jk/trunk/xdocs/news/20140201.xml?rev=1564656view=auto
==
--- tomcat/jk/trunk/xdocs/news/20140201.xml (added)
+++ tomcat/jk/trunk/xdocs/news/20140201.xml Wed Feb  5 07:51:43 2014
@@ -0,0 +1,37 @@
+?xml version=1.0?
+!--
+  Licensed to the Apache Software Foundation (ASF) under one or more
+  contributor license agreements.  See the NOTICE file distributed with
+  this work for additional information regarding copyright ownership.
+  The ASF licenses this file to You 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.
+--
+!DOCTYPE document [
+  !ENTITY project SYSTEM project.xml
+]
+document url=20140201.html
+
+  project;
+
+  properties
+author email=dev.AT.tomcat.DOT.apache.DOT.orgApache Tomcat Connectors 
Project/author
+title2014 News and Status/title
+  /properties
+
+body
+
+section name=2014 News amp; Status
+br /
+
+/section
+/body
+/document

Propchange: tomcat/jk/trunk/xdocs/news/20140201.xml
--
svn:eol-style

svn commit: r1557755 - /tomcat/tc6.0.x/trunk/STATUS.txt

2014-01-13 Thread mturk
Author: mturk
Date: Mon Jan 13 15:46:36 2014
New Revision: 1557755

URL: http://svn.apache.org/r1557755
Log:
Cast my votes

Modified:
tomcat/tc6.0.x/trunk/STATUS.txt

Modified: tomcat/tc6.0.x/trunk/STATUS.txt
URL: 
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/STATUS.txt?rev=1557755r1=1557754r2=1557755view=diff
==
--- tomcat/tc6.0.x/trunk/STATUS.txt (original)
+++ tomcat/tc6.0.x/trunk/STATUS.txt Mon Jan 13 15:46:36 2014
@@ -35,7 +35,7 @@ PATCHES PROPOSED TO BACKPORT:
 * Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=55759
   Update the Eclipse compiler to 4.3.1
   
http://people.apache.org/~markt/patches/2014-01-13-ecj-4.3.1-update-tc6-v1.patch
-  +1: markt, remm
+  +1: markt, remm, mturk
   +0: kkolinko: A Tomcat6-specific patch is needed. It needs update to jar
exclude lists in TldConfig.java, TldLocationsCache.java, see r1476932.
   markt: Patch updated
@@ -49,7 +49,7 @@ PATCHES PROPOSED TO BACKPORT:
   Note: Part 5 onwards do not depend on this patch so this could be ignored /
 addressed later without impacting the XML changes.
   
http://people.apache.org/~markt/patches/2013-12-19-xml-prep-part4-tc6-v1.patch
-  +1: markt, remm
+  +1: markt, remm, mturk
   +0: kkolinko:
   This requires JUnit4. Formally, eclipse.classpath file still uses
   JUnit 3 and if I understand correctly build.xml does not have JUnit
@@ -65,7 +65,7 @@ PATCHES PROPOSED TO BACKPORT:
 * Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=55671
   Consistent naming for genStringAsCharArray
   https://issues.apache.org/bugzilla/attachment.cgi?id=31187
-  +1: markt, remm
+  +1: markt, remm, mturk
   -0: kkolinko: I think genStrAsCharArray is the proper and
 documented name for Tomcat 6. If we change the init-param name
 for better compatibility with Tomcat 7 (a good thing, +1),
@@ -81,7 +81,7 @@ PATCHES PROPOSED TO BACKPORT:
   enable the logging of any blocked entities.
   Backport of https://svn.apache.org/r1549529
   
http://people.apache.org/~markt/patches/2014-01-13-xml-block-external-tc6-v1.patch
-  +1: markt
+  +1: markt, mturk
   -1:
 
 



-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org



svn commit: r1532703 - in /tomcat/native/branches/1.1.x/native: include/tcn_version.h os/win32/libtcnative.rc

2013-10-16 Thread mturk
Author: mturk
Date: Wed Oct 16 09:49:36 2013
New Revision: 1532703

URL: http://svn.apache.org/r1532703
Log:
Branch version is 1.1.30-dev

Modified:
tomcat/native/branches/1.1.x/native/include/tcn_version.h
tomcat/native/branches/1.1.x/native/os/win32/libtcnative.rc

Modified: tomcat/native/branches/1.1.x/native/include/tcn_version.h
URL: 
http://svn.apache.org/viewvc/tomcat/native/branches/1.1.x/native/include/tcn_version.h?rev=1532703r1=1532702r2=1532703view=diff
==
--- tomcat/native/branches/1.1.x/native/include/tcn_version.h (original)
+++ tomcat/native/branches/1.1.x/native/include/tcn_version.h Wed Oct 16 
09:49:36 2013
@@ -69,13 +69,13 @@ extern C {
 #define TCN_MINOR_VERSION   1
 
 /** patch level */
-#define TCN_PATCH_VERSION   29
+#define TCN_PATCH_VERSION   30
 
 /**
  *  This symbol is defined for internal, development copies of TCN. This
  *  symbol will be #undef'd for releases.
  */
-#define TCN_IS_DEV_VERSION  0
+#define TCN_IS_DEV_VERSION  1
 
 
 /** The formatted string of APU's version */

Modified: tomcat/native/branches/1.1.x/native/os/win32/libtcnative.rc
URL: 
http://svn.apache.org/viewvc/tomcat/native/branches/1.1.x/native/os/win32/libtcnative.rc?rev=1532703r1=1532702r2=1532703view=diff
==
--- tomcat/native/branches/1.1.x/native/os/win32/libtcnative.rc (original)
+++ tomcat/native/branches/1.1.x/native/os/win32/libtcnative.rc Wed Oct 16 
09:49:36 2013
@@ -20,7 +20,7 @@ LANGUAGE 0x9,0x1
  See the License for the specific language governing  \
  permissions and limitations under the License.
 
-#define TCN_VERSION 1.1.29
+#define TCN_VERSION 1.1.30
 1000 ICON apache.ico
 
 1001 DIALOGEX 0, 0, 252, 51
@@ -36,8 +36,8 @@ BEGIN
 END
 
 1 VERSIONINFO
- FILEVERSION 1,1,29,0
- PRODUCTVERSION 1,1,29,0
+ FILEVERSION 1,1,30,0
+ PRODUCTVERSION 1,1,30,0
  FILEFLAGSMASK 0x3fL
 #ifdef _DEBUG
  FILEFLAGS 0x1L



-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org



svn commit: r1532336 - in /tomcat/native/branches/1.1.x/xdocs: index.xml news/2013.xml

2013-10-15 Thread mturk
Author: mturk
Date: Tue Oct 15 13:46:05 2013
New Revision: 1532336

URL: http://svn.apache.org/r1532336
Log:
Add 1.1.29 release note

Modified:
tomcat/native/branches/1.1.x/xdocs/index.xml
tomcat/native/branches/1.1.x/xdocs/news/2013.xml

Modified: tomcat/native/branches/1.1.x/xdocs/index.xml
URL: 
http://svn.apache.org/viewvc/tomcat/native/branches/1.1.x/xdocs/index.xml?rev=1532336r1=1532335r2=1532336view=diff
==
--- tomcat/native/branches/1.1.x/xdocs/index.xml (original)
+++ tomcat/native/branches/1.1.x/xdocs/index.xml Tue Oct 15 13:46:05 2013
@@ -66,8 +66,8 @@
 br /
 ul
 
-lia href=news/2013.html#20130916.116 September 2013 - 
bTC-Native-1.1.28 released/b/a
-pThe Apache Tomcat team is proud to announce the immediate availability of 
Tomcat Native 1.1.28 Stable.
+lia href=news/2013.html#20131015.115 October 2013 - bTC-Native-1.1.29 
released/b/a
+pThe Apache Tomcat team is proud to announce the immediate availability of 
Tomcat Native 1.1.29 Stable.
 /p
 p
  The sources and the binaries for selected platforms are available from the

Modified: tomcat/native/branches/1.1.x/xdocs/news/2013.xml
URL: 
http://svn.apache.org/viewvc/tomcat/native/branches/1.1.x/xdocs/news/2013.xml?rev=1532336r1=1532335r2=1532336view=diff
==
--- tomcat/native/branches/1.1.x/xdocs/news/2013.xml (original)
+++ tomcat/native/branches/1.1.x/xdocs/news/2013.xml Tue Oct 15 13:46:05 2013
@@ -31,6 +31,13 @@
 
 section name=2013 News amp; Status
 br /
+a name=20131015.1
+h315 October - TC-Native-1.1.29 released/h3
+/a
+pThe Apache Tomcat team is proud to announce the immediate availability
+of Tomcat Native 1.1.29. This is a bug fixing release.
+/p
+br /
 a name=20130916.1
 h316 September - TC-Native-1.1.28 released/h3
 /a



-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org



svn commit: r1532337 - in /tomcat/site/trunk/docs/native-doc: index.html miscellaneous/changelog.html miscellaneous/printer/changelog.html news/2013.html news/printer/2013.html printer/index.html

2013-10-15 Thread mturk
Author: mturk
Date: Tue Oct 15 13:49:41 2013
New Revision: 1532337

URL: http://svn.apache.org/r1532337
Log:
Publish native-doc

Modified:
tomcat/site/trunk/docs/native-doc/index.html
tomcat/site/trunk/docs/native-doc/miscellaneous/changelog.html
tomcat/site/trunk/docs/native-doc/miscellaneous/printer/changelog.html
tomcat/site/trunk/docs/native-doc/news/2013.html
tomcat/site/trunk/docs/native-doc/news/printer/2013.html
tomcat/site/trunk/docs/native-doc/printer/index.html

Modified: tomcat/site/trunk/docs/native-doc/index.html
URL: 
http://svn.apache.org/viewvc/tomcat/site/trunk/docs/native-doc/index.html?rev=1532337r1=1532336r2=1532337view=diff
==
--- tomcat/site/trunk/docs/native-doc/index.html (original)
+++ tomcat/site/trunk/docs/native-doc/index.html Tue Oct 15 13:49:41 2013
@@ -34,8 +34,8 @@
 br
 ul
 
-lia href=news/2013.html#20130916.116 September 2013 - 
bTC-Native-1.1.28 released/b/a
-pThe Apache Tomcat team is proud to announce the immediate availability of 
Tomcat Native 1.1.28 Stable.
+lia href=news/2013.html#20131015.115 October 2013 - bTC-Native-1.1.29 
released/b/a
+pThe Apache Tomcat team is proud to announce the immediate availability of 
Tomcat Native 1.1.29 Stable.
 /p
 p
  The sources and the binaries for selected platforms are available from the

Modified: tomcat/site/trunk/docs/native-doc/miscellaneous/changelog.html
URL: 
http://svn.apache.org/viewvc/tomcat/site/trunk/docs/native-doc/miscellaneous/changelog.html?rev=1532337r1=1532336r2=1532337view=diff
==
--- tomcat/site/trunk/docs/native-doc/miscellaneous/changelog.html (original)
+++ tomcat/site/trunk/docs/native-doc/miscellaneous/changelog.html Tue Oct 15 
13:49:41 2013
@@ -6,6 +6,13 @@
   It should contain fixes made only after December 19th 2007, when the
   new documentation project for Tomcat Native was started.
   /p
+/blockquote/td/tr/tabletable border=0 cellspacing=0 
cellpadding=2 width=100%trtd bgcolor=#525D76font color=#ff 
face=arial,helvetica.sanserifa name=Changes between 1.1.28 and 
1.1.29strongChanges between 1.1.28 and 
1.1.29/strong/a/font/td/trtrtdblockquote
+  table border=0 cellpadding=2 cellspacing=2
+trtd valign=topimg alt=fix class=icon 
src=../images/fix.gif/tdtd
+  Change return code when removing a socket from a poller, that was
+  actually not in the poller from APR_SUCCESS to APR_NOTFOUND. (rjung)
+/td/tr
+  /table
 /blockquote/td/tr/tabletable border=0 cellspacing=0 
cellpadding=2 width=100%trtd bgcolor=#525D76font color=#ff 
face=arial,helvetica.sanserifa name=Changes between 1.1.27 and 
1.1.28strongChanges between 1.1.27 and 
1.1.28/strong/a/font/td/trtrtdblockquote
   table border=0 cellpadding=2 cellspacing=2
 trtd valign=topimg alt=update class=icon 
src=../images/update.gif/tdtd
@@ -27,6 +34,7 @@
 trtd valign=topimg alt=fix class=icon 
src=../images/fix.gif/tdtd
   a 
href=http://issues.apache.org/bugzilla/show_bug.cgi?id=51813;51813/a Add 
NULL-checking for b class=codes-gt;net/b to
   avoid SIGSEGV in situations where it appears a socket bas been recycled.
+  (schultz)
 /td/tr
   /table
 /blockquote/td/tr/tabletable border=0 cellspacing=0 
cellpadding=2 width=100%trtd bgcolor=#525D76font color=#ff 
face=arial,helvetica.sanserifa name=Changes between 1.1.26 and 
1.1.27strongChanges between 1.1.26 and 
1.1.27/strong/a/font/td/trtrtdblockquote

Modified: tomcat/site/trunk/docs/native-doc/miscellaneous/printer/changelog.html
URL: 
http://svn.apache.org/viewvc/tomcat/site/trunk/docs/native-doc/miscellaneous/printer/changelog.html?rev=1532337r1=1532336r2=1532337view=diff
==
--- tomcat/site/trunk/docs/native-doc/miscellaneous/printer/changelog.html 
(original)
+++ tomcat/site/trunk/docs/native-doc/miscellaneous/printer/changelog.html Tue 
Oct 15 13:49:41 2013
@@ -5,6 +5,13 @@
   It should contain fixes made only after December 19th 2007, when the
   new documentation project for Tomcat Native was started.
   /p
+/blockquote/td/tr/tabletable border=0 cellspacing=0 
cellpadding=2 width=100%trtd bgcolor=#525D76font color=#ff 
face=arial,helvetica.sanserifa name=Changes between 1.1.28 and 
1.1.29strongChanges between 1.1.28 and 
1.1.29/strong/a/font/td/trtrtdblockquote
+  table border=0 cellpadding=2 cellspacing=2
+trtd valign=topimg alt=fix class=icon 
src=../../images/fix.gif/tdtd
+  Change return code when removing a socket from a poller, that was
+  actually not in the poller from APR_SUCCESS to APR_NOTFOUND. (rjung)
+/td/tr
+  /table
 /blockquote/td/tr/tabletable border=0 cellspacing=0 
cellpadding=2 width=100%trtd bgcolor=#525D76font color=#ff 
face=arial,helvetica.sanserifa name=Changes between 1.1.27 and 
1.1.28strongChanges between 1.1.27 and 
1.1.28/strong/a/font/td

svn commit: r3257 - in /release/tomcat/tomcat-connectors/native: ./ 1.1.27/ 1.1.29/ 1.1.29/binaries/ 1.1.29/source/

2013-10-14 Thread mturk
Author: mturk
Date: Mon Oct 14 10:27:51 2013
New Revision: 3257

Log:
Upload 1.1.29 artefacts

Added:
release/tomcat/tomcat-connectors/native/1.1.29/
release/tomcat/tomcat-connectors/native/1.1.29/binaries/

release/tomcat/tomcat-connectors/native/1.1.29/binaries/tomcat-native-1.1.29-ocsp-win32-bin.zip
   (with props)

release/tomcat/tomcat-connectors/native/1.1.29/binaries/tomcat-native-1.1.29-ocsp-win32-bin.zip.asc
   (with props)

release/tomcat/tomcat-connectors/native/1.1.29/binaries/tomcat-native-1.1.29-ocsp-win32-bin.zip.md5

release/tomcat/tomcat-connectors/native/1.1.29/binaries/tomcat-native-1.1.29-ocsp-win32-bin.zip.sha1

release/tomcat/tomcat-connectors/native/1.1.29/binaries/tomcat-native-1.1.29-win32-bin.zip
   (with props)

release/tomcat/tomcat-connectors/native/1.1.29/binaries/tomcat-native-1.1.29-win32-bin.zip.asc
   (with props)

release/tomcat/tomcat-connectors/native/1.1.29/binaries/tomcat-native-1.1.29-win32-bin.zip.md5

release/tomcat/tomcat-connectors/native/1.1.29/binaries/tomcat-native-1.1.29-win32-bin.zip.sha1
release/tomcat/tomcat-connectors/native/1.1.29/source/

release/tomcat/tomcat-connectors/native/1.1.29/source/tomcat-native-1.1.29-src.tar.gz
   (with props)

release/tomcat/tomcat-connectors/native/1.1.29/source/tomcat-native-1.1.29-src.tar.gz.asc
   (with props)

release/tomcat/tomcat-connectors/native/1.1.29/source/tomcat-native-1.1.29-src.tar.gz.md5

release/tomcat/tomcat-connectors/native/1.1.29/source/tomcat-native-1.1.29-src.tar.gz.sha1

release/tomcat/tomcat-connectors/native/1.1.29/source/tomcat-native-1.1.29-win32-src.zip
   (with props)

release/tomcat/tomcat-connectors/native/1.1.29/source/tomcat-native-1.1.29-win32-src.zip.asc
   (with props)

release/tomcat/tomcat-connectors/native/1.1.29/source/tomcat-native-1.1.29-win32-src.zip.md5

release/tomcat/tomcat-connectors/native/1.1.29/source/tomcat-native-1.1.29-win32-src.zip.sha1
Removed:
release/tomcat/tomcat-connectors/native/1.1.27/
Modified:
release/tomcat/tomcat-connectors/native/README.html

Added: 
release/tomcat/tomcat-connectors/native/1.1.29/binaries/tomcat-native-1.1.29-ocsp-win32-bin.zip
==
Binary file - no diff available.

Propchange: 
release/tomcat/tomcat-connectors/native/1.1.29/binaries/tomcat-native-1.1.29-ocsp-win32-bin.zip
--
svn:mime-type = application/zip

Added: 
release/tomcat/tomcat-connectors/native/1.1.29/binaries/tomcat-native-1.1.29-ocsp-win32-bin.zip.asc
==
--- 
release/tomcat/tomcat-connectors/native/1.1.29/binaries/tomcat-native-1.1.29-ocsp-win32-bin.zip.asc
 (added)
+++ 
release/tomcat/tomcat-connectors/native/1.1.29/binaries/tomcat-native-1.1.29-ocsp-win32-bin.zip.asc
 Mon Oct 14 10:27:51 2013
@@ -0,0 +1,7 @@
+-BEGIN PGP SIGNATURE-
+Version: GnuPG v1.4.14 (GNU/Linux)
+
+iF4EABEIAAYFAlJWp20ACgkQNc0jwQ1JjiNOLAD+P33QT1WVVnlLgguDihnBbJmM
+2sWRnYwHrDcquizDMi0A/1vn4PMndeUxC5wCeO4XzUJ4nwP9+EDVMfGwt5DZ22jO
+=Jevk
+-END PGP SIGNATURE-

Propchange: 
release/tomcat/tomcat-connectors/native/1.1.29/binaries/tomcat-native-1.1.29-ocsp-win32-bin.zip.asc
--
svn:eol-style = native

Propchange: 
release/tomcat/tomcat-connectors/native/1.1.29/binaries/tomcat-native-1.1.29-ocsp-win32-bin.zip.asc
--
svn:mime-type = text/plain

Added: 
release/tomcat/tomcat-connectors/native/1.1.29/binaries/tomcat-native-1.1.29-ocsp-win32-bin.zip.md5
==
--- 
release/tomcat/tomcat-connectors/native/1.1.29/binaries/tomcat-native-1.1.29-ocsp-win32-bin.zip.md5
 (added)
+++ 
release/tomcat/tomcat-connectors/native/1.1.29/binaries/tomcat-native-1.1.29-ocsp-win32-bin.zip.md5
 Mon Oct 14 10:27:51 2013
@@ -0,0 +1 @@
+ac203534041e21d13e9141c030a3a862 *tomcat-native-1.1.29-ocsp-win32-bin.zip

Added: 
release/tomcat/tomcat-connectors/native/1.1.29/binaries/tomcat-native-1.1.29-ocsp-win32-bin.zip.sha1
==
--- 
release/tomcat/tomcat-connectors/native/1.1.29/binaries/tomcat-native-1.1.29-ocsp-win32-bin.zip.sha1
 (added)
+++ 
release/tomcat/tomcat-connectors/native/1.1.29/binaries/tomcat-native-1.1.29-ocsp-win32-bin.zip.sha1
 Mon Oct 14 10:27:51 2013
@@ -0,0 +1 @@
+2d31acb5c8a60f4acc71f627dcf2b90b7f4e7a54 
*tomcat-native-1.1.29-ocsp-win32-bin.zip

Added: 
release/tomcat/tomcat-connectors/native/1.1.29/binaries/tomcat-native-1.1.29-win32-bin.zip
==
Binary file - no diff available.

Propchange: 
release/tomcat/tomcat-connectors

svn commit: r3257 - in /release/tomcat/tomcat-connectors/native: ./ 1.1.27/ 1.1.29/ 1.1.29/binaries/ 1.1.29/source/

2013-10-14 Thread mturk
Author: mturk
Date: Mon Oct 14 10:27:51 2013
New Revision: 3257

Log:
Upload 1.1.29 artefacts

Added:
release/tomcat/tomcat-connectors/native/1.1.29/
release/tomcat/tomcat-connectors/native/1.1.29/binaries/

release/tomcat/tomcat-connectors/native/1.1.29/binaries/tomcat-native-1.1.29-ocsp-win32-bin.zip
   (with props)

release/tomcat/tomcat-connectors/native/1.1.29/binaries/tomcat-native-1.1.29-ocsp-win32-bin.zip.asc
   (with props)

release/tomcat/tomcat-connectors/native/1.1.29/binaries/tomcat-native-1.1.29-ocsp-win32-bin.zip.md5

release/tomcat/tomcat-connectors/native/1.1.29/binaries/tomcat-native-1.1.29-ocsp-win32-bin.zip.sha1

release/tomcat/tomcat-connectors/native/1.1.29/binaries/tomcat-native-1.1.29-win32-bin.zip
   (with props)

release/tomcat/tomcat-connectors/native/1.1.29/binaries/tomcat-native-1.1.29-win32-bin.zip.asc
   (with props)

release/tomcat/tomcat-connectors/native/1.1.29/binaries/tomcat-native-1.1.29-win32-bin.zip.md5

release/tomcat/tomcat-connectors/native/1.1.29/binaries/tomcat-native-1.1.29-win32-bin.zip.sha1
release/tomcat/tomcat-connectors/native/1.1.29/source/

release/tomcat/tomcat-connectors/native/1.1.29/source/tomcat-native-1.1.29-src.tar.gz
   (with props)

release/tomcat/tomcat-connectors/native/1.1.29/source/tomcat-native-1.1.29-src.tar.gz.asc
   (with props)

release/tomcat/tomcat-connectors/native/1.1.29/source/tomcat-native-1.1.29-src.tar.gz.md5

release/tomcat/tomcat-connectors/native/1.1.29/source/tomcat-native-1.1.29-src.tar.gz.sha1

release/tomcat/tomcat-connectors/native/1.1.29/source/tomcat-native-1.1.29-win32-src.zip
   (with props)

release/tomcat/tomcat-connectors/native/1.1.29/source/tomcat-native-1.1.29-win32-src.zip.asc
   (with props)

release/tomcat/tomcat-connectors/native/1.1.29/source/tomcat-native-1.1.29-win32-src.zip.md5

release/tomcat/tomcat-connectors/native/1.1.29/source/tomcat-native-1.1.29-win32-src.zip.sha1
Removed:
release/tomcat/tomcat-connectors/native/1.1.27/
Modified:
release/tomcat/tomcat-connectors/native/README.html

Added: 
release/tomcat/tomcat-connectors/native/1.1.29/binaries/tomcat-native-1.1.29-ocsp-win32-bin.zip
==
Binary file - no diff available.

Propchange: 
release/tomcat/tomcat-connectors/native/1.1.29/binaries/tomcat-native-1.1.29-ocsp-win32-bin.zip
--
svn:mime-type = application/zip

Added: 
release/tomcat/tomcat-connectors/native/1.1.29/binaries/tomcat-native-1.1.29-ocsp-win32-bin.zip.asc
==
--- 
release/tomcat/tomcat-connectors/native/1.1.29/binaries/tomcat-native-1.1.29-ocsp-win32-bin.zip.asc
 (added)
+++ 
release/tomcat/tomcat-connectors/native/1.1.29/binaries/tomcat-native-1.1.29-ocsp-win32-bin.zip.asc
 Mon Oct 14 10:27:51 2013
@@ -0,0 +1,7 @@
+-BEGIN PGP SIGNATURE-
+Version: GnuPG v1.4.14 (GNU/Linux)
+
+iF4EABEIAAYFAlJWp20ACgkQNc0jwQ1JjiNOLAD+P33QT1WVVnlLgguDihnBbJmM
+2sWRnYwHrDcquizDMi0A/1vn4PMndeUxC5wCeO4XzUJ4nwP9+EDVMfGwt5DZ22jO
+=Jevk
+-END PGP SIGNATURE-

Propchange: 
release/tomcat/tomcat-connectors/native/1.1.29/binaries/tomcat-native-1.1.29-ocsp-win32-bin.zip.asc
--
svn:eol-style = native

Propchange: 
release/tomcat/tomcat-connectors/native/1.1.29/binaries/tomcat-native-1.1.29-ocsp-win32-bin.zip.asc
--
svn:mime-type = text/plain

Added: 
release/tomcat/tomcat-connectors/native/1.1.29/binaries/tomcat-native-1.1.29-ocsp-win32-bin.zip.md5
==
--- 
release/tomcat/tomcat-connectors/native/1.1.29/binaries/tomcat-native-1.1.29-ocsp-win32-bin.zip.md5
 (added)
+++ 
release/tomcat/tomcat-connectors/native/1.1.29/binaries/tomcat-native-1.1.29-ocsp-win32-bin.zip.md5
 Mon Oct 14 10:27:51 2013
@@ -0,0 +1 @@
+ac203534041e21d13e9141c030a3a862 *tomcat-native-1.1.29-ocsp-win32-bin.zip

Added: 
release/tomcat/tomcat-connectors/native/1.1.29/binaries/tomcat-native-1.1.29-ocsp-win32-bin.zip.sha1
==
--- 
release/tomcat/tomcat-connectors/native/1.1.29/binaries/tomcat-native-1.1.29-ocsp-win32-bin.zip.sha1
 (added)
+++ 
release/tomcat/tomcat-connectors/native/1.1.29/binaries/tomcat-native-1.1.29-ocsp-win32-bin.zip.sha1
 Mon Oct 14 10:27:51 2013
@@ -0,0 +1 @@
+2d31acb5c8a60f4acc71f627dcf2b90b7f4e7a54 
*tomcat-native-1.1.29-ocsp-win32-bin.zip

Added: 
release/tomcat/tomcat-connectors/native/1.1.29/binaries/tomcat-native-1.1.29-win32-bin.zip
==
Binary file - no diff available.

Propchange: 
release/tomcat/tomcat-connectors

svn commit: r1530898 - in /tomcat/native/branches/1.1.x: build.properties.default build.xml native/include/tcn_version.h

2013-10-10 Thread mturk
Author: mturk
Date: Thu Oct 10 09:36:13 2013
New Revision: 1530898

URL: http://svn.apache.org/r1530898
Log:
Prepare versions for tag

Modified:
tomcat/native/branches/1.1.x/build.properties.default
tomcat/native/branches/1.1.x/build.xml
tomcat/native/branches/1.1.x/native/include/tcn_version.h

Modified: tomcat/native/branches/1.1.x/build.properties.default
URL: 
http://svn.apache.org/viewvc/tomcat/native/branches/1.1.x/build.properties.default?rev=1530898r1=1530897r2=1530898view=diff
==
--- tomcat/native/branches/1.1.x/build.properties.default (original)
+++ tomcat/native/branches/1.1.x/build.properties.default Thu Oct 10 09:36:13 
2013
@@ -20,8 +20,8 @@ version.major=1
 version.minor=1
 version.build=29
 version.patch=0
-version.suffix=-dev
-#version.suffix=
+#version.suffix=-dev
+version.suffix=
 
 # - Default Base Path for Dependent Packages -
 # Please note this path must be absolute, not relative,

Modified: tomcat/native/branches/1.1.x/build.xml
URL: 
http://svn.apache.org/viewvc/tomcat/native/branches/1.1.x/build.xml?rev=1530898r1=1530897r2=1530898view=diff
==
--- tomcat/native/branches/1.1.x/build.xml (original)
+++ tomcat/native/branches/1.1.x/build.xml Thu Oct 10 09:36:13 2013
@@ -35,7 +35,7 @@
 property name=version.minor value=1 /
 property name=version.build value=29 /
 property name=version.patch value=0 /
-property name=version.suffixvalue=-dev /
+property name=version.suffixvalue= /
 
 property name=junit.homevalue=/usr/local/junit3.8/
 property name=junit.jar value=${junit.home}/junit.jar/

Modified: tomcat/native/branches/1.1.x/native/include/tcn_version.h
URL: 
http://svn.apache.org/viewvc/tomcat/native/branches/1.1.x/native/include/tcn_version.h?rev=1530898r1=1530897r2=1530898view=diff
==
--- tomcat/native/branches/1.1.x/native/include/tcn_version.h (original)
+++ tomcat/native/branches/1.1.x/native/include/tcn_version.h Thu Oct 10 
09:36:13 2013
@@ -75,7 +75,7 @@ extern C {
  *  This symbol is defined for internal, development copies of TCN. This
  *  symbol will be #undef'd for releases.
  */
-#define TCN_IS_DEV_VERSION  1
+#define TCN_IS_DEV_VERSION  0
 
 
 /** The formatted string of APU's version */



-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org



svn commit: r1530906 - /tomcat/native/branches/1.1.x/java/org/apache/tomcat/

2013-10-10 Thread mturk
Author: mturk
Date: Thu Oct 10 10:10:22 2013
New Revision: 1530906

URL: http://svn.apache.org/r1530906
Log:
Sync svn externals

Modified:
tomcat/native/branches/1.1.x/java/org/apache/tomcat/   (props changed)

Propchange: tomcat/native/branches/1.1.x/java/org/apache/tomcat/
--
--- svn:externals (original)
+++ svn:externals Thu Oct 10 10:10:22 2013
@@ -1 +1 @@
-^/tomcat/trunk/java/org/apache/tomcat/jni@1456474 jni
+^/tomcat/trunk/java/org/apache/tomcat/jni@1528407 jni



-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org



svn commit: r1530944 - /tomcat/native/tags/TOMCAT_NATIVE_1_1_29/

2013-10-10 Thread mturk
Author: mturk
Date: Thu Oct 10 12:37:51 2013
New Revision: 1530944

URL: http://svn.apache.org/r1530944
Log:
Tag 1.1.29

Added:
tomcat/native/tags/TOMCAT_NATIVE_1_1_29/   (props changed)
  - copied from r1530943, tomcat/native/branches/1.1.x/

Propchange: tomcat/native/tags/TOMCAT_NATIVE_1_1_29/
--
--- svn:ignore (added)
+++ svn:ignore Thu Oct 10 12:37:51 2013
@@ -0,0 +1 @@
+dist

Propchange: tomcat/native/tags/TOMCAT_NATIVE_1_1_29/
--
--- svn:mergeinfo (added)
+++ svn:mergeinfo Thu Oct 10 12:37:51 2013
@@ -0,0 +1,3 @@
+/tomcat/native/trunk:815411,1342003,1342008,1342013,1342020,1342024,1394258,1394342,1424947,1424971,1430753,1437081,1438342,1439337,1441884,1441886,1442579,1442581,1445972,1507113
+/tomcat/tc7.0.x/trunk:1199985,1200164,1349932,1434887,1435769
+/tomcat/trunk:815418,832198,1001939,1033916,1043103,1044729,1078522,1145209,1145285,1149092,1241356,1241406-1241407,1242254,1292671,1299980,1300102,1434905,1437083



-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org



svn commit: r1529773 - /tomcat/jk/trunk/native/common/jk_connect.c

2013-10-07 Thread mturk
Author: mturk
Date: Mon Oct  7 06:50:03 2013
New Revision: 1529773

URL: http://svn.apache.org/r1529773
Log:
Use our own defines for AF_INET/AF_INET6

Modified:
tomcat/jk/trunk/native/common/jk_connect.c

Modified: tomcat/jk/trunk/native/common/jk_connect.c
URL: 
http://svn.apache.org/viewvc/tomcat/jk/trunk/native/common/jk_connect.c?rev=1529773r1=1529772r2=1529773view=diff
==
--- tomcat/jk/trunk/native/common/jk_connect.c (original)
+++ tomcat/jk/trunk/native/common/jk_connect.c Mon Oct  7 06:50:03 2013
@@ -339,7 +339,7 @@ in_addr_t jk_inet_addr(const char * addr
 int jk_resolve(const char *host, int port, jk_sockaddr_t *saddr,
void *pool, int prefer_ipv6, jk_logger_t *l)
 {
-int family = AF_INET;
+int family = JK_INET;
 struct in_addr iaddr;
 
 JK_TRACE_ENTER(l);
@@ -371,12 +371,12 @@ int jk_resolve(const char *host, int por
 /* Check if we have multiple address matches
  */
 if (remote_sa-next) {
-/* Since we are only handling AF_INET (IPV4) address (in_addr_t) */
+/* Since we are only handling JK_INET (IPV4) address (in_addr_t) */
 /* make sure we find one of those.   */
 temp_sa = remote_sa;
 #if APR_HAVE_IPV6
 if (prefer_ipv6) {
-while ((NULL != temp_sa)  (AF_INET6 != temp_sa-family))
+while ((NULL != temp_sa)  (APR_INET6 != temp_sa-family))
 temp_sa = temp_sa-next;
 }
 #endif
@@ -384,7 +384,7 @@ int jk_resolve(const char *host, int por
 remote_sa = temp_sa;
 }
 else {
-while ((NULL != temp_sa)  (AF_INET != temp_sa-family))
+while ((NULL != temp_sa)  (APR_INET != temp_sa-family))
 temp_sa = temp_sa-next;
 }
 /* if temp_sa is set, we have a valid address otherwise, just 
return */
@@ -396,14 +396,14 @@ int jk_resolve(const char *host, int por
 return JK_FALSE;
 }
 }
-if (remote_sa-family == AF_INET) {
+if (remote_sa-family == APR_INET) {
 saddr-sa.sin = remote_sa-sa.sin;
-family = AF_INET;
+family = JK_INET;
 }
 #if APR_HAVE_IPV6
 else {
 saddr-sa.sin6 = remote_sa-sa.sin6;
-family = AF_INET6;
+family = JK_INET6;
 }
 #endif
 #else /* HAVE_APR */
@@ -432,12 +432,12 @@ int jk_resolve(const char *host, int por
 #endif /* HAVE_APR */
 }
 
-if (family == AF_INET) {
+if (family == JK_INET) {
 saddr-ipaddr_ptr = (saddr-sa.sin.sin_addr);
 saddr-ipaddr_len = (int)sizeof(struct in_addr);
 saddr-salen  = (int)sizeof(struct sockaddr_in);
 }
-#if APR_HAVE_IPV6
+#if JK_HAVE_IPV6
 else {
 saddr-ipaddr_ptr = (saddr-sa.sin6.sin6_addr);
 saddr-ipaddr_len = (int)sizeof(struct in6_addr);
@@ -486,7 +486,7 @@ jk_sock_t jk_open_socket(jk_sockaddr_t *
 #if defined(SOCK_CLOEXEC)  defined(USE_SOCK_CLOEXEC)
 flags |= SOCK_CLOEXEC;
 #endif
-sd = socket(AF_INET, SOCK_STREAM | flags, 0);
+sd = socket(addr-family, SOCK_STREAM | flags, 0);
 if (!IS_VALID_SOCKET(sd)) {
 JK_GET_SOCKET_ERRNO();
 jk_log(l, JK_LOG_ERROR,
@@ -1126,7 +1126,7 @@ char *jk_dump_hinfo(jk_sockaddr_t *saddr
 {
 char pb[8];
 
-if (saddr-family == AF_INET) {
+if (saddr-family == JK_INET) {
 inet_ntop4(saddr-ipaddr_ptr, buf, 16);
 }
 #if APR_HAVE_IPV6
@@ -1152,7 +1152,7 @@ char *jk_dump_sinfo(jk_sock_t sd, char *
 if (getpeername(sd, rsaddr, salen) == 0) {
 char   pb[8];
 size_t ps;
-if (lsaddr.sa_family == AF_INET) {
+if (lsaddr.sa_family == JK_INET) {
 struct sockaddr_in  *sa = (struct sockaddr_in  *)lsaddr;
 inet_ntop4((unsigned char *)sa-sin_addr,  buf, 16);
 sprintf(pb, :%d, (unsigned int)htons(sa-sin_port));
@@ -1167,7 +1167,7 @@ char *jk_dump_sinfo(jk_sock_t sd, char *
 strcat(buf, pb);
 strcat(buf,  - );
 ps = strlen(buf);
-if (rsaddr.sa_family == AF_INET) {
+if (rsaddr.sa_family == JK_INET) {
 struct sockaddr_in  *sa = (struct sockaddr_in  *)rsaddr;
 inet_ntop4((unsigned char *)sa-sin_addr,  buf + ps, 16);
 sprintf(pb, :%d, (unsigned int)htons(sa-sin_port));



-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org



svn commit: r1529803 - in /tomcat/jk/trunk/native/common: jk_connect.c jk_global.h

2013-10-07 Thread mturk
Author: mturk
Date: Mon Oct  7 09:24:32 2013
New Revision: 1529803

URL: http://svn.apache.org/r1529803
Log:
Use getaddrinfo instead gethostbyname for both IPv4 and IPv6

Modified:
tomcat/jk/trunk/native/common/jk_connect.c
tomcat/jk/trunk/native/common/jk_global.h

Modified: tomcat/jk/trunk/native/common/jk_connect.c
URL: 
http://svn.apache.org/viewvc/tomcat/jk/trunk/native/common/jk_connect.c?rev=1529803r1=1529802r2=1529803view=diff
==
--- tomcat/jk/trunk/native/common/jk_connect.c (original)
+++ tomcat/jk/trunk/native/common/jk_connect.c Mon Oct  7 09:24:32 2013
@@ -409,11 +409,76 @@ int jk_resolve(const char *host, int por
 #else /* HAVE_APR */
 /* Without APR go the classic way.
  */
-
-struct hostent *hoste;
+#if defined(HAVE_GETADDRINFO)
 /* TODO:
- * Check for numeric IPV6 addresses
+ * 1. Check for numeric IPV6 addresses
+ * 2. Do we need to set service name for getaddrinfo?
  */
+struct addrinfo hints, *ai_list, *ai = NULL;
+int error;
+
+memset(hints, 0, sizeof(hints));
+hints.ai_socktype = SOCK_STREAM;
+#if JK_HAVE_IPV6
+if (prefer_ipv6)
+hints.ai_family = JK_INET6;
+else
+#endif
+hints.ai_family = JK_INET;
+error = getaddrinfo(host, NULL, hints, ai_list);
+#if JK_HAVE_IPV6
+/* XXX:
+ * Is the check for EAI_FAMILY/WSAEAFNOSUPPORT correct
+ * way to retry the IPv4 address?
+ */
+if (error == EAI_FAMILY  prefer_ipv6) {
+hints.ai_family = JK_INET;
+error = getaddrinfo(host, NULL, hints, ai_list);
+}
+#endif
+if (error) {
+JK_TRACE_EXIT(l);
+errno = error;
+return JK_FALSE;
+}
+#if JK_HAVE_IPV6
+if (prefer_ipv6) {
+ai = ai_list;
+while (ai) {
+if (ai-ai_family == AF_INET6) {
+family = JK_INET6;
+break;
+}
+else {
+ai = ai-ai_next;
+}
+}
+}
+#endif
+if (ai == NULL) {
+ai = ai_list;
+while (ai) {
+if (ai-ai_family == AF_INET) {
+family = JK_INET;
+break;
+}
+else {
+ai = ai-ai_next;
+}
+}
+}
+freeaddrinfo(ai_list);
+if (ai == NULL) {
+/* No address found
+ * XXX: Use better error code?
+ */
+JK_TRACE_EXIT(l);
+errno = ENOENT;
+return JK_FALSE;
+}
+memcpy((saddr-sa), ai-ai_addr, ai-ai_addrlen);
+#else /* HAVE_GETADDRINFO */
+struct hostent *hoste;
 
 /* XXX : WARNING : We should really use gethostbyname_r in 
multi-threaded env */
 /* Fortunatly when APR is available, ie under Apache 2.0, we use it */
@@ -428,7 +493,7 @@ int jk_resolve(const char *host, int por
 }
 iaddr = *((struct in_addr *)hoste-h_addr_list[0]);
 memcpy((saddr-sa.sin.sin_addr), iaddr, sizeof(struct in_addr));
-
+#endif /* HAVE_GETADDRINFO */
 #endif /* HAVE_APR */
 }
 
@@ -823,7 +888,7 @@ int jk_shutdown_socket(jk_sock_t sd, jk_
 rd += rp;
 if (rp  sizeof(dummy)) {
 if (timeout  MS_TO_LINGER_LAST) {
-/* Try one last time with a short timeout 
+/* Try one last time with a short timeout
 */
 timeout = MS_TO_LINGER_LAST;
 continue;

Modified: tomcat/jk/trunk/native/common/jk_global.h
URL: 
http://svn.apache.org/viewvc/tomcat/jk/trunk/native/common/jk_global.h?rev=1529803r1=1529802r2=1529803view=diff
==
--- tomcat/jk/trunk/native/common/jk_global.h (original)
+++ tomcat/jk/trunk/native/common/jk_global.h Mon Oct  7 09:24:32 2013
@@ -347,6 +347,7 @@ extern C
 #define HAVE_SNPRINTF
 #define HAVE_SOCKADDR_STORAGE
 #define HAVE_AF_INET6
+#define HAVE_GETADDRINFO
 #ifdef HAVE_APR
 #define snprintf apr_snprintf
 #define vsnprintf apr_vsnprintf



-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org



svn commit: r1529764 - /tomcat/jk/trunk/native/common/jk_global.h

2013-10-06 Thread mturk
Author: mturk
Date: Mon Oct  7 05:50:55 2013
New Revision: 1529764

URL: http://svn.apache.org/r1529764
Log:
Add few more IPv6 defines

Modified:
tomcat/jk/trunk/native/common/jk_global.h

Modified: tomcat/jk/trunk/native/common/jk_global.h
URL: 
http://svn.apache.org/viewvc/tomcat/jk/trunk/native/common/jk_global.h?rev=1529764r1=1529763r2=1529764view=diff
==
--- tomcat/jk/trunk/native/common/jk_global.h (original)
+++ tomcat/jk/trunk/native/common/jk_global.h Mon Oct  7 05:50:55 2013
@@ -346,6 +346,7 @@ extern C
 #define HAVE_VSNPRINTF
 #define HAVE_SNPRINTF
 #define HAVE_SOCKADDR_STORAGE
+#define HAVE_AF_INET6
 #ifdef HAVE_APR
 #define snprintf apr_snprintf
 #define vsnprintf apr_vsnprintf
@@ -403,15 +404,25 @@ typedef int jk_sock_t;
 
 /* IPV6 support */
 #if defined(HAVE_APR)
-#define JK_HAVE_IPV6APR_HAVE_IPV6
+#define JK_HAVE_IPV6APR_HAVE_IPV6
+#define JK_INET APR_INET
+#define JK_UNSPEC   APR_UNSPEC
 #else
 #if defined(WIN32) || defined(HAVE_AF_INET6)
 #define JK_HAVE_IPV61
 #else
 #define JK_HAVE_IPV60
 #endif
+#define JK_INET AF_INET
+#if defined(AF_UNSPEC)
+#define JK_UNSPEC   AF_UNSPEC
+#else
+#define JK_UNSPEC   0
+#endif
+#endif
+#if JK_HAVE_IPV6
+#define JK_INET6AF_INET6
 #endif
-
 
 typedef struct jk_sockaddr_t jk_sockaddr_t;
 struct jk_sockaddr_t {
@@ -432,7 +443,7 @@ struct jk_sockaddr_t {
 struct sockaddr_in6 sin6;
 #endif
 /** Placeholder to ensure that the size of this union is not
- * dependent on whether APR_HAVE_IPV6 is defined. */
+ * dependent on whether JK_HAVE_IPV6 is defined. */
 #ifdef HAVE_SOCKADDR_STORAGE
 struct sockaddr_storage sas;
 #else



-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org



svn commit: r1526842 - /tomcat/jk/trunk/native/common/jk_connect.c

2013-09-27 Thread mturk
Author: mturk
Date: Fri Sep 27 09:37:31 2013
New Revision: 1526842

URL: http://svn.apache.org/r1526842
Log:
Dump correct IPv4/IPv6 addresses

Modified:
tomcat/jk/trunk/native/common/jk_connect.c

Modified: tomcat/jk/trunk/native/common/jk_connect.c
URL: 
http://svn.apache.org/viewvc/tomcat/jk/trunk/native/common/jk_connect.c?rev=1526842r1=1526841r2=1526842view=diff
==
--- tomcat/jk/trunk/native/common/jk_connect.c (original)
+++ tomcat/jk/trunk/native/common/jk_connect.c Fri Sep 27 09:37:31 2013
@@ -1142,23 +1142,44 @@ char *jk_dump_hinfo(jk_sockaddr_t *saddr
 
 char *jk_dump_sinfo(jk_sock_t sd, char *buf)
 {
-struct sockaddr_in rsaddr;
-struct sockaddr_in lsaddr;
-socklen_t  salen;
+struct sockaddr rsaddr;
+struct sockaddr lsaddr;
+socklen_t   salen;
 
 salen = sizeof(struct sockaddr);
-if (getsockname(sd, (struct sockaddr *)lsaddr, salen) == 0) {
+if (getsockname(sd, lsaddr, salen) == 0) {
 salen = sizeof(struct sockaddr);
-if (getpeername(sd, (struct sockaddr *)rsaddr, salen) == 0) {
-unsigned long  laddr = (unsigned  
long)htonl(lsaddr.sin_addr.s_addr);
-unsigned short lport = (unsigned short)htons(lsaddr.sin_port);
-unsigned long  raddr = (unsigned  
long)htonl(rsaddr.sin_addr.s_addr);
-unsigned short rport = (unsigned short)htons(rsaddr.sin_port);
-sprintf(buf, %d.%d.%d.%d:%d - %d.%d.%d.%d:%d,
-(int)(laddr  24), (int)((laddr  16)  0xff),
-(int)((laddr  8)  0xff), (int)(laddr  0xff), 
(int)lport,
-(int)(raddr  24), (int)((raddr  16)  0xff),
-(int)((raddr  8)  0xff), (int)(raddr  0xff), 
(int)rport);
+if (getpeername(sd, rsaddr, salen) == 0) {
+char   pb[8];
+size_t ps;
+if (lsaddr.sa_family == AF_INET) {
+struct sockaddr_in  *sa = (struct sockaddr_in  *)lsaddr;
+inet_ntop4((unsigned char *)sa-sin_addr,  buf, 16);
+sprintf(pb, :%d, (unsigned int)htons(sa-sin_port));
+}
+#if APR_HAVE_IPV6
+else {
+struct sockaddr_in6 *sa = (struct sockaddr_in6 *)lsaddr;
+inet_ntop6((unsigned char *)sa-sin6_addr, buf, 64);
+sprintf(pb, :%d, (unsigned int)htons(sa-sin6_port));
+}
+#endif
+strcat(buf, pb);
+strcat(buf,  - );
+ps = strlen(buf);
+if (rsaddr.sa_family == AF_INET) {
+struct sockaddr_in  *sa = (struct sockaddr_in  *)rsaddr;
+inet_ntop4((unsigned char *)sa-sin_addr,  buf + ps, 16);
+sprintf(pb, :%d, (unsigned int)htons(sa-sin_port));
+}
+#if APR_HAVE_IPV6
+else {
+struct sockaddr_in6 *sa = (struct sockaddr_in6 *)rsaddr;
+inet_ntop6((unsigned char *)sa-sin6_addr, buf + ps, 64);
+sprintf(pb, :%d, (unsigned int)htons(sa-sin6_port));
+}
+#endif
+strcat(buf, pb);
 return buf;
 }
 }



-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org



svn commit: r1523544 - in /tomcat/native/branches/1.1.x: build.properties.default build.xml native/include/tcn_version.h native/os/win32/libtcnative.rc xdocs/index.xml xdocs/news/2013.xml

2013-09-16 Thread mturk
Author: mturk
Date: Mon Sep 16 06:04:51 2013
New Revision: 1523544

URL: http://svn.apache.org/r1523544
Log:
Add 1.1.28 release note and increment version numbers

Modified:
tomcat/native/branches/1.1.x/build.properties.default
tomcat/native/branches/1.1.x/build.xml
tomcat/native/branches/1.1.x/native/include/tcn_version.h
tomcat/native/branches/1.1.x/native/os/win32/libtcnative.rc
tomcat/native/branches/1.1.x/xdocs/index.xml
tomcat/native/branches/1.1.x/xdocs/news/2013.xml

Modified: tomcat/native/branches/1.1.x/build.properties.default
URL: 
http://svn.apache.org/viewvc/tomcat/native/branches/1.1.x/build.properties.default?rev=1523544r1=1523543r2=1523544view=diff
==
--- tomcat/native/branches/1.1.x/build.properties.default (original)
+++ tomcat/native/branches/1.1.x/build.properties.default Mon Sep 16 06:04:51 
2013
@@ -18,7 +18,7 @@
 # - Version Control Flags -
 version.major=1
 version.minor=1
-version.build=28
+version.build=29
 version.patch=0
 version.suffix=-dev
 #version.suffix=

Modified: tomcat/native/branches/1.1.x/build.xml
URL: 
http://svn.apache.org/viewvc/tomcat/native/branches/1.1.x/build.xml?rev=1523544r1=1523543r2=1523544view=diff
==
--- tomcat/native/branches/1.1.x/build.xml (original)
+++ tomcat/native/branches/1.1.x/build.xml Mon Sep 16 06:04:51 2013
@@ -33,7 +33,7 @@
 property name=year  value=2013 /
 property name=version.major value=1 /
 property name=version.minor value=1 /
-property name=version.build value=23 /
+property name=version.build value=29 /
 property name=version.patch value=0 /
 property name=version.suffixvalue=-dev /
 

Modified: tomcat/native/branches/1.1.x/native/include/tcn_version.h
URL: 
http://svn.apache.org/viewvc/tomcat/native/branches/1.1.x/native/include/tcn_version.h?rev=1523544r1=1523543r2=1523544view=diff
==
--- tomcat/native/branches/1.1.x/native/include/tcn_version.h (original)
+++ tomcat/native/branches/1.1.x/native/include/tcn_version.h Mon Sep 16 
06:04:51 2013
@@ -69,13 +69,13 @@ extern C {
 #define TCN_MINOR_VERSION   1
 
 /** patch level */
-#define TCN_PATCH_VERSION   28
+#define TCN_PATCH_VERSION   29
 
 /**
  *  This symbol is defined for internal, development copies of TCN. This
  *  symbol will be #undef'd for releases.
  */
-#define TCN_IS_DEV_VERSION  0
+#define TCN_IS_DEV_VERSION  1
 
 
 /** The formatted string of APU's version */

Modified: tomcat/native/branches/1.1.x/native/os/win32/libtcnative.rc
URL: 
http://svn.apache.org/viewvc/tomcat/native/branches/1.1.x/native/os/win32/libtcnative.rc?rev=1523544r1=1523543r2=1523544view=diff
==
--- tomcat/native/branches/1.1.x/native/os/win32/libtcnative.rc (original)
+++ tomcat/native/branches/1.1.x/native/os/win32/libtcnative.rc Mon Sep 16 
06:04:51 2013
@@ -20,7 +20,7 @@ LANGUAGE 0x9,0x1
  See the License for the specific language governing  \
  permissions and limitations under the License.
 
-#define TCN_VERSION 1.1.28
+#define TCN_VERSION 1.1.29
 1000 ICON apache.ico
 
 1001 DIALOGEX 0, 0, 252, 51
@@ -36,8 +36,8 @@ BEGIN
 END
 
 1 VERSIONINFO
- FILEVERSION 1,1,28,0
- PRODUCTVERSION 1,1,28,0
+ FILEVERSION 1,1,29,0
+ PRODUCTVERSION 1,1,29,0
  FILEFLAGSMASK 0x3fL
 #ifdef _DEBUG
  FILEFLAGS 0x1L

Modified: tomcat/native/branches/1.1.x/xdocs/index.xml
URL: 
http://svn.apache.org/viewvc/tomcat/native/branches/1.1.x/xdocs/index.xml?rev=1523544r1=1523543r2=1523544view=diff
==
--- tomcat/native/branches/1.1.x/xdocs/index.xml (original)
+++ tomcat/native/branches/1.1.x/xdocs/index.xml Mon Sep 16 06:04:51 2013
@@ -66,8 +66,8 @@
 br /
 ul
 
-lia href=news/2013.html#20130211.112 February 2013 - bTC-Native-1.1.27 
released/b/a
-pThe Apache Tomcat team is proud to announce the immediate availability of 
Tomcat Native 1.1.27 Stable.
+lia href=news/2013.html#20130916.116 September 2013 - 
bTC-Native-1.1.28 released/b/a
+pThe Apache Tomcat team is proud to announce the immediate availability of 
Tomcat Native 1.1.28 Stable.
 /p
 p
  The sources and the binaries for selected platforms are available from the

Modified: tomcat/native/branches/1.1.x/xdocs/news/2013.xml
URL: 
http://svn.apache.org/viewvc/tomcat/native/branches/1.1.x/xdocs/news/2013.xml?rev=1523544r1=1523543r2=1523544view=diff
==
--- tomcat/native/branches/1.1.x/xdocs/news/2013.xml (original)
+++ tomcat/native/branches/1.1.x/xdocs/news/2013.xml Mon Sep 16 06:04:51 2013
@@ -31,6 +31,18 @@
 
 section name=2013 News amp

svn commit: r2898 - in /release/tomcat/tomcat-connectors/native: ./ 1.1.28/ 1.1.28/binaries/ 1.1.28/source/

2013-09-16 Thread mturk
Author: mturk
Date: Mon Sep 16 06:14:45 2013
New Revision: 2898

Log:
Add voted Tomcat Native 1.1.28 artefacts

Added:
release/tomcat/tomcat-connectors/native/1.1.28/
release/tomcat/tomcat-connectors/native/1.1.28/binaries/

release/tomcat/tomcat-connectors/native/1.1.28/binaries/tomcat-native-1.1.28-ocsp-win32-bin.zip
   (with props)

release/tomcat/tomcat-connectors/native/1.1.28/binaries/tomcat-native-1.1.28-ocsp-win32-bin.zip.asc
   (with props)

release/tomcat/tomcat-connectors/native/1.1.28/binaries/tomcat-native-1.1.28-ocsp-win32-bin.zip.md5

release/tomcat/tomcat-connectors/native/1.1.28/binaries/tomcat-native-1.1.28-ocsp-win32-bin.zip.sha1

release/tomcat/tomcat-connectors/native/1.1.28/binaries/tomcat-native-1.1.28-win32-bin.zip
   (with props)

release/tomcat/tomcat-connectors/native/1.1.28/binaries/tomcat-native-1.1.28-win32-bin.zip.asc
   (with props)

release/tomcat/tomcat-connectors/native/1.1.28/binaries/tomcat-native-1.1.28-win32-bin.zip.md5

release/tomcat/tomcat-connectors/native/1.1.28/binaries/tomcat-native-1.1.28-win32-bin.zip.sha1
release/tomcat/tomcat-connectors/native/1.1.28/source/

release/tomcat/tomcat-connectors/native/1.1.28/source/tomcat-native-1.1.28-src.tar.gz
   (with props)

release/tomcat/tomcat-connectors/native/1.1.28/source/tomcat-native-1.1.28-src.tar.gz.asc
   (with props)

release/tomcat/tomcat-connectors/native/1.1.28/source/tomcat-native-1.1.28-src.tar.gz.md5

release/tomcat/tomcat-connectors/native/1.1.28/source/tomcat-native-1.1.28-src.tar.gz.sha1

release/tomcat/tomcat-connectors/native/1.1.28/source/tomcat-native-1.1.28-win32-src.zip
   (with props)

release/tomcat/tomcat-connectors/native/1.1.28/source/tomcat-native-1.1.28-win32-src.zip.asc
   (with props)

release/tomcat/tomcat-connectors/native/1.1.28/source/tomcat-native-1.1.28-win32-src.zip.md5

release/tomcat/tomcat-connectors/native/1.1.28/source/tomcat-native-1.1.28-win32-src.zip.sha1
Modified:
release/tomcat/tomcat-connectors/native/README.html

Added: 
release/tomcat/tomcat-connectors/native/1.1.28/binaries/tomcat-native-1.1.28-ocsp-win32-bin.zip
==
Binary file - no diff available.

Propchange: 
release/tomcat/tomcat-connectors/native/1.1.28/binaries/tomcat-native-1.1.28-ocsp-win32-bin.zip
--
svn:mime-type = application/zip

Added: 
release/tomcat/tomcat-connectors/native/1.1.28/binaries/tomcat-native-1.1.28-ocsp-win32-bin.zip.asc
==
--- 
release/tomcat/tomcat-connectors/native/1.1.28/binaries/tomcat-native-1.1.28-ocsp-win32-bin.zip.asc
 (added)
+++ 
release/tomcat/tomcat-connectors/native/1.1.28/binaries/tomcat-native-1.1.28-ocsp-win32-bin.zip.asc
 Mon Sep 16 06:14:45 2013
@@ -0,0 +1,7 @@
+-BEGIN PGP SIGNATURE-
+Version: GnuPG v1.4.13 (GNU/Linux)
+
+iF4EABEIAAYFAlItr7MACgkQNc0jwQ1JjiNXKQD8D93y/1xeroJlVb8JlMNWwnUg
+wyM30MMLO3m7eGqqkZUA/2/iGaa4g/3w9J9r5dpXeMak1urwzhSFl7USFtIpafJz
+=cmln
+-END PGP SIGNATURE-

Propchange: 
release/tomcat/tomcat-connectors/native/1.1.28/binaries/tomcat-native-1.1.28-ocsp-win32-bin.zip.asc
--
svn:eol-style = native

Propchange: 
release/tomcat/tomcat-connectors/native/1.1.28/binaries/tomcat-native-1.1.28-ocsp-win32-bin.zip.asc
--
svn:mime-type = text/plain

Added: 
release/tomcat/tomcat-connectors/native/1.1.28/binaries/tomcat-native-1.1.28-ocsp-win32-bin.zip.md5
==
--- 
release/tomcat/tomcat-connectors/native/1.1.28/binaries/tomcat-native-1.1.28-ocsp-win32-bin.zip.md5
 (added)
+++ 
release/tomcat/tomcat-connectors/native/1.1.28/binaries/tomcat-native-1.1.28-ocsp-win32-bin.zip.md5
 Mon Sep 16 06:14:45 2013
@@ -0,0 +1 @@
+cb20f9cceaa25e1e9b1b7c6949171593 *tomcat-native-1.1.28-ocsp-win32-bin.zip

Added: 
release/tomcat/tomcat-connectors/native/1.1.28/binaries/tomcat-native-1.1.28-ocsp-win32-bin.zip.sha1
==
--- 
release/tomcat/tomcat-connectors/native/1.1.28/binaries/tomcat-native-1.1.28-ocsp-win32-bin.zip.sha1
 (added)
+++ 
release/tomcat/tomcat-connectors/native/1.1.28/binaries/tomcat-native-1.1.28-ocsp-win32-bin.zip.sha1
 Mon Sep 16 06:14:45 2013
@@ -0,0 +1 @@
+27c2830ce13b23d414206884422d2cc5b6eadb6e 
*tomcat-native-1.1.28-ocsp-win32-bin.zip

Added: 
release/tomcat/tomcat-connectors/native/1.1.28/binaries/tomcat-native-1.1.28-win32-bin.zip
==
Binary file - no diff available.

Propchange: 
release/tomcat/tomcat-connectors/native/1.1.28/binaries/tomcat-native-1.1.28

svn commit: r2898 - in /release/tomcat/tomcat-connectors/native: ./ 1.1.28/ 1.1.28/binaries/ 1.1.28/source/

2013-09-16 Thread mturk
Author: mturk
Date: Mon Sep 16 06:14:45 2013
New Revision: 2898

Log:
Add voted Tomcat Native 1.1.28 artefacts

Added:
release/tomcat/tomcat-connectors/native/1.1.28/
release/tomcat/tomcat-connectors/native/1.1.28/binaries/

release/tomcat/tomcat-connectors/native/1.1.28/binaries/tomcat-native-1.1.28-ocsp-win32-bin.zip
   (with props)

release/tomcat/tomcat-connectors/native/1.1.28/binaries/tomcat-native-1.1.28-ocsp-win32-bin.zip.asc
   (with props)

release/tomcat/tomcat-connectors/native/1.1.28/binaries/tomcat-native-1.1.28-ocsp-win32-bin.zip.md5

release/tomcat/tomcat-connectors/native/1.1.28/binaries/tomcat-native-1.1.28-ocsp-win32-bin.zip.sha1

release/tomcat/tomcat-connectors/native/1.1.28/binaries/tomcat-native-1.1.28-win32-bin.zip
   (with props)

release/tomcat/tomcat-connectors/native/1.1.28/binaries/tomcat-native-1.1.28-win32-bin.zip.asc
   (with props)

release/tomcat/tomcat-connectors/native/1.1.28/binaries/tomcat-native-1.1.28-win32-bin.zip.md5

release/tomcat/tomcat-connectors/native/1.1.28/binaries/tomcat-native-1.1.28-win32-bin.zip.sha1
release/tomcat/tomcat-connectors/native/1.1.28/source/

release/tomcat/tomcat-connectors/native/1.1.28/source/tomcat-native-1.1.28-src.tar.gz
   (with props)

release/tomcat/tomcat-connectors/native/1.1.28/source/tomcat-native-1.1.28-src.tar.gz.asc
   (with props)

release/tomcat/tomcat-connectors/native/1.1.28/source/tomcat-native-1.1.28-src.tar.gz.md5

release/tomcat/tomcat-connectors/native/1.1.28/source/tomcat-native-1.1.28-src.tar.gz.sha1

release/tomcat/tomcat-connectors/native/1.1.28/source/tomcat-native-1.1.28-win32-src.zip
   (with props)

release/tomcat/tomcat-connectors/native/1.1.28/source/tomcat-native-1.1.28-win32-src.zip.asc
   (with props)

release/tomcat/tomcat-connectors/native/1.1.28/source/tomcat-native-1.1.28-win32-src.zip.md5

release/tomcat/tomcat-connectors/native/1.1.28/source/tomcat-native-1.1.28-win32-src.zip.sha1
Modified:
release/tomcat/tomcat-connectors/native/README.html

Added: 
release/tomcat/tomcat-connectors/native/1.1.28/binaries/tomcat-native-1.1.28-ocsp-win32-bin.zip
==
Binary file - no diff available.

Propchange: 
release/tomcat/tomcat-connectors/native/1.1.28/binaries/tomcat-native-1.1.28-ocsp-win32-bin.zip
--
svn:mime-type = application/zip

Added: 
release/tomcat/tomcat-connectors/native/1.1.28/binaries/tomcat-native-1.1.28-ocsp-win32-bin.zip.asc
==
--- 
release/tomcat/tomcat-connectors/native/1.1.28/binaries/tomcat-native-1.1.28-ocsp-win32-bin.zip.asc
 (added)
+++ 
release/tomcat/tomcat-connectors/native/1.1.28/binaries/tomcat-native-1.1.28-ocsp-win32-bin.zip.asc
 Mon Sep 16 06:14:45 2013
@@ -0,0 +1,7 @@
+-BEGIN PGP SIGNATURE-
+Version: GnuPG v1.4.13 (GNU/Linux)
+
+iF4EABEIAAYFAlItr7MACgkQNc0jwQ1JjiNXKQD8D93y/1xeroJlVb8JlMNWwnUg
+wyM30MMLO3m7eGqqkZUA/2/iGaa4g/3w9J9r5dpXeMak1urwzhSFl7USFtIpafJz
+=cmln
+-END PGP SIGNATURE-

Propchange: 
release/tomcat/tomcat-connectors/native/1.1.28/binaries/tomcat-native-1.1.28-ocsp-win32-bin.zip.asc
--
svn:eol-style = native

Propchange: 
release/tomcat/tomcat-connectors/native/1.1.28/binaries/tomcat-native-1.1.28-ocsp-win32-bin.zip.asc
--
svn:mime-type = text/plain

Added: 
release/tomcat/tomcat-connectors/native/1.1.28/binaries/tomcat-native-1.1.28-ocsp-win32-bin.zip.md5
==
--- 
release/tomcat/tomcat-connectors/native/1.1.28/binaries/tomcat-native-1.1.28-ocsp-win32-bin.zip.md5
 (added)
+++ 
release/tomcat/tomcat-connectors/native/1.1.28/binaries/tomcat-native-1.1.28-ocsp-win32-bin.zip.md5
 Mon Sep 16 06:14:45 2013
@@ -0,0 +1 @@
+cb20f9cceaa25e1e9b1b7c6949171593 *tomcat-native-1.1.28-ocsp-win32-bin.zip

Added: 
release/tomcat/tomcat-connectors/native/1.1.28/binaries/tomcat-native-1.1.28-ocsp-win32-bin.zip.sha1
==
--- 
release/tomcat/tomcat-connectors/native/1.1.28/binaries/tomcat-native-1.1.28-ocsp-win32-bin.zip.sha1
 (added)
+++ 
release/tomcat/tomcat-connectors/native/1.1.28/binaries/tomcat-native-1.1.28-ocsp-win32-bin.zip.sha1
 Mon Sep 16 06:14:45 2013
@@ -0,0 +1 @@
+27c2830ce13b23d414206884422d2cc5b6eadb6e 
*tomcat-native-1.1.28-ocsp-win32-bin.zip

Added: 
release/tomcat/tomcat-connectors/native/1.1.28/binaries/tomcat-native-1.1.28-win32-bin.zip
==
Binary file - no diff available.

Propchange: 
release/tomcat/tomcat-connectors/native/1.1.28/binaries/tomcat-native-1.1.28

svn commit: r1521546 - /tomcat/jk/trunk/native/common/jk_connect.c

2013-09-10 Thread mturk
Author: mturk
Date: Tue Sep 10 16:44:48 2013
New Revision: 1521546

URL: http://svn.apache.org/r1521546
Log:
Do not use APR types for common code

Modified:
tomcat/jk/trunk/native/common/jk_connect.c

Modified: tomcat/jk/trunk/native/common/jk_connect.c
URL: 
http://svn.apache.org/viewvc/tomcat/jk/trunk/native/common/jk_connect.c?rev=1521546r1=1521545r2=1521546view=diff
==
--- tomcat/jk/trunk/native/common/jk_connect.c (original)
+++ tomcat/jk/trunk/native/common/jk_connect.c Tue Sep 10 16:44:48 2013
@@ -64,7 +64,7 @@ static apr_pool_t *jk_apr_pool = NULL;
 #endif
 
 #ifndef INT16SZ
-#define INT16SZ sizeof(apr_int16_t)
+#define INT16SZ sizeof(short)
 #endif
 
 #if !defined(EAFNOSUPPORT)  defined(WSAEAFNOSUPPORT)
@@ -978,7 +978,7 @@ int jk_tcp_socket_recvfull(jk_sock_t sd,
  */
 static const char *inet_ntop4(const unsigned char *src, char *dst, size_t size)
 {
-const apr_size_t MIN_SIZE = 16; /* space for 255.255.255.255\0 */
+const size_t MIN_SIZE = 16; /* space for 255.255.255.255\0 */
 int n = 0;
 char *next = dst;
 



-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org



svn commit: r1520968 - /tomcat/native/branches/1.1.x/native/srclib/VERSIONS

2013-09-09 Thread mturk
Author: mturk
Date: Mon Sep  9 07:03:29 2013
New Revision: 1520968

URL: http://svn.apache.org/r1520968
Log:
Update versions that will be used in next binary release

Modified:
tomcat/native/branches/1.1.x/native/srclib/VERSIONS

Modified: tomcat/native/branches/1.1.x/native/srclib/VERSIONS
URL: 
http://svn.apache.org/viewvc/tomcat/native/branches/1.1.x/native/srclib/VERSIONS?rev=1520968r1=1520967r2=1520968view=diff
==
--- tomcat/native/branches/1.1.x/native/srclib/VERSIONS (original)
+++ tomcat/native/branches/1.1.x/native/srclib/VERSIONS Mon Sep  9 07:03:29 2013
@@ -1,6 +1,4 @@
 Use the following version of the libraries
 
-- APR 1.4.6, http://apr.apache.org
-- OpenSSL 1.0.1d, http://www.openssl.org
-  Applied patch for openssl.org issue #2975
-  http://git.openssl.org/gitweb/?p=openssl.git;a=patch;h=32cc247
+- APR 1.4.8, http://apr.apache.org
+- OpenSSL 1.0.1e, http://www.openssl.org



-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org



svn commit: r1520969 - /tomcat/native/branches/1.1.x/native/include/tcn_version.h

2013-09-09 Thread mturk
Author: mturk
Date: Mon Sep  9 07:09:41 2013
New Revision: 1520969

URL: http://svn.apache.org/r1520969
Log:
Update release before tag

Modified:
tomcat/native/branches/1.1.x/native/include/tcn_version.h

Modified: tomcat/native/branches/1.1.x/native/include/tcn_version.h
URL: 
http://svn.apache.org/viewvc/tomcat/native/branches/1.1.x/native/include/tcn_version.h?rev=1520969r1=1520968r2=1520969view=diff
==
--- tomcat/native/branches/1.1.x/native/include/tcn_version.h (original)
+++ tomcat/native/branches/1.1.x/native/include/tcn_version.h Mon Sep  9 
07:09:41 2013
@@ -75,7 +75,7 @@ extern C {
  *  This symbol is defined for internal, development copies of TCN. This
  *  symbol will be #undef'd for releases.
  */
-#define TCN_IS_DEV_VERSION  1
+#define TCN_IS_DEV_VERSION  0
 
 
 /** The formatted string of APU's version */



-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org



  1   2   3   4   5   6   7   8   9   10   >