You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tomcat.apache.org by ma...@apache.org on 2015/11/02 16:10:18 UTC

svn commit: r10986 - in /dev/tomcat/tomcat-connectors/native/1.2.1: ./ source/

Author: markt
Date: Mon Nov  2 15:10:18 2015
New Revision: 10986

Log:
Upload Tomcat Native 1.2.1 source files

Added:
    dev/tomcat/tomcat-connectors/native/1.2.1/
    dev/tomcat/tomcat-connectors/native/1.2.1/source/
    dev/tomcat/tomcat-connectors/native/1.2.1/source/tomcat-native-1.2.1-src.tar.gz   (with props)
    dev/tomcat/tomcat-connectors/native/1.2.1/source/tomcat-native-1.2.1-src.tar.gz.asc
    dev/tomcat/tomcat-connectors/native/1.2.1/source/tomcat-native-1.2.1-src.tar.gz.md5
    dev/tomcat/tomcat-connectors/native/1.2.1/source/tomcat-native-1.2.1-src.tar.gz.sha1
    dev/tomcat/tomcat-connectors/native/1.2.1/source/tomcat-native-1.2.1-win32-src.zip   (with props)
    dev/tomcat/tomcat-connectors/native/1.2.1/source/tomcat-native-1.2.1-win32-src.zip.asc
    dev/tomcat/tomcat-connectors/native/1.2.1/source/tomcat-native-1.2.1-win32-src.zip.md5
    dev/tomcat/tomcat-connectors/native/1.2.1/source/tomcat-native-1.2.1-win32-src.zip.sha1

Added: dev/tomcat/tomcat-connectors/native/1.2.1/source/tomcat-native-1.2.1-src.tar.gz
==============================================================================
Binary file - no diff available.

Propchange: dev/tomcat/tomcat-connectors/native/1.2.1/source/tomcat-native-1.2.1-src.tar.gz
------------------------------------------------------------------------------
    svn:mime-type = application/x-gzip

Added: dev/tomcat/tomcat-connectors/native/1.2.1/source/tomcat-native-1.2.1-src.tar.gz.asc
==============================================================================
--- dev/tomcat/tomcat-connectors/native/1.2.1/source/tomcat-native-1.2.1-src.tar.gz.asc (added)
+++ dev/tomcat/tomcat-connectors/native/1.2.1/source/tomcat-native-1.2.1-src.tar.gz.asc Mon Nov  2 15:10:18 2015
@@ -0,0 +1,17 @@
+-----BEGIN PGP SIGNATURE-----
+Comment: GPGTools - http://gpgtools.org
+
+iQIcBAABCAAGBQJWN3rrAAoJEBDAHFovYFnnHnwP/RmW3NPQ8mRwvc3hLrU58+JI
+eA5RQySFQphTaA16x5uMOTbg0WRf69lTGx8qpxD5lwvuZl/WYD6keWVm3mhTpnts
+SIwf/d54im17O1ZPfJRAlU8sBYX/Xnu72KpgNOPPZvckhscrWpx1/c5MNpelSCW3
+Ud+9xyXMX+zo163uJnfmLplJZqtJYLmyl2qhtjRxm9bzePo9r8EuWKnCDUgMl3Yi
+EnV5q5Ut3wMxdh/fykvmgcMnX9ACD+GVQf088dGAD7WtMuaRnk8rvsbFLU9/e1oX
+keDEuuAgNhxHsBy/ULgXpOzTFice0Wo15dayFT20j2FPxtsb19LbGLMkUFm3QfPF
+aJ+tUnvOmkAnCHzem0iX5EcXe5KFhh9JRBnog5LUEWwsz6/S0ITekIP9mFsdJB+f
+og4v55WMZnnRH/tJ6TbDtFkZpMCq5VjpWCgpIzrs2luZDl8bL51nW675ri51peAe
+Vu630/UIaxS+w8Jt92bSI4sBd46YCNUOCOeQ28Ua3JnudUqOxp9aaBFQv0eBkapc
+U1ubGXtFYgEwOB1syo/GrdA+LX4EkpqqNcSh+ltV7KK+eFwq4jwl7uLmTB4i6Ndt
+BmEkm4Qi+QSTQ6ySqEpDXKfdAeQMg32MyvPKX29a9HeS2VRUwydLfvNXEYlGKVmd
+IphDjxfz9/3o0XObqT6Y
+=F6qM
+-----END PGP SIGNATURE-----

Added: dev/tomcat/tomcat-connectors/native/1.2.1/source/tomcat-native-1.2.1-src.tar.gz.md5
==============================================================================
--- dev/tomcat/tomcat-connectors/native/1.2.1/source/tomcat-native-1.2.1-src.tar.gz.md5 (added)
+++ dev/tomcat/tomcat-connectors/native/1.2.1/source/tomcat-native-1.2.1-src.tar.gz.md5 Mon Nov  2 15:10:18 2015
@@ -0,0 +1 @@
+2fc6c513e8cbef00bf87abdca697995a *tomcat-native-1.2.1-src.tar.gz
\ No newline at end of file

