svn commit: r1490220 - in /tomcat/tc7.0.x/tags/TOMCAT_7_0_41: ./ build.properties.default
Author: markt Date: Thu Jun 6 09:56:30 2013 New Revision: 1490220 URL: http://svn.apache.org/r1490220 Log: Tag 7.0.41 Added: tomcat/tc7.0.x/tags/TOMCAT_7_0_41/ (props changed) - copied from r1490215, tomcat/tc7.0.x/trunk/ Modified: tomcat/tc7.0.x/tags/TOMCAT_7_0_41/build.properties.default Propchange: tomcat/tc7.0.x/tags/TOMCAT_7_0_41/ -- bugtraq:append = false Propchange: tomcat/tc7.0.x/tags/TOMCAT_7_0_41/ -- bugtraq:label = Bugzilla ID (optional) Propchange: tomcat/tc7.0.x/tags/TOMCAT_7_0_41/ -- --- bugtraq:message (added) +++ bugtraq:message Thu Jun 6 09:56:30 2013 @@ -0,0 +1 @@ +Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=%BUGID% Propchange: tomcat/tc7.0.x/tags/TOMCAT_7_0_41/ -- bugtraq:number = true Propchange: tomcat/tc7.0.x/tags/TOMCAT_7_0_41/ -- bugtraq:url = https://issues.apache.org/bugzilla/show_bug.cgi?id=%BUGID% Propchange: tomcat/tc7.0.x/tags/TOMCAT_7_0_41/ -- bugtraq:warnifnoissue = false Propchange: tomcat/tc7.0.x/tags/TOMCAT_7_0_41/ -- --- svn:ignore (added) +++ svn:ignore Thu Jun 6 09:56:30 2013 @@ -0,0 +1,7 @@ +.* +build.properties +logs +nbproject +output +work +*.iml Propchange: tomcat/tc7.0.x/tags/TOMCAT_7_0_41/ -- --- svn:mergeinfo (added) +++ svn:mergeinfo Thu Jun 6 09:56:30 2013 @@ -0,0 +1 @@ +/tomcat/trunk:1156115-1157160,1157162-1157859,1157862-1157942,1157945-1160347,1160349-1163716,1163718-1166689,1166691-1174340,1174342-1175596,1175598-1175611,1175613-1175932,1175934-1177783,1177785-1177980,1178006-1180720,1180722-1183094,1183096-1187753,1187755,1187775,1187801,1187806,1187809,1187826-1188312,1188314-1188401,1188646-1188840,1188842-1190176,1190178-1195223,1195225-1195953,1195955,1195957-1201238,1201240-1203345,1203347-1206623,1206625-1208046,1208073,1208096,1208114,1208145,1208772,1209194-1212125,1212127-1220291,1220293,1220295-1221321,1221323-1222328,1222332-1222401,1222405-1222795,1222850-1222950,1222969-1225326,1225328-1225463,1225465,1225627,1225629-1226534,1226536-1228908,1228911-1228923,1228927-1229532,1229534-1230766,1230768-1231625,1231627-1233414,1233419-1235207,1235209-1237425,1237427,1237429-1237977,1237981,1237985,1237995,1238070,1238073,1239024-1239048,1239050-1239062,1239135,1239256,1239258-1239485,1239785-1240046,1240101,1240106,1240109,1240112 ,1240114,1240116,1240118,1240121,1240329,1240474-1240850,1240857,1241087,1241160,1241408-1241822,1241908-1241909,1241912-1242110,1242371-1292130,1292134-1292458,1292464-1292670,1292672-1292776,1292780-1293392,1293397-1297017,1297019-1297963,1297965-1299820,1300108,1300111-1300460,1300520-1300948,1300997,1301006,1301280,1302332,1302348,1302608-1302610,1302649,1302837,1303138,1303163,1303338,1303521,1303587,1303698,1303803,1303852,1304011,1304035,1304037,1304135,1304249,1304253,1304260,1304271,1304275,1304468,1304895,1304930-1304932,1305194,1305943,1305965,1306556,1306579-1306580,1307084,1307310,1307511-1307512,1307579,1307591,1307597,1310636,1310639-1310640,1310642,1310701,1311212,1311995,1327617,1327670,1331766,1333161,1333173,1333827,1334787,1335026,1335257,1335547,1335692,1335711,1335731,1336515,1336813,1336864,1336868,1336884,1337419,1337426,1337546,1337572,1337591-1337595,1337643,1337707,1337719,1337734,1337741,1337745,1338151-1338154,1338178,1342027,1342029,1342315,1342 320,1342476,1342498,1342503,1342717,1342795,1342805,1343044-1343046,1343335,1343394,1343400,1343629,1343708,1343718,1343895,1344063,1344068,1344250,1344266,1344515,1344528,1344612,1344629,1344725,1344868,1344890,1344893,1344896,1344901,1345020,1345029,1345039,1345287-1345290,1345294,1345309,1345325,1345357,1345367,1345579-1345580,1345582,1345688,1345699,1345704,1345731-1345732,1345737,1345744,1345752,1345754,1345779,1345781,1345846,1346107,1346376,1346404,1346510,1346514,1346519,1346581,1346635,1346644,1346683,1346794,1346885,1346932,1347034,1347047,1347087,1347108-1347109,1347583,1347737,1348105,1348357,1348398,1348425,1348461-1348495,1348498,1348752,1348762,1348772,1348776,1348859,1348968,1348973,1348989,1349007,1349237,1349298,1349317,1349410,1349473,1349539,1349879,1349887,1349893,1349922,1349984,1350124,1350241,1350243,1350294-1350295,1350299,1350864,1350900,1351010,1351054,1351056,1351068,1351134-1351135,1351148,1351259,1351604,1351636-1351640,1351991,1351993,1352011,1 352056,1352059,1352661,1352663,1352788,1352799,1353087,1353125,1353240,1353261,1353414,1353468,1353501,1353581,13537
svn commit: r2134 - /release/tomcat/tomcat-7/v7.0.39/
Author: markt Date: Thu Jun 6 10:33:15 2013 New Revision: 2134 Log: Remove 7.0.39 Removed: release/tomcat/tomcat-7/v7.0.39/ - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r2134 - /release/tomcat/tomcat-7/v7.0.39/
Author: markt Date: Thu Jun 6 10:33:15 2013 New Revision: 2134 Log: Remove 7.0.39 Removed: release/tomcat/tomcat-7/v7.0.39/ - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[VOTE] Release Apache Tomcat 7.0.41
The proposed Apache Tomcat 7.0.41 release is now available for voting. It can be obtained from: https://dist.apache.org/repos/dist/dev/tomcat/tomcat-7/v7.0.41/ The Maven staging repo is: https://repository.apache.org/content/repositories/orgapachetomcat-073/ The svn tag is: http://svn.apache.org/repos/asf/tomcat/tc7.0.x/tags/TOMCAT_7_0_41/ The proposed 7.0.41 release is: [ ] Broken - do not release [ ] Stable - go ahead and release as 7.0.41 Stable Cheers, Mark - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1490332 - /tomcat/native/branches/1.1.x/README.txt
Author: schultz Date: Thu Jun 6 16:05:44 2013 New Revision: 1490332 URL: http://svn.apache.org/r1490332 Log: Fixed build instructions. Modified: tomcat/native/branches/1.1.x/README.txt Modified: tomcat/native/branches/1.1.x/README.txt URL: http://svn.apache.org/viewvc/tomcat/native/branches/1.1.x/README.txt?rev=1490332&r1=1490331&r2=1490332&view=diff == --- tomcat/native/branches/1.1.x/README.txt (original) +++ tomcat/native/branches/1.1.x/README.txt Thu Jun 6 16:05:44 2013 @@ -38,11 +38,10 @@ http://tomcat.apache.org/tomcat-7.0-doc/ Building -To build the Java API -> cd jni +To build the Java API. Note that Java 1.7 is required to build the Java API. > ant -To build the native part see jni/native/BUILDING +To build the native part see native/BUILDING Running the tests - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[Bug 51813] Tomcat randomly crashes with [libtcnative-1.so.1+0x152ca] Java_org_apache_tomcat_jni_Socket_sendbb+0x5a
https://issues.apache.org/bugzilla/show_bug.cgi?id=51813 --- Comment #7 from Christopher Schultz --- Created attachment 30402 --> https://issues.apache.org/bugzilla/attachment.cgi?id=30402&action=edit Patch against tcnative-1.1.x I'm not sure if I should be checking s->net or s->sock. They both seem to be set to NULL in the various recycle routines so it probably doesn't matter either way. I'm also not sure if APR_EINVALSOCK is the right error code to use. -- 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
Where to put proposals for tcnative?
All, Neither tcnative/trunk not tcnative/branches/1.1.x have a STATUS.txt file... where should proposals be made? In Tomcat directly? Thanks, -chris signature.asc Description: OpenPGP digital signature
Re: Where to put proposals for tcnative?
On 06.06.2013 18:22, Christopher Schultz wrote: > All, > > Neither tcnative/trunk not tcnative/branches/1.1.x have a STATUS.txt > file... where should proposals be made? In Tomcat directly? The Java classes come from TC trunk via externals. So proposals which are mainly for those can be discussed just like any big trunk change (mail list). Proposals mostly for the C files probably make sense in a STATUS file here if they are backports from native trunk. The old STATUS file can be seen under: http://svn.apache.org/viewvc?view=revision&revision=881756 Proposals for the C part in native trunk probably also make sense to discuss on the mail list if necessary. My 2 cents. Rainer - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: Where to put proposals for tcnative?
Rainer, On 6/6/13 1:32 PM, Rainer Jung wrote: > On 06.06.2013 18:22, Christopher Schultz wrote: >> All, >> >> Neither tcnative/trunk not tcnative/branches/1.1.x have a STATUS.txt >> file... where should proposals be made? In Tomcat directly? > > The Java classes come from TC trunk via externals. So proposals which > are mainly for those can be discussed just like any big trunk change > (mail list). > > Proposals mostly for the C files probably make sense in a STATUS file > here if they are backports from native trunk. I was going to make a C-language proposal. I can't seem to get "configure" to work in trunk because some macros aren't working properly (see below), so I've been working in the 1.1.x branch. > The old STATUS file can be seen under: > > http://svn.apache.org/viewvc?view=revision&revision=881756 > > Proposals for the C part in native trunk probably also make sense to > discuss on the mail list if necessary. The patch in question is the one attached to this bug: https://issues.apache.org/bugzilla/show_bug.cgi?id=51813 Normally, I'd just make the change and let someone object, but tcnative is something I have less familiarity with, so I wanted to get some eyes on it (probably Mladen's) before committing. Thanks, -chris PS Here's what I get when trying to build tcnative-trunk: $ sh buildconf --with-apr=../../apr-1.4.6/ Looking for apr source in ../../apr-1.4.6/ Creating configure ... Generating 'make' outputs ... rebuilding rpm spec file ./configure --with-apr=../../apr-1.4.6/ --with-ssl=yes checking build system type... x86_64-unknown-linux-gnu checking host system type... x86_64-unknown-linux-gnu checking target system type... x86_64-unknown-linux-gnu checking for a BSD-compatible install... /usr/bin/install -c checking for working mkdir -p... yes Tomcat Native Version: 1.2.0 checking for chosen layout... tcnative checking for APR... yes configure: APR 1.4.6 detected. setting CC to "gcc" setting CPP to "gcc -E" ./configure: line 2710: TCN_FIND_JDK: command not found ./configure: line 2711: TCN_SABLEVM: command not found ./configure: line 2712: TCN_J9VM: command not found adding "-I/usr/include" to TCNATIVE_PRIV_INCLUDES checking for JDK os include directory... Cannot find jni_md.h in /usr/ configure: error: You should retry --with-os-type=SUBDIR It looks like configure only looks at JAVA_HOME environment variable and does not accept --with-java-home like tcnative 1.1.x does. I think we should allow --with-java-home like tcnative 1.1.x, but I have no idea how to work with buildconf/configure/etc. signature.asc Description: OpenPGP digital signature
svn commit: r1490438 - /tomcat/native/trunk/native/build/tcnative.m4
Author: rjung Date: Thu Jun 6 20:50:02 2013 New Revision: 1490438 URL: http://svn.apache.org/r1490438 Log: tcnative configure: --with-java -> --with-java-home as indicated by the help string. Modified: tomcat/native/trunk/native/build/tcnative.m4 Modified: tomcat/native/trunk/native/build/tcnative.m4 URL: http://svn.apache.org/viewvc/tomcat/native/trunk/native/build/tcnative.m4?rev=1490438&r1=1490437&r2=1490438&view=diff == --- tomcat/native/trunk/native/build/tcnative.m4 (original) +++ tomcat/native/trunk/native/build/tcnative.m4 Thu Jun 6 20:50:02 2013 @@ -68,7 +68,7 @@ dnl result goes in JAVA_HOME / JAVA_PLAT dnl dnl -- AC_DEFUN([TCN_FIND_JAVA],[ - AC_ARG_WITH(java,[ --with-java-home=DIR Specify the location of your JDK installation],[ + AC_ARG_WITH(java-home,[ --with-java-home=DIR Specify the location of your JDK installation],[ AC_MSG_CHECKING([JAVA_HOME]) if test -d "$withval" then - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1490439 - /tomcat/native/trunk/native/configure.in
Author: rjung
Date: Thu Jun 6 20:51:20 2013
New Revision: 1490439
URL: http://svn.apache.org/r1490439
Log:
Adjust configure to m4 macros.
Followup to r1205445.
Modified:
tomcat/native/trunk/native/configure.in
Modified: tomcat/native/trunk/native/configure.in
URL:
http://svn.apache.org/viewvc/tomcat/native/trunk/native/configure.in?rev=1490439&r1=1490438&r2=1490439&view=diff
==
--- tomcat/native/trunk/native/configure.in (original)
+++ tomcat/native/trunk/native/configure.in Thu Jun 6 20:51:20 2013
@@ -107,9 +107,7 @@ dnl
dnl Find the JVM related information
dnl
NEED_JNI_MD=yes
-TCN_FIND_JDK
-TCN_SABLEVM
-TCN_J9VM
+TCN_FIND_JAVA
dnl MAC OS X does not used include but Headers
if test -d ${JAVA_HOME}/Headers; then
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: Where to put proposals for tcnative?
On 06.06.2013 19:56, Christopher Schultz wrote: > Rainer, > > On 6/6/13 1:32 PM, Rainer Jung wrote: >> On 06.06.2013 18:22, Christopher Schultz wrote: >> Proposals mostly for the C files probably make sense in a STATUS file >> here if they are backports from native trunk. > > I was going to make a C-language proposal. > > I can't seem to get "configure" to work in trunk because some macros > aren't working properly (see below), so I've been working in the 1.1.x > branch. See below below :) > PS Here's what I get when trying to build tcnative-trunk: ... snip ... configure.in was broken as was the new java detection macro. Hopefully fixed in the last two commits. "svn up" and there you go. Regards, Rainer - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
RE: Where to put proposals for tcnative?
> From: Christopher Schultz [mailto:ch...@christopherschultz.net] > Subject: Re: Where to put proposals for tcnative? > PS Here's what I get when trying to build tcnative-trunk: > $ sh buildconf --with-apr=../../apr-1.4.6/ > checking for JDK os include directory... Cannot find jni_md.h in /usr/ > configure: error: You should retry --with-os-type=SUBDIR It's an error to ever look for jni_md.h explicitly, since it's existence is dependent on the JVM vendor. (This was recently reported on the users' list.) In Sun/Oracle JDKs, jni_md.h is automatically #included inside jni.h, which is the only header file the spec requires. - Chuck THIS COMMUNICATION MAY CONTAIN CONFIDENTIAL AND/OR OTHERWISE PROPRIETARY MATERIAL and is thus for use only by the intended recipient. If you received this in error, please contact the sender and delete the e-mail and its attachments from all computers. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: Where to put proposals for tcnative?
On 06.06.2013 22:54, Rainer Jung wrote: > On 06.06.2013 19:56, Christopher Schultz wrote: >> Rainer, >> >> On 6/6/13 1:32 PM, Rainer Jung wrote: >>> On 06.06.2013 18:22, Christopher Schultz wrote: > >>> Proposals mostly for the C files probably make sense in a STATUS file >>> here if they are backports from native trunk. >> >> I was going to make a C-language proposal. >> >> I can't seem to get "configure" to work in trunk because some macros >> aren't working properly (see below), so I've been working in the 1.1.x >> branch. > > See below below :) > >> PS Here's what I get when trying to build tcnative-trunk: > > ... snip ... > > configure.in was broken as was the new java detection macro. Hopefully > fixed in the last two commits. "svn up" and there you go. I should also warn you: native trunk is not in good shape. Many C files are behind the 1.1 ones. trunk was created for some new features and increased APR minimum version http://mail-archives.apache.org/mod_mbox/tomcat-dev/200810.mbox/%3c48e6302b.7060...@kippdata.de%3E but later lots of changes were applied directly to 1.1 and trunk was forgotten. See the January 2013 discussion thread on tcnative. The clean up for the native c files didn't happen. Regards, Rainer - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: Where to put proposals for tcnative?
On 06.06.2013 23:00, Caldarale, Charles R wrote: >> From: Christopher Schultz [mailto:ch...@christopherschultz.net] >> Subject: Re: Where to put proposals for tcnative? > >> PS Here's what I get when trying to build tcnative-trunk: > >> $ sh buildconf --with-apr=../../apr-1.4.6/ > >> checking for JDK os include directory... Cannot find jni_md.h in /usr/ >> configure: error: You should retry --with-os-type=SUBDIR > > It's an error to ever look for jni_md.h explicitly, since it's existence is > dependent on the JVM vendor. (This was recently reported on the users' > list.) In Sun/Oracle JDKs, jni_md.h is automatically #included inside jni.h, > which is the only header file the spec requires. Hmm, yes it's automatically included, but the preprocessor will not find it, because it sits in an OS dependent sub directory. So what configure does is trying to find jni_md.h to set up the include path correctly. Otherwise including jni.h will fail. For the JVMs that don't have a jni_md.h (and are known to us), configure has additional script code running later. The JNI spec doesn't seem to help and the FAQ knows about the problem but not the solution: http://www.oracle.com/technetwork/java/jni-j2sdk-faq-141732.html#jni_md Regards, Rainer - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[Bug 55071] New: try finally catch structure masks original exception in JDBCRealm.getPassword()
https://issues.apache.org/bugzilla/show_bug.cgi?id=55071 Bug ID: 55071 Summary: try finally catch structure masks original exception in JDBCRealm.getPassword() Product: Tomcat 7 Version: 7.0.40 Hardware: Other OS: All Status: NEW Severity: normal Priority: P2 Component: Catalina Assignee: dev@tomcat.apache.org Reporter: br...@iris.washington.edu I have run into a mysterious apparent SQL exception in JDBCRealm.getPassword(). Presumably, line 557 "stmt.executeQuery()" occasionally fails. I'm not sure why and would like to know why. However, the finally block contains dbConnection.commit() (line 579). This throws an exception (Connection Closed) which is then logged on line 585. In summary, line 579 should be surrounded by a try catch. -- 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
