[Bug 56005] ISAPI redirector WEB-INF/META-INF Path Check false positive (#51769 is back)
https://issues.apache.org/bugzilla/show_bug.cgi?id=56005 Rainer Jung rainer.j...@kippdata.de changed: What|Removed |Added Status|NEW |NEEDINFO --- Comment #2 from Rainer Jung rainer.j...@kippdata.de --- Can we please get any feedback on the open questions? I need some more details about your test case. -- You are receiving this mail because: You are the assignee for the bug. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[Bug 54112] ISAPI redirector not working when IIS recycles
https://issues.apache.org/bugzilla/show_bug.cgi?id=54112 Rainer Jung rainer.j...@kippdata.de changed: What|Removed |Added Status|REOPENED|NEEDINFO --- Comment #8 from Rainer Jung rainer.j...@kippdata.de --- Does this problem still exist? No user feedback since 2 years. -- You are receiving this mail because: You are the assignee for the bug. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[Bug 57420] Wrong class names generated since URL_ENCODER in DirContextURLConnection is not thread safe
https://issues.apache.org/bugzilla/show_bug.cgi?id=57420 Marc Buetikofer marc.buetiko...@ergon.ch changed: What|Removed |Added CC||marc.buetiko...@ergon.ch OS||All -- You are receiving this mail because: You are the assignee for the bug. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[Bug 57421] New: Farming default directories
https://issues.apache.org/bugzilla/show_bug.cgi?id=57421 Bug ID: 57421 Summary: Farming default directories Product: Tomcat 8 Version: trunk Hardware: All OS: All Status: NEW Severity: enhancement Priority: P2 Component: Cluster Assignee: dev@tomcat.apache.org Reporter: aterrest...@gmail.com When using the FarmWarDeployer on Tomcat 6/7/8, it is now mandatory to specify deployDir and tempDir. I believe we could make them optional, by giving them default values based on $CATALINA_BASE (host.appBase for deployDir, and $CATALINA_BASE/temp for tempDir). If accepted, I could work on a patch. -- You are receiving this mail because: You are the assignee for the bug. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1650036 - in /tomcat/jk/trunk: native/common/jk_global.h xdocs/miscellaneous/changelog.xml
Author: rjung Date: Wed Jan 7 11:21:47 2015 New Revision: 1650036 URL: http://svn.apache.org/r1650036 Log: Fix annoying redefine warnings for the autoconf PACKAGE defines during configure based builds. Modified: tomcat/jk/trunk/native/common/jk_global.h tomcat/jk/trunk/xdocs/miscellaneous/changelog.xml Modified: tomcat/jk/trunk/native/common/jk_global.h URL: http://svn.apache.org/viewvc/tomcat/jk/trunk/native/common/jk_global.h?rev=1650036r1=1650035r2=1650036view=diff == --- tomcat/jk/trunk/native/common/jk_global.h (original) +++ tomcat/jk/trunk/native/common/jk_global.h Wed Jan 7 11:21:47 2015 @@ -26,6 +26,18 @@ #define JK_GLOBAL_H #if defined(HAVE_CONFIG_H) + +/* Undefine autoconf defines also existing + * in Apache web server includes, and which + * will be redefined in our config.h */ +#undef PACKAGE +#undef PACKAGE_NAME +#undef PACKAGE_STRING +#undef PACKAGE_TARNAME +#undef PACKAGE_VERSION +#undef PACKAGE_BUGREPORT +#undef PACKAGE_URL + #include config.h #endif Modified: tomcat/jk/trunk/xdocs/miscellaneous/changelog.xml URL: http://svn.apache.org/viewvc/tomcat/jk/trunk/xdocs/miscellaneous/changelog.xml?rev=1650036r1=1650035r2=1650036view=diff == --- tomcat/jk/trunk/xdocs/miscellaneous/changelog.xml (original) +++ tomcat/jk/trunk/xdocs/miscellaneous/changelog.xml Wed Jan 7 11:21:47 2015 @@ -192,6 +192,10 @@ fix Adjust linger parameters used during connection shutdown. (rjung) /fix + fix +Fix annoying redefine warnings for the autoconf PACKAGE defines +during configure based builds. (rjung) + /fix /changelog /subsection /section - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: [mod_jk] Modify how common/config.h gets built
Am 07.01.2015 um 03:15 schrieb Konstantin Kolinko: 2015-01-07 2:25 GMT+03:00 Christopher Schultz ch...@christopherschultz.net: All, I give up. I can't seem to figure out exactly how common/config.h comes into existence during the configure process. It is created from common/config.h.in. Whereas most of the .in-based files are created by configure (see configure.ac) in AC_OUTPUT([ Makefile apache-1.3/Makefile apache-1.3/Makefile.apxs apache-2.0/Makefile apache-2.0/Makefile.apxs common/Makefile common/list.mk common/jk_types.h ]) the config.h is handled by AC_CONFIG_HEADER(common/config.h) and the PACKAGE variable values come from AC_INIT([mod_jk], [1.2.41]) I have never built mod_jk, but here are some thoughts When compiling on Mac OS X, I get the following irritating warning: In file included from mod_jk.c:89: In file included from ../common/jk_global.h:29: ../common/config.h:81:9: warning: 'PACKAGE_NAME' macro redefined #define PACKAGE_NAME mod_jk ^ 1. I think that the PACKAGE_NAME define is generated by the following macro in native/configure.ac: dnl package and version. dnl synchronization with common/jk_version.h ? AC_INIT([mod_jk], [1.2.41]) /usr/include/apache2/ap_config_auto.h:213:9: note: previous definition is here #define PACKAGE_NAME ^ 2. From the path and file name, I think that the above header file belongs to Apache HTTPD, not mod_jk. It is no wonder that it has a different PACKAGE_NAME. There are 3 others like it for a few other #defines. I would like to clean these up, but I can't just commit changes to common/config.h because it's auto-generated. Can anyone shed some light on where I can modify what gets dumped into common/config.h? I see some stuff in config.status, but that in turn gets generated by configure. Any suggestions? Yes, those errors are annoying. The problem is, that the Apache web server and also mod_jk use autoconf/automake and both include the generated defines for PACKAGE_NAME etc. in their header files. Officially those vars should not get published by Apache but instead be kept in private header files. During mod_jk build that generates these redefine warnings. Currently that does not pose a real problem, since the mod_jk defines win and we don't need the Apache defines. In Apache land the defines are in ap_config_auto.h, which is included in ap_config.h. I don't expect that not including Apache ap_config.h is an option. It is included itself in to many other Apache include files. So I applied a workaround in r1650036, that can be found in other modules as well, namely undefining those vars before including our own config.h. Thanks for the heads up. I found it annoying as well and simply needed a kick to look for a solution. Regards, Rainer - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1650037 - /tomcat/jk/trunk/xdocs/reference/workers.xml
Author: rjung Date: Wed Jan 7 11:32:43 2015 New Revision: 1650037 URL: http://svn.apache.org/r1650037 Log: Minor doc fix. 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=1650037r1=1650036r2=1650037view=diff == --- tomcat/jk/trunk/xdocs/reference/workers.xml (original) +++ tomcat/jk/trunk/xdocs/reference/workers.xml Wed Jan 7 11:32:43 2015 @@ -911,7 +911,7 @@ This directive can be used multiple time /p /directive -directive name=secret workers=AJP,LB,SUB default= required=false +directive name=secret workers=AJP,SUB,LB default= required=false You can set a secret keyword on the Tomcat AJP Connector. Then only requests from workers with the same secret keyword will be accepted. p @@ -1114,7 +1114,7 @@ This feature has been added in bjk 1.2 /p /directive -directive name=prefer_ipv6 workers=AJP default=false required=false +directive name=prefer_ipv6 workers=AJP,SUB default=false 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 - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1650043 - in /tomcat/jk/trunk/native/common: jk_global.h jk_lb_worker.c
Author: rjung
Date: Wed Jan 7 11:54:50 2015
New Revision: 1650043
URL: http://svn.apache.org/r1650043
Log:
Add warning if LB method busyness is used,
but no atomics support detected.
Modified:
tomcat/jk/trunk/native/common/jk_global.h
tomcat/jk/trunk/native/common/jk_lb_worker.c
Modified: tomcat/jk/trunk/native/common/jk_global.h
URL:
http://svn.apache.org/viewvc/tomcat/jk/trunk/native/common/jk_global.h?rev=1650043r1=1650042r2=1650043view=diff
==
--- tomcat/jk/trunk/native/common/jk_global.h (original)
+++ tomcat/jk/trunk/native/common/jk_global.h Wed Jan 7 11:54:50 2015
@@ -449,6 +449,7 @@ typedef int jk_sock_t;
if (y == 0 || y INT_MAX) apr_atomic_inc32((volatile apr_uint32_t
*)x);\
} while (0)
#else
+#define JK_ATOMIC_MISSING
#define JK_ATOMIC_INCREMENT(x) (++(*x))
#define JK_ATOMIC_DECREMENT(x) \
do {\
Modified: tomcat/jk/trunk/native/common/jk_lb_worker.c
URL:
http://svn.apache.org/viewvc/tomcat/jk/trunk/native/common/jk_lb_worker.c?rev=1650043r1=1650042r2=1650043view=diff
==
--- tomcat/jk/trunk/native/common/jk_lb_worker.c (original)
+++ tomcat/jk/trunk/native/common/jk_lb_worker.c Wed Jan 7 11:54:50 2015
@@ -1903,6 +1903,12 @@ static int JK_METHOD init(jk_worker_t *p
p-s-last_reset = p-s-last_maintain_time;
p-lbmethod = jk_get_lb_method(props, p-name);
+#ifdef JK_ATOMIC_MISSING
+if (p-lbmethod == JK_LB_METHOD_BUSYNESS) {
+jk_log(log, JK_LOG_WARNING, Missing support for atomics:
+ LB method 'busyness' not recommended);
+}
+#endif
p-lblock = jk_get_lb_lock(props, p-name);
s = jk_get_lb_session_cookie(props, p-name, JK_SESSION_IDENTIFIER);
if (jk_check_attribute_length(session_cookie, s, log) == JK_FALSE) {
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: [VOTE] Release Apache Tomcat 8.0.16
On 07/01/2015 07:42, Violeta Georgieva wrote: Hi, 2015-01-05 15:13 GMT+02:00 Mark Thomas ma...@apache.org mailto:ma...@apache.org: The proposed Apache Tomcat 8.0.16 release is now available for voting. The main changes since 8.0.15 are: - Correct a regression in annotation scanning introduced in 8.0.15 - The RemoteAddrValve and RemoteHostValve can now optionally include the port when filtering along with a new option to trigger authentication rather than denying access - Various edge cases fixes in WebSocket There is also a large collection of bug fixes, new features and performance improvements. For full details, see the changelog: http://svn.us.apache.org/repos/asf/tomcat/tc8.0.x/trunk/webapps/docs/changelog.xml It can be obtained from: https://dist.apache.org/repos/dist/dev/tomcat/tomcat-8/v8.0.16/ The Maven staging repo is: https://repository.apache.org/content/repositories/orgapachetomcat-1028/ The svn tag is: http://svn.apache.org/repos/asf/tomcat/tc8.0.x/tags/TOMCAT_8_0_16/ The proposed 8.0.16 release is: [ ] Broken - do not release [ ] Stable - go ahead and release as 8.0.16 After revision 1643232 If there is a ServletRequestListener and the application sends an error then ServletRequestListener.requestDestroyed is not invoked anymore. I'm attaching a test case. Bother. The test case didn't come through. Probably best to commit it to trunk with @Ignore. It looks like 8.0.17 will be required at this point. I'll leave the vote open a little longer to see if anyone finds anything else. Mark - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: [mod_jk] Modify how common/config.h gets built
Am 07.01.2015 um 15:05 schrieb Christopher Schultz: On 1/7/15 6:24 AM, Rainer Jung wrote: Am 07.01.2015 um 03:15 schrieb Konstantin Kolinko: 2015-01-07 2:25 GMT+03:00 Christopher Schultz ch...@christopherschultz.net: All, I give up. I can't seem to figure out exactly how common/config.h comes into existence during the configure process. It is created from common/config.h.in. Whereas most of the .in-based files are created by configure (see configure.ac) in AC_OUTPUT([ Makefile apache-1.3/Makefile apache-1.3/Makefile.apxs apache-2.0/Makefile apache-2.0/Makefile.apxs common/Makefile common/list.mk common/jk_types.h ]) the config.h is handled by AC_CONFIG_HEADER(common/config.h) and the PACKAGE variable values come from AC_INIT([mod_jk], [1.2.41]) Okay, but how can we tweak what comes out into common/config.h? I don't really know, but I expect no easy way to fine-tune the file. It is meant to be generated by autoconf and contain the configure detection results in the form of defines. So I applied a workaround in r1650036, that can be found in other modules as well, namely undefining those vars before including our own config.h. That's exactly what I was going to do... just in config.h. Which IMHO is harder or impossible to do. Thanks for the heads up. I found it annoying as well and simply needed a kick to look for a solution. :) I was going to take a look at all our native components to see if I could get rid of all warnings on both Linux and Mac OS X (environments to which I have easy access). It looks like mod_jk builds on Mac OS X now with no warnings or anything when using -Wall -pedantic. Yay! Great, thanks for checking. Regards, Rainer - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1650073 - /tomcat/jk/trunk/native/common/jk_lb_worker.c
Author: rjung
Date: Wed Jan 7 14:52:08 2015
New Revision: 1650073
URL: http://svn.apache.org/r1650073
Log:
Reword log message.
Modified:
tomcat/jk/trunk/native/common/jk_lb_worker.c
Modified: tomcat/jk/trunk/native/common/jk_lb_worker.c
URL:
http://svn.apache.org/viewvc/tomcat/jk/trunk/native/common/jk_lb_worker.c?rev=1650073r1=1650072r2=1650073view=diff
==
--- tomcat/jk/trunk/native/common/jk_lb_worker.c (original)
+++ tomcat/jk/trunk/native/common/jk_lb_worker.c Wed Jan 7 14:52:08 2015
@@ -1217,7 +1217,7 @@ static int JK_METHOD service(jk_endpoint
if (ajp_has_endpoint(rec-worker, l)) {
if (JK_IS_DEBUG_LEVEL(l))
jk_log(l, JK_LOG_DEBUG,
- worker %s busy count fixed,
+ worker %s busy state ended,
rec-name);
rec-s-state = JK_LB_STATE_OK;
}
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1650072 - in /tomcat/jk/trunk/native/common: jk_lb_worker.c jk_shm.h
Author: rjung
Date: Wed Jan 7 14:51:42 2015
New Revision: 1650072
URL: http://svn.apache.org/r1650072
Log:
Remove busy counter for sub worker.
It simply shadows the ajp busy counter.
Modified:
tomcat/jk/trunk/native/common/jk_lb_worker.c
tomcat/jk/trunk/native/common/jk_shm.h
Modified: tomcat/jk/trunk/native/common/jk_lb_worker.c
URL:
http://svn.apache.org/viewvc/tomcat/jk/trunk/native/common/jk_lb_worker.c?rev=1650072r1=1650071r2=1650072view=diff
==
--- tomcat/jk/trunk/native/common/jk_lb_worker.c (original)
+++ tomcat/jk/trunk/native/common/jk_lb_worker.c Wed Jan 7 14:51:42 2015
@@ -1343,7 +1343,6 @@ static int JK_METHOD service(jk_endpoint
jk_shm_lock();
/* Increment the number of workers serving request */
-busy = JK_ATOMIC_INCREMENT((rec-s-busy));
busy = JK_ATOMIC_INCREMENT((p-worker-s-busy));
if (busy p-worker-s-max_busy)
p-worker-s-max_busy = busy;
@@ -1444,7 +1443,6 @@ static int JK_METHOD service(jk_endpoint
* restart of the server.
*/
JK_ATOMIC_DECREMENT((p-worker-s-busy));
-JK_ATOMIC_DECREMENT((rec-s-busy));
if (service_stat == JK_TRUE) {
/*
* Successful request.
@@ -1549,7 +1547,7 @@ static int JK_METHOD service(jk_endpoint
*/
time_t now = time(NULL);
rec-s-errors++;
-if (rec-s-busy == 0 ||
+if (aw-s-busy == 0 ||
p-worker-error_escalation_time == 0 ||
(rec-s-first_error_time 0
(int)difftime(now, rec-s-first_error_time) =
p-worker-error_escalation_time)) {
Modified: tomcat/jk/trunk/native/common/jk_shm.h
URL:
http://svn.apache.org/viewvc/tomcat/jk/trunk/native/common/jk_shm.h?rev=1650072r1=1650071r2=1650072view=diff
==
--- tomcat/jk/trunk/native/common/jk_shm.h (original)
+++ tomcat/jk/trunk/native/common/jk_shm.h Wed Jan 7 14:51:42 2015
@@ -135,8 +135,6 @@ struct jk_shm_lb_sub_worker
chardomain[JK_SHM_STR_SIZ];
/* worker redirect route */
charredirect[JK_SHM_STR_SIZ];
-/* Number of currently busy channels */
-volatile int busy;
/* worker distance */
volatile int distance;
/* current activation state (config) of the worker */
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: [mod_jk] Modify how common/config.h gets built
Rainer, On 1/7/15 6:24 AM, Rainer Jung wrote: Am 07.01.2015 um 03:15 schrieb Konstantin Kolinko: 2015-01-07 2:25 GMT+03:00 Christopher Schultz ch...@christopherschultz.net: All, I give up. I can't seem to figure out exactly how common/config.h comes into existence during the configure process. It is created from common/config.h.in. Whereas most of the .in-based files are created by configure (see configure.ac) in AC_OUTPUT([ Makefile apache-1.3/Makefile apache-1.3/Makefile.apxs apache-2.0/Makefile apache-2.0/Makefile.apxs common/Makefile common/list.mk common/jk_types.h ]) the config.h is handled by AC_CONFIG_HEADER(common/config.h) and the PACKAGE variable values come from AC_INIT([mod_jk], [1.2.41]) Okay, but how can we tweak what comes out into common/config.h? I have never built mod_jk, but here are some thoughts When compiling on Mac OS X, I get the following irritating warning: In file included from mod_jk.c:89: In file included from ../common/jk_global.h:29: ../common/config.h:81:9: warning: 'PACKAGE_NAME' macro redefined #define PACKAGE_NAME mod_jk ^ 1. I think that the PACKAGE_NAME define is generated by the following macro in native/configure.ac: dnl package and version. dnl synchronization with common/jk_version.h ? AC_INIT([mod_jk], [1.2.41]) /usr/include/apache2/ap_config_auto.h:213:9: note: previous definition is here #define PACKAGE_NAME ^ 2. From the path and file name, I think that the above header file belongs to Apache HTTPD, not mod_jk. It is no wonder that it has a different PACKAGE_NAME. There are 3 others like it for a few other #defines. I would like to clean these up, but I can't just commit changes to common/config.h because it's auto-generated. Can anyone shed some light on where I can modify what gets dumped into common/config.h? I see some stuff in config.status, but that in turn gets generated by configure. Any suggestions? Yes, those errors are annoying. The problem is, that the Apache web server and also mod_jk use autoconf/automake and both include the generated defines for PACKAGE_NAME etc. in their header files. Officially those vars should not get published by Apache but instead be kept in private header files. During mod_jk build that generates these redefine warnings. Currently that does not pose a real problem, since the mod_jk defines win and we don't need the Apache defines. In Apache land the defines are in ap_config_auto.h, which is included in ap_config.h. I don't expect that not including Apache ap_config.h is an option. It is included itself in to many other Apache include files. So I applied a workaround in r1650036, that can be found in other modules as well, namely undefining those vars before including our own config.h. That's exactly what I was going to do... just in config.h. Thanks for the heads up. I found it annoying as well and simply needed a kick to look for a solution. :) I was going to take a look at all our native components to see if I could get rid of all warnings on both Linux and Mac OS X (environments to which I have easy access). It looks like mod_jk builds on Mac OS X now with no warnings or anything when using -Wall -pedantic. Yay! Thanks, -chris signature.asc Description: OpenPGP digital signature
svn commit: r1650217 - /tomcat/trunk/test/org/apache/coyote/http11/TestInternalOutputBuffer.java
Author: markt Date: Thu Jan 8 07:50:57 2015 New Revision: 1650217 URL: http://svn.apache.org/r1650217 Log: Fix Checkstyle/IDE/Gump nags Modified: tomcat/trunk/test/org/apache/coyote/http11/TestInternalOutputBuffer.java Modified: tomcat/trunk/test/org/apache/coyote/http11/TestInternalOutputBuffer.java URL: http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/coyote/http11/TestInternalOutputBuffer.java?rev=1650217r1=1650216r2=1650217view=diff == --- tomcat/trunk/test/org/apache/coyote/http11/TestInternalOutputBuffer.java (original) +++ tomcat/trunk/test/org/apache/coyote/http11/TestInternalOutputBuffer.java Thu Jan 8 07:50:57 2015 @@ -17,7 +17,6 @@ package org.apache.coyote.http11; import org.junit.Assert; -import org.junit.Ignore; import org.junit.Test; import org.apache.catalina.Context; - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: Release of Apache Taglibs
On 08/01/2015 06:42, Jeremy Boynes wrote: I made a couple of minor improvements to Apache Taglibs last year related to XML parsing and to how we load libraries (it now uses the TCCL which means the jars can be shared between webapps as well as be included in a webapp as before). I would like to perform a minor release (1.2.2) to include these. Before I do, are there any other issues that should be addressed? One change in 1.2 I think was not useful was the split of the 1.0 EL evaluator into its own jar. I propose to merge that back so we end up with two jars: one with the javax classes and one with our implementation. Sounds good to me. Mark - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Release of Apache Taglibs
I made a couple of minor improvements to Apache Taglibs last year related to XML parsing and to how we load libraries (it now uses the TCCL which means the jars can be shared between webapps as well as be included in a webapp as before). I would like to perform a minor release (1.2.2) to include these. Before I do, are there any other issues that should be addressed? One change in 1.2 I think was not useful was the split of the 1.0 EL evaluator into its own jar. I propose to merge that back so we end up with two jars: one with the javax classes and one with our implementation. Thanks Jeremy signature.asc Description: Message signed with OpenPGP using GPGMail
[Bug 57425] ReplicatedContext implementation throws NullPointerException for attributes with null value
https://issues.apache.org/bugzilla/show_bug.cgi?id=57425 Josh Landin jlan...@gmail.com changed: What|Removed |Added OS||All --- Comment #1 from Josh Landin jlan...@gmail.com --- This work item is to make ReplicatedContext behave the way StandardContext does for null values. -- You are receiving this mail because: You are the assignee for the bug. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[Bug 57425] New: ReplicatedContext implementation throws NullPointerException for attributes with null value
https://issues.apache.org/bugzilla/show_bug.cgi?id=57425 Bug ID: 57425 Summary: ReplicatedContext implementation throws NullPointerException for attributes with null value Product: Tomcat 7 Version: 7.0.25 Hardware: PC Status: NEW Severity: normal Priority: P2 Component: Catalina Assignee: dev@tomcat.apache.org Reporter: jlan...@gmail.com In Tomcat versions prior to 7.0.35, the servlet context attribute javax.servlet.context.orderedLibs has a null value (a fix was added to Tomcat in https://issues.apache.org/bugzilla/show_bug.cgi?id=54391). When context replication is not used, the StandardContext.setAttribute method checks for and handles a null value by invoking StandardContext.removeAttribute. However, when context replication is enabled the null value is passed to ConcurrentHashMap.put which throws a NullPointerException. This causes the context to fail startup. -- You are receiving this mail because: You are the assignee for the bug. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1650095 - in /tomcat/jk/trunk: native/common/jk_status.c xdocs/miscellaneous/changelog.xml
Author: rjung Date: Wed Jan 7 16:05:12 2015 New Revision: 1650095 URL: http://svn.apache.org/r1650095 Log: Use multi-line table headers and fix invalid xml output in status worker. Modified: tomcat/jk/trunk/native/common/jk_status.c tomcat/jk/trunk/xdocs/miscellaneous/changelog.xml Modified: tomcat/jk/trunk/native/common/jk_status.c URL: http://svn.apache.org/viewvc/tomcat/jk/trunk/native/common/jk_status.c?rev=1650095r1=1650094r2=1650095view=diff == --- tomcat/jk/trunk/native/common/jk_status.c (original) +++ tomcat/jk/trunk/native/common/jk_status.c Wed Jan 7 16:05:12 2015 @@ -96,6 +96,16 @@ #define JK_STATUS_ARG_LB_TEXT_METHOD LB Method #define JK_STATUS_ARG_LB_TEXT_LOCK Locking +#define JK_STATUS_ARG_LB_HEAD_RETRIES Retries +#define JK_STATUS_ARG_LB_HEAD_RETRY_INTRetrybr/Interval +#define JK_STATUS_ARG_LB_HEAD_RECOVER_TIME Recoverbr/Wait Time +#define JK_STATUS_ARG_LB_HEAD_ERROR_ESCALATION_TIME Errorbr/Escalation Time +#define JK_STATUS_ARG_LB_HEAD_MAX_REPLY_TIMEOUTS Max Replybr/Timeouts +#define JK_STATUS_ARG_LB_HEAD_STICKY Stickybr/Sessions +#define JK_STATUS_ARG_LB_HEAD_STICKY_FORCE Force Stickybr/Sessions +#define JK_STATUS_ARG_LB_HEAD_METHOD LBbr/Method +#define JK_STATUS_ARG_LB_HEAD_LOCK Locking + #define JK_STATUS_ARG_LBM_ACTIVATION (vwa) #define JK_STATUS_ARG_LBM_FACTOR (vwf) #define JK_STATUS_ARG_LBM_ROUTE(vwn) @@ -110,6 +120,13 @@ #define JK_STATUS_ARG_LBM_TEXT_DOMAIN Cluster Domain #define JK_STATUS_ARG_LBM_TEXT_DISTANCEDistance +#define JK_STATUS_ARG_LBM_HEAD_ACTIVATION Activation +#define JK_STATUS_ARG_LBM_HEAD_FACTOR LBbr/Factor +#define JK_STATUS_ARG_LBM_HEAD_ROUTE Route +#define JK_STATUS_ARG_LBM_HEAD_REDIRECTRedirectbr/Route +#define JK_STATUS_ARG_LBM_HEAD_DOMAIN Clusterbr/Domain +#define JK_STATUS_ARG_LBM_HEAD_DISTANCEDistance + #define JK_STATUS_ARG_AJP_CACHE_TO vacpt #define JK_STATUS_ARG_AJP_PING_TO vapng #define JK_STATUS_ARG_AJP_CONNECT_TO vact @@ -137,6 +154,20 @@ #define JK_STATUS_ARG_AJP_TEXT_PORTPort #define JK_STATUS_ARG_AJP_TEXT_ADDR_STRAddress:Port +#define JK_STATUS_ARG_AJP_HEAD_CACHE_TOConnectionbr/Pool Timeout +#define JK_STATUS_ARG_AJP_HEAD_PING_TO Pingbr/Timeout +#define JK_STATUS_ARG_AJP_HEAD_CONNECT_TO Connectbr/Timeout +#define JK_STATUS_ARG_AJP_HEAD_PREPOST_TO Prepostbr/Timeout +#define JK_STATUS_ARG_AJP_HEAD_REPLY_TOReplybr/Timeout +#define JK_STATUS_ARG_AJP_HEAD_RETRIES Retries +#define JK_STATUS_ARG_AJP_HEAD_RETRY_INT Retrybr/Interval +#define JK_STATUS_ARG_AJP_HEAD_REC_OPTSRecoverybr/Options +#define JK_STATUS_ARG_AJP_HEAD_MAX_PK_SZ Max Packetbr/Size +#define JK_STATUS_ARG_AJP_HEAD_CPING_INT Connectionbr/Ping Interval +#define JK_STATUS_ARG_AJP_HEAD_HOST_STRHostname +#define JK_STATUS_ARG_AJP_HEAD_PORTPort +#define JK_STATUS_ARG_AJP_HEAD_ADDR_STRAddress:Port + #define JK_STATUS_CMD_UNKNOWN (0) #define JK_STATUS_CMD_LIST (1) #define JK_STATUS_CMD_SHOW (2) @@ -232,21 +263,21 @@ #define JK_STATUS_FORM_START form method=\%s\ action=\%s\\n #define JK_STATUS_FORM_HIDDEN_INT input type=\hidden\ name=\%s\ value=\%d\/\n #define JK_STATUS_FORM_HIDDEN_STRING input type=\hidden\ name=\%s\ value=\%s\/\n -#define JK_STATUS_URI_MAP_TABLE_HEAD trth%s/thth%s/thth%s/thth%s/thth%s/thth%s/thth%s/thth%s/thth%s/thth%s/thth%s/th/tr\n +#define JK_STATUS_URI_MAP_TABLE_HEAD tr valign=\bottom\th%s/thth%s/thth%s/thth%s/thth%s/thth%s/thth%s/thth%s/thth%s/thth%s/thth%s/th/tr\n #define JK_STATUS_URI_MAP_TABLE_ROW trtd%s/tdtd%s/tdtd%s/tdtd%d/tdtd%d/tdtd%d/tdtd%s/tdtd%s/tdtd%s/tdtd%s/tdtd%d/td/tr\n -#define JK_STATUS_URI_MAP_TABLE_HEAD2 trth%s/thth%s/thth%s/thth%s/thth%s/thth%s/thth%s/thth%s/thth%s/thth%s/thth%s/thth%s/th/tr\n +#define JK_STATUS_URI_MAP_TABLE_HEAD2 tr valign=\bottom\th%s/thth%s/thth%s/thth%s/thth%s/thth%s/thth%s/thth%s/thth%s/thth%s/thth%s/thth%s/th/tr\n #define JK_STATUS_URI_MAP_TABLE_ROW2 trtd%s/tdtd%s/tdtd%s/tdtd%s/tdtd%d/tdtd%d/tdtd%d/tdtd%s/tdtd%s/tdtd%s/tdtd%s/tdtd%d/td/tr\n -#define JK_STATUS_SHOW_AJP_CONF_HEAD tr \ +#define JK_STATUS_SHOW_AJP_CONF_HEAD tr valign=\bottom\ \ thType/th \ - th JK_STATUS_ARG_AJP_TEXT_HOST_STR /th \ - th JK_STATUS_ARG_AJP_TEXT_ADDR_STR /th \ - th JK_STATUS_ARG_AJP_TEXT_CACHE_TO /th \ - th JK_STATUS_ARG_AJP_TEXT_CONNECT_TO /th \ - th JK_STATUS_ARG_AJP_TEXT_PREPOST_TO /th \ - th JK_STATUS_ARG_AJP_TEXT_REPLY_TO /th \ -
svn commit: r1650038 - /tomcat/jk/trunk/xdocs/reference/workers.xml
Author: rjung Date: Wed Jan 7 11:36:10 2015 New Revision: 1650038 URL: http://svn.apache.org/r1650038 Log: Reorder attributes. 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=1650038r1=1650037r2=1650038view=diff == --- tomcat/jk/trunk/xdocs/reference/workers.xml (original) +++ tomcat/jk/trunk/xdocs/reference/workers.xml Wed Jan 7 11:36:10 2015 @@ -903,11 +903,14 @@ This feature has been added in bjk 1.2 /p /directive -directive name=mount workers=AJP,LB default= required=false -Space delimited list of uri maps the worker should handle. It is only used, -if the worker is included in worker.list. +directive name=prefer_ipv6 workers=AJP,SUB default=false 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 directive can be used multiple times for the same worker. +This feature has been added in bjk 1.2.38/b. /p /directive @@ -927,6 +930,14 @@ This feature has been added in bjk 1.2 /p /directive +directive name=mount workers=AJP,LB default= required=false +Space delimited list of uri maps the worker should handle. It is only used, +if the worker is included in worker.list. +p +This directive can be used multiple times for the same worker. +/p +/directive + directive name=max_reply_timeouts workers=LB default=0 required=false If you use a breply_timeout/b for the members of a load balancer worker, and you want to tolerate a few requests taking longer than reply_timeout, @@ -977,6 +988,57 @@ This features has been added in bjk 1. /p /directive +directive name=session_cookie workers=LB default=JSESSIONID required=false +The name of the cookie that contains the routing identifier needed for session stickyness. +The routing identifier is everything after a . character in the value of the cookie. +p +This feature has been added in bjk 1.2.27/b. +/p +/directive + +directive name=session_path workers=LB default=;jsessionid required=false +The name of the path parameter that contains the routing identifier needed for +session stickyness. The routing identifier is everything after a . character in the value +of the path parameter. +p +This feature has been added in bjk 1.2.27/b. +/p +/directive + +directive name=set_session_cookie workers=LB default=false required=false +Activates generation of session stickyness cookies. Typically you don't need this. +p +Some web frameworks replace Tomcat session management and use a different way +of generating session IDs. As a consequence the routing ID added by Tomcat to the +end of the session ID is lost and we no longer can do sticky load balancing. +As a workaround you can use the following steps: +ul +liChoose a non-standard cookie name using the session_cookie attribute./li +liActivate cookie sending by setting the attribute set_session_cookie to btrue/b./li +liSet the attribute session_cookie_path to the correct application URI, like +e.g. /myapp/./li +/ul +/p +p +The cookie will only be send if the request does not already contain +a cookie of the same name, or that cookie does not contain a routing +ID which the load balancer can fulfill. Especially after a node failover +we will send a new cookie to switch stickyness to the new node. +/p +p +This feature has been added in bjk 1.2.38/b. +/p +/directive + +directive name=session_cookie_path workers=LB default= required=false +This attribute is only used if set_session_cookie is set to btrue/b. +See set_session_cookie for a description. If the value of session_cookie_path +is empty (default), then the send cookie will not contain a PATH information. +p +This feature has been added in bjk 1.2.38/b. +/p +/directive + directive name=activation workers=SUB default=Active required=false Using this directive, a balanced worker of a load balancer can be configured as disabled or stopped. A disabled worker only gets @@ -1063,68 +1125,6 @@ This feature has been added in bjk 1.2 /p /directive -directive name=session_cookie workers=LB default=JSESSIONID required=false -The name of the cookie that contains the routing identifier needed for session stickyness. -The routing identifier is everything after a . character in the value of the cookie. -p -This feature has been added in bjk 1.2.27/b. -/p -/directive - -directive name=session_path workers=LB default=;jsessionid required=false -The name of the path parameter that contains the routing identifier needed for -session stickyness. The routing identifier is everything
svn commit: r1650081 - /tomcat/trunk/test/org/apache/catalina/core/TestStandardHostValve.java
Author: violetagg
Date: Wed Jan 7 15:18:27 2015
New Revision: 1650081
URL: http://svn.apache.org/r1650081
Log:
Test case that reproduces ServletRequestListener.requestDestroyed problem. Mark
it with @Ignore in order to keep the build 'green'.
Modified:
tomcat/trunk/test/org/apache/catalina/core/TestStandardHostValve.java
Modified: tomcat/trunk/test/org/apache/catalina/core/TestStandardHostValve.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/catalina/core/TestStandardHostValve.java?rev=1650081r1=1650080r2=1650081view=diff
==
--- tomcat/trunk/test/org/apache/catalina/core/TestStandardHostValve.java
(original)
+++ tomcat/trunk/test/org/apache/catalina/core/TestStandardHostValve.java Wed
Jan 7 15:18:27 2015
@@ -17,13 +17,18 @@
package org.apache.catalina.core;
import java.io.IOException;
+import java.util.ArrayList;
+import java.util.List;
import javax.servlet.ServletException;
+import javax.servlet.ServletRequestEvent;
+import javax.servlet.ServletRequestListener;
import javax.servlet.http.HttpServlet;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import org.junit.Assert;
+import org.junit.Ignore;
import org.junit.Test;
import org.apache.catalina.Context;
@@ -68,6 +73,48 @@ public class TestStandardHostValve exten
doTestErrorPageHandling(501, /default);
}
+@Test
+@Ignore
+public void testSRLAfterError() throws Exception {
+// Set up a container
+Tomcat tomcat = getTomcatInstance();
+
+// No file system docBase required
+Context ctx = tomcat.addContext(, null);
+
+// Add the error page
+Tomcat.addServlet(ctx, error, new ErrorServlet());
+ctx.addServletMapping(/error, error);
+
+final ListString result = new ArrayList();
+
+// Add the request listener
+ServletRequestListener servletRequestListener = new
ServletRequestListener() {
+
+@Override
+public void requestDestroyed(ServletRequestEvent sre) {
+result.add(Visit requestDestroyed);
+}
+
+@Override
+public void requestInitialized(ServletRequestEvent sre) {
+result.add(Visit requestInitialized);
+}
+
+};
+((StandardContext)
ctx).addApplicationEventListener(servletRequestListener);
+
+tomcat.start();
+
+// Request a page that triggers an error
+ByteChunk bc = new ByteChunk();
+int rc = getUrl(http://localhost:; + getPort() +
/error?errorCode=400, bc, null);
+
+Assert.assertEquals(400, rc);
+Assert.assertTrue(result.contains(Visit requestInitialized));
+Assert.assertTrue(result.contains(Visit requestDestroyed));
+}
+
private void doTestErrorPageHandling(int error, String report)
throws Exception {
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[GUMP@vmgump]: Project tomcat-tc8.0.x-test-apr (in module tomcat-8.0.x) failed
To whom it may engage... This is an automated request, but not an unsolicited one. For more information please visit http://gump.apache.org/nagged.html, and/or contact the folk at gene...@gump.apache.org. Project tomcat-tc8.0.x-test-apr has an issue affecting its community integration. This issue affects 1 projects. The current state of this project is 'Failed', with reason 'Build Failed'. For reference only, the following projects are affected by this: - tomcat-tc8.0.x-test-apr : Tomcat 8.x, a web server implementing the Java Servlet 3.1, ... Full details are available at: http://vmgump.apache.org/gump/public/tomcat-8.0.x/tomcat-tc8.0.x-test-apr/index.html That said, some information snippets are provided here. The following annotations (debug/informational/warning/error messages) were provided: -DEBUG- Dependency on commons-daemon exists, no need to add for property commons-daemon.native.src.tgz. -DEBUG- Dependency on commons-daemon exists, no need to add for property tomcat-native.tar.gz. -INFO- Failed with reason build failed -INFO- Project Reports in: /srv/gump/public/workspace/tomcat-8.0.x/output/logs-APR -INFO- Project Reports in: /srv/gump/public/workspace/tomcat-8.0.x/output/test-tmp-APR/logs The following work was performed: http://vmgump.apache.org/gump/public/tomcat-8.0.x/tomcat-tc8.0.x-test-apr/gump_work/build_tomcat-8.0.x_tomcat-tc8.0.x-test-apr.html Work Name: build_tomcat-8.0.x_tomcat-tc8.0.x-test-apr (Type: Build) Work ended in a state of : Failed Elapsed: 26 mins 48 secs Command Line: /usr/lib/jvm/java-8-oracle/bin/java -Djava.awt.headless=true -Dbuild.sysclasspath=only org.apache.tools.ant.Main -Dgump.merge=/srv/gump/public/gump/work/merge.xml -Djunit.jar=/srv/gump/public/workspace/junit/target/junit-4.13-SNAPSHOT.jar -Dobjenesis.jar=/srv/gump/public/workspace/objenesis/main/target/objenesis-2.2-SNAPSHOT.jar -Dtest.reports=output/logs-APR -Dtomcat-native.tar.gz=/srv/gump/public/workspace/apache-commons/daemon/dist/bin/commons-daemon-20150107-native-src.tar.gz -Dexamples.sources.skip=true -Djdt.jar=/srv/gump/packages/eclipse/plugins/R-4.4-201406061215/ecj-4.4.jar -Dtest.apr.loc=/srv/gump/public/workspace/tomcat-native/dest-20150107/lib -Dcommons-daemon.jar=/srv/gump/public/workspace/apache-commons/daemon/dist/commons-daemon-20150107.jar -Dcommons-daemon.native.src.tgz=/srv/gump/public/workspace/apache-commons/daemon/dist/bin/commons-daemon-20150107-native-src.tar.gz -Dtest.temp=output/test-tmp-APR -Dtest.accesslog=true -Dexecute.test.nio=false -Dtest .openssl.path=/srv/gump/public/workspace/openssl/dest-20150107/bin/openssl -Dexecute.test.apr=true -Dexecute.test.bio=false -Dexecute.test.nio2=false -Deasymock.jar=/srv/gump/public/workspace/easymock/easymock/target/easymock-3.4-SNAPSHOT.jar -Dhamcrest.jar=/srv/gump/public/workspace/hamcrest/build/hamcrest-all-20150107.jar -Dcglib.jar=/srv/gump/packages/cglib/cglib-nodep-2.2.jar test [Working Directory: /srv/gump/public/workspace/tomcat-8.0.x] CLASSPATH: /usr/lib/jvm/java-8-oracle/lib/tools.jar:/srv/gump/public/workspace/tomcat-8.0.x/output/build/webapps/examples/WEB-INF/classes:/srv/gump/public/workspace/tomcat-8.0.x/output/testclasses:/srv/gump/public/workspace/ant/dist/lib/ant.jar:/srv/gump/public/workspace/ant/dist/lib/ant-launcher.jar:/srv/gump/public/workspace/ant/dist/lib/ant-jmf.jar:/srv/gump/public/workspace/ant/dist/lib/ant-junit.jar:/srv/gump/public/workspace/ant/dist/lib/ant-junit4.jar:/srv/gump/public/workspace/ant/dist/lib/ant-swing.jar:/srv/gump/public/workspace/ant/dist/lib/ant-apache-resolver.jar:/srv/gump/public/workspace/ant/dist/lib/ant-apache-xalan2.jar:/srv/gump/public/workspace/xml-commons/java/build/resolver.jar:/srv/gump/public/workspace/tomcat-8.0.x/output/build/bin/bootstrap.jar:/srv/gump/public/workspace/tomcat-8.0.x/output/build/bin/tomcat-juli.jar:/srv/gump/public/workspace/tomcat-8.0.x/output/build/lib/annotations-api.jar:/srv/gump/public/workspace/tomcat-8.0.x/output/build/lib/servlet-api.ja r:/srv/gump/public/workspace/tomcat-8.0.x/output/build/lib/jsp-api.jar:/srv/gump/public/workspace/tomcat-8.0.x/output/build/lib/el-api.jar:/srv/gump/public/workspace/tomcat-8.0.x/output/build/lib/websocket-api.jar:/srv/gump/public/workspace/tomcat-8.0.x/output/build/lib/catalina.jar:/srv/gump/public/workspace/tomcat-8.0.x/output/build/lib/catalina-ant.jar:/srv/gump/public/workspace/tomcat-8.0.x/output/build/lib/catalina-storeconfig.jar:/srv/gump/public/workspace/tomcat-8.0.x/output/build/lib/tomcat-coyote.jar:/srv/gump/public/workspace/tomcat-8.0.x/output/build/lib/jasper.jar:/srv/gump/public/workspace/tomcat-8.0.x/output/build/lib/jasper-el.jar:/srv/gump/public/workspace/tomcat-8.0.x/output/build/lib/catalina-tribes.jar:/srv/gump/public/workspace/tomcat-8.0.x/output/build/lib/catalina-ha.jar:/srv/gump/public/workspace/tomcat-8.0.x/output/build/lib/tomcat-api.jar:/srv/gump/public/workspace/tomcat-8.0.x/output/build/lib/tomcat-jni.jar:/srv/gump/public
[GUMP@vmgump]: Project tomcat-trunk-validate (in module tomcat-trunk) failed
To whom it may engage... This is an automated request, but not an unsolicited one. For more information please visit http://gump.apache.org/nagged.html, and/or contact the folk at gene...@gump.apache.org. Project tomcat-trunk-validate has an issue affecting its community integration. This issue affects 1 projects. The current state of this project is 'Failed', with reason 'Build Failed'. For reference only, the following projects are affected by this: - tomcat-trunk-validate : Tomcat 9.x, a web server implementing the Java Servlet 4.0, ... Full details are available at: http://vmgump.apache.org/gump/public/tomcat-trunk/tomcat-trunk-validate/index.html That said, some information snippets are provided here. The following annotations (debug/informational/warning/error messages) were provided: -DEBUG- Dependency on checkstyle exists, no need to add for property checkstyle.jar. -INFO- Failed with reason build failed The following work was performed: http://vmgump.apache.org/gump/public/tomcat-trunk/tomcat-trunk-validate/gump_work/build_tomcat-trunk_tomcat-trunk-validate.html Work Name: build_tomcat-trunk_tomcat-trunk-validate (Type: Build) Work ended in a state of : Failed Elapsed: 35 secs Command Line: /usr/lib/jvm/java-8-oracle/bin/java -Djava.awt.headless=true -Dbuild.sysclasspath=only org.apache.tools.ant.Main -Dgump.merge=/srv/gump/public/gump/work/merge.xml -Dcheckstyle.jar=/srv/gump/public/workspace/checkstyle/target/checkstyle-6.3-SNAPSHOT.jar -Dexecute.validate=true validate [Working Directory: /srv/gump/public/workspace/tomcat-trunk] CLASSPATH: /usr/lib/jvm/java-8-oracle/lib/tools.jar:/srv/gump/public/workspace/ant/dist/lib/ant.jar:/srv/gump/public/workspace/ant/dist/lib/ant-launcher.jar:/srv/gump/public/workspace/ant/dist/lib/ant-jmf.jar:/srv/gump/public/workspace/ant/dist/lib/ant-junit.jar:/srv/gump/public/workspace/ant/dist/lib/ant-junit4.jar:/srv/gump/public/workspace/ant/dist/lib/ant-swing.jar:/srv/gump/public/workspace/ant/dist/lib/ant-apache-resolver.jar:/srv/gump/public/workspace/ant/dist/lib/ant-apache-xalan2.jar:/srv/gump/public/workspace/xml-commons/java/build/resolver.jar:/srv/gump/packages/antlr/antlr-3.1.3.jar:/srv/gump/public/workspace/checkstyle/target/checkstyle-6.3-SNAPSHOT.jar:/srv/gump/public/workspace/apache-commons/beanutils/dist/commons-beanutils-20150108.jar:/srv/gump/public/workspace/apache-commons/cli/target/commons-cli-1.3-SNAPSHOT.jar:/srv/gump/packages/commons-collections3/commons-collections-3.2.1.jar:/srv/gump/public/workspace/apache-commons/exec/target/commons-exec-1.3.1-SNAPSHOT.j ar:/srv/gump/public/workspace/apache-commons/logging/target/commons-logging-20150108.jar:/srv/gump/public/workspace/apache-commons/logging/target/commons-logging-api-20150108.jar:/srv/gump/public/workspace/apache-commons/validator/dist/commons-validator-20150108.jar:/srv/gump/packages/guava/guava-18.0.jar - Buildfile: /srv/gump/public/workspace/tomcat-trunk/build.xml build-prepare: [delete] Deleting directory /srv/gump/public/workspace/tomcat-trunk/output/build/temp [mkdir] Created dir: /srv/gump/public/workspace/tomcat-trunk/output/build/temp compile-prepare: download-validate: testexist: [echo] Testing for /srv/gump/public/workspace/checkstyle/target/checkstyle-6.3-SNAPSHOT.jar setproxy: downloadfile: validate: [mkdir] Created dir: /srv/gump/public/workspace/tomcat-trunk/output/res/checkstyle [checkstyle] Running Checkstyle 6.3-SNAPSHOT on 2896 files [checkstyle] /srv/gump/public/workspace/tomcat-trunk/test/org/apache/coyote/http11/TestInternalOutputBuffer.java:20:8: Unused import - org.junit.Ignore. BUILD FAILED /srv/gump/public/workspace/tomcat-trunk/build.xml:544: Got 1 errors and 0 warnings. Total time: 35 seconds - To subscribe to this information via syndicated feeds: - RSS: http://vmgump.apache.org/gump/public/tomcat-trunk/tomcat-trunk-validate/rss.xml - Atom: http://vmgump.apache.org/gump/public/tomcat-trunk/tomcat-trunk-validate/atom.xml == Gump Tracking Only === Produced by Apache Gump(TM) version 2.3. Gump Run 2015010805, vmgump.apache.org:vmgump:2015010805 Gump E-mail Identifier (unique within run) #8. -- Apache Gump http://gump.apache.org/ [Instance: vmgump] - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: [VOTE] Release Apache Tomcat 8.0.16
Hi, 2015-01-07 15:02 GMT+02:00 Mark Thomas ma...@apache.org: On 07/01/2015 07:42, Violeta Georgieva wrote: Hi, 2015-01-05 15:13 GMT+02:00 Mark Thomas ma...@apache.org mailto:ma...@apache.org: The proposed Apache Tomcat 8.0.16 release is now available for voting. The main changes since 8.0.15 are: - Correct a regression in annotation scanning introduced in 8.0.15 - The RemoteAddrValve and RemoteHostValve can now optionally include the port when filtering along with a new option to trigger authentication rather than denying access - Various edge cases fixes in WebSocket There is also a large collection of bug fixes, new features and performance improvements. For full details, see the changelog: http://svn.us.apache.org/repos/asf/tomcat/tc8.0.x/trunk/webapps/docs/changelog.xml It can be obtained from: https://dist.apache.org/repos/dist/dev/tomcat/tomcat-8/v8.0.16/ The Maven staging repo is: https://repository.apache.org/content/repositories/orgapachetomcat-1028/ The svn tag is: http://svn.apache.org/repos/asf/tomcat/tc8.0.x/tags/TOMCAT_8_0_16/ The proposed 8.0.16 release is: [ ] Broken - do not release [ ] Stable - go ahead and release as 8.0.16 After revision 1643232 If there is a ServletRequestListener and the application sends an error then ServletRequestListener.requestDestroyed is not invoked anymore. I'm attaching a test case. Bother. The test case didn't come through. Probably best to commit it to trunk with @Ignore. Here it is r1650081 Vily It looks like 8.0.17 will be required at this point. I'll leave the vote open a little longer to see if anyone finds anything else. Mark - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Unused code in tcnative
All, There is a function in src/jnilib.c starting on line 119 called tcn_new_stringn that appears to be unused: jstring tcn_new_stringn(JNIEnv *env, const char *str, size_t l) clang brought it to my attention because it's got a logical error in it: size_t len = l; [...] if (l 0) len = strlen(str); The argument 'l' can never be less than zero because it's declared to be unsigned. Therefore, the 'len' local will always be the same as the value of the 'l' argument and is therefore superfluous. Before bothering to fix the problem, I did a quick grep and I can't find any instances of a call to that function. Any objections to simply removing the function entirely? The function tcn_new_string (without the trailing 'n') is definitely used. That function does not check to make sure that allocation of the new string object will succeed (in terms of local references: that is, it does not call EnsureCapacity). I've only read the miniscule documentation Oracle provides for NewStringUTF, but is it appropriate to call EnsureCapacity from tcn_new_string? Thanks, -chris signature.asc Description: OpenPGP digital signature
svn commit: r1650098 - in /tomcat/jk/trunk: native/common/ xdocs/miscellaneous/ xdocs/reference/
Author: rjung
Date: Wed Jan 7 16:15:28 2015
New Revision: 1650098
URL: http://svn.apache.org/r1650098
Log:
BZ 44571: Implement an optional limit on concurrent
requests allowed for a worker
(attribute busy_limit).
Original patch contributed by zealot0630 at
gmail dot com.
The feature is documented as being experimental.
Modified:
tomcat/jk/trunk/native/common/jk_ajp13.h
tomcat/jk/trunk/native/common/jk_ajp_common.c
tomcat/jk/trunk/native/common/jk_ajp_common.h
tomcat/jk/trunk/native/common/jk_lb_worker.c
tomcat/jk/trunk/native/common/jk_shm.h
tomcat/jk/trunk/native/common/jk_status.c
tomcat/jk/trunk/native/common/jk_util.c
tomcat/jk/trunk/native/common/jk_util.h
tomcat/jk/trunk/xdocs/miscellaneous/changelog.xml
tomcat/jk/trunk/xdocs/reference/status.xml
tomcat/jk/trunk/xdocs/reference/workers.xml
Modified: tomcat/jk/trunk/native/common/jk_ajp13.h
URL:
http://svn.apache.org/viewvc/tomcat/jk/trunk/native/common/jk_ajp13.h?rev=1650098r1=1650097r2=1650098view=diff
==
--- tomcat/jk/trunk/native/common/jk_ajp13.h (original)
+++ tomcat/jk/trunk/native/common/jk_ajp13.h Wed Jan 7 16:15:28 2015
@@ -50,6 +50,7 @@ extern C
#define JK_STATUS_FATAL_ERROR (-9)
#define JK_REPLY_TIMEOUT(-10)
#define JK_AJP_PROTOCOL_ERROR (-11)
+#define JK_BUSY_ERROR (-12)
#define AJP13_DEF_TIMEOUT (0) /* Idle timout for pooled connections
*/
Modified: tomcat/jk/trunk/native/common/jk_ajp_common.c
URL:
http://svn.apache.org/viewvc/tomcat/jk/trunk/native/common/jk_ajp_common.c?rev=1650098r1=1650097r2=1650098view=diff
==
--- tomcat/jk/trunk/native/common/jk_ajp_common.c (original)
+++ tomcat/jk/trunk/native/common/jk_ajp_common.c Wed Jan 7 16:15:28 2015
@@ -1118,6 +1118,7 @@ void jk_ajp_pull(ajp_worker_t * aw, int
aw-recovery_opts = aw-s-recovery_opts;
aw-retries = aw-s-retries;
aw-retry_interval = aw-s-retry_interval;
+aw-busy_limit = aw-s-busy_limit;
aw-max_packet_size = aw-s-max_packet_size;
aw-sequence = aw-s-h.sequence;
if (aw-addr_sequence != aw-s-addr_sequence) {
@@ -1187,6 +1188,7 @@ void jk_ajp_push(ajp_worker_t * aw, int
aw-s-recovery_opts = aw-recovery_opts;
aw-s-retries = aw-retries;
aw-s-retry_interval = aw-retry_interval;
+aw-s-busy_limit = aw-busy_limit;
aw-s-max_packet_size = aw-max_packet_size;
/* Force squence update on push
*/
@@ -2561,6 +2563,20 @@ static int JK_METHOD ajp_service(jk_endp
aw-name, aw-retries);
}
busy = JK_ATOMIC_INCREMENT((aw-s-busy));
+if (aw-busy_limit 0 busy aw-busy_limit) {
+JK_ATOMIC_DECREMENT((aw-s-busy));
+e-recoverable = JK_TRUE;
+aw-s-errors++;
+aw-s-error_time = time(NULL);
+*is_error = JK_HTTP_SERVER_BUSY;
+rc = JK_BUSY_ERROR;
+jk_log(l, JK_LOG_ERROR,
+ (%s) sending request to tomcat failed (unrecoverable),
+ busy limit %d reached (rc=%d, errors=%d, client_errors=%d).,
+ aw-name, aw-busy_limit, rc, aw-s-errors,
aw-s-client_errors);
+JK_TRACE_EXIT(l);
+return rc;
+}
if (aw-s-state == JK_AJP_STATE_ERROR)
aw-s-state = JK_AJP_STATE_PROBE;
if (busy aw-s-max_busy)
@@ -2995,6 +3011,8 @@ int ajp_init(jk_worker_t *pThis,
JK_SLEEP_DEF);
p-cache_acquire_timeout = jk_get_worker_cache_acquire_timeout(props,
p-name, p-retries * p-retry_interval);
+p-busy_limit =
+jk_get_worker_busy_limit(props, p-name, 0);
jk_get_worker_fail_on_status(props, p-name,
(p-http_status_fail),
(p-http_status_fail_num));
@@ -3066,6 +3084,10 @@ int ajp_init(jk_worker_t *pThis,
jk_log(l, JK_LOG_DEBUG,
retry interval: %d,
p-retry_interval);
+
+jk_log(l, JK_LOG_DEBUG,
+ busy limit: %d,
+p-busy_limit);
}
/*
* Need to initialize secret here since we could return from inside
Modified: tomcat/jk/trunk/native/common/jk_ajp_common.h
URL:
http://svn.apache.org/viewvc/tomcat/jk/trunk/native/common/jk_ajp_common.h?rev=1650098r1=1650097r2=1650098view=diff
==
--- tomcat/jk/trunk/native/common/jk_ajp_common.h (original)
+++ tomcat/jk/trunk/native/common/jk_ajp_common.h Wed Jan 7 16:15:28 2015
@@ -371,6 +371,8 @@ struct ajp_worker
int retry_interval;/* Number of milliseconds to sleep before
doing a retry */
+int busy_limit;/* Maximum allowed number of concurrent
requests (if 0) */
+
/*
[Bug 44571] Limits busy per worker to a threshold
https://issues.apache.org/bugzilla/show_bug.cgi?id=44571 --- Comment #4 from Rainer Jung rainer.j...@kippdata.de --- I have changed my opinion. This can be configured using the connection_pool_size only for the ISAPI redirector. For the common mod_jk case, busy is a global counter, whereas the connection_pool_size is per process. I have implemented the busy_limit very similar to your original patch in r1650098. Some remarks: - the busy counter is known to have been buggy in the past. I have also aplied a change to use atomics where available. Since it might still be buggy, I have flagged the busy_limit feature as experimental in the docs - I have made it configurable on the AJP or LB member worker, not on the LB worker itself. This way you can set it to different values for individual LB members. If you want to set it to the same value for all members, simply add it to a template using the reference feature. - I decided to reuse the already existing busy state of a worker. As a consequence there's a small change in behavior, even if you don't use busy_limit: if a request is sticky, and there's no endpoint available, previously we nevertheless tried to process the request using the sticky worker. After this change, we will failover th request (withough marking the worker as in ERROR). Note that in the default mod_jk (Apache) case, this will never occur. It can only happen, if you have fewer worker endpoints than threades, e.g. in the ISAPI or NSAPI case. Thanks for your contribution. -- You are receiving this mail because: You are the assignee for the bug. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1650114 - in /tomcat/trunk: java/org/apache/coyote/http11/InternalNio2OutputBuffer.java test/org/apache/coyote/http11/TestInternalOutputBuffer.java
Author: remm
Date: Wed Jan 7 16:42:26 2015
New Revision: 1650114
URL: http://svn.apache.org/r1650114
Log:
Add flush to send ack in the NIO2 connector, and enable the test which now
passes.
Modified:
tomcat/trunk/java/org/apache/coyote/http11/InternalNio2OutputBuffer.java
tomcat/trunk/test/org/apache/coyote/http11/TestInternalOutputBuffer.java
Modified:
tomcat/trunk/java/org/apache/coyote/http11/InternalNio2OutputBuffer.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/http11/InternalNio2OutputBuffer.java?rev=1650114r1=1650113r2=1650114view=diff
==
--- tomcat/trunk/java/org/apache/coyote/http11/InternalNio2OutputBuffer.java
(original)
+++ tomcat/trunk/java/org/apache/coyote/http11/InternalNio2OutputBuffer.java
Wed Jan 7 16:42:26 2015
@@ -243,6 +243,7 @@ public class InternalNio2OutputBuffer ex
public void sendAck() throws IOException {
if (!committed) {
addToBB(Constants.ACK_BYTES, 0, Constants.ACK_BYTES.length);
+flushBuffer(true);
}
}
Modified:
tomcat/trunk/test/org/apache/coyote/http11/TestInternalOutputBuffer.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/coyote/http11/TestInternalOutputBuffer.java?rev=1650114r1=1650113r2=1650114view=diff
==
--- tomcat/trunk/test/org/apache/coyote/http11/TestInternalOutputBuffer.java
(original)
+++ tomcat/trunk/test/org/apache/coyote/http11/TestInternalOutputBuffer.java
Wed Jan 7 16:42:26 2015
@@ -28,8 +28,6 @@ import org.apache.catalina.startup.Tomca
public class TestInternalOutputBuffer extends TomcatBaseTest {
@Test
-@Ignore // Currently fails for NIO2 since that implementation writes the
ACK
-// to the buffers rather than directly to the socket.
public void testSendAck() throws Exception {
Tomcat tomcat = getTomcatInstance();
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1650115 - in /tomcat/tc8.0.x/trunk: java/org/apache/coyote/http11/InternalNio2OutputBuffer.java webapps/docs/changelog.xml
Author: remm
Date: Wed Jan 7 16:43:20 2015
New Revision: 1650115
URL: http://svn.apache.org/r1650115
Log:
Port: Add flush to send ack in the NIO2 connector.
Modified:
tomcat/tc8.0.x/trunk/java/org/apache/coyote/http11/InternalNio2OutputBuffer.java
tomcat/tc8.0.x/trunk/webapps/docs/changelog.xml
Modified:
tomcat/tc8.0.x/trunk/java/org/apache/coyote/http11/InternalNio2OutputBuffer.java
URL:
http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/java/org/apache/coyote/http11/InternalNio2OutputBuffer.java?rev=1650115r1=1650114r2=1650115view=diff
==
---
tomcat/tc8.0.x/trunk/java/org/apache/coyote/http11/InternalNio2OutputBuffer.java
(original)
+++
tomcat/tc8.0.x/trunk/java/org/apache/coyote/http11/InternalNio2OutputBuffer.java
Wed Jan 7 16:43:20 2015
@@ -251,6 +251,7 @@ public class InternalNio2OutputBuffer ex
public void sendAck() throws IOException {
if (!committed) {
addToBB(Constants.ACK_BYTES, 0, Constants.ACK_BYTES.length);
+flushBuffer(true);
}
}
Modified: tomcat/tc8.0.x/trunk/webapps/docs/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/webapps/docs/changelog.xml?rev=1650115r1=1650114r2=1650115view=diff
==
--- tomcat/tc8.0.x/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/tc8.0.x/trunk/webapps/docs/changelog.xml Wed Jan 7 16:43:20 2015
@@ -44,6 +44,15 @@
They eventually become mixed with the numbered issues. (I.e., numbered
issues to not pop up wrt. others).
--
+section name=Tomcat 8.0.17 (markt)
+ subsection name=Coyote
+changelog
+ fix
+Add flushing to send ack in the NIO2 connector. (remm)
+ /fix
+/changelog
+ /subsection
+/section
section name=Tomcat 8.0.16 (markt)
subsection name=Catalina
changelog
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1650107 - /tomcat/jk/trunk/native/common/jk_ajp_common.c
Author: rjung Date: Wed Jan 7 16:30:39 2015 New Revision: 1650107 URL: http://svn.apache.org/r1650107 Log: Fix typo in new log message. Modified: tomcat/jk/trunk/native/common/jk_ajp_common.c Modified: tomcat/jk/trunk/native/common/jk_ajp_common.c URL: http://svn.apache.org/viewvc/tomcat/jk/trunk/native/common/jk_ajp_common.c?rev=1650107r1=1650106r2=1650107view=diff == --- tomcat/jk/trunk/native/common/jk_ajp_common.c (original) +++ tomcat/jk/trunk/native/common/jk_ajp_common.c Wed Jan 7 16:30:39 2015 @@ -2571,7 +2571,7 @@ static int JK_METHOD ajp_service(jk_endp *is_error = JK_HTTP_SERVER_BUSY; rc = JK_BUSY_ERROR; jk_log(l, JK_LOG_ERROR, - (%s) sending request to tomcat failed (unrecoverable), + (%s) sending request to tomcat failed (recoverable), busy limit %d reached (rc=%d, errors=%d, client_errors=%d)., aw-name, aw-busy_limit, rc, aw-s-errors, aw-s-client_errors); JK_TRACE_EXIT(l); - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
tcnative trunk versus 1.1 branch
All, As far as I can tell, the 1.1 branch has gotten way out of sync with the trunk, here. Rainer has been doing a lot of work on the trunk, lately, with nothing being back-ported. Is anyone interested in an effort to bring these two back into sync with each other? There are whole features (e.g. anything in sslext.c) in trunk that aren't available in the 1.1 branch, which is where all the releases are coming from, and there are Java features that rely on these native features being there, which they will never be unless we either back-port a huge amount of patches or decide to go to a 1.2 branch or something similar. Rainer, do you have a plan for all the changes you are making? Thanks, -chris signature.asc Description: OpenPGP digital signature
[tcnative] Unused function in src/poll.c
All,
There is a function in src/poll.c that is completely unused:
450737 mturk static void remove_all(tcn_pollset_t *p)
450737 mturk {
450737 mturk apr_int32_t i;
450737 mturk for (i = 0; i p-nelts; i++) {
450737 mturk apr_pollset_remove(p-pollset,
(p-socket_set[i]));
450737 mturk #ifdef TCN_DO_STATISTICS
450737 mturk p-sp_removed++;
450737 mturk #endif
450737 mturk }
450737 mturk p-nelts = 0;
450737 mturk }
It was added in the revision indicated, is static, and is not used in
poll.c. Should it be removed?
Thanks,
-chris
signature.asc
Description: OpenPGP digital signature
svn commit: r1650129 - /tomcat/native/trunk/native/src/sslext.c
Author: schultz
Date: Wed Jan 7 17:52:24 2015
New Revision: 1650129
URL: http://svn.apache.org/r1650129
Log:
Bytes should be signed char, not unsigned char
Modified:
tomcat/native/trunk/native/src/sslext.c
Modified: tomcat/native/trunk/native/src/sslext.c
URL:
http://svn.apache.org/viewvc/tomcat/native/trunk/native/src/sslext.c?rev=1650129r1=1650128r2=1650129view=diff
==
--- tomcat/native/trunk/native/src/sslext.c (original)
+++ tomcat/native/trunk/native/src/sslext.c Wed Jan 7 17:52:24 2015
@@ -530,8 +530,8 @@ TCN_IMPLEMENT_CALL(jint, SSLExt, setSNI)
{
tcn_socket_t *s = J2P(tcsock, tcn_socket_t *);
tcn_ssl_conn_t *tcssl = (tcn_ssl_conn_t *)s-opaque;
-unsigned char bytes[TCN_BUFFER_SZ];
-const unsigned char *bytesp = bytes[0];
+signed char bytes[TCN_BUFFER_SZ];
+const signed char *bytesp = bytes[0];
if (len TCN_BUFFER_SZ) {
return -1;
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[Bug 44454] busy count reported in mod_jk inflated, causes incorrect balancing
https://issues.apache.org/bugzilla/show_bug.cgi?id=44454 --- Comment #31 from Rainer Jung rainer.j...@kippdata.de --- Warning added in r1650043: [Wed Jan 07 12:53:10.882 2015] [6976:1] [warn] init::jk_lb_worker.c (1908): Missing support for atomics: LB method 'busyness' not recommended -- You are receiving this mail because: You are the assignee for the bug. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1650119 - /tomcat/native/trunk/native/src/multicast.c
Author: schultz Date: Wed Jan 7 17:16:17 2015 New Revision: 1650119 URL: http://svn.apache.org/r1650119 Log: Removed superfluous ; characters after close-braces to eliminate compiler warnin gs. Modified: tomcat/native/trunk/native/src/multicast.c Modified: tomcat/native/trunk/native/src/multicast.c URL: http://svn.apache.org/viewvc/tomcat/native/trunk/native/src/multicast.c?rev=1650119r1=1650118r2=1650119view=diff == --- tomcat/native/trunk/native/src/multicast.c (original) +++ tomcat/native/trunk/native/src/multicast.c Wed Jan 7 17:16:17 2015 @@ -32,7 +32,7 @@ TCN_IMPLEMENT_CALL(jint, Multicast, join apr_sockaddr_t *sa = J2P(source, apr_sockaddr_t *); UNREFERENCED_STDARGS; return (jint)apr_mcast_join(s-sock, ja, ia, sa); -}; +} TCN_IMPLEMENT_CALL(jint, Multicast, leave)(TCN_STDARGS, jlong sock, jlong addr, @@ -44,7 +44,7 @@ TCN_IMPLEMENT_CALL(jint, Multicast, leav apr_sockaddr_t *sa = J2P(source, apr_sockaddr_t *); UNREFERENCED_STDARGS; return (jint)apr_mcast_leave(s-sock, aa, ia, sa); -}; +} TCN_IMPLEMENT_CALL(jint, Multicast, hops)(TCN_STDARGS, jlong sock, jint ttl) @@ -52,7 +52,7 @@ TCN_IMPLEMENT_CALL(jint, Multicast, hops tcn_socket_t *s = J2P(sock, tcn_socket_t *); UNREFERENCED_STDARGS; return (jint)apr_mcast_hops(s-sock, (apr_byte_t)ttl); -}; +} TCN_IMPLEMENT_CALL(jint, Multicast, loopback)(TCN_STDARGS, jlong sock, jboolean opt) @@ -63,7 +63,7 @@ TCN_IMPLEMENT_CALL(jint, Multicast, loop if (opt) on = 1; return (jint)apr_mcast_loopback(s-sock, on); -}; +} TCN_IMPLEMENT_CALL(jint, Multicast, ointerface)(TCN_STDARGS, jlong sock, jlong iface) @@ -72,4 +72,4 @@ TCN_IMPLEMENT_CALL(jint, Multicast, oint apr_sockaddr_t *ia = J2P(iface, apr_sockaddr_t *); UNREFERENCED_STDARGS; return (jint)apr_mcast_interface(s-sock, ia); -}; +} - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1650120 - in /tomcat/native/branches/1.1.x: ./ native/src/multicast.c
Author: schultz Date: Wed Jan 7 17:17:37 2015 New Revision: 1650120 URL: http://svn.apache.org/r1650120 Log: Back-port r1650119 to remove superfluous semicolons after close-braces to eliminate compiler warnings. Modified: tomcat/native/branches/1.1.x/ (props changed) tomcat/native/branches/1.1.x/native/src/multicast.c Propchange: tomcat/native/branches/1.1.x/ -- --- svn:mergeinfo (original) +++ svn:mergeinfo Wed Jan 7 17:17:37 2015 @@ -1,3 +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,1588195,1607262,1607267,1607278,1607291,1607477,1648821 +/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,1588195,1607262,1607267,1607278,1607291,1607477,1648821,1650119 /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 Modified: tomcat/native/branches/1.1.x/native/src/multicast.c URL: http://svn.apache.org/viewvc/tomcat/native/branches/1.1.x/native/src/multicast.c?rev=1650120r1=1650119r2=1650120view=diff == --- tomcat/native/branches/1.1.x/native/src/multicast.c (original) +++ tomcat/native/branches/1.1.x/native/src/multicast.c Wed Jan 7 17:17:37 2015 @@ -32,7 +32,7 @@ TCN_IMPLEMENT_CALL(jint, Multicast, join apr_sockaddr_t *sa = J2P(source, apr_sockaddr_t *); UNREFERENCED_STDARGS; return (jint)apr_mcast_join(s-sock, ja, ia, sa); -}; +} TCN_IMPLEMENT_CALL(jint, Multicast, leave)(TCN_STDARGS, jlong sock, jlong addr, @@ -44,7 +44,7 @@ TCN_IMPLEMENT_CALL(jint, Multicast, leav apr_sockaddr_t *sa = J2P(source, apr_sockaddr_t *); UNREFERENCED_STDARGS; return (jint)apr_mcast_leave(s-sock, aa, ia, sa); -}; +} TCN_IMPLEMENT_CALL(jint, Multicast, hops)(TCN_STDARGS, jlong sock, jint ttl) @@ -52,7 +52,7 @@ TCN_IMPLEMENT_CALL(jint, Multicast, hops tcn_socket_t *s = J2P(sock, tcn_socket_t *); UNREFERENCED_STDARGS; return (jint)apr_mcast_hops(s-sock, (apr_byte_t)ttl); -}; +} TCN_IMPLEMENT_CALL(jint, Multicast, loopback)(TCN_STDARGS, jlong sock, jboolean opt) @@ -63,7 +63,7 @@ TCN_IMPLEMENT_CALL(jint, Multicast, loop if (opt) on = 1; return (jint)apr_mcast_loopback(s-sock, on); -}; +} TCN_IMPLEMENT_CALL(jint, Multicast, ointerface)(TCN_STDARGS, jlong sock, jlong iface) @@ -72,4 +72,4 @@ TCN_IMPLEMENT_CALL(jint, Multicast, oint apr_sockaddr_t *ia = J2P(iface, apr_sockaddr_t *); UNREFERENCED_STDARGS; return (jint)apr_mcast_interface(s-sock, ia); -}; +} - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1650127 - /tomcat/native/trunk/native/src/sslext.c
Author: schultz
Date: Wed Jan 7 17:46:03 2015
New Revision: 1650127
URL: http://svn.apache.org/r1650127
Log:
Predicate use of SSL_set_session_ticket_ext and SSL_get_session_ticket_ext with
availability of SSL_F_SSL_SET_SESSION_TICKET_EXT.
Modified:
tomcat/native/trunk/native/src/sslext.c
Modified: tomcat/native/trunk/native/src/sslext.c
URL:
http://svn.apache.org/viewvc/tomcat/native/trunk/native/src/sslext.c?rev=1650127r1=1650126r2=1650127view=diff
==
--- tomcat/native/trunk/native/src/sslext.c (original)
+++ tomcat/native/trunk/native/src/sslext.c Wed Jan 7 17:46:03 2015
@@ -69,6 +69,7 @@ TCN_IMPLEMENT_CALL(jbyteArray, SSLExt, g
return javaBytes;
}
+#ifdef SSL_F_SSL_SET_SESSION_TICKET_EXT
TCN_IMPLEMENT_CALL(jint, SSLExt, getTicket)(TCN_STDARGS, jlong tcsock,
jbyteArray buf)
{
tcn_socket_t *s = J2P(tcsock, tcn_socket_t *);
@@ -96,6 +97,18 @@ TCN_IMPLEMENT_CALL(jint, SSLExt, setTick
SSL_set_session_ticket_ext(tcssl-ssl, requestedTicket, len);
return 0;
}
+#else /* ifdef SSL_F_SSL_SET_SESSION_TICKET_EXT */
+TCN_IMPLEMENT_CALL(jint, SSLExt, getTicket)(TCN_STDARGS, jlong tcsock,
jbyteArray buf)
+{
+ return 0; /* Unsupported function */
+}
+
+TCN_IMPLEMENT_CALL(jint, SSLExt, setTicket)(TCN_STDARGS, jlong tcsock,
jbyteArray buf,
+jint len)
+{
+ return 0;
+}
+#endif /* ifdef SSL_F_SSL_SET_SESSION_TICKET_EXT */
TCN_IMPLEMENT_CALL(jint, SSLExt, setTicketKeys)(TCN_STDARGS, jlong tc_ssl_ctx,
jbyteArray buf, jint len)
{
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