Added: dev/tomcat/tomcat-connectors/native/1.2.1/source/tomcat-native-1.2.1-src.tar.gz.sha1
==============================================================================
--- dev/tomcat/tomcat-connectors/native/1.2.1/source/tomcat-native-1.2.1-src.tar.gz.sha1 (added)
+++ dev/tomcat/tomcat-connectors/native/1.2.1/source/tomcat-native-1.2.1-src.tar.gz.sha1 Mon Nov  2 15:10:18 2015
@@ -0,0 +1 @@
+a3698c32bcc02b0054c7b6c8362f6793902fe77b *tomcat-native-1.2.1-src.tar.gz
\ No newline at end of file

Added: dev/tomcat/tomcat-connectors/native/1.2.1/source/tomcat-native-1.2.1-win32-src.zip
==============================================================================
Binary file - no diff available.

Propchange: dev/tomcat/tomcat-connectors/native/1.2.1/source/tomcat-native-1.2.1-win32-src.zip
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

Added: dev/tomcat/tomcat-connectors/native/1.2.1/source/tomcat-native-1.2.1-win32-src.zip.asc
==============================================================================
--- dev/tomcat/tomcat-connectors/native/1.2.1/source/tomcat-native-1.2.1-win32-src.zip.asc (added)
+++ dev/tomcat/tomcat-connectors/native/1.2.1/source/tomcat-native-1.2.1-win32-src.zip.asc Mon Nov  2 15:10:18 2015
@@ -0,0 +1,17 @@
+-----BEGIN PGP SIGNATURE-----
+Comment: GPGTools - http://gpgtools.org
+
+iQIcBAABCAAGBQJWN3rrAAoJEBDAHFovYFnnnqgQAJ9av9GzZWy6dCyCxaFCJSRE
++SO2d/9kaPsC1l48HpLnSfzGgQMm5PElPS5fmrXCz+U5MLz6sAWYb67u7Cey3Btk
+PtWWrJgEqvzGIJPXU/0EjFiShLFyKUFBB9ul0OLi2eUqnyuR5lVYDqVPMt/QehNM
+gC74esyQpQ4yUCAhnKvqRE89gTnG3lp7flbUDVOli4dydTS7rpKuH8l3PXefNIPM
+miYKr1ur+w/zgVQcUkTTXl/XQqq9g+lsod6MbeoWXxQczfMZyR1QYxSKqv4FrNbC
+/+xfdvt0QRbqmQNo/NJBapcUYHD1BOncvvn0X+ZO5yFSuhzOHxwVvdIam4L2JVky
+w/kYHDQvWRk6b9gKV8u9HlhimUZV1KFXnKvnZxI4UuAHtsEf06XoCF+Kae5U4Sa6
+ZFZ11vjCralWqDCkg50aQwSpGKGC2tEQRiTHc38zdfBD/3MmHs+hJ/W9PVMYbEXA
+pMni8ty1buCWLuoMrXYO7EwAHfrH6M5UbnWIPZExXASPFc6thkn3/WAM9BBuEXAT
+LSJ04sGyx7Occ6pzJHX7u//RRFzft7CmrHzDh7i8Z3exvQM7fFZrEbCvSDO0V7KS
+cNGMZ0bpz0Q2eK5caPtVGEuHO9Dn+B28Dg5ZI5ltm9zoThzYLsPz8064/6HTe9Ui
+wEzoMOvitW1a+4IGh5iC
+=jNfN
+-----END PGP SIGNATURE-----

Added: dev/tomcat/tomcat-connectors/native/1.2.1/source/tomcat-native-1.2.1-win32-src.zip.md5
==============================================================================
--- dev/tomcat/tomcat-connectors/native/1.2.1/source/tomcat-native-1.2.1-win32-src.zip.md5 (added)
+++ dev/tomcat/tomcat-connectors/native/1.2.1/source/tomcat-native-1.2.1-win32-src.zip.md5 Mon Nov  2 15:10:18 2015
@@ -0,0 +1 @@
+0559054825af69cc78f1cd9ab6966269 *tomcat-native-1.2.1-win32-src.zip
\ No newline at end of file

Added: dev/tomcat/tomcat-connectors/native/1.2.1/source/tomcat-native-1.2.1-win32-src.zip.sha1
==============================================================================
--- dev/tomcat/tomcat-connectors/native/1.2.1/source/tomcat-native-1.2.1-win32-src.zip.sha1 (added)
+++ dev/tomcat/tomcat-connectors/native/1.2.1/source/tomcat-native-1.2.1-win32-src.zip.sha1 Mon Nov  2 15:10:18 2015
@@ -0,0 +1 @@
+e22c1c2a3a006bd0b93916fdb99202c94f60d3f8 *tomcat-native-1.2.1-win32-src.zip
\ No newline at end of file



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


Re: svn commit: r10986 - in /dev/tomcat/tomcat-connectors/native/1.2.1: ./ source/

Posted by Felix Schumacher <fe...@internetallee.de>.
Am 02.11.2015 um 16:20 schrieb Mark Thomas:
> On 02/11/2015 15:10, markt@apache.org wrote:
>> Author: markt
>> Date: Mon Nov  2 15:10:18 2015
>> New Revision: 10986
>>
>> Log:
>> Upload Tomcat Native 1.2.1 source files
> The Windows binaries should follow shortly. I've tested building on OSX
> from the tar.gz archive and that works so I believe that the problems
> with 1.2.0 are resolved.
I tried  to build it on ubuntu 14.04 LTS, but since that only includes 
openssl 1.0.1, it will not build (out of the box).

Felix
>
> Mark
>
>
>> Added:
>>      dev/tomcat/tomcat-connectors/native/1.2.1/
>>      dev/tomcat/tomcat-connectors/native/1.2.1/source/
>>      dev/tomcat/tomcat-connectors/native/1.2.1/source/tomcat-native-1.2.1-src.tar.gz   (with props)
>>      dev/tomcat/tomcat-connectors/native/1.2.1/source/tomcat-native-1.2.1-src.tar.gz.asc
>>      dev/tomcat/tomcat-connectors/native/1.2.1/source/tomcat-native-1.2.1-src.tar.gz.md5
>>      dev/tomcat/tomcat-connectors/native/1.2.1/source/tomcat-native-1.2.1-src.tar.gz.sha1
>>      dev/tomcat/tomcat-connectors/native/1.2.1/source/tomcat-native-1.2.1-win32-src.zip   (with props)
>>      dev/tomcat/tomcat-connectors/native/1.2.1/source/tomcat-native-1.2.1-win32-src.zip.asc
>>      dev/tomcat/tomcat-connectors/native/1.2.1/source/tomcat-native-1.2.1-win32-src.zip.md5
>>      dev/tomcat/tomcat-connectors/native/1.2.1/source/tomcat-native-1.2.1-win32-src.zip.sha1
>>
>> Added: dev/tomcat/tomcat-connectors/native/1.2.1/source/tomcat-native-1.2.1-src.tar.gz
>> ==============================================================================
>> Binary file - no diff available.
>>
>> Propchange: dev/tomcat/tomcat-connectors/native/1.2.1/source/tomcat-native-1.2.1-src.tar.gz
>> ------------------------------------------------------------------------------
>>      svn:mime-type = application/x-gzip
>>
>> Added: dev/tomcat/tomcat-connectors/native/1.2.1/source/tomcat-native-1.2.1-src.tar.gz.asc
>> ==============================================================================
>> --- dev/tomcat/tomcat-connectors/native/1.2.1/source/tomcat-native-1.2.1-src.tar.gz.asc (added)
>> +++ dev/tomcat/tomcat-connectors/native/1.2.1/source/tomcat-native-1.2.1-src.tar.gz.asc Mon Nov  2 15:10:18 2015
>> @@ -0,0 +1,17 @@
>> +-----BEGIN PGP SIGNATURE-----
>> +Comment: GPGTools - http://gpgtools.org
>> +
>> +iQIcBAABCAAGBQJWN3rrAAoJEBDAHFovYFnnHnwP/RmW3NPQ8mRwvc3hLrU58+JI
>> +eA5RQySFQphTaA16x5uMOTbg0WRf69lTGx8qpxD5lwvuZl/WYD6keWVm3mhTpnts
>> +SIwf/d54im17O1ZPfJRAlU8sBYX/Xnu72KpgNOPPZvckhscrWpx1/c5MNpelSCW3
>> +Ud+9xyXMX+zo163uJnfmLplJZqtJYLmyl2qhtjRxm9bzePo9r8EuWKnCDUgMl3Yi
>> +EnV5q5Ut3wMxdh/fykvmgcMnX9ACD+GVQf088dGAD7WtMuaRnk8rvsbFLU9/e1oX
>> +keDEuuAgNhxHsBy/ULgXpOzTFice0Wo15dayFT20j2FPxtsb19LbGLMkUFm3QfPF
>> +aJ+tUnvOmkAnCHzem0iX5EcXe5KFhh9JRBnog5LUEWwsz6/S0ITekIP9mFsdJB+f
>> +og4v55WMZnnRH/tJ6TbDtFkZpMCq5VjpWCgpIzrs2luZDl8bL51nW675ri51peAe
>> +Vu630/UIaxS+w8Jt92bSI4sBd46YCNUOCOeQ28Ua3JnudUqOxp9aaBFQv0eBkapc
>> +U1ubGXtFYgEwOB1syo/GrdA+LX4EkpqqNcSh+ltV7KK+eFwq4jwl7uLmTB4i6Ndt
>> +BmEkm4Qi+QSTQ6ySqEpDXKfdAeQMg32MyvPKX29a9HeS2VRUwydLfvNXEYlGKVmd
>> +IphDjxfz9/3o0XObqT6Y
>> +=F6qM
>> +-----END PGP SIGNATURE-----
>>
>> Added: dev/tomcat/tomcat-connectors/native/1.2.1/source/tomcat-native-1.2.1-src.tar.gz.md5
>> ==============================================================================
>> --- dev/tomcat/tomcat-connectors/native/1.2.1/source/tomcat-native-1.2.1-src.tar.gz.md5 (added)
>> +++ dev/tomcat/tomcat-connectors/native/1.2.1/source/tomcat-native-1.2.1-src.tar.gz.md5 Mon Nov  2 15:10:18 2015
>> @@ -0,0 +1 @@
>> +2fc6c513e8cbef00bf87abdca697995a *tomcat-native-1.2.1-src.tar.gz
>> \ No newline at end of file
>>
>> Added: dev/tomcat/tomcat-connectors/native/1.2.1/source/tomcat-native-1.2.1-src.tar.gz.sha1
>> ==============================================================================
>> --- dev/tomcat/tomcat-connectors/native/1.2.1/source/tomcat-native-1.2.1-src.tar.gz.sha1 (added)
>> +++ dev/tomcat/tomcat-connectors/native/1.2.1/source/tomcat-native-1.2.1-src.tar.gz.sha1 Mon Nov  2 15:10:18 2015
>> @@ -0,0 +1 @@
>> +a3698c32bcc02b0054c7b6c8362f6793902fe77b *tomcat-native-1.2.1-src.tar.gz
>> \ No newline at end of file
>>
>> Added: dev/tomcat/tomcat-connectors/native/1.2.1/source/tomcat-native-1.2.1-win32-src.zip
>> ==============================================================================
>> Binary file - no diff available.
>>
>> Propchange: dev/tomcat/tomcat-connectors/native/1.2.1/source/tomcat-native-1.2.1-win32-src.zip
>> ------------------------------------------------------------------------------
>>      svn:mime-type = application/octet-stream
>>
>> Added: dev/tomcat/tomcat-connectors/native/1.2.1/source/tomcat-native-1.2.1-win32-src.zip.asc
>> ==============================================================================
>> --- dev/tomcat/tomcat-connectors/native/1.2.1/source/tomcat-native-1.2.1-win32-src.zip.asc (added)
>> +++ dev/tomcat/tomcat-connectors/native/1.2.1/source/tomcat-native-1.2.1-win32-src.zip.asc Mon Nov  2 15:10:18 2015
>> @@ -0,0 +1,17 @@
>> +-----BEGIN PGP SIGNATURE-----
>> +Comment: GPGTools - http://gpgtools.org
>> +
>> +iQIcBAABCAAGBQJWN3rrAAoJEBDAHFovYFnnnqgQAJ9av9GzZWy6dCyCxaFCJSRE
>> ++SO2d/9kaPsC1l48HpLnSfzGgQMm5PElPS5fmrXCz+U5MLz6sAWYb67u7Cey3Btk
>> +PtWWrJgEqvzGIJPXU/0EjFiShLFyKUFBB9ul0OLi2eUqnyuR5lVYDqVPMt/QehNM
>> +gC74esyQpQ4yUCAhnKvqRE89gTnG3lp7flbUDVOli4dydTS7rpKuH8l3PXefNIPM
>> +miYKr1ur+w/zgVQcUkTTXl/XQqq9g+lsod6MbeoWXxQczfMZyR1QYxSKqv4FrNbC
>> +/+xfdvt0QRbqmQNo/NJBapcUYHD1BOncvvn0X+ZO5yFSuhzOHxwVvdIam4L2JVky
>> +w/kYHDQvWRk6b9gKV8u9HlhimUZV1KFXnKvnZxI4UuAHtsEf06XoCF+Kae5U4Sa6
>> +ZFZ11vjCralWqDCkg50aQwSpGKGC2tEQRiTHc38zdfBD/3MmHs+hJ/W9PVMYbEXA
>> +pMni8ty1buCWLuoMrXYO7EwAHfrH6M5UbnWIPZExXASPFc6thkn3/WAM9BBuEXAT
>> +LSJ04sGyx7Occ6pzJHX7u//RRFzft7CmrHzDh7i8Z3exvQM7fFZrEbCvSDO0V7KS
>> +cNGMZ0bpz0Q2eK5caPtVGEuHO9Dn+B28Dg5ZI5ltm9zoThzYLsPz8064/6HTe9Ui
>> +wEzoMOvitW1a+4IGh5iC
>> +=jNfN
>> +-----END PGP SIGNATURE-----
>>
>> Added: dev/tomcat/tomcat-connectors/native/1.2.1/source/tomcat-native-1.2.1-win32-src.zip.md5
>> ==============================================================================
>> --- dev/tomcat/tomcat-connectors/native/1.2.1/source/tomcat-native-1.2.1-win32-src.zip.md5 (added)
>> +++ dev/tomcat/tomcat-connectors/native/1.2.1/source/tomcat-native-1.2.1-win32-src.zip.md5 Mon Nov  2 15:10:18 2015
>> @@ -0,0 +1 @@
>> +0559054825af69cc78f1cd9ab6966269 *tomcat-native-1.2.1-win32-src.zip
>> \ No newline at end of file
>>
>> Added: dev/tomcat/tomcat-connectors/native/1.2.1/source/tomcat-native-1.2.1-win32-src.zip.sha1
>> ==============================================================================
>> --- dev/tomcat/tomcat-connectors/native/1.2.1/source/tomcat-native-1.2.1-win32-src.zip.sha1 (added)
>> +++ dev/tomcat/tomcat-connectors/native/1.2.1/source/tomcat-native-1.2.1-win32-src.zip.sha1 Mon Nov  2 15:10:18 2015
>> @@ -0,0 +1 @@
>> +e22c1c2a3a006bd0b93916fdb99202c94f60d3f8 *tomcat-native-1.2.1-win32-src.zip
>> \ No newline at end of file
>>
>>
>>
>> ---------------------------------------------------------------------
>> To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
>> For additional commands, e-mail: dev-help@tomcat.apache.org
>>
>
> ---------------------------------------------------------------------
> To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
> For additional commands, e-mail: dev-help@tomcat.apache.org
>


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


Re: svn commit: r10986 - in /dev/tomcat/tomcat-connectors/native/1.2.1: ./ source/

Posted by Rainer Jung <ra...@kippdata.de>.
Am 02.11.2015 um 22:32 schrieb Emmanuel Bourg:
> Le 02/11/2015 21:31, Rainer Jung a écrit :
>
>> So as a safety check, one could check against c
>> being NULL and throw an exception if it is.
>
> Thank you for the suggestion, I'll use that for the Debian package instead.

I'll include --enable-maintainer-mode plus the suggested patch in my 
release checks and report in the VOTE thread for 1.2.1.

Regards,

Rainer


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


Re: svn commit: r10986 - in /dev/tomcat/tomcat-connectors/native/1.2.1: ./ source/

Posted by Emmanuel Bourg <eb...@apache.org>.
Le 02/11/2015 21:31, Rainer Jung a écrit :

> So as a safety check, one could check against c
> being NULL and throw an exception if it is.

Thank you for the suggestion, I'll use that for the Debian package instead.

Emmanuel Bourg


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


Re: svn commit: r10986 - in /dev/tomcat/tomcat-connectors/native/1.2.1: ./ source/

Posted by Rainer Jung <ra...@kippdata.de>.
Am 02.11.2015 um 18:26 schrieb Emmanuel Bourg:
> Le 02/11/2015 18:11, Emmanuel Bourg a écrit :
>
>>    src/ssl.c: In function 'Java_org_apache_tomcat_jni_SSL_setVerify':
>>    src/ssl.c:1557:16: error: 'ctx' undeclared (first use in this function)
>>         TCN_ASSERT(ctx != 0);
>
> I applied this patch to fix the error, is this correct?
>
> --- a/native/src/ssl.c
> +++ b/native/src/ssl.c
> @@ -1554,7 +1554,7 @@
>       verify = SSL_VERIFY_NONE;
>
>       UNREFERENCED(o);
> -    TCN_ASSERT(ctx != 0);
> +    TCN_ASSERT(c->ctx != 0);
>       c->verify_mode = level;
>
>       if (c->verify_mode == SSL_CVERIFY_UNSET)

The problem happens, because you do a DEBUG build, maybe using 
--enable-maintainer-mode for configure. In normal build the TCN_ASSERT 
will be removed automatically.

The wrong ASSERT is in the file from the first commit of the setVerify() 
function. I'd say instead one would like to check c for not being NULL.

A TCN_ASSERT() could be used for TCN_ASSERT(ssl != 0), but the function 
already does "SSL *ssl_ = J2P(ssl, SSL *);" and directly next checks for 
"ssl_ == NULL" and throws an exception if that is the case. So ssl_ 
should be safe. The next step is "c = SSL_get_app_data2(ssl_);" and then 
using the pointer c. So as a safety check, one could check against c 
being NULL and throw an exception if it is.

So something like

@@ -1554,7 +1554,11 @@
      verify = SSL_VERIFY_NONE;

      UNREFERENCED(o);
-    TCN_ASSERT(ctx != 0);
+
+    if (c == NULL) {
+        tcn_ThrowException(e, "context is null");
+        return;
+    }
      c->verify_mode = level;

      if (c->verify_mode == SSL_CVERIFY_UNSET)


Regards,

Rainer

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


Re: svn commit: r10986 - in /dev/tomcat/tomcat-connectors/native/1.2.1: ./ source/

Posted by Emmanuel Bourg <eb...@apache.org>.
Le 02/11/2015 18:11, Emmanuel Bourg a écrit :

>   src/ssl.c: In function 'Java_org_apache_tomcat_jni_SSL_setVerify':
>   src/ssl.c:1557:16: error: 'ctx' undeclared (first use in this function)
>        TCN_ASSERT(ctx != 0);

I applied this patch to fix the error, is this correct?

--- a/native/src/ssl.c
+++ b/native/src/ssl.c
@@ -1554,7 +1554,7 @@
     verify = SSL_VERIFY_NONE;

     UNREFERENCED(o);
-    TCN_ASSERT(ctx != 0);
+    TCN_ASSERT(c->ctx != 0);
     c->verify_mode = level;

     if (c->verify_mode == SSL_CVERIFY_UNSET)


Emmanuel Bourg


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


Re: svn commit: r10986 - in /dev/tomcat/tomcat-connectors/native/1.2.1: ./ source/

Posted by Emmanuel Bourg <eb...@apache.org>.
Hi tested on Debian and I got this compilation error:

  In file included from /home/ebourg/packaging/tomcat-native/native/include/tcn.h:52:0,
                   from src/ssl.c:17:
  src/ssl.c: In function 'Java_org_apache_tomcat_jni_SSL_setVerify':
  src/ssl.c:1557:16: error: 'ctx' undeclared (first use in this function)
       TCN_ASSERT(ctx != 0);
                  ^
  src/ssl.c:1557:5: note: in expansion of macro 'TCN_ASSERT'
       TCN_ASSERT(ctx != 0);
       ^
  src/ssl.c:1557:16: note: each undeclared identifier is reported only once for each function it appears in
       TCN_ASSERT(ctx != 0);
                  ^
  src/ssl.c:1557:5: note: in expansion of macro 'TCN_ASSERT'
       TCN_ASSERT(ctx != 0);
       ^
  /home/ebourg/packaging/tomcat-native/native/build/rules.mk:206: recipe for target 'src/ssl.lo' failed

The full build log is available here:

https://paste.apache.org/8kFY

Emmanuel Bourg


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


Re: svn commit: r10986 - in /dev/tomcat/tomcat-connectors/native/1.2.1: ./ source/

Posted by Rainer Jung <ra...@kippdata.de>.
Am 02.11.2015 um 16:20 schrieb Mark Thomas:
> On 02/11/2015 15:10, markt@apache.org wrote:
>> Author: markt
>> Date: Mon Nov  2 15:10:18 2015
>> New Revision: 10986
>>
>> Log:
>> Upload Tomcat Native 1.2.1 source files
>
> The Windows binaries should follow shortly. I've tested building on OSX
> from the tar.gz archive and that works so I believe that the problems
> with 1.2.0 are resolved.

I did a quick build on Solaris and RHEL 6, looks OK.

Rainer


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


Re: svn commit: r10986 - in /dev/tomcat/tomcat-connectors/native/1.2.1: ./ source/

Posted by Mark Thomas <ma...@apache.org>.
On 02/11/2015 15:10, markt@apache.org wrote:
> Author: markt
> Date: Mon Nov  2 15:10:18 2015
> New Revision: 10986
> 
> Log:
> Upload Tomcat Native 1.2.1 source files

The Windows binaries should follow shortly. I've tested building on OSX
from the tar.gz archive and that works so I believe that the problems
with 1.2.0 are resolved.

Mark


> 
> Added:
>     dev/tomcat/tomcat-connectors/native/1.2.1/
>     dev/tomcat/tomcat-connectors/native/1.2.1/source/
>     dev/tomcat/tomcat-connectors/native/1.2.1/source/tomcat-native-1.2.1-src.tar.gz   (with props)
>     dev/tomcat/tomcat-connectors/native/1.2.1/source/tomcat-native-1.2.1-src.tar.gz.asc
>     dev/tomcat/tomcat-connectors/native/1.2.1/source/tomcat-native-1.2.1-src.tar.gz.md5
>     dev/tomcat/tomcat-connectors/native/1.2.1/source/tomcat-native-1.2.1-src.tar.gz.sha1
>     dev/tomcat/tomcat-connectors/native/1.2.1/source/tomcat-native-1.2.1-win32-src.zip   (with props)
>     dev/tomcat/tomcat-connectors/native/1.2.1/source/tomcat-native-1.2.1-win32-src.zip.asc
>     dev/tomcat/tomcat-connectors/native/1.2.1/source/tomcat-native-1.2.1-win32-src.zip.md5
>     dev/tomcat/tomcat-connectors/native/1.2.1/source/tomcat-native-1.2.1-win32-src.zip.sha1
> 
> Added: dev/tomcat/tomcat-connectors/native/1.2.1/source/tomcat-native-1.2.1-src.tar.gz
> ==============================================================================
> Binary file - no diff available.
> 
> Propchange: dev/tomcat/tomcat-connectors/native/1.2.1/source/tomcat-native-1.2.1-src.tar.gz
> ------------------------------------------------------------------------------
>     svn:mime-type = application/x-gzip
> 
> Added: dev/tomcat/tomcat-connectors/native/1.2.1/source/tomcat-native-1.2.1-src.tar.gz.asc
> ==============================================================================
> --- dev/tomcat/tomcat-connectors/native/1.2.1/source/tomcat-native-1.2.1-src.tar.gz.asc (added)
> +++ dev/tomcat/tomcat-connectors/native/1.2.1/source/tomcat-native-1.2.1-src.tar.gz.asc Mon Nov  2 15:10:18 2015
> @@ -0,0 +1,17 @@
> +-----BEGIN PGP SIGNATURE-----
> +Comment: GPGTools - http://gpgtools.org
> +
> +iQIcBAABCAAGBQJWN3rrAAoJEBDAHFovYFnnHnwP/RmW3NPQ8mRwvc3hLrU58+JI
> +eA5RQySFQphTaA16x5uMOTbg0WRf69lTGx8qpxD5lwvuZl/WYD6keWVm3mhTpnts
> +SIwf/d54im17O1ZPfJRAlU8sBYX/Xnu72KpgNOPPZvckhscrWpx1/c5MNpelSCW3
> +Ud+9xyXMX+zo163uJnfmLplJZqtJYLmyl2qhtjRxm9bzePo9r8EuWKnCDUgMl3Yi
> +EnV5q5Ut3wMxdh/fykvmgcMnX9ACD+GVQf088dGAD7WtMuaRnk8rvsbFLU9/e1oX
> +keDEuuAgNhxHsBy/ULgXpOzTFice0Wo15dayFT20j2FPxtsb19LbGLMkUFm3QfPF
> +aJ+tUnvOmkAnCHzem0iX5EcXe5KFhh9JRBnog5LUEWwsz6/S0ITekIP9mFsdJB+f
> +og4v55WMZnnRH/tJ6TbDtFkZpMCq5VjpWCgpIzrs2luZDl8bL51nW675ri51peAe
> +Vu630/UIaxS+w8Jt92bSI4sBd46YCNUOCOeQ28Ua3JnudUqOxp9aaBFQv0eBkapc
> +U1ubGXtFYgEwOB1syo/GrdA+LX4EkpqqNcSh+ltV7KK+eFwq4jwl7uLmTB4i6Ndt
> +BmEkm4Qi+QSTQ6ySqEpDXKfdAeQMg32MyvPKX29a9HeS2VRUwydLfvNXEYlGKVmd
> +IphDjxfz9/3o0XObqT6Y
> +=F6qM
> +-----END PGP SIGNATURE-----
> 
> Added: dev/tomcat/tomcat-connectors/native/1.2.1/source/tomcat-native-1.2.1-src.tar.gz.md5
> ==============================================================================
> --- dev/tomcat/tomcat-connectors/native/1.2.1/source/tomcat-native-1.2.1-src.tar.gz.md5 (added)
> +++ dev/tomcat/tomcat-connectors/native/1.2.1/source/tomcat-native-1.2.1-src.tar.gz.md5 Mon Nov  2 15:10:18 2015
> @@ -0,0 +1 @@
> +2fc6c513e8cbef00bf87abdca697995a *tomcat-native-1.2.1-src.tar.gz
> \ No newline at end of file
> 
> Added: dev/tomcat/tomcat-connectors/native/1.2.1/source/tomcat-native-1.2.1-src.tar.gz.sha1
> ==============================================================================
> --- dev/tomcat/tomcat-connectors/native/1.2.1/source/tomcat-native-1.2.1-src.tar.gz.sha1 (added)
> +++ dev/tomcat/tomcat-connectors/native/1.2.1/source/tomcat-native-1.2.1-src.tar.gz.sha1 Mon Nov  2 15:10:18 2015
> @@ -0,0 +1 @@
> +a3698c32bcc02b0054c7b6c8362f6793902fe77b *tomcat-native-1.2.1-src.tar.gz
> \ No newline at end of file
> 
> Added: dev/tomcat/tomcat-connectors/native/1.2.1/source/tomcat-native-1.2.1-win32-src.zip
> ==============================================================================
> Binary file - no diff available.
> 
> Propchange: dev/tomcat/tomcat-connectors/native/1.2.1/source/tomcat-native-1.2.1-win32-src.zip
> ------------------------------------------------------------------------------
>     svn:mime-type = application/octet-stream
> 
> Added: dev/tomcat/tomcat-connectors/native/1.2.1/source/tomcat-native-1.2.1-win32-src.zip.asc
> ==============================================================================
> --- dev/tomcat/tomcat-connectors/native/1.2.1/source/tomcat-native-1.2.1-win32-src.zip.asc (added)
> +++ dev/tomcat/tomcat-connectors/native/1.2.1/source/tomcat-native-1.2.1-win32-src.zip.asc Mon Nov  2 15:10:18 2015
> @@ -0,0 +1,17 @@
> +-----BEGIN PGP SIGNATURE-----
> +Comment: GPGTools - http://gpgtools.org
> +
> +iQIcBAABCAAGBQJWN3rrAAoJEBDAHFovYFnnnqgQAJ9av9GzZWy6dCyCxaFCJSRE
> ++SO2d/9kaPsC1l48HpLnSfzGgQMm5PElPS5fmrXCz+U5MLz6sAWYb67u7Cey3Btk
> +PtWWrJgEqvzGIJPXU/0EjFiShLFyKUFBB9ul0OLi2eUqnyuR5lVYDqVPMt/QehNM
> +gC74esyQpQ4yUCAhnKvqRE89gTnG3lp7flbUDVOli4dydTS7rpKuH8l3PXefNIPM
> +miYKr1ur+w/zgVQcUkTTXl/XQqq9g+lsod6MbeoWXxQczfMZyR1QYxSKqv4FrNbC
> +/+xfdvt0QRbqmQNo/NJBapcUYHD1BOncvvn0X+ZO5yFSuhzOHxwVvdIam4L2JVky
> +w/kYHDQvWRk6b9gKV8u9HlhimUZV1KFXnKvnZxI4UuAHtsEf06XoCF+Kae5U4Sa6
> +ZFZ11vjCralWqDCkg50aQwSpGKGC2tEQRiTHc38zdfBD/3MmHs+hJ/W9PVMYbEXA
> +pMni8ty1buCWLuoMrXYO7EwAHfrH6M5UbnWIPZExXASPFc6thkn3/WAM9BBuEXAT
> +LSJ04sGyx7Occ6pzJHX7u//RRFzft7CmrHzDh7i8Z3exvQM7fFZrEbCvSDO0V7KS
> +cNGMZ0bpz0Q2eK5caPtVGEuHO9Dn+B28Dg5ZI5ltm9zoThzYLsPz8064/6HTe9Ui
> +wEzoMOvitW1a+4IGh5iC
> +=jNfN
> +-----END PGP SIGNATURE-----
> 
> Added: dev/tomcat/tomcat-connectors/native/1.2.1/source/tomcat-native-1.2.1-win32-src.zip.md5
> ==============================================================================
> --- dev/tomcat/tomcat-connectors/native/1.2.1/source/tomcat-native-1.2.1-win32-src.zip.md5 (added)
> +++ dev/tomcat/tomcat-connectors/native/1.2.1/source/tomcat-native-1.2.1-win32-src.zip.md5 Mon Nov  2 15:10:18 2015
> @@ -0,0 +1 @@
> +0559054825af69cc78f1cd9ab6966269 *tomcat-native-1.2.1-win32-src.zip
> \ No newline at end of file
> 
> Added: dev/tomcat/tomcat-connectors/native/1.2.1/source/tomcat-native-1.2.1-win32-src.zip.sha1
> ==============================================================================
> --- dev/tomcat/tomcat-connectors/native/1.2.1/source/tomcat-native-1.2.1-win32-src.zip.sha1 (added)
> +++ dev/tomcat/tomcat-connectors/native/1.2.1/source/tomcat-native-1.2.1-win32-src.zip.sha1 Mon Nov  2 15:10:18 2015
> @@ -0,0 +1 @@
> +e22c1c2a3a006bd0b93916fdb99202c94f60d3f8 *tomcat-native-1.2.1-win32-src.zip
> \ No newline at end of file
> 
> 
> 
> ---------------------------------------------------------------------
> To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
> For additional commands, e-mail: dev-help@tomcat.apache.org
> 


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