DO NOT REPLY [Bug 52002] Pool re-opens and re-issues closed connection
https://issues.apache.org/bugzilla/show_bug.cgi?id=52002 Kevin Greiner changed: What|Removed |Added Attachment #27751|0 |1 is obsolete|| --- Comment #1 from Kevin Greiner 2011-11-01 00:02:55 UTC --- Created attachment 27879 --> https://issues.apache.org/bugzilla/attachment.cgi?id=27879 Patch to create new test case and fix. This patch directly addresses the defect in the ConnectionPool's setupConnection method. This method creates a new proxy instance each time it is called. However, unlike an ordinary object where each instance is unique, proxy objects store their state in their InvocationHandler object. In the original implementation, calls to getConnection() returned a new proxy instance and, as a side effect, returned all previous proxies to the same PooledConnection to an open state. In this patch, I've created a new interceptor (ProxyCutOffConnection) to act as a unique, and disposable, head to a shared interceptor chain. Each proxy instance created by setConnection uses its own unique ProxyCutOffConnection as its handler. When 'close' is called for the first time, ProxyCutOffConnection first passes it to the next interceptor to perform all normal close logic then it severs its connection with that interceptor. As a result, all future calls using this proxy object irrevocably fail with a connection closed error. -- Configure bugmail: https://issues.apache.org/bugzilla/userprefs.cgi?tab=email --- 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
Re: svn commit: r1195531 - /tomcat/trunk/java/org/apache/tomcat/util/http/Parameters.java
On 31/10/2011 23:05, Konstantin Kolinko wrote: > 2011/11/1 Mark Thomas : > > +import org.apache.catalina.util.Enumerator; -1 That import is not permitted. The o.a.tomcat package may not depend on o.a.catalina. You should have seen a checkstyle warning for that when you tried to build it. >>> >>> Maybe move that Enumerator class into org.apache.tomcat.util.collections ? >>> (Resurrecting the collections package) >> >> That works for trunk. It would need to be a copy + deprecation for 7.0.x. >> >>> There are two copies of Enumerator class now: one in catalina and one in >>> jasper. >> Jasper will need to keep its own copy as it can't have any external >> dependencies. > > Isn't tomcat-util.jar the place for classes that both Catalina and > Jasper depend on? Ah yes, I forgot we added that for the Jar scanning stuff. I don't see any reason not to include Enumeration in that jar. Mark - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: svn commit: r1195531 - /tomcat/trunk/java/org/apache/tomcat/util/http/Parameters.java
2011/11/1 Mark Thomas : +import org.apache.catalina.util.Enumerator; >>> >>> -1 >>> >>> That import is not permitted. The o.a.tomcat package may not depend on >>> o.a.catalina. You should have seen a checkstyle warning for that when >>> you tried to build it. >>> >> >> Maybe move that Enumerator class into org.apache.tomcat.util.collections ? >> (Resurrecting the collections package) > > That works for trunk. It would need to be a copy + deprecation for 7.0.x. > >> There are two copies of Enumerator class now: one in catalina and one in >> jasper. > Jasper will need to keep its own copy as it can't have any external > dependencies. Isn't tomcat-util.jar the place for classes that both Catalina and Jasper depend on? Best regards, Konstantin Kolinko - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: svn commit: r1195531 - /tomcat/trunk/java/org/apache/tomcat/util/http/Parameters.java
On 31/10/2011 22:52, Konstantin Kolinko wrote: > 2011/11/1 Mark Thomas : >> On 31/10/2011 15:46, kkoli...@apache.org wrote: >>> Author: kkolinko >>> Date: Mon Oct 31 15:46:36 2011 >>> New Revision: 1195531 >>> >>> URL: http://svn.apache.org/viewvc?rev=1195531&view=rev >>> Log: >>> Replace Hashtable with HashMap in parameter processing. >>> Improve paramsAsString() debug method by iterating over entries instead of >>> keys. >>> >>> Modified: >>> tomcat/trunk/java/org/apache/tomcat/util/http/Parameters.java >>> >>> Modified: tomcat/trunk/java/org/apache/tomcat/util/http/Parameters.java >>> URL: >>> http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/http/Parameters.java?rev=1195531&r1=1195530&r2=1195531&view=diff >>> == >>> --- tomcat/trunk/java/org/apache/tomcat/util/http/Parameters.java (original) >>> +++ tomcat/trunk/java/org/apache/tomcat/util/http/Parameters.java Mon Oct >>> 31 15:46:36 2011 >>> @@ -21,8 +21,10 @@ import java.io.UnsupportedEncodingExcept >>> import java.nio.charset.Charset; >>> import java.util.ArrayList; >>> import java.util.Enumeration; >>> -import java.util.Hashtable; >>> +import java.util.HashMap; >>> +import java.util.Map; >>> >>> +import org.apache.catalina.util.Enumerator; >> >> -1 >> >> That import is not permitted. The o.a.tomcat package may not depend on >> o.a.catalina. You should have seen a checkstyle warning for that when >> you tried to build it. >> > > Maybe move that Enumerator class into org.apache.tomcat.util.collections ? > (Resurrecting the collections package) That works for trunk. It would need to be a copy + deprecation for 7.0.x. > There are two copies of Enumerator class now: one in catalina and one in > jasper. Jasper will need to keep its own copy as it can't have any external dependencies. It would be good to get this fixed asap as I'd like to create the tag for 7.0.23 tomorrow. Mark - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: svn commit: r1195531 - /tomcat/trunk/java/org/apache/tomcat/util/http/Parameters.java
2011/11/1 Mark Thomas : > On 31/10/2011 15:46, kkoli...@apache.org wrote: >> Author: kkolinko >> Date: Mon Oct 31 15:46:36 2011 >> New Revision: 1195531 >> >> URL: http://svn.apache.org/viewvc?rev=1195531&view=rev >> Log: >> Replace Hashtable with HashMap in parameter processing. >> Improve paramsAsString() debug method by iterating over entries instead of >> keys. >> >> Modified: >> tomcat/trunk/java/org/apache/tomcat/util/http/Parameters.java >> >> Modified: tomcat/trunk/java/org/apache/tomcat/util/http/Parameters.java >> URL: >> http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/http/Parameters.java?rev=1195531&r1=1195530&r2=1195531&view=diff >> == >> --- tomcat/trunk/java/org/apache/tomcat/util/http/Parameters.java (original) >> +++ tomcat/trunk/java/org/apache/tomcat/util/http/Parameters.java Mon Oct 31 >> 15:46:36 2011 >> @@ -21,8 +21,10 @@ import java.io.UnsupportedEncodingExcept >> import java.nio.charset.Charset; >> import java.util.ArrayList; >> import java.util.Enumeration; >> -import java.util.Hashtable; >> +import java.util.HashMap; >> +import java.util.Map; >> >> +import org.apache.catalina.util.Enumerator; > > -1 > > That import is not permitted. The o.a.tomcat package may not depend on > o.a.catalina. You should have seen a checkstyle warning for that when > you tried to build it. > Maybe move that Enumerator class into org.apache.tomcat.util.collections ? (Resurrecting the collections package) There are two copies of Enumerator class now: one in catalina and one in jasper. It will need a tweak to build script to pack it into tomcat-util.jar Best regards, Konstantin Kolinko - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: svn commit: r1195531 - /tomcat/trunk/java/org/apache/tomcat/util/http/Parameters.java
On 31/10/2011 15:46, kkoli...@apache.org wrote: > Author: kkolinko > Date: Mon Oct 31 15:46:36 2011 > New Revision: 1195531 > > URL: http://svn.apache.org/viewvc?rev=1195531&view=rev > Log: > Replace Hashtable with HashMap in parameter processing. > Improve paramsAsString() debug method by iterating over entries instead of > keys. > > Modified: > tomcat/trunk/java/org/apache/tomcat/util/http/Parameters.java > > Modified: tomcat/trunk/java/org/apache/tomcat/util/http/Parameters.java > URL: > http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/http/Parameters.java?rev=1195531&r1=1195530&r2=1195531&view=diff > == > --- tomcat/trunk/java/org/apache/tomcat/util/http/Parameters.java (original) > +++ tomcat/trunk/java/org/apache/tomcat/util/http/Parameters.java Mon Oct 31 > 15:46:36 2011 > @@ -21,8 +21,10 @@ import java.io.UnsupportedEncodingExcept > import java.nio.charset.Charset; > import java.util.ArrayList; > import java.util.Enumeration; > -import java.util.Hashtable; > +import java.util.HashMap; > +import java.util.Map; > > +import org.apache.catalina.util.Enumerator; -1 That import is not permitted. The o.a.tomcat package may not depend on o.a.catalina. You should have seen a checkstyle warning for that when you tried to build it. Mark - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1195649 - in /tomcat/tc5.5.x/trunk: ./ build/ build/resources/ container/catalina/src/share/org/apache/catalina/startup/ container/webapps/docs/ jasper/
Author: markt
Date: Mon Oct 31 20:11:12 2011
New Revision: 1195649
URL: http://svn.apache.org/viewvc?rev=1195649&view=rev
Log:
Update Eclipse compiler to 3.7 and switch to using ecj.jar
Added:
tomcat/tc5.5.x/trunk/build/resources/License.rtf
- copied, changed from r1195441, tomcat/tc6.0.x/trunk/res/License.rtf
Modified:
tomcat/tc5.5.x/trunk/LICENSE
tomcat/tc5.5.x/trunk/STATUS.txt
tomcat/tc5.5.x/trunk/build/RELEASE-NOTES
tomcat/tc5.5.x/trunk/build/build.properties.default
tomcat/tc5.5.x/trunk/build/build.xml
tomcat/tc5.5.x/trunk/container/catalina/src/share/org/apache/catalina/startup/TldConfig.java
tomcat/tc5.5.x/trunk/container/webapps/docs/changelog.xml
tomcat/tc5.5.x/trunk/container/webapps/docs/class-loader-howto.xml
tomcat/tc5.5.x/trunk/container/webapps/docs/jasper-howto.xml
tomcat/tc5.5.x/trunk/eclipse.classpath
tomcat/tc5.5.x/trunk/jasper/build.xml
Modified: tomcat/tc5.5.x/trunk/LICENSE
URL:
http://svn.apache.org/viewvc/tomcat/tc5.5.x/trunk/LICENSE?rev=1195649&r1=1195648&r2=1195649&view=diff
==
--- tomcat/tc5.5.x/trunk/LICENSE (original)
+++ tomcat/tc5.5.x/trunk/LICENSE Mon Oct 31 20:11:12 2011
@@ -263,7 +263,7 @@ For the jmx.jar component:
*/
-For the jasper-jdt.jar component:
+For the Eclipse JDT Java compiler:
Eclipse Public License - v 1.0
Modified: tomcat/tc5.5.x/trunk/STATUS.txt
URL:
http://svn.apache.org/viewvc/tomcat/tc5.5.x/trunk/STATUS.txt?rev=1195649&r1=1195648&r2=1195649&view=diff
==
--- tomcat/tc5.5.x/trunk/STATUS.txt (original)
+++ tomcat/tc5.5.x/trunk/STATUS.txt Mon Oct 31 20:11:12 2011
@@ -27,23 +27,6 @@ PATCHES ACCEPTED TO BACKPORT FROM TRUNK/
PATCHES PROPOSED TO BACKPORT:
[ New proposals should be added at the end of the list ]
-* Update Eclipse compiler and switch to using ecj.jar
- http://people.apache.org/~markt/patches/2011-08-25-lib-update-tc5-v2.patch
- +1: markt
- +1: kkolinko:
-+ update build/resources/License.rtf to match LICENSE file
-+ in class-loader-howto.xml sort the JARs list alphabetically
-I've run jarcheck tool against the archive. Results are in
- http://people.apache.org/~kkolinko/patches/jarcheck/
-Most classes are JDK 1.2 compatible. Some are JDK 1.6 (esp.
annotations processor),
-but it is the same in ecj 3.3.1 that is currently used.
-Those classes are absent in jasper-compiler-jdt.jar that we would
-generate, so their presence does not matter.
- +1: rjung:
-I suggest we switch after releasing 5.5.34 so that the change isn't
introduced
-immediately before tagging.
- -1:
-
* Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=52059
http://svn.apache.org/viewvc?rev=1186763&view=rev
Fix a typo in Windows uninstaller:
Modified: tomcat/tc5.5.x/trunk/build/RELEASE-NOTES
URL:
http://svn.apache.org/viewvc/tomcat/tc5.5.x/trunk/build/RELEASE-NOTES?rev=1195649&r1=1195648&r2=1195649&view=diff
==
--- tomcat/tc5.5.x/trunk/build/RELEASE-NOTES (original)
+++ tomcat/tc5.5.x/trunk/build/RELEASE-NOTES Mon Oct 31 20:11:12 2011
@@ -86,7 +86,7 @@ for use by web applications (by placing
* commons-el.jar (Commons Expression Language 1.0)
* commons-logging-api.jar (Commons Logging API 1.0.x)
* jasper-compiler.jar (Jasper 2 Compiler)
-* jasper-compiler-jdt.jar (Eclipse JDT Java compiler)
+* ecj-x.y.z.jar (Eclipse JDT Java compiler)
* jasper-runtime.jar (Jasper 2 Runtime)
* jsp-api.jar (JSP 2.0 API)
* naming-common.jar (JNDI Context implementation)
Modified: tomcat/tc5.5.x/trunk/build/build.properties.default
URL:
http://svn.apache.org/viewvc/tomcat/tc5.5.x/trunk/build/build.properties.default?rev=1195649&r1=1195648&r2=1195649&view=diff
==
--- tomcat/tc5.5.x/trunk/build/build.properties.default (original)
+++ tomcat/tc5.5.x/trunk/build/build.properties.default Mon Oct 31 20:11:12 2011
@@ -146,10 +146,14 @@ xerces.loc=${base-xerces.loc}/j/binaries
# - Eclipse JDT, version 3.3.1 or later -
-jdt.home=${base.path}/eclipse/plugins
-jdt.lib=${jdt.home}
-jdt.jar=${jdt.lib}/org.eclipse.jdt.core_3.3.1.v_780_R33x.jar
-jdt.loc=http://archive.eclipse.org/eclipse/downloads/drops/R-3.3.1-200709211145/eclipse-JDT-3.3.1.zip
+jdt.version=3.7
+jdt.release=R-3.7-201106131736
+jdt.home=${base.path}/ecj-${jdt.version}
+jdt.jar=${jdt.home}/ecj-${jdt.version}.jar
+# The download will be moved to the archive area eventually. We are taking
care of that in advance.
+# Note older JARs were called ecj.jar. Newer JARs are called
ecj-${jdt.version}.jar
+jdt.loc.1=http://archive.eclipse.org/eclipse/downloads/drops/${jdt.release}/ecj-${jdt.version}.jar
+jdt.loc.2=http://download.eclipse.org/eclipse/downloads/drops/${jdt
svn commit: r1195626 - /tomcat/tc6.0.x/trunk/STATUS.txt
Author: kkolinko Date: Mon Oct 31 19:20:18 2011 New Revision: 1195626 URL: http://svn.apache.org/viewvc?rev=1195626&view=rev Log: vote Modified: tomcat/tc6.0.x/trunk/STATUS.txt Modified: tomcat/tc6.0.x/trunk/STATUS.txt URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/STATUS.txt?rev=1195626&r1=1195625&r2=1195626&view=diff == --- tomcat/tc6.0.x/trunk/STATUS.txt (original) +++ tomcat/tc6.0.x/trunk/STATUS.txt Mon Oct 31 19:20:18 2011 @@ -106,7 +106,7 @@ PATCHES PROPOSED TO BACKPORT: no context manager message is replied in order to avoid timeout (default 60sec) of GET_ALL_SESSIONS sync phase. http://svn.apache.org/viewvc?view=revision&revision=1195393 - +1: kfujino, markt + +1: kfujino, markt, kkolinko -1: PATCHES/ISSUES THAT ARE STALLED - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1195614 - /tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml
Author: kkolinko Date: Mon Oct 31 18:54:16 2011 New Revision: 1195614 URL: http://svn.apache.org/viewvc?rev=1195614&view=rev Log: Restore changelog entry for issue 51940 that was occasionally removed in r1195441. Modified: tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml Modified: tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml URL: http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml?rev=1195614&r1=1195613&r2=1195614&view=diff == --- tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml (original) +++ tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml Mon Oct 31 18:54:16 2011 @@ -76,6 +76,11 @@ are being used without the CometConnectionManagerValve. (markt) +51940: Do not limit saving of request bodies during FORM +authentication to POST requests since any HTTP method may include a +request body. Based on a patch by Nicholas Sushkin. (markt/kkolinko) + + 51956: RemoteAddrFilter used getRemoteHost instead of getRemoteAddr when filtering Comet events. (schultz) - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1195604 - in /tomcat/tc6.0.x/trunk: ./ STATUS.txt java/org/apache/catalina/ha/session/DeltaSession.java webapps/docs/changelog.xml
Author: kkolinko Date: Mon Oct 31 18:42:09 2011 New Revision: 1195604 URL: http://svn.apache.org/viewvc?rev=1195604&view=rev Log: Merged revision 1189386 from tomcat/trunk: In DeltaSession.setId(String): fix duplicate resetDeltaRequest() call. It occurred via super.setId(id) calling overridden DeltaSession.setId(id, true). Modified: tomcat/tc6.0.x/trunk/ (props changed) tomcat/tc6.0.x/trunk/STATUS.txt tomcat/tc6.0.x/trunk/java/org/apache/catalina/ha/session/DeltaSession.java tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml Propchange: tomcat/tc6.0.x/trunk/ -- --- svn:mergeinfo (original) +++ svn:mergeinfo Mon Oct 31 18:42:09 2011 @@ -1 +1 @@ -/tomcat/trunk:601180,606992,612607,630314,640888,652744,653247,666232,673796,673820,677910,683969,683982,684001,684081,684234,684269-684270,685177,687503,687645,689402,690781,691392,691805,692748,693378,694992,695053,695311,696780,696782,698012,698227,698236,698613,699427,699634,701355,709294,709811,709816,710063,710066,710125,710205,711126,711600,712461,712467,713953,714002,718360,719119,719124,719602,719626,719628,720046,720069,721040,721286,721708,721886,723404,723738,726052,727303,728032,728768,728947,729057,729567,729569,729571,729681,729809,729815,729934,730250,730590,731651,732859,732863,734734,740675,740684,742677,742697,742714,744160,744238,746321,746384,746425,747834,747863,748344,750258,750291,750921,751286-751287,751289,751295,752323,753039,757335,757774,758249,758365,758596,758616,758664,759074,761601,762868,762929,762936-762937,763166,763183,763193,763228,763262,763298,763302,763325,763599,763611,763654,763681,763706,764985,764997,765662,768335,769979,770716,77 0809,770876,772872,776921,776924,776935,776945,777464,777466,777576,777625,778379,778523-778524,781528,781779,782145,782791,783316,783696,783724,783756,783762,783766,783863,783934,784453,784602,784614,785381,785688,785768,785859,786468,786487,786490,786496,786667,787627,787770,787985,789389,790405,791041,791184,791194,791224,791243,791326,791328,791789,792740,793372,793757,793882,793981,794082,794673,794822,795043,795152,795210,795457,795466,797168,797425,797596,797607,802727,802940,804462,804544,804734,805153,809131,809603,810916,810977,812125,812137,812432,813001,813013,813866,814180,814708,814876,815972,816252,817442,817822,819339,819361,820110,820132,820874,820954,821397,828196,828201,828210,828225,828759,830378-830379,830999,831106,831774,831785,831828,831850,831860,832214,832218,833121,833545,834047,835036,835336,836405,881396,881412,883130,883134,883146,883165,883177,883362,883565,884341,885038,885231,885241,885260,885901,885991,886019,888072,889363,889606,889716,8901 39,890265,890349-890350,890417,891185-891187,891583,892198,892341,892415,892464,892555,892812,892814,892817,892843,892887,893321,893493,894580,894586,894805,894831,895013,895045,895057,895191,895392,895703,896370,896384,897380-897381,897776,898126,898256,898468,898527,898555,898558,898718,898836,898906,899284,899348,899420,899653,899769-899770,899783,899788,899792,899916,899918-899919,899935,899949,903916,905020,905151,905722,905728,905735,907311,907513,907538,907652,907819,907825,907864,908002,908721,908754,908759,909097,909206,909212,909525,909636,909869,909875,909887,910266,910370,910442,910471,910485,910974,915226,915737,915861,916097,916141,916157,916170,917598,917633,918093,918489,918594,918684,918787,918792,918799,918803,918885,919851,919914,920025,920055,920298,920449,920596,920824,920840,921444,922010,926716,927062,927621,928482,928695,928732,928798,931709,932357,932967,935105,935983,939491,939551,940064,941356,941463,943112,944409,944416,945231,945808,945835,945841 ,946686,948057,950164,950596,950614,950851,950905,951615,953434,954435,955648,955655,956832,957130,957830,958192,960701,961948,962865,962872,962881,962900,963106,963865,963868,964614,966177-966178,966292,966692,966863,981815,988448,991837,993042,1001955,1002185,1002263,1002274,1002349,1002359,1002362,1002481,1002514,1003461,1003481,1003488,1003556,1003572,1003581,1003861,1004393,1004409,1004415,1004868-1004869,1004912,1005452,1005467,1005647,1005802,1022120,1022134,1022323,1022415,1022606,1022623,1024224,1024251,1026042,1026784,1026912,1026920,1029767,1033415,1033448,1033842,1033897,1037715,1037794,1037887,1037924,1038041,1042022,1042029,1042447,1042452,1042494,1044944,1044987,1050249,1055055,1055236,1055458,1055975,1056264,1056828,1056889,1059881,1061412,1061442,1061446,1062398,1064652,1066244,1066772,1067039,1067139,1069824,1070139,1070420,1070609,1072042,1073393,1075458,1076212,1078409,1078412,1079801,1081334,1088179,1088460,1090022,1094069,1094089,1095138,1097899,1099575 ,1099586,1099772,1099789,1100145,1100822,1101094,1101144,1124680,1130774,1133014,1137862,1137996,1138950,1138953,1140693,1141104,1141441,1142043,1142904,1143134,1143150,1148216,1148471,1152601,1156171,1156519,1164567,1167394,1172233-1172234,1172236,1173614,1174353,1174882,1174884,117
svn commit: r1195564 - in /tomcat/tc6.0.x/trunk: ./ STATUS.txt java/org/apache/catalina/ha/session/SerializablePrincipal.java java/org/apache/catalina/realm/GenericPrincipal.java webapps/docs/changelo
Author: kkolinko Date: Mon Oct 31 16:48:20 2011 New Revision: 1195564 URL: http://svn.apache.org/viewvc?rev=1195564&view=rev Log: Merged revision 1178684 from tomcat/trunk: In GenericPrincipal, SerializablePrincipal: Do not sort lists that have only one element Modified: tomcat/tc6.0.x/trunk/ (props changed) tomcat/tc6.0.x/trunk/STATUS.txt tomcat/tc6.0.x/trunk/java/org/apache/catalina/ha/session/SerializablePrincipal.java tomcat/tc6.0.x/trunk/java/org/apache/catalina/realm/GenericPrincipal.java tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml Propchange: tomcat/tc6.0.x/trunk/ -- --- svn:mergeinfo (original) +++ svn:mergeinfo Mon Oct 31 16:48:20 2011 @@ -1 +1 @@ -/tomcat/trunk:601180,606992,612607,630314,640888,652744,653247,666232,673796,673820,677910,683969,683982,684001,684081,684234,684269-684270,685177,687503,687645,689402,690781,691392,691805,692748,693378,694992,695053,695311,696780,696782,698012,698227,698236,698613,699427,699634,701355,709294,709811,709816,710063,710066,710125,710205,711126,711600,712461,712467,713953,714002,718360,719119,719124,719602,719626,719628,720046,720069,721040,721286,721708,721886,723404,723738,726052,727303,728032,728768,728947,729057,729567,729569,729571,729681,729809,729815,729934,730250,730590,731651,732859,732863,734734,740675,740684,742677,742697,742714,744160,744238,746321,746384,746425,747834,747863,748344,750258,750291,750921,751286-751287,751289,751295,752323,753039,757335,757774,758249,758365,758596,758616,758664,759074,761601,762868,762929,762936-762937,763166,763183,763193,763228,763262,763298,763302,763325,763599,763611,763654,763681,763706,764985,764997,765662,768335,769979,770716,77 0809,770876,772872,776921,776924,776935,776945,777464,777466,777576,777625,778379,778523-778524,781528,781779,782145,782791,783316,783696,783724,783756,783762,783766,783863,783934,784453,784602,784614,785381,785688,785768,785859,786468,786487,786490,786496,786667,787627,787770,787985,789389,790405,791041,791184,791194,791224,791243,791326,791328,791789,792740,793372,793757,793882,793981,794082,794673,794822,795043,795152,795210,795457,795466,797168,797425,797596,797607,802727,802940,804462,804544,804734,805153,809131,809603,810916,810977,812125,812137,812432,813001,813013,813866,814180,814708,814876,815972,816252,817442,817822,819339,819361,820110,820132,820874,820954,821397,828196,828201,828210,828225,828759,830378-830379,830999,831106,831774,831785,831828,831850,831860,832214,832218,833121,833545,834047,835036,835336,836405,881396,881412,883130,883134,883146,883165,883177,883362,883565,884341,885038,885231,885241,885260,885901,885991,886019,888072,889363,889606,889716,8901 39,890265,890349-890350,890417,891185-891187,891583,892198,892341,892415,892464,892555,892812,892814,892817,892843,892887,893321,893493,894580,894586,894805,894831,895013,895045,895057,895191,895392,895703,896370,896384,897380-897381,897776,898126,898256,898468,898527,898555,898558,898718,898836,898906,899284,899348,899420,899653,899769-899770,899783,899788,899792,899916,899918-899919,899935,899949,903916,905020,905151,905722,905728,905735,907311,907513,907538,907652,907819,907825,907864,908002,908721,908754,908759,909097,909206,909212,909525,909636,909869,909875,909887,910266,910370,910442,910471,910485,910974,915226,915737,915861,916097,916141,916157,916170,917598,917633,918093,918489,918594,918684,918787,918792,918799,918803,918885,919851,919914,920025,920055,920298,920449,920596,920824,920840,921444,922010,926716,927062,927621,928482,928695,928732,928798,931709,932357,932967,935105,935983,939491,939551,940064,941356,941463,943112,944409,944416,945231,945808,945835,945841 ,946686,948057,950164,950596,950614,950851,950905,951615,953434,954435,955648,955655,956832,957130,957830,958192,960701,961948,962865,962872,962881,962900,963106,963865,963868,964614,966177-966178,966292,966692,966863,981815,988448,991837,993042,1001955,1002185,1002263,1002274,1002349,1002359,1002362,1002481,1002514,1003461,1003481,1003488,1003556,1003572,1003581,1003861,1004393,1004409,1004415,1004868-1004869,1004912,1005452,1005467,1005647,1005802,1022120,1022134,1022323,1022415,1022606,1022623,1024224,1024251,1026042,1026784,1026912,1026920,1029767,1033415,1033448,1033842,1033897,1037715,1037794,1037887,1037924,1038041,1042022,1042029,1042447,1042452,1042494,1044944,1044987,1050249,1055055,1055236,1055458,1055975,1056264,1056828,1056889,1059881,1061412,1061442,1061446,1062398,1064652,1066244,1066772,1067039,1067139,1069824,1070139,1070420,1070609,1072042,1073393,1075458,1076212,1078409,1078412,1079801,1081334,1088179,1088460,1090022,1094069,1094089,1095138,1097899,1099575 ,1099586,1099772,1099789,1100145,1100822,1101094,1101144,1124680,1130774,1133014,1137862,1137996,1138950,1138953,1140693,1141104,1141441,1142043,1142904,1143134,1143150,1148216,1148471,1152601,1156171,1156519,1164567,1167394,1172233-1172234,1172236,1173614,11
buildbot success in ASF Buildbot on tomcat-trunk
The Buildbot has detected a restored build on builder tomcat-trunk while building ASF Buildbot. Full details are available at: http://ci.apache.org/builders/tomcat-trunk/builds/2443 Buildbot URL: http://ci.apache.org/ Buildslave for this Build: bb-vm_ubuntu Build Reason: scheduler Build Source Stamp: [branch tomcat/trunk] 1195531 Blamelist: kkolinko Build succeeded! sincerely, -The Buildbot
svn commit: r1195537 - in /tomcat/tc7.0.x/trunk: ./ java/org/apache/tomcat/util/http/Parameters.java webapps/docs/changelog.xml
Author: kkolinko Date: Mon Oct 31 15:55:53 2011 New Revision: 1195537 URL: http://svn.apache.org/viewvc?rev=1195537&view=rev Log: Merged revision 1195531 from tomcat/trunk: Replace Hashtable with HashMap in parameter processing. Improve paramsAsString() debug method by iterating over entries instead of keys. Modified: tomcat/tc7.0.x/trunk/ (props changed) tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/http/Parameters.java tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml Propchange: tomcat/tc7.0.x/trunk/ -- --- svn:mergeinfo (original) +++ svn:mergeinfo Mon Oct 31 15:55:53 2011 @@ -1 +1 @@ -/tomcat/trunk:1156115,1156171,1156276,1156304,1156519,1156530,1156602,1157015,1157018,1157151,1157198,1157204,1157810,1157832,1157834,1157847,1157908,1157939,1158155,1158160,1158176,1158195,1158198-1158199,1158227,1158331,1158334-1158335,1158426,1160347,1160592,1160611,1160619,1160626,1160639,1160652,1160720-1160721,1160772,1160774,1160776,1161303,1161310,1161322,1161339,1161486,1161540,1161549,1161584,1162082,1162149,1162169,1162721,1162769,1162836,1162932,1163630,1164419,1164438,1164469,1164480,1164567,1165234,1165247-1165248,1165253,1165273,1165282,1165309,1165331,1165338,1165347,1165360-1165361,1165367-1165368,1165602,1165608,1165677,1165693,1165721,1165723,1165728,1165730,1165738,1165746,1165765,1165777,1165918,1165921,1166077,1166150-1166151,1166290,1166366,1166620,1166686,1166693,1166752,1166757,1167368,1167394,1169447,1170647,1171692,1172233-1172234,1172236,1172269,1172278,1172282,1172556,1172610,1172664,1172689,1172711,1173020-1173021,1173082,1173088,1173090,1173096 ,1173241,1173256,1173288,117,1173342,1173461,1173614,1173630,1173659,1173722,1174061,1174239,1174322,1174325,1174329-1174330,1174337-1174339,1174343,1174353,1174799,1174882,1174884,1174983,1175155,1175158,1175167,1175182,1175190,1175201,1175272,1175275,1175283,1175582,1175589-1175590,1175594,1175602,1175613,1175633,1175690,1175713,1175889,1175896,1175907,1176584,1176590,1176799,1177050,1177060,1177125,1177152,1177160,1177245,1177850,1177862,1177978,1178209,1178228,1178233,1178449,1178542,1178681,1178684,1178721,1179268,1179274,1180261,1180865,1180891,1180894,1180907,1181028,1181123,1181125,1181136,1181291,1181743,1182796,1183078,1183105,1183142,1183328,1183339-1183340,1183492-1183494,1183605,1184917,1184919,1185018,1185020,1185200,1185588,1185626,1185756,1185758,1186011,1186042-1186045,1186104,1186123,1186137,1186153,1186254,1186257,1186377-1186379,1186479-1186480,1186712,1186743,1186750,1186763,1186890-1186892,1186894,1186949,1187018,1187027-1187028,1187381,1187755,1187 775,1187827,1188301,1188303-1188305,1188399,1188822,1188930-1188931,1189116,1189129,1189183,1189240,1189256,1189386,1189413-1189414,1189477,1189685,1189805,1189857,1189864,1189882,1190034,1190185,1190279,1190339,1190371,1190388-1190389,1190474,1190481,1194915,1195222-1195223 +/tomcat/trunk:1156115,1156171,1156276,1156304,1156519,1156530,1156602,1157015,1157018,1157151,1157198,1157204,1157810,1157832,1157834,1157847,1157908,1157939,1158155,1158160,1158176,1158195,1158198-1158199,1158227,1158331,1158334-1158335,1158426,1160347,1160592,1160611,1160619,1160626,1160639,1160652,1160720-1160721,1160772,1160774,1160776,1161303,1161310,1161322,1161339,1161486,1161540,1161549,1161584,1162082,1162149,1162169,1162721,1162769,1162836,1162932,1163630,1164419,1164438,1164469,1164480,1164567,1165234,1165247-1165248,1165253,1165273,1165282,1165309,1165331,1165338,1165347,1165360-1165361,1165367-1165368,1165602,1165608,1165677,1165693,1165721,1165723,1165728,1165730,1165738,1165746,1165765,1165777,1165918,1165921,1166077,1166150-1166151,1166290,1166366,1166620,1166686,1166693,1166752,1166757,1167368,1167394,1169447,1170647,1171692,1172233-1172234,1172236,1172269,1172278,1172282,1172556,1172610,1172664,1172689,1172711,1173020-1173021,1173082,1173088,1173090,1173096 ,1173241,1173256,1173288,117,1173342,1173461,1173614,1173630,1173659,1173722,1174061,1174239,1174322,1174325,1174329-1174330,1174337-1174339,1174343,1174353,1174799,1174882,1174884,1174983,1175155,1175158,1175167,1175182,1175190,1175201,1175272,1175275,1175283,1175582,1175589-1175590,1175594,1175602,1175613,1175633,1175690,1175713,1175889,1175896,1175907,1176584,1176590,1176799,1177050,1177060,1177125,1177152,1177160,1177245,1177850,1177862,1177978,1178209,1178228,1178233,1178449,1178542,1178681,1178684,1178721,1179268,1179274,1180261,1180865,1180891,1180894,1180907,1181028,1181123,1181125,1181136,1181291,1181743,1182796,1183078,1183105,1183142,1183328,1183339-1183340,1183492-1183494,1183605,1184917,1184919,1185018,1185020,1185200,1185588,1185626,1185756,1185758,1186011,1186042-1186045,1186104,1186123,1186137,1186153,1186254,1186257,1186377-1186379,1186479-1186480,1186712,1186743,1186750,1186763,1186890-1186892,1186894,1186949,1187018,1187027-1187028,1187381,1187755,1187 775,1187827,1188301,1188303-1188305,1188399,1188822,1188930-118
Re: svn commit: r1190720 - /tomcat/tc5.5.x/trunk/STATUS.txt
2011/10/29 Mark Thomas : >> + "private final Hashtable paramHashValues" >> + - Maybe a HashMap can be used instead. I do not expect much >> improvements >> + from that though. > Hashtable makes implementing getParameterNames() a lot simpler. Replaced with HashMap in trunk in r1195531, will apply to TC7 as well. With performance tests the HashMap works faster for me. The difference is from 2% in short test up to 6% with maximum test size. Best regards, Konstantin Kolinko - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1195531 - /tomcat/trunk/java/org/apache/tomcat/util/http/Parameters.java
Author: kkolinko
Date: Mon Oct 31 15:46:36 2011
New Revision: 1195531
URL: http://svn.apache.org/viewvc?rev=1195531&view=rev
Log:
Replace Hashtable with HashMap in parameter processing.
Improve paramsAsString() debug method by iterating over entries instead of keys.
Modified:
tomcat/trunk/java/org/apache/tomcat/util/http/Parameters.java
Modified: tomcat/trunk/java/org/apache/tomcat/util/http/Parameters.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/http/Parameters.java?rev=1195531&r1=1195530&r2=1195531&view=diff
==
--- tomcat/trunk/java/org/apache/tomcat/util/http/Parameters.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/http/Parameters.java Mon Oct 31
15:46:36 2011
@@ -21,8 +21,10 @@ import java.io.UnsupportedEncodingExcept
import java.nio.charset.Charset;
import java.util.ArrayList;
import java.util.Enumeration;
-import java.util.Hashtable;
+import java.util.HashMap;
+import java.util.Map;
+import org.apache.catalina.util.Enumerator;
import org.apache.tomcat.util.buf.B2CConverter;
import org.apache.tomcat.util.buf.ByteChunk;
import org.apache.tomcat.util.buf.CharChunk;
@@ -42,8 +44,8 @@ public final class Parameters {
protected static final StringManager sm =
StringManager.getManager("org.apache.tomcat.util.http");
-private final Hashtable> paramHashValues =
-new Hashtable>();
+private final HashMap> paramHashValues =
+new HashMap>();
private boolean didQueryParameters=false;
MessageBytes queryMB;
@@ -111,7 +113,7 @@ public final class Parameters {
public Enumeration getParameterNames() {
handleQueryParameters();
-return paramHashValues.keys();
+return new Enumerator(paramHashValues.keySet());
}
// Shortcut.
@@ -394,12 +396,10 @@ public final class Parameters {
*/
public String paramsAsString() {
StringBuilder sb = new StringBuilder();
-Enumeration en = paramHashValues.keys();
-while (en.hasMoreElements()) {
-String k = en.nextElement();
-sb.append(k).append('=');
-ArrayList values = paramHashValues.get(k);
-for(String value : values) {
+for (Map.Entry> e :
paramHashValues.entrySet()) {
+sb.append(e.getKey()).append('=');
+ArrayList values = e.getValue();
+for (String value : values) {
sb.append(value).append(',');
}
sb.append('\n');
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1195524 - /tomcat/jk/trunk/native/iis/jk_isapi_plugin.c
Author: mturk
Date: Mon Oct 31 15:34:25 2011
New Revision: 1195524
URL: http://svn.apache.org/viewvc?rev=1195524&view=rev
Log:
More code cleanup. Remove those useless casts
Modified:
tomcat/jk/trunk/native/iis/jk_isapi_plugin.c
Modified: tomcat/jk/trunk/native/iis/jk_isapi_plugin.c
URL:
http://svn.apache.org/viewvc/tomcat/jk/trunk/native/iis/jk_isapi_plugin.c?rev=1195524&r1=1195523&r2=1195524&view=diff
==
--- tomcat/jk/trunk/native/iis/jk_isapi_plugin.c (original)
+++ tomcat/jk/trunk/native/iis/jk_isapi_plugin.c Mon Oct 31 15:34:25 2011
@@ -904,15 +904,15 @@ static void write_error_message(LPEXTENS
if (error_page) {
char error_page_url[INTERNET_MAX_URL_LENGTH] = "";
-int len_of_error_page;
+DWORD len_of_error_page;
StringCbPrintf(error_page_url, INTERNET_MAX_URL_LENGTH,
- (LPCSTR)error_page, err);
-len_of_error_page = (int)strlen(error_page_url);
+ error_page, err);
+len_of_error_page = (DWORD)strlen(error_page_url);
if (!lpEcb->ServerSupportFunction(lpEcb->ConnID,
HSE_REQ_SEND_URL_REDIRECT_RESP,
error_page_url,
- (LPDWORD)&len_of_error_page,
- (LPDWORD)NULL)) {
+ &len_of_error_page,
+ NULL)) {
lpEcb->dwHttpStatusCode = err;
}
else {
@@ -1224,7 +1224,7 @@ static int JK_METHOD iis_read(jk_ws_serv
jk_log(logger, JK_LOG_DEBUG,
"Attempting to read %d bytes from client", l);
}
-if (p->lpEcb->ReadClient(p->lpEcb->ConnID, buf, (LPDWORD)&l)) {
+if (p->lpEcb->ReadClient(p->lpEcb->ConnID, buf, &l)) {
/* ReadClient will succeed with dwSize == 0 for last chunk
if request chunk encoded */
*a += l;
@@ -1348,8 +1348,7 @@ static int JK_METHOD iis_write(jk_ws_ser
if (!p->lpEcb->ServerSupportFunction(p->lpEcb->ConnID,
HSE_REQ_VECTOR_SEND,
&response_vector,
-(LPDWORD)NULL,
-(LPDWORD)NULL)) {
+NULL, NULL)) {
jk_log(logger, JK_LOG_ERROR,
"Vector write of chunk encoded response failed
with %d (0x%08x)",
GetLastError(), GetLastError());
@@ -1440,8 +1439,7 @@ static int JK_METHOD iis_done(jk_ws_serv
if (!p->lpEcb->ServerSupportFunction(p->lpEcb->ConnID,
HSE_REQ_VECTOR_SEND,
&response_vector,
- (LPDWORD)NULL,
- (LPDWORD)NULL)) {
+ NULL, NULL)) {
jk_log(logger, JK_LOG_ERROR,
"Vector termination of chunk encoded response
failed with %d (0x%08x)",
GetLastError(), GetLastError());
@@ -2968,7 +2966,7 @@ static int get_registry_config_parameter
sz = sz - 1; /* Reserve space for RegQueryValueEx to add null terminator */
b[sz] = '\0'; /* Null terminate in case RegQueryValueEx doesn't */
-lrc = RegQueryValueEx(hkey, tag, (LPDWORD) 0, &type, (LPBYTE) b, &sz);
+lrc = RegQueryValueEx(hkey, tag, NULL, &type, (LPBYTE)b, &sz);
if ((ERROR_SUCCESS != lrc) || (type != REG_SZ)) {
return JK_FALSE;
}
@@ -2984,7 +2982,7 @@ static int get_registry_config_number(HK
DWORD sz = sizeof(DWORD);
LONG lrc;
-lrc = RegQueryValueEx(hkey, tag, (LPDWORD)0, &type, (LPBYTE)&data, &sz);
+lrc = RegQueryValueEx(hkey, tag, NULL, &type, (LPBYTE)&data, &sz);
if ((ERROR_SUCCESS != lrc) || (type != REG_DWORD)) {
return JK_FALSE;
}
@@ -3171,20 +3169,17 @@ static int init_ws_service(isapi_private
if (private_data->lpEcb->
ServerSupportFunction(private_data->lpEcb->ConnID,
- (DWORD) HSE_REQ_GET_CERT_INFO_EX,
- (LPVOID) & cc, NULL,
- NULL) != FALSE) {
+ HSE_REQ_GET_CERT_INFO_EX,
+ &cc, NULL, NULL) != FALSE) {
jk_log(logger, JK_LOG_DEBUG,
"Client Certificate encoding:%d sz:%d flags:%ld",
cc.CertContext.
dwCertEncodingType & X509_ASN_ENCODING,
cc.CertContext.cbCertEncoded
Re: svn commit: r1195434 - in /tomcat/jk/trunk/native/common: jk_pool.c jk_pool.h
On 10/31/2011 02:14 PM, Konstantin Kolinko wrote: 2011/10/31: There is a typo in *.h above: s/strdcat/strcat/ You are commenting old code mate :) This was changed in r1195439 and have no clue what was I thinking with 1195434. Cheers -- ^TM - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: buildbot failure in ASF Buildbot on tomcat-trunk
2011/10/31 Konstantin Kolinko : > 2011/10/31 : >> The Buildbot has detected a new failure on builder tomcat-trunk while >> building ASF Buildbot. >> Full details are available at: >> http://ci.apache.org/builders/tomcat-trunk/builds/2442 >> > > [junit] Running org.apache.tomcat.util.http.mapper.TestMapper > [junit] Tests run: 3, Failures: 1, Errors: 0, Time elapsed: 4.682 sec > [junit] Test org.apache.tomcat.util.http.mapper.TestMapper FAILED > > There are no details wrt what test in TestMapper failed and why. Cannot reproduce. It probably was testPerformance(). Note the "4.682 sec" in the message above. The performance test takes most of the time and it fails if time taken is >= 4 sec. Another TestMapper run in the same log file is Time elapsed: 1.422 sec. Previous build (2441) also shows similar numbers of 1.47, 1.41 sec. On my laptop the TestMapper tests currently take ~3,4 sec to run. Best regards, Konstantin Kolinko - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1195490 - /tomcat/jk/trunk/native/iis/jk_isapi_plugin.c
Author: mturk
Date: Mon Oct 31 14:57:04 2011
New Revision: 1195490
URL: http://svn.apache.org/viewvc?rev=1195490&view=rev
Log:
Be consistent. No need for some variables to have variable declaration and all
others don't
Modified:
tomcat/jk/trunk/native/iis/jk_isapi_plugin.c
Modified: tomcat/jk/trunk/native/iis/jk_isapi_plugin.c
URL:
http://svn.apache.org/viewvc/tomcat/jk/trunk/native/iis/jk_isapi_plugin.c?rev=1195490&r1=1195489&r2=1195490&view=diff
==
--- tomcat/jk/trunk/native/iis/jk_isapi_plugin.c (original)
+++ tomcat/jk/trunk/native/iis/jk_isapi_plugin.c Mon Oct 31 14:57:04 2011
@@ -487,9 +487,6 @@ static jk_map_t *jk_environment_map = NU
static jk_logger_t *logger = NULL;
static JK_CRIT_SEC log_cs;
-static char *SERVER_NAME = "SERVER_NAME";
-static char *SERVER_SOFTWARE = "SERVER_SOFTWARE";
-static char *INSTANCE_ID = "INSTANCE_ID";
static char *CONTENT_TYPE = "Content-Type:text/html\r\n\r\n";
static char extension_uri[INTERNET_MAX_URL_LENGTH] =
@@ -1841,11 +1838,11 @@ DWORD WINAPI HttpFilterProc(PHTTP_FILTER
char instanceId[MAX_INSTANCEID] = "";
DWORD dwLen = MAX_SERVERNAME - MAX_INSTANCEID - 1;
-if (pfc->GetServerVariable(pfc, SERVER_NAME, serverName, &dwLen)) {
+if (pfc->GetServerVariable(pfc, "SERVER_NAME", serverName, &dwLen)) {
if (dwLen > 0) {
serverName[dwLen - 1] = '\0';
dwLen = MAX_INSTANCEID;
-if (pfc->GetServerVariable(pfc, INSTANCE_ID, instanceId,
&dwLen)) {
+if (pfc->GetServerVariable(pfc, "INSTANCE_ID", instanceId,
&dwLen)) {
if (dwLen > 0) {
instanceId[dwLen - 1] = '\0';
StringCbCat(serverName, MAX_SERVERNAME, "_");
@@ -1949,15 +1946,13 @@ DWORD WINAPI HttpFilterProc(PHTTP_FILTER
return SF_STATUS_REQ_FINISHED;
}
getparents(uri);
-if (pfc->
-GetServerVariable(pfc, SERVER_NAME, Host, &szHost)) {
+if (pfc->GetServerVariable(pfc, "SERVER_NAME", Host, &szHost)) {
if (szHost > 0) {
Host[szHost - 1] = '\0';
}
}
Port[0] = '\0';
-if (pfc->
-GetServerVariable(pfc, "SERVER_PORT", Port, &szPort)) {
+if (pfc->GetServerVariable(pfc, "SERVER_PORT", Port, &szPort)) {
if (szPort > 0) {
Port[szPort - 1] = '\0';
}
@@ -2186,13 +2181,13 @@ DWORD WINAPI HttpExtensionProc(LPEXTENSI
char instanceId[MAX_INSTANCEID] = "";
DWORD dwLen = MAX_SERVERNAME - MAX_INSTANCEID - 1;
-if (lpEcb->GetServerVariable(lpEcb->ConnID,
-SERVER_NAME, serverName, &dwLen)) {
+if (lpEcb->GetServerVariable(lpEcb->ConnID, "SERVER_NAME",
+ serverName, &dwLen)) {
if (dwLen > 0) {
serverName[dwLen - 1] = '\0';
dwLen = MAX_INSTANCEID;
-if (lpEcb->GetServerVariable(lpEcb->ConnID,
-INSTANCE_ID, instanceId, &dwLen)) {
+if (lpEcb->GetServerVariable(lpEcb->ConnID, "INSTANCE_ID",
+ instanceId, &dwLen)) {
if (dwLen > 0) {
instanceId[dwLen - 1] = '\0';
StringCbCat(serverName, MAX_SERVERNAME, "_");
@@ -3052,9 +3047,9 @@ static int init_ws_service(isapi_private
GET_SERVER_VARIABLE_VALUE("REMOTE_HOST", s->remote_host);
GET_SERVER_VARIABLE_VALUE("REMOTE_ADDR", s->remote_addr);
GET_SERVER_VARIABLE_VALUE("REMOTE_PORT", s->remote_port);
-GET_SERVER_VARIABLE_VALUE(SERVER_NAME, s->server_name);
+GET_SERVER_VARIABLE_VALUE("SERVER_NAME", s->server_name);
GET_SERVER_VARIABLE_VALUE_INT("SERVER_PORT", s->server_port, 80);
-GET_SERVER_VARIABLE_VALUE(SERVER_SOFTWARE, s->server_software);
+GET_SERVER_VARIABLE_VALUE("SERVER_SOFTWARE", s->server_software);
GET_SERVER_VARIABLE_VALUE_INT("SERVER_PORT_SECURE", s->is_ssl, 0);
s->method = private_data->lpEcb->lpszMethod;
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1195483 - /tomcat/jk/trunk/native/iis/jk_isapi_plugin.c
Author: mturk
Date: Mon Oct 31 14:44:40 2011
New Revision: 1195483
URL: http://svn.apache.org/viewvc?rev=1195483&view=rev
Log:
According to the MSDN SetHeader's lpszValue points to the new string for the
header, or NIL to delete the header. Use empty string instead NULL
Modified:
tomcat/jk/trunk/native/iis/jk_isapi_plugin.c
Modified: tomcat/jk/trunk/native/iis/jk_isapi_plugin.c
URL:
http://svn.apache.org/viewvc/tomcat/jk/trunk/native/iis/jk_isapi_plugin.c?rev=1195483&r1=1195482&r2=1195483&view=diff
==
--- tomcat/jk/trunk/native/iis/jk_isapi_plugin.c (original)
+++ tomcat/jk/trunk/native/iis/jk_isapi_plugin.c Mon Oct 31 14:44:40 2011
@@ -156,6 +156,7 @@ static char HTTP_WORKER_HEADER_INDEX[RES
/* HTTP protocol CRLF */
#define CRLF("\r\n")
#define CRLF_LEN(2)
+#define NIL ("")
/* Transfer-Encoding: chunked content trailer */
#define CHUNKED_ENCODING_TRAILER ("0\r\n\r\n")
@@ -1900,11 +1901,11 @@ DWORD WINAPI HttpFilterProc(PHTTP_FILTER
/*
* Just in case somebody set these headers in the request!
*/
-SetHeader(pfc, URI_HEADER_NAME, NULL);
-SetHeader(pfc, QUERY_HEADER_NAME, NULL);
-SetHeader(pfc, WORKER_HEADER_NAME, NULL);
-SetHeader(pfc, WORKER_HEADER_INDEX, NULL);
-SetHeader(pfc, TOMCAT_TRANSLATE_HEADER_NAME, NULL);
+SetHeader(pfc, URI_HEADER_NAME, NIL);
+SetHeader(pfc, QUERY_HEADER_NAME, NIL);
+SetHeader(pfc, WORKER_HEADER_NAME, NIL);
+SetHeader(pfc, WORKER_HEADER_INDEX, NIL);
+SetHeader(pfc, TOMCAT_TRANSLATE_HEADER_NAME, NIL);
/*
* Suppress logging of original uri/query when we don't map a URL
@@ -2095,7 +2096,7 @@ DWORD WINAPI HttpFilterProc(PHTTP_FILTER
"error while adding Tomcat-Translate headers");
return SF_STATUS_REQ_ERROR;
}
-SetHeader(pfc, "Translate:", NULL);
+SetHeader(pfc, "Translate:", NIL);
}
if (!pfc->pFilterContext) {
isapi_log_data_t *ld = (isapi_log_data_t
*)pfc->AllocMem(pfc, sizeof(isapi_log_data_t), 0);
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1195475 - /tomcat/jk/trunk/native/iis/jk_isapi_plugin.c
Author: mturk
Date: Mon Oct 31 14:31:04 2011
New Revision: 1195475
URL: http://svn.apache.org/viewvc?rev=1195475&view=rev
Log:
Remove useless catings
Modified:
tomcat/jk/trunk/native/iis/jk_isapi_plugin.c
Modified: tomcat/jk/trunk/native/iis/jk_isapi_plugin.c
URL:
http://svn.apache.org/viewvc/tomcat/jk/trunk/native/iis/jk_isapi_plugin.c?rev=1195475&r1=1195474&r2=1195475&view=diff
==
--- tomcat/jk/trunk/native/iis/jk_isapi_plugin.c (original)
+++ tomcat/jk/trunk/native/iis/jk_isapi_plugin.c Mon Oct 31 14:31:04 2011
@@ -1873,19 +1873,13 @@ DWORD WINAPI HttpFilterProc(PHTTP_FILTER
char uri[INTERNET_MAX_URL_LENGTH];
char snuri[INTERNET_MAX_URL_LENGTH] = "/";
char Host[INTERNET_MAX_URL_LENGTH] = "";
-char Port[INTERNET_MAX_URL_LENGTH] = "";
char Translate[INTERNET_MAX_URL_LENGTH];
char squery[INTERNET_MAX_URL_LENGTH] = "";
-char swindex[MAX_INSTANCEID] = "";
-BOOL(WINAPI * GetHeader)
-(struct _HTTP_FILTER_CONTEXT * pfc, LPSTR lpszName,
- LPVOID lpvBuffer, LPDWORD lpdwSize);
-BOOL(WINAPI * SetHeader)
-(struct _HTTP_FILTER_CONTEXT * pfc, LPSTR lpszName,
- LPSTR lpszValue);
-BOOL(WINAPI * AddHeader)
-(struct _HTTP_FILTER_CONTEXT * pfc, LPSTR lpszName,
- LPSTR lpszValue);
+char swindex[32] = "";
+char Port[16] = "";
+BOOL (WINAPI * GetHeader)(PHTTP_FILTER_CONTEXT, LPSTR, LPVOID,
LPDWORD);
+BOOL (WINAPI * SetHeader)(PHTTP_FILTER_CONTEXT, LPSTR, LPSTR);
+BOOL (WINAPI * AddHeader)(PHTTP_FILTER_CONTEXT, LPSTR, LPSTR);
char *query;
DWORD sz = sizeof(uri);
DWORD szHost = sizeof(Host);
@@ -1920,7 +1914,8 @@ DWORD WINAPI HttpFilterProc(PHTTP_FILTER
ld->request_matched = JK_FALSE;
}
-if (!GetHeader(pfc, "url", (LPVOID) uri, (LPDWORD) & sz)) {
+if (!GetHeader(pfc, "url", uri, &sz)) {
+
jk_log(logger, JK_LOG_ERROR,
"error while getting the url");
return SF_STATUS_REQ_ERROR;
@@ -1954,16 +1949,14 @@ DWORD WINAPI HttpFilterProc(PHTTP_FILTER
}
getparents(uri);
if (pfc->
-GetServerVariable(pfc, SERVER_NAME, (LPVOID) Host,
- (LPDWORD) & szHost)) {
+GetServerVariable(pfc, SERVER_NAME, Host, &szHost)) {
if (szHost > 0) {
Host[szHost - 1] = '\0';
}
}
Port[0] = '\0';
if (pfc->
-GetServerVariable(pfc, "SERVER_PORT", (LPVOID) Port,
- (LPDWORD) & szPort)) {
+GetServerVariable(pfc, "SERVER_PORT", Port, &szPort)) {
if (szPort > 0) {
Port[szPort - 1] = '\0';
}
@@ -2013,7 +2006,7 @@ DWORD WINAPI HttpFilterProc(PHTTP_FILTER
/* get URI we should forward */
if (uri_select_option == URI_SELECT_OPT_UNPARSED) {
/* get original unparsed URI */
-GetHeader(pfc, "url", (LPVOID) uri, (LPDWORD) & sz);
+GetHeader(pfc, "url", uri, &sz);
/* restore terminator for uri portion */
if (query)
*(query - 1) = '\0';
@@ -2081,8 +2074,7 @@ DWORD WINAPI HttpFilterProc(PHTTP_FILTER
itoa(worker_index, swindex, 10);
if (!AddHeader(pfc, URI_HEADER_NAME, forwardURI) ||
-((strlen(squery) > 0)
- ? !AddHeader(pfc, QUERY_HEADER_NAME, squery) : FALSE) ||
+((strlen(squery) > 0) ? !AddHeader(pfc, QUERY_HEADER_NAME,
squery) : FALSE) ||
!AddHeader(pfc, WORKER_HEADER_NAME, (LPSTR)worker) ||
!AddHeader(pfc, WORKER_HEADER_INDEX, swindex) ||
!SetHeader(pfc, "url", extension_uri)) {
@@ -2096,12 +2088,9 @@ DWORD WINAPI HttpFilterProc(PHTTP_FILTER
* that the extension proc will be called.
* This allows the servlet to handle 'Translate: f'.
*/
-if (GetHeader
-(pfc, TRANSLATE_HEADER, (LPVOID) Translate,
- (LPDWORD) & szTranslate) && Translate != NULL
-&& szTranslate > 0) {
-if (!AddHeader
-(pfc, TOMCAT_TRANSLATE_HEADER_NAME, Translate)) {
+if (GetHeader(pfc, TRANSLATE_HEADER, Translate, &szTranslate)
&&
+ Translate != NULL && szTranslate > 0) {
+if (!AddHeader(pfc, TOMCAT_TRANSLATE_HEADER_NAME,
Translate)) {
jk_log(logger, JK_LOG_ERROR,
"error while adding Tomcat-Transla
DO NOT REPLY [Bug 52113] Tomcat reports missing context xml at wrong location on JMX deployment
https://issues.apache.org/bugzilla/show_bug.cgi?id=52113 --- Comment #1 from michael.golu...@jetbrains.com 2011-10-31 14:10:05 UTC --- Created attachment 27876 --> https://issues.apache.org/bugzilla/attachment.cgi?id=27876 stack traces for logged exceptions -- Configure bugmail: https://issues.apache.org/bugzilla/userprefs.cgi?tab=email --- 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
DO NOT REPLY [Bug 52113] New: Tomcat reports missing context xml at wrong location on JMX deployment
https://issues.apache.org/bugzilla/show_bug.cgi?id=52113 Bug #: 52113 Summary: Tomcat reports missing context xml at wrong location on JMX deployment Product: Tomcat 7 Version: 7.0.21 Platform: PC Status: NEW Severity: normal Priority: P2 Component: Catalina AssignedTo: dev@tomcat.apache.org ReportedBy: michael.golu...@jetbrains.com Classification: Unclassified Hello, I'm using Tomcat JMX interface to deploy apps as follows: 1) call MBeanFactory#createStandardContext, where MBeanFactory is "Catalina:type=MBeanFactory", with parameters: parent = "Catalina:type=Host,host=localhost", path = "/w1", docBase = 2) call #start, where is "Catalina:j2eeType=WebModule,name=//localhost/w1,J2EEApplication=none,J2EEServer=none" As result, my app _is succesfully deployed (its context is available)_, but nevertheless I see the following exceptions in the server console (full stacktraces are skipped, to be attached next comment): 31 2011 14:05:53 org.apache.catalina.startup.ContextConfig processContextConfig SEVERE: Missing context.xml: file:/C://conf/Catalina/localhost/w1.xml java.io.FileNotFoundException: C:\\conf\Catalina\localhost\w1.xml 31 2011 14:05:53 org.apache.catalina.startup.ContextConfig processContextConfig SEVERE: Parse error in context.xml for /w1 java.io.FileNotFoundException: C:\\conf\Catalina\localhost\w1.xml 31 2011 14:05:53 org.apache.catalina.startup.ContextConfig configureStart SEVERE: Marking this application unavailable due to previous error(s) 31 2011 14:05:53 org.apache.catalina.core.StandardContext startInternal SEVERE: Error getConfigured 31 2011 14:05:53 org.apache.catalina.core.StandardContext startInternal SEVERE: Context [/w1] startup failed due to previous errors The exceptions looks strange to me, since I don't understand why Tomcat searches for a context xml file during the jmx deploy. Do I do something wrong in the deployment workflow? Regards, Michael -- Configure bugmail: https://issues.apache.org/bugzilla/userprefs.cgi?tab=email --- 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: r1195459 - /tomcat/jk/trunk/native/iis/jk_isapi_plugin.c
Author: mturk
Date: Mon Oct 31 13:57:44 2011
New Revision: 1195459
URL: http://svn.apache.org/viewvc?rev=1195459&view=rev
Log:
Header callback functions have the same structure offset in both
HTTP_FILTER_PREPROC_HEADERS and HTTP_FILTER_AUTH_COMPLETE_INFO.
Modified:
tomcat/jk/trunk/native/iis/jk_isapi_plugin.c
Modified: tomcat/jk/trunk/native/iis/jk_isapi_plugin.c
URL:
http://svn.apache.org/viewvc/tomcat/jk/trunk/native/iis/jk_isapi_plugin.c?rev=1195459&r1=1195458&r2=1195459&view=diff
==
--- tomcat/jk/trunk/native/iis/jk_isapi_plugin.c (original)
+++ tomcat/jk/trunk/native/iis/jk_isapi_plugin.c Mon Oct 31 13:57:44 2011
@@ -1892,22 +1892,13 @@ DWORD WINAPI HttpFilterProc(PHTTP_FILTER
DWORD szPort = sizeof(Port);
DWORD szTranslate = sizeof(Translate);
-if (iis_info.filter_notify_event == SF_NOTIFY_AUTH_COMPLETE) {
-GetHeader =
-((PHTTP_FILTER_AUTH_COMPLETE_INFO) pvNotification)->GetHeader;
-SetHeader =
-((PHTTP_FILTER_AUTH_COMPLETE_INFO) pvNotification)->SetHeader;
-AddHeader =
-((PHTTP_FILTER_AUTH_COMPLETE_INFO) pvNotification)->AddHeader;
-}
-else {
-GetHeader =
-((PHTTP_FILTER_PREPROC_HEADERS) pvNotification)->GetHeader;
-SetHeader =
-((PHTTP_FILTER_PREPROC_HEADERS) pvNotification)->SetHeader;
-AddHeader =
-((PHTTP_FILTER_PREPROC_HEADERS) pvNotification)->AddHeader;
-}
+/* This can be either HTTP_FILTER_PREPROC_HEADERS or
+ * HTTP_FILTER_AUTH_COMPLETE_INFO. In either case the
+ * requested functions are at the same structure offset
+ */
+GetHeader = ((PHTTP_FILTER_PREPROC_HEADERS)pvNotification)->GetHeader;
+SetHeader = ((PHTTP_FILTER_PREPROC_HEADERS)pvNotification)->SetHeader;
+AddHeader = ((PHTTP_FILTER_PREPROC_HEADERS)pvNotification)->AddHeader;
if (JK_IS_DEBUG_LEVEL(logger))
jk_log(logger, JK_LOG_DEBUG, "Filter started");
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1195456 - /tomcat/jk/trunk/native/iis/jk_isapi_plugin.c
Author: mturk
Date: Mon Oct 31 13:52:09 2011
New Revision: 1195456
URL: http://svn.apache.org/viewvc?rev=1195456&view=rev
Log:
Use 8K stack buffer instead INTERNET_MAX_URL_LENGTH for rewrite rules.
Modified:
tomcat/jk/trunk/native/iis/jk_isapi_plugin.c
Modified: tomcat/jk/trunk/native/iis/jk_isapi_plugin.c
URL:
http://svn.apache.org/viewvc/tomcat/jk/trunk/native/iis/jk_isapi_plugin.c?rev=1195456&r1=1195455&r2=1195456&view=diff
==
--- tomcat/jk/trunk/native/iis/jk_isapi_plugin.c (original)
+++ tomcat/jk/trunk/native/iis/jk_isapi_plugin.c Mon Oct 31 13:52:09 2011
@@ -1786,15 +1786,15 @@ static int simple_rewrite(char *uri)
{
if (rewrite_map) {
int i;
-char buf[INTERNET_MAX_URL_LENGTH];
+char buf[8192];
for (i = 0; i < jk_map_size(rewrite_map); i++) {
const char *src = jk_map_name_at(rewrite_map, i);
if (*src == '~')
continue; /* Skip regexp rewrites */
if (strncmp(uri, src, strlen(src)) == 0) {
-StringCbCopy(buf, INTERNET_MAX_URL_LENGTH,
jk_map_value_at(rewrite_map, i));
-StringCbCat(buf, INTERNET_MAX_URL_LENGTH, uri + strlen(src));
-StringCbCopy(uri, INTERNET_MAX_URL_LENGTH, buf);
+StringCbCopy(buf, sizeof(buf), jk_map_value_at(rewrite_map,
i));
+StringCbCat(buf, sizeof(buf), uri + strlen(src));
+StringCbCopy(uri, sizeof(buf), buf);
return 1;
}
}
@@ -1814,12 +1814,12 @@ static int rregex_rewrite(char *uri)
char *subs = ap_pregsub(regexp->fake, uri,
AP_MAX_REG_MATCH, regm);
if (subs) {
-char buf[INTERNET_MAX_URL_LENGTH];
+char buf[8192];
size_t diffsz = strlen(subs) - (regm[0].rm_eo -
regm[0].rm_so);
memcpy(&buf[0], uri, regm[0].rm_so);
-StringCbCopy(&buf[regm[0].rm_so], INTERNET_MAX_URL_LENGTH
- regm[0].rm_so, subs);
-StringCbCat(&buf[0], INTERNET_MAX_URL_LENGTH, uri +
regm[0].rm_eo);
-StringCbCopy(uri, INTERNET_MAX_URL_LENGTH, &buf[0]);
+StringCbCopy(&buf[regm[0].rm_so], sizeof(buf) -
regm[0].rm_so, subs);
+StringCbCat(&buf[0], sizeof(buf), uri + regm[0].rm_eo);
+StringCbCopy(uri, sizeof(buf), &buf[0]);
free(subs);
return 1;
}
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1195447 - /tomcat/jk/trunk/native/iis/jk_isapi_plugin.c
Author: mturk
Date: Mon Oct 31 13:19:15 2011
New Revision: 1195447
URL: http://svn.apache.org/viewvc?rev=1195447&view=rev
Log:
Step 1 in sanitizing useless stack storage. MAX_PATH (260) chars is just wast
of space for something that can't be larger then 60 bytes
Modified:
tomcat/jk/trunk/native/iis/jk_isapi_plugin.c
Modified: tomcat/jk/trunk/native/iis/jk_isapi_plugin.c
URL:
http://svn.apache.org/viewvc/tomcat/jk/trunk/native/iis/jk_isapi_plugin.c?rev=1195447&r1=1195446&r2=1195447&view=diff
==
--- tomcat/jk/trunk/native/iis/jk_isapi_plugin.c (original)
+++ tomcat/jk/trunk/native/iis/jk_isapi_plugin.c Mon Oct 31 13:19:15 2011
@@ -63,6 +63,8 @@
* for MaxClients
*/
#define DEFAULT_WORKER_THREADS 250
+#define RES_BUFFER_SIZE 64
+#define HDR_BUFFER_SIZE 1024
/*
* We use special headers to pass values from the filter to the
@@ -96,19 +98,19 @@
#define HEADER_TEMPLATE "%s%p:"
#define HTTP_HEADER_TEMPLATE HTTP_HEADER_PREFIX "%s%p"
-static char URI_HEADER_NAME[MAX_PATH];
-static char QUERY_HEADER_NAME[MAX_PATH];
-static char WORKER_HEADER_NAME[MAX_PATH];
-static char TOMCAT_TRANSLATE_HEADER_NAME[MAX_PATH];
-static char WORKER_HEADER_INDEX[MAX_PATH];
+static char URI_HEADER_NAME[RES_BUFFER_SIZE];
+static char QUERY_HEADER_NAME[RES_BUFFER_SIZE];
+static char WORKER_HEADER_NAME[RES_BUFFER_SIZE];
+static char TOMCAT_TRANSLATE_HEADER_NAME[RES_BUFFER_SIZE];
+static char WORKER_HEADER_INDEX[RES_BUFFER_SIZE];
/* The variants of the special headers after IIS adds
* "HTTP_" to the front of them
*/
-static char HTTP_URI_HEADER_NAME[MAX_PATH];
-static char HTTP_QUERY_HEADER_NAME[MAX_PATH];
-static char HTTP_WORKER_HEADER_NAME[MAX_PATH];
-static char HTTP_WORKER_HEADER_INDEX[MAX_PATH];
+static char HTTP_URI_HEADER_NAME[RES_BUFFER_SIZE];
+static char HTTP_QUERY_HEADER_NAME[RES_BUFFER_SIZE];
+static char HTTP_WORKER_HEADER_NAME[RES_BUFFER_SIZE];
+static char HTTP_WORKER_HEADER_INDEX[RES_BUFFER_SIZE];
#define REGISTRY_LOCATION ("Software\\Apache Software
Foundation\\Jakarta Isapi Redirector\\1.0")
#define W3SVC_REGISTRY_KEY
("SYSTEM\\CurrentControlSet\\Services\\W3SVC\\Parameters")
@@ -872,13 +874,13 @@ static int uri_is_web_inf(const char *ur
static void write_error_response(PHTTP_FILTER_CONTEXT pfc, int err)
{
-char status[MAX_PATH];
+char status[1024];
char body[8192] = "";
DWORD len;
/* reject !!! */
pfc->AddResponseHeaders(pfc, CONTENT_TYPE, 0);
-StringCbPrintf(status, MAX_PATH, "%d %s", err, status_reason(err));
+StringCbPrintf(status, sizeof(status), "%d %s", err, status_reason(err));
pfc->ServerSupportFunction(pfc,
SF_REQ_SEND_RESPONSE_HEADER,
status, 0, 0);
@@ -899,7 +901,7 @@ static void write_error_response(PHTTP_F
static void write_error_message(LPEXTENSION_CONTROL_BLOCK lpEcb, int err)
{
DWORD len;
-char status[MAX_PATH];
+char status[1024];
char body[8192] = "";
if (error_page) {
@@ -921,7 +923,7 @@ static void write_error_message(LPEXTENS
}
lpEcb->dwHttpStatusCode = err;
-StringCbPrintf(status, MAX_PATH, "%d %s", err, status_reason(err));
+StringCbPrintf(status, sizeof(status), "%d %s", err, status_reason(err));
lpEcb->ServerSupportFunction(lpEcb->ConnID,
HSE_REQ_SEND_RESPONSE_HEADER,
status,
@@ -2412,17 +2414,17 @@ BOOL WINAPI DllMain(HINSTANCE hInst,
fReturn = JK_FALSE;
}
/* Construct redirector headers to use for this redirector instance */
-StringCbPrintf(URI_HEADER_NAME, MAX_PATH, HEADER_TEMPLATE,
URI_HEADER_NAME_BASE, hInst);
-StringCbPrintf(QUERY_HEADER_NAME, MAX_PATH, HEADER_TEMPLATE,
QUERY_HEADER_NAME_BASE, hInst);
-StringCbPrintf(WORKER_HEADER_NAME, MAX_PATH, HEADER_TEMPLATE,
WORKER_HEADER_NAME_BASE, hInst);
-StringCbPrintf(WORKER_HEADER_INDEX, MAX_PATH, HEADER_TEMPLATE,
WORKER_HEADER_INDEX_BASE, hInst);
-StringCbPrintf(TOMCAT_TRANSLATE_HEADER_NAME, MAX_PATH,
HEADER_TEMPLATE, TOMCAT_TRANSLATE_HEADER_NAME_BASE, hInst);
+StringCbPrintf(URI_HEADER_NAME, RES_BUFFER_SIZE, HEADER_TEMPLATE,
URI_HEADER_NAME_BASE, hInst);
+StringCbPrintf(QUERY_HEADER_NAME, RES_BUFFER_SIZE, HEADER_TEMPLATE,
QUERY_HEADER_NAME_BASE, hInst);
+StringCbPrintf(WORKER_HEADER_NAME, RES_BUFFER_SIZE, HEADER_TEMPLATE,
WORKER_HEADER_NAME_BASE, hInst);
+StringCbPrintf(WORKER_HEADER_INDEX, RES_BUFFER_SIZE, HEADER_TEMPLATE,
WORKER_HEADER_INDEX_BASE, hInst);
+StringCbPrintf(TOMCAT_TRANSLATE_HEADER_NAME, RES_BUFFER_SIZE,
HEADER_TEMPLATE, TOMCAT_TRANSLATE_HEADER_NAME_BASE, hInst);
/* Construct the HTTP_ headers that will be seen in ExtensionProc */
-StringCbPrintf(HTTP_URI_HEADER_NAME, MAX_PATH, HTTP_HEADER_TEMPLATE,
URI_HEADER_NAME_BASE,
Re: svn commit: r1195434 - in /tomcat/jk/trunk/native/common: jk_pool.c jk_pool.h
2011/10/31 :
> Author: mturk
> Date: Mon Oct 31 12:44:39 2011
> New Revision: 1195434
>
> URL: http://svn.apache.org/viewvc?rev=1195434&view=rev
> Log:
> Fix weird jk_pool_strdup declaration and add jk_pool_strcat function
>
> Modified:
> tomcat/jk/trunk/native/common/jk_pool.c
> tomcat/jk/trunk/native/common/jk_pool.h
>
> +char *jk_pool_strcat(jk_pool_t *p, const char *s, const char *a)
+if (a)
+size += strlen(a);
Then strcat(rc, a); is always called, without checking whether a is NULL.
+rc = jk_pool_alloc(p, size);
+if (rc) {
+if (rc != s)
+strcpy(rc, s);
rc can be equal to s ?
> --- tomcat/jk/trunk/native/common/jk_pool.h (original)
> +++ tomcat/jk/trunk/native/common/jk_pool.h Mon Oct 31 12:44:39 2011
> @@ -118,7 +118,9 @@ void *jk_pool_alloc(jk_pool_t *p, size_t
> void *jk_pool_realloc(jk_pool_t *p,
> size_t sz, const void *old, size_t old_sz);
>
> -void *jk_pool_strdup(jk_pool_t *p, const char *s);
> +char *jk_pool_strdup(jk_pool_t *p, const char *s);
> +
> +char *jk_pool_strdcat(jk_pool_t *p, const char *s, const char *a);
There is a typo in *.h above:
s/strdcat/strcat/
Best regards,
Konstantin Kolinko
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
DO NOT REPLY [Bug 52059] Windows Registry are not removed after uninstall
https://issues.apache.org/bugzilla/show_bug.cgi?id=52059 Mark Thomas changed: What|Removed |Added Component|Native:Packaging|Native:Packaging Version|6.0.33 |5.5.34 Product|Tomcat 6|Tomcat 5 Target Milestone|default |--- --- Comment #5 from Mark Thomas 2011-10-31 13:10:54 UTC --- Fixed in 6.0.x and will be included in 6.0.34 onwards. Moving to 5.5.x -- Configure bugmail: https://issues.apache.org/bugzilla/userprefs.cgi?tab=email --- 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: r1195442 - in /tomcat/tc6.0.x/trunk: ./ STATUS.txt res/tomcat.nsi webapps/docs/changelog.xml
Author: markt Date: Mon Oct 31 13:09:17 2011 New Revision: 1195442 URL: http://svn.apache.org/viewvc?rev=1195442&view=rev Log: Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=52059 Fix a typo in Windows uninstaller (kkolinko) Modified: tomcat/tc6.0.x/trunk/ (props changed) tomcat/tc6.0.x/trunk/STATUS.txt tomcat/tc6.0.x/trunk/res/tomcat.nsi tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml Propchange: tomcat/tc6.0.x/trunk/ -- --- svn:mergeinfo (original) +++ svn:mergeinfo Mon Oct 31 13:09:17 2011 @@ -1 +1 @@ -/tomcat/trunk:601180,606992,612607,630314,640888,652744,653247,666232,673796,673820,677910,683969,683982,684001,684081,684234,684269-684270,685177,687503,687645,689402,690781,691392,691805,692748,693378,694992,695053,695311,696780,696782,698012,698227,698236,698613,699427,699634,701355,709294,709811,709816,710063,710066,710125,710205,711126,711600,712461,712467,713953,714002,718360,719119,719124,719602,719626,719628,720046,720069,721040,721286,721708,721886,723404,723738,726052,727303,728032,728768,728947,729057,729567,729569,729571,729681,729809,729815,729934,730250,730590,731651,732859,732863,734734,740675,740684,742677,742697,742714,744160,744238,746321,746384,746425,747834,747863,748344,750258,750291,750921,751286-751287,751289,751295,752323,753039,757335,757774,758249,758365,758596,758616,758664,759074,761601,762868,762929,762936-762937,763166,763183,763193,763228,763262,763298,763302,763325,763599,763611,763654,763681,763706,764985,764997,765662,768335,769979,770716,77 0809,770876,772872,776921,776924,776935,776945,777464,777466,777576,777625,778379,778523-778524,781528,781779,782145,782791,783316,783696,783724,783756,783762,783766,783863,783934,784453,784602,784614,785381,785688,785768,785859,786468,786487,786490,786496,786667,787627,787770,787985,789389,790405,791041,791184,791194,791224,791243,791326,791328,791789,792740,793372,793757,793882,793981,794082,794673,794822,795043,795152,795210,795457,795466,797168,797425,797596,797607,802727,802940,804462,804544,804734,805153,809131,809603,810916,810977,812125,812137,812432,813001,813013,813866,814180,814708,814876,815972,816252,817442,817822,819339,819361,820110,820132,820874,820954,821397,828196,828201,828210,828225,828759,830378-830379,830999,831106,831774,831785,831828,831850,831860,832214,832218,833121,833545,834047,835036,835336,836405,881396,881412,883130,883134,883146,883165,883177,883362,883565,884341,885038,885231,885241,885260,885901,885991,886019,888072,889363,889606,889716,8901 39,890265,890349-890350,890417,891185-891187,891583,892198,892341,892415,892464,892555,892812,892814,892817,892843,892887,893321,893493,894580,894586,894805,894831,895013,895045,895057,895191,895392,895703,896370,896384,897380-897381,897776,898126,898256,898468,898527,898555,898558,898718,898836,898906,899284,899348,899420,899653,899769-899770,899783,899788,899792,899916,899918-899919,899935,899949,903916,905020,905151,905722,905728,905735,907311,907513,907538,907652,907819,907825,907864,908002,908721,908754,908759,909097,909206,909212,909525,909636,909869,909875,909887,910266,910370,910442,910471,910485,910974,915226,915737,915861,916097,916141,916157,916170,917598,917633,918093,918489,918594,918684,918787,918792,918799,918803,918885,919851,919914,920025,920055,920298,920449,920596,920824,920840,921444,922010,926716,927062,927621,928482,928695,928732,928798,931709,932357,932967,935105,935983,939491,939551,940064,941356,941463,943112,944409,944416,945231,945808,945835,945841 ,946686,948057,950164,950596,950614,950851,950905,951615,953434,954435,955648,955655,956832,957130,957830,958192,960701,961948,962865,962872,962881,962900,963106,963865,963868,964614,966177-966178,966292,966692,966863,981815,988448,991837,993042,1001955,1002185,1002263,1002274,1002349,1002359,1002362,1002481,1002514,1003461,1003481,1003488,1003556,1003572,1003581,1003861,1004393,1004409,1004415,1004868-1004869,1004912,1005452,1005467,1005647,1005802,1022120,1022134,1022323,1022415,1022606,1022623,1024224,1024251,1026042,1026784,1026912,1026920,1029767,1033415,1033448,1033842,1033897,1037715,1037794,1037887,1037924,1038041,1042022,1042029,1042447,1042452,1042494,1044944,1044987,1050249,1055055,1055236,1055458,1055975,1056264,1056828,1056889,1059881,1061412,1061442,1061446,1062398,1064652,1066244,1066772,1067039,1067139,1069824,1070139,1070420,1070609,1072042,1073393,1075458,1076212,1078409,1078412,1079801,1081334,1088179,1088460,1090022,1094069,1094089,1095138,1097899,1099575 ,1099586,1099772,1099789,1100145,1100822,1101094,1101144,1124680,1130774,1133014,1137862,1137996,1138950,1138953,1140693,1141104,1141441,1142043,1142904,1143134,1143150,1148216,1148471,1152601,1156171,1156519,1164567,1167394,1172233-1172234,1172236,1173614,1174353,1174882,1174884,1175158,1175190,1176799,1177125,1177245,1177850,1177862,1178228,1178233,1181028,1181136,1184917,1184919,1185200,1185588,1186011,118610
DO NOT REPLY [Bug 51940] Form Authentication Valve should restore request body on PUT method
https://issues.apache.org/bugzilla/show_bug.cgi?id=51940 Mark Thomas changed: What|Removed |Added Status|NEW |RESOLVED Resolution||FIXED --- Comment #13 from Mark Thomas 2011-10-31 13:06:53 UTC --- Fixed in 6.0.x and will be included in 6.0.34 onwards. -- Configure bugmail: https://issues.apache.org/bugzilla/userprefs.cgi?tab=email --- 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: r1195441 - /tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml
Author: markt Date: Mon Oct 31 13:06:04 2011 New Revision: 1195441 URL: http://svn.apache.org/viewvc?rev=1195441&view=rev Log: Fix order Modified: tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml Modified: tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml URL: http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml?rev=1195441&r1=1195440&r2=1195441&view=diff == --- tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml (original) +++ tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml Mon Oct 31 13:06:04 2011 @@ -63,13 +63,17 @@ by Joe Kislo and Felix Schumacher. (markt) -51910: Prevent NPE on connector stop if Comet applications -are being used without the CometConnectionManagerValve. (markt) +51744: Throw the correct exception if an application attempts +to modify the associated JNDI context. (markt) + +51744: Add an option to the StandardContext that allows +exception throwing when an application attempts to modify the associated +JNDI context to be disabled. (markt) + -51940: Do not limit saving of request bodies during FORM -authentication to POST requests since any HTTP method may include a -request body. Based on a patch by Nicholas Sushkin. (markt/kkolinko) +51910: Prevent NPE on connector stop if Comet applications +are being used without the CometConnectionManagerValve. (markt) 51956: RemoteAddrFilter used getRemoteHost instead of @@ -153,15 +157,6 @@ per request. This defaults to 1. (markt) -51744: Throw the correct exception if an application attempts -to modify the associated JNDI context. (markt) - - -51744: Add an option to the StandardContext that allows -exception throwing when an application attempts to modify the associated -JNDI context to be disabled. (markt) - - 52091: Address performance issues related to lock contention StandardWrapper. Patch provided by Taiki Sugawara. (markt) - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1195440 - in /tomcat/tc6.0.x/trunk: ./ STATUS.txt java/org/apache/catalina/authenticator/FormAuthenticator.java java/org/apache/catalina/authenticator/LocalStrings.properties webapps/docs
Author: markt Date: Mon Oct 31 13:05:10 2011 New Revision: 1195440 URL: http://svn.apache.org/viewvc?rev=1195440&view=rev Log: Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=51940 Don't limit saving of request bodies during FORM authentication to POST requests since any HTTP method may include a body plus review improvements. Based on a patch by Nicholas Sushkin. (kkolinko) Modified: tomcat/tc6.0.x/trunk/ (props changed) tomcat/tc6.0.x/trunk/STATUS.txt tomcat/tc6.0.x/trunk/java/org/apache/catalina/authenticator/FormAuthenticator.java tomcat/tc6.0.x/trunk/java/org/apache/catalina/authenticator/LocalStrings.properties tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml Propchange: tomcat/tc6.0.x/trunk/ -- --- svn:mergeinfo (original) +++ svn:mergeinfo Mon Oct 31 13:05:10 2011 @@ -1 +1 @@ -/tomcat/trunk:601180,606992,612607,630314,640888,652744,653247,666232,673796,673820,677910,683969,683982,684001,684081,684234,684269-684270,685177,687503,687645,689402,690781,691392,691805,692748,693378,694992,695053,695311,696780,696782,698012,698227,698236,698613,699427,699634,701355,709294,709811,709816,710063,710066,710125,710205,711126,711600,712461,712467,713953,714002,718360,719119,719124,719602,719626,719628,720046,720069,721040,721286,721708,721886,723404,723738,726052,727303,728032,728768,728947,729057,729567,729569,729571,729681,729809,729815,729934,730250,730590,731651,732859,732863,734734,740675,740684,742677,742697,742714,744160,744238,746321,746384,746425,747834,747863,748344,750258,750291,750921,751286-751287,751289,751295,752323,753039,757335,757774,758249,758365,758596,758616,758664,759074,761601,762868,762929,762936-762937,763166,763183,763193,763228,763262,763298,763302,763325,763599,763611,763654,763681,763706,764985,764997,765662,768335,769979,770716,77 0809,770876,772872,776921,776924,776935,776945,777464,777466,777576,777625,778379,778523-778524,781528,781779,782145,782791,783316,783696,783724,783756,783762,783766,783863,783934,784453,784602,784614,785381,785688,785768,785859,786468,786487,786490,786496,786667,787627,787770,787985,789389,790405,791041,791184,791194,791224,791243,791326,791328,791789,792740,793372,793757,793882,793981,794082,794673,794822,795043,795152,795210,795457,795466,797168,797425,797596,797607,802727,802940,804462,804544,804734,805153,809131,809603,810916,810977,812125,812137,812432,813001,813013,813866,814180,814708,814876,815972,816252,817442,817822,819339,819361,820110,820132,820874,820954,821397,828196,828201,828210,828225,828759,830378-830379,830999,831106,831774,831785,831828,831850,831860,832214,832218,833121,833545,834047,835036,835336,836405,881396,881412,883130,883134,883146,883165,883177,883362,883565,884341,885038,885231,885241,885260,885901,885991,886019,888072,889363,889606,889716,8901 39,890265,890349-890350,890417,891185-891187,891583,892198,892341,892415,892464,892555,892812,892814,892817,892843,892887,893321,893493,894580,894586,894805,894831,895013,895045,895057,895191,895392,895703,896370,896384,897380-897381,897776,898126,898256,898468,898527,898555,898558,898718,898836,898906,899284,899348,899420,899653,899769-899770,899783,899788,899792,899916,899918-899919,899935,899949,903916,905020,905151,905722,905728,905735,907311,907513,907538,907652,907819,907825,907864,908002,908721,908754,908759,909097,909206,909212,909525,909636,909869,909875,909887,910266,910370,910442,910471,910485,910974,915226,915737,915861,916097,916141,916157,916170,917598,917633,918093,918489,918594,918684,918787,918792,918799,918803,918885,919851,919914,920025,920055,920298,920449,920596,920824,920840,921444,922010,926716,927062,927621,928482,928695,928732,928798,931709,932357,932967,935105,935983,939491,939551,940064,941356,941463,943112,944409,944416,945231,945808,945835,945841 ,946686,948057,950164,950596,950614,950851,950905,951615,953434,954435,955648,955655,956832,957130,957830,958192,960701,961948,962865,962872,962881,962900,963106,963865,963868,964614,966177-966178,966292,966692,966863,981815,988448,991837,993042,1001955,1002185,1002263,1002274,1002349,1002359,1002362,1002481,1002514,1003461,1003481,1003488,1003556,1003572,1003581,1003861,1004393,1004409,1004415,1004868-1004869,1004912,1005452,1005467,1005647,1005802,1022120,1022134,1022323,1022415,1022606,1022623,1024224,1024251,1026042,1026784,1026912,1026920,1029767,1033415,1033448,1033842,1033897,1037715,1037794,1037887,1037924,1038041,1042022,1042029,1042447,1042452,1042494,1044944,1044987,1050249,1055055,1055236,1055458,1055975,1056264,1056828,1056889,1059881,1061412,1061442,1061446,1062398,1064652,1066244,1066772,1067039,1067139,1069824,1070139,1070420,1070609,1072042,1073393,1075458,1076212,1078409,1078412,1079801,1081334,1088179,1088460,1090022,1094069,1094089,1095138,1097899,1099575 ,1099586,1099772,1099789,1100145,1100822,1101094,1101144,1124680,1130774,1133014,1137862,1137996,1138950,1138953,1140693,1141
svn commit: r1195439 - in /tomcat/jk/trunk/native/common: jk_pool.c jk_pool.h
Author: mturk
Date: Mon Oct 31 13:04:18 2011
New Revision: 1195439
URL: http://svn.apache.org/viewvc?rev=1195439&view=rev
Log:
Add varargs pool strcat. Similar to APR's apr_pstrcatv
Modified:
tomcat/jk/trunk/native/common/jk_pool.c
tomcat/jk/trunk/native/common/jk_pool.h
Modified: tomcat/jk/trunk/native/common/jk_pool.c
URL:
http://svn.apache.org/viewvc/tomcat/jk/trunk/native/common/jk_pool.c?rev=1195439&r1=1195438&r2=1195439&view=diff
==
--- tomcat/jk/trunk/native/common/jk_pool.c (original)
+++ tomcat/jk/trunk/native/common/jk_pool.c Mon Oct 31 13:04:18 2011
@@ -118,19 +118,52 @@ char *jk_pool_strdup(jk_pool_t *p, const
char *jk_pool_strcat(jk_pool_t *p, const char *s, const char *a)
{
char *rc = NULL;
-if (s && p) {
-size_t size = strlen(s);
-if (a)
-size += strlen(a);
+
+if (s && a && p) {
+size_t szs = strlen(s);
+size_t sza = strlen(a);
+if ((szs + sza) == 0) {
+return "";
+}
+rc = jk_pool_alloc(p, szs + sza + 1);
+if (rc) {
+memcpy(rc, s, szs);
+memcpy(rc + szs, a, sza + 1);
+}
+}
+
+return rc;
+}
+
+char *jk_pool_strcatv(jk_pool_t *p, ...)
+{
+char *cp;
+char *rc = NULL;
+va_list ap;
+
+if (p) {
+char *str;
+size_t size = 0;
+va_start(ap, p);
+while ((str = va_arg(ap, char *)) != 0) {
+size += strlen(str);
+}
+va_end(ap);
if (size == 0) {
return "";
-}
+}
size++;
-rc = jk_pool_alloc(p, size);
+cp = rc = jk_pool_alloc(p, size);
if (rc) {
-if (rc != s)
-strcpy(rc, s);
-strcat(rc, a);
+size_t len = 0;
+va_start(ap, p);
+while ((str = va_arg(ap, char *)) != 0) {
+len = strlen(str);
+memcpy(cp, str, len);
+cp += len;
+}
+va_end(ap);
+*cp = '\0';
}
}
@@ -173,7 +206,7 @@ static void *jk_pool_dyn_alloc(jk_pool_t
else {
#if defined (DEBUG) || defined(_DEBUG)
jk_dump_pool(p, stderr);
-#endif
+#endif
return NULL;
}
}
Modified: tomcat/jk/trunk/native/common/jk_pool.h
URL:
http://svn.apache.org/viewvc/tomcat/jk/trunk/native/common/jk_pool.h?rev=1195439&r1=1195438&r2=1195439&view=diff
==
--- tomcat/jk/trunk/native/common/jk_pool.h (original)
+++ tomcat/jk/trunk/native/common/jk_pool.h Mon Oct 31 13:04:18 2011
@@ -120,7 +120,9 @@ void *jk_pool_realloc(jk_pool_t *p,
char *jk_pool_strdup(jk_pool_t *p, const char *s);
-char *jk_pool_strdcat(jk_pool_t *p, const char *s, const char *a);
+char *jk_pool_strcat(jk_pool_t *p, const char *s, const char *a);
+
+char *jk_pool_strcatv(jk_pool_t *p, ...);
#ifdef __cplusplus
}
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1195434 - in /tomcat/jk/trunk/native/common: jk_pool.c jk_pool.h
Author: mturk
Date: Mon Oct 31 12:44:39 2011
New Revision: 1195434
URL: http://svn.apache.org/viewvc?rev=1195434&view=rev
Log:
Fix weird jk_pool_strdup declaration and add jk_pool_strcat function
Modified:
tomcat/jk/trunk/native/common/jk_pool.c
tomcat/jk/trunk/native/common/jk_pool.h
Modified: tomcat/jk/trunk/native/common/jk_pool.c
URL:
http://svn.apache.org/viewvc/tomcat/jk/trunk/native/common/jk_pool.c?rev=1195434&r1=1195433&r2=1195434&view=diff
==
--- tomcat/jk/trunk/native/common/jk_pool.c (original)
+++ tomcat/jk/trunk/native/common/jk_pool.c Mon Oct 31 12:44:39 2011
@@ -95,9 +95,9 @@ void *jk_pool_realloc(jk_pool_t *p, size
return rc;
}
-void *jk_pool_strdup(jk_pool_t *p, const char *s)
+char *jk_pool_strdup(jk_pool_t *p, const char *s)
{
-void *rc = NULL;
+char *rc = NULL;
if (s && p) {
size_t size = strlen(s);
@@ -115,6 +115,28 @@ void *jk_pool_strdup(jk_pool_t *p, const
return rc;
}
+char *jk_pool_strcat(jk_pool_t *p, const char *s, const char *a)
+{
+char *rc = NULL;
+if (s && p) {
+size_t size = strlen(s);
+if (a)
+size += strlen(a);
+if (size == 0) {
+return "";
+}
+size++;
+rc = jk_pool_alloc(p, size);
+if (rc) {
+if (rc != s)
+strcpy(rc, s);
+strcat(rc, a);
+}
+}
+
+return rc;
+}
+
#if defined (DEBUG) || defined(_DEBUG)
static void jk_dump_pool(jk_pool_t *p, FILE * f)
{
Modified: tomcat/jk/trunk/native/common/jk_pool.h
URL:
http://svn.apache.org/viewvc/tomcat/jk/trunk/native/common/jk_pool.h?rev=1195434&r1=1195433&r2=1195434&view=diff
==
--- tomcat/jk/trunk/native/common/jk_pool.h (original)
+++ tomcat/jk/trunk/native/common/jk_pool.h Mon Oct 31 12:44:39 2011
@@ -118,7 +118,9 @@ void *jk_pool_alloc(jk_pool_t *p, size_t
void *jk_pool_realloc(jk_pool_t *p,
size_t sz, const void *old, size_t old_sz);
-void *jk_pool_strdup(jk_pool_t *p, const char *s);
+char *jk_pool_strdup(jk_pool_t *p, const char *s);
+
+char *jk_pool_strdcat(jk_pool_t *p, const char *s, const char *a);
#ifdef __cplusplus
}
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1195432 - /tomcat/tc6.0.x/trunk/STATUS.txt
Author: markt Date: Mon Oct 31 12:23:33 2011 New Revision: 1195432 URL: http://svn.apache.org/viewvc?rev=1195432&view=rev Log: Vote Modified: tomcat/tc6.0.x/trunk/STATUS.txt Modified: tomcat/tc6.0.x/trunk/STATUS.txt URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/STATUS.txt?rev=1195432&r1=1195431&r2=1195432&view=diff == --- tomcat/tc6.0.x/trunk/STATUS.txt (original) +++ tomcat/tc6.0.x/trunk/STATUS.txt Mon Oct 31 12:23:33 2011 @@ -134,7 +134,7 @@ PATCHES PROPOSED TO BACKPORT: no context manager message is replied in order to avoid timeout (default 60sec) of GET_ALL_SESSIONS sync phase. http://svn.apache.org/viewvc?view=revision&revision=1195393 - +1: kfujino + +1: kfujino, markt -1: PATCHES/ISSUES THAT ARE STALLED - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1195430 - /tomcat/jk/trunk/native/iis/jk_isapi_plugin.c
Author: mturk
Date: Mon Oct 31 12:15:48 2011
New Revision: 1195430
URL: http://svn.apache.org/viewvc?rev=1195430&view=rev
Log:
Replace C++ with C style comments.
Modified:
tomcat/jk/trunk/native/iis/jk_isapi_plugin.c
Modified: tomcat/jk/trunk/native/iis/jk_isapi_plugin.c
URL:
http://svn.apache.org/viewvc/tomcat/jk/trunk/native/iis/jk_isapi_plugin.c?rev=1195430&r1=1195429&r2=1195430&view=diff
==
--- tomcat/jk/trunk/native/iis/jk_isapi_plugin.c (original)
+++ tomcat/jk/trunk/native/iis/jk_isapi_plugin.c Mon Oct 31 12:15:48 2011
@@ -24,7 +24,9 @@
* Version: $Revision$*
***/
-// This define is needed to include wincrypt,h, needed to get client
certificates
+/*
+ * Define WIN32 API we are going to use.
+ */
#ifndef _WIN32_WINNT
#define _WIN32_WINNT 0x0502
#endif
@@ -1917,7 +1919,9 @@ DWORD WINAPI HttpFilterProc(PHTTP_FILTER
SetHeader(pfc, WORKER_HEADER_INDEX, NULL);
SetHeader(pfc, TOMCAT_TRANSLATE_HEADER_NAME, NULL);
-// Suppress logging of original uri/query when we don't map a URL
+/*
+ * Suppress logging of original uri/query when we don't map a URL
+ */
if (pfc->pFilterContext) {
isapi_log_data_t *ld = (isapi_log_data_t *)pfc->pFilterContext;
ld->request_matched = JK_FALSE;
@@ -2369,9 +2373,9 @@ BOOL WINAPI TerminateFilter(DWORD dwFlag
}
-BOOL WINAPI DllMain(HINSTANCE hInst,// Instance Handle of the DLL
-ULONG ulReason, // Reason why NT called this DLL
-LPVOID lpReserved) // Reserved parameter for future use
+BOOL WINAPI DllMain(HINSTANCE hInst,/* Instance Handle of the DLL
*/
+ULONG ulReason, /* Reason why NT called this DLL
*/
+LPVOID lpReserved) /* Reserved parameter for future use
*/
{
int rc;
BOOL fReturn = TRUE;
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: buildbot failure in ASF Buildbot on tomcat-trunk
2011/10/31 : > The Buildbot has detected a new failure on builder tomcat-trunk while > building ASF Buildbot. > Full details are available at: > http://ci.apache.org/builders/tomcat-trunk/builds/2442 > [junit] Running org.apache.tomcat.util.http.mapper.TestMapper [junit] Tests run: 3, Failures: 1, Errors: 0, Time elapsed: 4.682 sec [junit] Test org.apache.tomcat.util.http.mapper.TestMapper FAILED There are no details wrt what test in TestMapper failed and why. Best regards, Konstantin Kolinko - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1195425 - /tomcat/tc6.0.x/trunk/STATUS.txt
Author: markt Date: Mon Oct 31 12:00:20 2011 New Revision: 1195425 URL: http://svn.apache.org/viewvc?rev=1195425&view=rev Log: Vote Modified: tomcat/tc6.0.x/trunk/STATUS.txt Modified: tomcat/tc6.0.x/trunk/STATUS.txt URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/STATUS.txt?rev=1195425&r1=1195424&r2=1195425&view=diff == --- tomcat/tc6.0.x/trunk/STATUS.txt (original) +++ tomcat/tc6.0.x/trunk/STATUS.txt Mon Oct 31 12:00:20 2011 @@ -98,7 +98,7 @@ PATCHES PROPOSED TO BACKPORT: RemoteIpValve via JMX are thread-safe. http://people.apache.org/~kkolinko/patches/2011-10-26_tc6_RequestFilterValve_v3.patch It is based on valves part of r1189256 and r1187027. (r1189258, r1187029 in TC7) - +1: kkolinko, kfujino + +1: kkolinko, kfujino, markt -1: * Make configuration issue for CsrfPreventionFilter result @@ -119,7 +119,7 @@ PATCHES PROPOSED TO BACKPORT: Patch provided by Taiki Sugawara. http://svn.apache.org/viewvc?rev=1190388&view=rev (r1190391 in TC7) - +1: kkolinko + +1: kkolinko, markt -1: * Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=52091 @@ -127,7 +127,7 @@ PATCHES PROPOSED TO BACKPORT: Patch provided by Taiki Sugawara. https://issues.apache.org/bugzilla/attachment.cgi?id=27862 (r1190389 in trunk, r1190392 in TC7) - +1: kkolinko + +1: kkolinko, markt -1: * When Context manager does not exist, - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
buildbot failure in ASF Buildbot on tomcat-trunk
The Buildbot has detected a new failure on builder tomcat-trunk while building ASF Buildbot. Full details are available at: http://ci.apache.org/builders/tomcat-trunk/builds/2442 Buildbot URL: http://ci.apache.org/ Buildslave for this Build: bb-vm_ubuntu Build Reason: scheduler Build Source Stamp: [branch tomcat/trunk] 1195407 Blamelist: markt BUILD FAILED: failed compile_1 sincerely, -The Buildbot
svn commit: r1195418 - /tomcat/tc6.0.x/trunk/STATUS.txt
Author: markt Date: Mon Oct 31 11:32:26 2011 New Revision: 1195418 URL: http://svn.apache.org/viewvc?rev=1195418&view=rev Log: Vote Modified: tomcat/tc6.0.x/trunk/STATUS.txt Modified: tomcat/tc6.0.x/trunk/STATUS.txt URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/STATUS.txt?rev=1195418&r1=1195417&r2=1195418&view=diff == --- tomcat/tc6.0.x/trunk/STATUS.txt (original) +++ tomcat/tc6.0.x/trunk/STATUS.txt Mon Oct 31 11:32:26 2011 @@ -89,7 +89,7 @@ PATCHES PROPOSED TO BACKPORT: It occurs via super.setId(id) calling overridden DeltaSession.setId(id, true). http://svn.apache.org/viewvc?rev=1189386&view=rev (r1189393 in TC7) - +1: kkolinko, kfujino + +1: kkolinko, kfujino, markt -1: * Make configuration issue for RemoteAddrValve, RemoteHostValve result - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1195412 - in /tomcat/tc6.0.x/trunk: ./ STATUS.txt java/org/apache/catalina/loader/WebappClassLoader.java webapps/docs/changelog.xml
Author: markt Date: Mon Oct 31 11:19:38 2011 New Revision: 1195412 URL: http://svn.apache.org/viewvc?rev=1195412&view=rev Log: Http keep-alive thread needs to have the context class loader fixed even if it isn't running Modified: tomcat/tc6.0.x/trunk/ (props changed) tomcat/tc6.0.x/trunk/STATUS.txt tomcat/tc6.0.x/trunk/java/org/apache/catalina/loader/WebappClassLoader.java tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml Propchange: tomcat/tc6.0.x/trunk/ -- --- svn:mergeinfo (original) +++ svn:mergeinfo Mon Oct 31 11:19:38 2011 @@ -1 +1 @@ -/tomcat/trunk:601180,606992,612607,630314,640888,652744,653247,666232,673796,673820,677910,683969,683982,684001,684081,684234,684269-684270,685177,687503,687645,689402,690781,691392,691805,692748,693378,694992,695053,695311,696780,696782,698012,698227,698236,698613,699427,699634,701355,709294,709811,709816,710063,710066,710125,710205,711126,711600,712461,712467,713953,714002,718360,719119,719124,719602,719626,719628,720046,720069,721040,721286,721708,721886,723404,723738,726052,727303,728032,728768,728947,729057,729567,729569,729571,729681,729809,729815,729934,730250,730590,731651,732859,732863,734734,740675,740684,742677,742697,742714,744160,744238,746321,746384,746425,747834,747863,748344,750258,750291,750921,751286-751287,751289,751295,752323,753039,757335,757774,758249,758365,758596,758616,758664,759074,761601,762868,762929,762936-762937,763166,763183,763193,763228,763262,763298,763302,763325,763599,763611,763654,763681,763706,764985,764997,765662,768335,769979,770716,77 0809,770876,772872,776921,776924,776935,776945,777464,777466,777576,777625,778379,778523-778524,781528,781779,782145,782791,783316,783696,783724,783756,783762,783766,783863,783934,784453,784602,784614,785381,785688,785768,785859,786468,786487,786490,786496,786667,787627,787770,787985,789389,790405,791041,791184,791194,791224,791243,791326,791328,791789,792740,793372,793757,793882,793981,794082,794673,794822,795043,795152,795210,795457,795466,797168,797425,797596,797607,802727,802940,804462,804544,804734,805153,809131,809603,810916,810977,812125,812137,812432,813001,813013,813866,814180,814708,814876,815972,816252,817442,817822,819339,819361,820110,820132,820874,820954,821397,828196,828201,828210,828225,828759,830378-830379,830999,831106,831774,831785,831828,831850,831860,832214,832218,833121,833545,834047,835036,835336,836405,881396,881412,883130,883134,883146,883165,883177,883362,883565,884341,885038,885231,885241,885260,885901,885991,886019,888072,889363,889606,889716,8901 39,890265,890349-890350,890417,891185-891187,891583,892198,892341,892415,892464,892555,892812,892814,892817,892843,892887,893321,893493,894580,894586,894805,894831,895013,895045,895057,895191,895392,895703,896370,896384,897380-897381,897776,898126,898256,898468,898527,898555,898558,898718,898836,898906,899284,899348,899420,899653,899769-899770,899783,899788,899792,899916,899918-899919,899935,899949,903916,905020,905151,905722,905728,905735,907311,907513,907538,907652,907819,907825,907864,908002,908721,908754,908759,909097,909206,909212,909525,909636,909869,909875,909887,910266,910370,910442,910471,910485,910974,915226,915737,915861,916097,916141,916157,916170,917598,917633,918093,918489,918594,918684,918787,918792,918799,918803,918885,919851,919914,920025,920055,920298,920449,920596,920824,920840,921444,922010,926716,927062,927621,928482,928695,928732,928798,931709,932357,932967,935105,935983,939491,939551,940064,941356,941463,943112,944409,944416,945231,945808,945835,945841 ,946686,948057,950164,950596,950614,950851,950905,951615,953434,954435,955648,955655,956832,957130,957830,958192,960701,961948,962865,962872,962881,962900,963106,963865,963868,964614,966177-966178,966292,966692,966863,981815,988448,991837,993042,1001955,1002185,1002263,1002274,1002349,1002359,1002362,1002481,1002514,1003461,1003481,1003488,1003556,1003572,1003581,1003861,1004393,1004409,1004415,1004868-1004869,1004912,1005452,1005467,1005647,1005802,1022120,1022134,1022323,1022415,1022606,1022623,1024224,1024251,1026042,1026784,1026912,1026920,1029767,1033415,1033448,1033842,1033897,1037715,1037794,1037887,1037924,1038041,1042022,1042029,1042447,1042452,1042494,1044944,1044987,1050249,1055055,1055236,1055458,1055975,1056264,1056828,1056889,1059881,1061412,1061442,1061446,1062398,1064652,1066244,1066772,1067039,1067139,1069824,1070139,1070420,1070609,1072042,1073393,1075458,1076212,1078409,1078412,1079801,1081334,1088179,1088460,1090022,1094069,1094089,1095138,1097899,1099575 ,1099586,1099772,1099789,1100145,1100822,1101094,1101144,1124680,1130774,1133014,1137862,1137996,1138950,1138953,1140693,1141104,1141441,1142043,1142904,1143134,1143150,1148216,1148471,1152601,1156171,1156519,1164567,1167394,1172233-1172234,1172236,1173614,1174353,1174882,1174884,1175158,1175190,1176799,1177125,1177245,1177850,1177862,1178228,1178233,1184917,1184919,1185200,1185588,11
svn commit: r1195409 - /tomcat/tc6.0.x/trunk/STATUS.txt
Author: jfclere Date: Mon Oct 31 11:02:57 2011 New Revision: 1195409 URL: http://svn.apache.org/viewvc?rev=1195409&view=rev Log: My votes. Modified: tomcat/tc6.0.x/trunk/STATUS.txt Modified: tomcat/tc6.0.x/trunk/STATUS.txt URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/STATUS.txt?rev=1195409&r1=1195408&r2=1195409&view=diff == --- tomcat/tc6.0.x/trunk/STATUS.txt (original) +++ tomcat/tc6.0.x/trunk/STATUS.txt Mon Oct 31 11:02:57 2011 @@ -69,14 +69,14 @@ PATCHES PROPOSED TO BACKPORT: requests since any HTTP method may include a body plus review improvements. Based on a patch by Nicholas Sushkin https://issues.apache.org/bugzilla/attachment.cgi?id=27825 - +1: kkolinko, markt + +1: kkolinko, markt, jfclere -1: * Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=52059 http://svn.apache.org/viewvc?rev=1186763&view=rev Fix a typo in Windows uninstaller: Do not forget to remove Tomcat keys from 32-bit registry on deinstallation. - +1: kkolinko, markt + +1: kkolinko, markt, jfclere -1: * In GenericPrincipal, SerializablePrincipal: @@ -111,13 +111,13 @@ PATCHES PROPOSED TO BACKPORT: in the failure of the filter rather than just a warning message. http://people.apache.org/~kkolinko/patches/2011-10-26_tc6_CsrfPreventionFilter.patch It is based on the filters part of r1189256 (r1189258 in TC7) - +1: kkolinko, kfujino + +1: kkolinko, kfujino, jfclere -1: * Improve performance of parameter processing. http://people.apache.org/~markt/patches/2011-10-29-param-perf-tc6-v2.patch http://svn.apache.org/viewvc?rev=1195222&view=rev - performance tweaks - +1: markt + +1: markt, jfclere -1: * Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=52091 - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1195407 - in /tomcat/trunk/java/org/apache/catalina/ha/session: ClusterSessionListener.java DeltaManager.java SessionMessage.java
Author: markt
Date: Mon Oct 31 10:59:49 2011
New Revision: 1195407
URL: http://svn.apache.org/viewvc?rev=1195407&view=rev
Log:
Fix trailing whitespace
Modified:
tomcat/trunk/java/org/apache/catalina/ha/session/ClusterSessionListener.java
tomcat/trunk/java/org/apache/catalina/ha/session/DeltaManager.java
tomcat/trunk/java/org/apache/catalina/ha/session/SessionMessage.java
Modified:
tomcat/trunk/java/org/apache/catalina/ha/session/ClusterSessionListener.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/ha/session/ClusterSessionListener.java?rev=1195407&r1=1195406&r2=1195407&view=diff
==
---
tomcat/trunk/java/org/apache/catalina/ha/session/ClusterSessionListener.java
(original)
+++
tomcat/trunk/java/org/apache/catalina/ha/session/ClusterSessionListener.java
Mon Oct 31 10:59:49 2011
@@ -80,16 +80,16 @@ public class ClusterSessionListener exte
if (log.isWarnEnabled())
log.warn("Context manager doesn't exist:" + ctxname);
-// A no context manager message is replied in order to
avoid
-// timeout of GET_ALL_SESSIONS sync phase.
+// A no context manager message is replied in order to
avoid
+// timeout of GET_ALL_SESSIONS sync phase.
if (msg.getEventType() ==
SessionMessage.EVT_GET_ALL_SESSIONS) {
SessionMessage replymsg = new
SessionMessageImpl(ctxname,
-
SessionMessage.EVT_ALL_SESSION_NOCONTEXTMANAGER,
+
SessionMessage.EVT_ALL_SESSION_NOCONTEXTMANAGER,
null,
"NO-CONTEXT-MANAGER","NO-CONTEXT-MANAGER-" + ctxname);
cluster.send(replymsg, msg.getAddress());
}
}
-
+
}
}
return;
Modified: tomcat/trunk/java/org/apache/catalina/ha/session/DeltaManager.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/ha/session/DeltaManager.java?rev=1195407&r1=1195406&r2=1195407&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/ha/session/DeltaManager.java
(original)
+++ tomcat/trunk/java/org/apache/catalina/ha/session/DeltaManager.java Mon Oct
31 10:59:49 2011
@@ -128,7 +128,7 @@ public class DeltaManager extends Cluste
private int counterSend_EVT_ALL_SESSION_TRANSFERCOMPLETE = 0 ;
private long counterSend_EVT_CHANGE_SESSION_ID = 0;
private int counterNoStateTransfered = 0 ;
-
+
// -
Constructor
public DeltaManager() {
@@ -269,7 +269,7 @@ public class DeltaManager extends Cluste
public long getCounterReceive_EVT_ALL_SESSION_NOCONTEXTMANAGER() {
return counterReceive_EVT_ALL_SESSION_NOCONTEXTMANAGER;
}
-
+
/**
* @return Returns the processingTime.
*/
@@ -1476,7 +1476,7 @@ public class DeltaManager extends Cluste
*/
protected void handleALL_SESSION_NOCONTEXTMANAGER(SessionMessage msg,
Member sender) {
counterReceive_EVT_ALL_SESSION_NOCONTEXTMANAGER++ ;
-if (log.isDebugEnabled())
+if (log.isDebugEnabled())
log.debug(sm.getString("deltaManager.receiveMessage.noContextManager",getName(),
sender.getHost(), Integer.valueOf(sender.getPort(;
noContextManagerReceived = true ;
}
Modified: tomcat/trunk/java/org/apache/catalina/ha/session/SessionMessage.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/ha/session/SessionMessage.java?rev=1195407&r1=1195406&r2=1195407&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/ha/session/SessionMessage.java
(original)
+++ tomcat/trunk/java/org/apache/catalina/ha/session/SessionMessage.java Mon
Oct 31 10:59:49 2011
@@ -84,7 +84,7 @@ public interface SessionMessage extends
/**
* Event type used when context manager doesn't exist.
- * This is used when the manager which send a session state does not
exist.
+ * This is used when the manager which send a session state does not exist.
*/
public static final int EVT_ALL_SESSION_NOCONTEXTMANAGER = 16;
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1195396 - /tomcat/tc6.0.x/trunk/STATUS.txt
Author: kfujino Date: Mon Oct 31 10:26:18 2011 New Revision: 1195396 URL: http://svn.apache.org/viewvc?rev=1195396&view=rev Log: Proposal. Modified: tomcat/tc6.0.x/trunk/STATUS.txt Modified: tomcat/tc6.0.x/trunk/STATUS.txt URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/STATUS.txt?rev=1195396&r1=1195395&r2=1195396&view=diff == --- tomcat/tc6.0.x/trunk/STATUS.txt (original) +++ tomcat/tc6.0.x/trunk/STATUS.txt Mon Oct 31 10:26:18 2011 @@ -136,6 +136,12 @@ PATCHES PROPOSED TO BACKPORT: +1: kkolinko -1: +* When Context manager does not exist, + no context manager message is replied in order to avoid timeout (default 60sec) + of GET_ALL_SESSIONS sync phase. + http://svn.apache.org/viewvc?view=revision&revision=1195393 + +1: kfujino + -1: PATCHES/ISSUES THAT ARE STALLED - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1195393 - in /tomcat/tc7.0.x/trunk: java/org/apache/catalina/ha/session/ webapps/docs/
Author: kfujino
Date: Mon Oct 31 10:22:31 2011
New Revision: 1195393
URL: http://svn.apache.org/viewvc?rev=1195393&view=rev
Log:
When Context manager does not exist, no context manager message is replied in
order to avoid timeout (default 60 sec) of GET_ALL_SESSIONS sync phase.
Modified:
tomcat/tc7.0.x/trunk/java/org/apache/catalina/ha/session/ClusterSessionListener.java
tomcat/tc7.0.x/trunk/java/org/apache/catalina/ha/session/DeltaManager.java
tomcat/tc7.0.x/trunk/java/org/apache/catalina/ha/session/LocalStrings.properties
tomcat/tc7.0.x/trunk/java/org/apache/catalina/ha/session/SessionMessage.java
tomcat/tc7.0.x/trunk/java/org/apache/catalina/ha/session/SessionMessageImpl.java
tomcat/tc7.0.x/trunk/java/org/apache/catalina/ha/session/mbeans-descriptors.xml
tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml
Modified:
tomcat/tc7.0.x/trunk/java/org/apache/catalina/ha/session/ClusterSessionListener.java
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/catalina/ha/session/ClusterSessionListener.java?rev=1195393&r1=1195392&r2=1195393&view=diff
==
---
tomcat/tc7.0.x/trunk/java/org/apache/catalina/ha/session/ClusterSessionListener.java
(original)
+++
tomcat/tc7.0.x/trunk/java/org/apache/catalina/ha/session/ClusterSessionListener.java
Mon Oct 31 10:22:31 2011
@@ -88,10 +88,22 @@ public class ClusterSessionListener exte
}
} else {
ClusterManager mgr = managers.get(ctxname);
-if (mgr != null)
+if (mgr != null) {
mgr.messageDataReceived(msg);
-else if (log.isWarnEnabled())
-log.warn("Context manager doesn't exist:" + ctxname);
+} else {
+if (log.isWarnEnabled())
+log.warn("Context manager doesn't exist:" + ctxname);
+
+// A no context manager message is replied in order to
avoid
+// timeout of GET_ALL_SESSIONS sync phase.
+if (msg.getEventType() ==
SessionMessage.EVT_GET_ALL_SESSIONS) {
+SessionMessage replymsg = new
SessionMessageImpl(ctxname,
+
SessionMessage.EVT_ALL_SESSION_NOCONTEXTMANAGER,
+null,
"NO-CONTEXT-MANAGER","NO-CONTEXT-MANAGER-" + ctxname);
+cluster.send(replymsg, msg.getAddress());
+}
+}
+
}
}
return;
Modified:
tomcat/tc7.0.x/trunk/java/org/apache/catalina/ha/session/DeltaManager.java
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/catalina/ha/session/DeltaManager.java?rev=1195393&r1=1195392&r2=1195393&view=diff
==
--- tomcat/tc7.0.x/trunk/java/org/apache/catalina/ha/session/DeltaManager.java
(original)
+++ tomcat/tc7.0.x/trunk/java/org/apache/catalina/ha/session/DeltaManager.java
Mon Oct 31 10:22:31 2011
@@ -97,6 +97,7 @@ public class DeltaManager extends Cluste
private boolean notifySessionListenersOnReplication = true;
private boolean notifyContainerListenersOnReplication = true;
private volatile boolean stateTransfered = false ;
+private volatile boolean noContextManagerReceived = false ;
private int stateTransferTimeout = 60;
private boolean sendAllSessions = true;
private int sendAllSessionsSize = 1000 ;
@@ -122,6 +123,7 @@ public class DeltaManager extends Cluste
private long counterReceive_EVT_SESSION_DELTA = 0;
private int counterReceive_EVT_ALL_SESSION_TRANSFERCOMPLETE = 0 ;
private long counterReceive_EVT_CHANGE_SESSION_ID = 0 ;
+private long counterReceive_EVT_ALL_SESSION_NOCONTEXTMANAGER = 0 ;
private long counterSend_EVT_GET_ALL_SESSIONS = 0 ;
private long counterSend_EVT_ALL_SESSION_DATA = 0 ;
private long counterSend_EVT_SESSION_CREATED = 0;
@@ -131,6 +133,7 @@ public class DeltaManager extends Cluste
private int counterSend_EVT_ALL_SESSION_TRANSFERCOMPLETE = 0 ;
private long counterSend_EVT_CHANGE_SESSION_ID = 0;
private int counterNoStateTransfered = 0 ;
+
// -
Constructor
public DeltaManager() {
@@ -274,7 +277,14 @@ public class DeltaManager extends Cluste
public long getCounterReceive_EVT_CHANGE_SESSION_ID() {
return counterReceive_EVT_CHANGE_SESSION_ID;
}
-
+
+/**
+ * @return Returns the counterReceive_EVT_ALL_SESSION_NOCONTEXTMANAGER.
+ */
+public long getCounterReceive_EVT_ALL_SESSION_NOCONTEXTMANAGER() {
+return counterReceive_EVT_ALL_SESSION_NOCONTEXTMANAGER;
+}
+
/**
* @return Returns the processingTime.
*/
@@ -329,7 +339,15 @@ public class DeltaManager extends
svn commit: r1195391 - /tomcat/trunk/java/org/apache/catalina/ha/session/DeltaManager.java
Author: kfujino
Date: Mon Oct 31 10:16:58 2011
New Revision: 1195391
URL: http://svn.apache.org/viewvc?rev=1195391&view=rev
Log:
Correct JavaDoc.
Modified:
tomcat/trunk/java/org/apache/catalina/ha/session/DeltaManager.java
Modified: tomcat/trunk/java/org/apache/catalina/ha/session/DeltaManager.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/ha/session/DeltaManager.java?rev=1195391&r1=1195390&r2=1195391&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/ha/session/DeltaManager.java
(original)
+++ tomcat/trunk/java/org/apache/catalina/ha/session/DeltaManager.java Mon Oct
31 10:16:58 2011
@@ -264,7 +264,7 @@ public class DeltaManager extends Cluste
}
/**
- * @return Returns the counterReceive_EVT_CHANGE_SESSION_ID.
+ * @return Returns the counterReceive_EVT_ALL_SESSION_NOCONTEXTMANAGER.
*/
public long getCounterReceive_EVT_ALL_SESSION_NOCONTEXTMANAGER() {
return counterReceive_EVT_ALL_SESSION_NOCONTEXTMANAGER;
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1195384 - in /tomcat/trunk/java/org/apache/catalina/ha/session: ClusterSessionListener.java DeltaManager.java LocalStrings.properties SessionMessage.java SessionMessageImpl.java mbeans-de
Author: kfujino
Date: Mon Oct 31 09:58:42 2011
New Revision: 1195384
URL: http://svn.apache.org/viewvc?rev=1195384&view=rev
Log:
When Context manager does not exist,
A no context manager message is replied in order to avoid timeout (default
60sec) of GET_ALL_SESSIONS sync phase.
Modified:
tomcat/trunk/java/org/apache/catalina/ha/session/ClusterSessionListener.java
tomcat/trunk/java/org/apache/catalina/ha/session/DeltaManager.java
tomcat/trunk/java/org/apache/catalina/ha/session/LocalStrings.properties
tomcat/trunk/java/org/apache/catalina/ha/session/SessionMessage.java
tomcat/trunk/java/org/apache/catalina/ha/session/SessionMessageImpl.java
tomcat/trunk/java/org/apache/catalina/ha/session/mbeans-descriptors.xml
Modified:
tomcat/trunk/java/org/apache/catalina/ha/session/ClusterSessionListener.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/ha/session/ClusterSessionListener.java?rev=1195384&r1=1195383&r2=1195384&view=diff
==
---
tomcat/trunk/java/org/apache/catalina/ha/session/ClusterSessionListener.java
(original)
+++
tomcat/trunk/java/org/apache/catalina/ha/session/ClusterSessionListener.java
Mon Oct 31 09:58:42 2011
@@ -74,10 +74,22 @@ public class ClusterSessionListener exte
}
} else {
ClusterManager mgr = managers.get(ctxname);
-if (mgr != null)
+if (mgr != null) {
mgr.messageDataReceived(msg);
-else if (log.isWarnEnabled())
-log.warn("Context manager doesn't exist:" + ctxname);
+} else {
+if (log.isWarnEnabled())
+log.warn("Context manager doesn't exist:" + ctxname);
+
+// A no context manager message is replied in order to
avoid
+// timeout of GET_ALL_SESSIONS sync phase.
+if (msg.getEventType() ==
SessionMessage.EVT_GET_ALL_SESSIONS) {
+SessionMessage replymsg = new
SessionMessageImpl(ctxname,
+
SessionMessage.EVT_ALL_SESSION_NOCONTEXTMANAGER,
+null,
"NO-CONTEXT-MANAGER","NO-CONTEXT-MANAGER-" + ctxname);
+cluster.send(replymsg, msg.getAddress());
+}
+}
+
}
}
return;
Modified: tomcat/trunk/java/org/apache/catalina/ha/session/DeltaManager.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/ha/session/DeltaManager.java?rev=1195384&r1=1195383&r2=1195384&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/ha/session/DeltaManager.java
(original)
+++ tomcat/trunk/java/org/apache/catalina/ha/session/DeltaManager.java Mon Oct
31 09:58:42 2011
@@ -92,6 +92,7 @@ public class DeltaManager extends Cluste
private boolean notifySessionListenersOnReplication = true;
private boolean notifyContainerListenersOnReplication = true;
private volatile boolean stateTransfered = false ;
+private volatile boolean noContextManagerReceived = false ;
private int stateTransferTimeout = 60;
private boolean sendAllSessions = true;
private int sendAllSessionsSize = 1000 ;
@@ -117,6 +118,7 @@ public class DeltaManager extends Cluste
private long counterReceive_EVT_SESSION_DELTA = 0;
private int counterReceive_EVT_ALL_SESSION_TRANSFERCOMPLETE = 0 ;
private long counterReceive_EVT_CHANGE_SESSION_ID = 0 ;
+private long counterReceive_EVT_ALL_SESSION_NOCONTEXTMANAGER = 0 ;
private long counterSend_EVT_GET_ALL_SESSIONS = 0 ;
private long counterSend_EVT_ALL_SESSION_DATA = 0 ;
private long counterSend_EVT_SESSION_CREATED = 0;
@@ -126,6 +128,7 @@ public class DeltaManager extends Cluste
private int counterSend_EVT_ALL_SESSION_TRANSFERCOMPLETE = 0 ;
private long counterSend_EVT_CHANGE_SESSION_ID = 0;
private int counterNoStateTransfered = 0 ;
+
// -
Constructor
public DeltaManager() {
@@ -261,6 +264,13 @@ public class DeltaManager extends Cluste
}
/**
+ * @return Returns the counterReceive_EVT_CHANGE_SESSION_ID.
+ */
+public long getCounterReceive_EVT_ALL_SESSION_NOCONTEXTMANAGER() {
+return counterReceive_EVT_ALL_SESSION_NOCONTEXTMANAGER;
+}
+
+/**
* @return Returns the processingTime.
*/
@Override
@@ -315,6 +325,14 @@ public class DeltaManager extends Cluste
this.stateTransfered = stateTransfered;
}
+public boolean isNoContextManagerReceived() {
+return noContextManagerReceived;
+}
+
+public void setNoContextManagerReceived(boolean noContextManagerReceived) {
+this.noContextManager
Re: svn commit: r1195363 - /tomcat/jk/trunk/native/iis/pcre/pcre.amd64
On 10/31/2011 09:25 AM, William A. Rowe Jr. wrote: On 10/31/2011 2:37 AM, mt...@apache.org wrote: --- tomcat/jk/trunk/native/iis/pcre/pcre.amd64 (original) +++ tomcat/jk/trunk/native/iis/pcre/pcre.amd64 Mon Oct 31 07:37:07 2011 @@ -66,7 +66,7 @@ LIB32_OBJS= \ $(LIB32_FLAGS) $(DEF_FLAGS) $(LIB32_OBJS) << -CPP_PROJ=-nologo -MD -W3 -O2 -Ob2 -Oy- -Zi -EHsc /D "_WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_AMD64_=1" -DWIN64 /D "_WIN64" /Wp64 /FIPRE64PRA.H /D "PCRE_STATIC" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\pcre_src" /FD /c +CPP_PROJ=-nologo -MD -W3 -O2 -Ob2 -Oy- -Zi -EHsc /D "_WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_AMD64_=1" -DWIN64 /D "_WIN64" /D "PCRE_STATIC" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\pcre_src" /FD /c You had informed me (correctly) that MS refers to 64 bit x86 as WIN64. Why would _WIN32 remain? Ask Microsoft :) eg. #if !defined (_WIN32) #error ERROR: Only Win32 target supported! #endif /* !defined (_WIN32) */ And then you have in the #ifdef _WIN64 typedef unsigned __int64size_t; #else typedef _W64 unsigned int size_t; #endif I suppose it has to do with backward compatibility. I have no idea why they didn't just do: #ifdef _WIN64 #define _WIN32 #endif Regards -- ^TM - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1195374 - in /tomcat/jk/trunk/native/iis: README jk_isapi_plugin.c
Author: mturk
Date: Mon Oct 31 08:46:41 2011
New Revision: 1195374
URL: http://svn.apache.org/viewvc?rev=1195374&view=rev
Log:
Simplify init by ensuring we run on supported IIS (5.1+)
Modified:
tomcat/jk/trunk/native/iis/README
tomcat/jk/trunk/native/iis/jk_isapi_plugin.c
Modified: tomcat/jk/trunk/native/iis/README
URL:
http://svn.apache.org/viewvc/tomcat/jk/trunk/native/iis/README?rev=1195374&r1=1195373&r2=1195374&view=diff
==
--- tomcat/jk/trunk/native/iis/README (original)
+++ tomcat/jk/trunk/native/iis/README Mon Oct 31 08:46:41 2011
@@ -41,3 +41,7 @@ The steps that you need to take are:
An alternative will be to open the isapi workspace file (isapi.dsw) in msdev
and
build it using the build menu.
+
+* USE_CGI_HEADERS
+ If provided at compile time the isapi_redirect will use alternete
+ header names. TODO: Needs a proper documentation.
Modified: tomcat/jk/trunk/native/iis/jk_isapi_plugin.c
URL:
http://svn.apache.org/viewvc/tomcat/jk/trunk/native/iis/jk_isapi_plugin.c?rev=1195374&r1=1195373&r2=1195374&view=diff
==
--- tomcat/jk/trunk/native/iis/jk_isapi_plugin.c (original)
+++ tomcat/jk/trunk/native/iis/jk_isapi_plugin.c Mon Oct 31 08:46:41 2011
@@ -121,9 +121,7 @@ static char HTTP_WORKER_HEADER_INDEX[MAX
#define SHM_SIZE_TAG("shm_size")
#define WORKER_MOUNT_RELOAD_TAG ("worker_mount_reload")
#define STRIP_SESSION_TAG ("strip_session")
-#ifndef AUTOMATIC_AUTH_NOTIFICATION
#define AUTH_COMPLETE_TAG ("auth_complete")
-#endif
#define REJECT_UNSAFE_TAG ("reject_unsafe")
#define WATCHDOG_INTERVAL_TAG ("watchdog_interval")
#define ENABLE_CHUNKED_ENCODING_TAG ("enable_chunked_encoding")
@@ -504,9 +502,7 @@ static int worker_mount_reload = JK_URI
static char rewrite_rule_file[MAX_PATH * 2] = {0};
static size_t shm_config_size = 0;
static int strip_session = 0;
-#ifndef AUTOMATIC_AUTH_NOTIFICATION
static int use_auth_notification_flags = 1;
-#endif
static int chunked_encoding_enabled = JK_FALSE;
static int reject_unsafe = 0;
static int watchdog_interval = 0;
@@ -1489,6 +1485,10 @@ BOOL WINAPI GetFilterVersion(PHTTP_FILTE
rv = initialize_extension();
}
JK_LEAVE_CS(&(init_cs), rc);
+if (iis_info.major < 5 || (iis_info.major == 5 && iis_info.minor < 1)) {
+SetLastError(ERROR_OLD_WIN_VERSION);
+return FALSE;
+}
pVer->dwFlags = SF_NOTIFY_ORDER_HIGH |
SF_NOTIFY_SECURE_PORT |
SF_NOTIFY_NONSECURE_PORT |
@@ -2807,6 +2807,10 @@ static BOOL initialize_extension(void)
if (read_registry_init_data()) {
if (get_iis_info(&iis_info) != JK_TRUE) {
jk_log(logger, JK_LOG_ERROR, "Could not retrieve IIS version from
registry");
+if (use_auth_notification_flags)
+iis_info.filter_notify_event = SF_NOTIFY_AUTH_COMPLETE;
+else
+iis_info.filter_notify_event = SF_NOTIFY_PREPROC_HEADERS;
}
is_inited = JK_TRUE;
}
@@ -2904,9 +2908,7 @@ static int read_registry_init_data(void)
shm_config_size = (size_t) get_config_int(src, SHM_SIZE_TAG, 0);
worker_mount_reload = get_config_int(src, WORKER_MOUNT_RELOAD_TAG,
JK_URIMAP_DEF_RELOAD);
strip_session = get_config_bool(src, STRIP_SESSION_TAG, JK_FALSE);
-#ifndef AUTOMATIC_AUTH_NOTIFICATION
use_auth_notification_flags = get_config_int(src, AUTH_COMPLETE_TAG, 1);
-#endif
reject_unsafe = get_config_bool(src, REJECT_UNSAFE_TAG, JK_FALSE);
watchdog_interval = get_config_int(src, WATCHDOG_INTERVAL_TAG, 0);
if (watchdog_interval < 0)
@@ -3484,39 +3486,19 @@ static int base64_encode_cert(char *enco
static int get_iis_info(iis_info_t* iis_info)
{
HKEY hkey;
-long rc;
int rv = JK_FALSE;
iis_info->major = 0;
iis_info->minor = 0;
-iis_info->filter_notify_event = SF_NOTIFY_PREPROC_HEADERS;
/* Retrieve the IIS version Major/Minor */
-rc = RegOpenKeyEx(HKEY_LOCAL_MACHINE,
- W3SVC_REGISTRY_KEY, (DWORD) 0, KEY_READ, &hkey);
-if (ERROR_SUCCESS == rc) {
-if (get_registry_config_number(hkey, "MajorVersion", &iis_info->major)
== JK_TRUE) {
-#ifdef AUTOMATIC_AUTH_NOTIFICATION
-if (iis_info->major > 4)
-#else
-if (use_auth_notification_flags && iis_info->major > 4)
-#endif
-iis_info->filter_notify_event = SF_NOTIFY_AUTH_COMPLETE;
-if (get_registry_config_number(hkey, "MinorVersion",
&iis_info->minor) == JK_TRUE) {
-
-#ifdef AUTOMATIC_AUTH_NOTIFICATION
-/* SF_NOTIFY_AUTH_COMPLETE causes redirect failures
- * (ERROR_INVALID_PARAMETER) on IIS 5.1 with OPTIONS/PUT
- * and is only available from IIS 5+
- */
-if (iis_info->major == 5 && iis_info->mino
Re: svn commit: r1195363 - /tomcat/jk/trunk/native/iis/pcre/pcre.amd64
On 10/31/2011 2:37 AM, mt...@apache.org wrote: > --- tomcat/jk/trunk/native/iis/pcre/pcre.amd64 (original) > +++ tomcat/jk/trunk/native/iis/pcre/pcre.amd64 Mon Oct 31 07:37:07 2011 > @@ -66,7 +66,7 @@ LIB32_OBJS= \ >$(LIB32_FLAGS) $(DEF_FLAGS) $(LIB32_OBJS) > << > > -CPP_PROJ=-nologo -MD -W3 -O2 -Ob2 -Oy- -Zi -EHsc /D "_WIN32" /D "NDEBUG" /D > "_WINDOWS" /D "_AMD64_=1" -DWIN64 /D "_WIN64" /Wp64 /FIPRE64PRA.H /D > "PCRE_STATIC" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\pcre_src" /FD /c > +CPP_PROJ=-nologo -MD -W3 -O2 -Ob2 -Oy- -Zi -EHsc /D "_WIN32" /D "NDEBUG" /D > "_WINDOWS" /D "_AMD64_=1" -DWIN64 /D "_WIN64" /D "PCRE_STATIC" > /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\pcre_src" /FD /c You had informed me (correctly) that MS refers to 64 bit x86 as WIN64. Why would _WIN32 remain? - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1195368 - /tomcat/jk/trunk/native/iis/jk_isapi_plugin.c
Author: mturk
Date: Mon Oct 31 08:13:57 2011
New Revision: 1195368
URL: http://svn.apache.org/viewvc?rev=1195368&view=rev
Log:
Axe trailing spaces. No functional change
Modified:
tomcat/jk/trunk/native/iis/jk_isapi_plugin.c
Modified: tomcat/jk/trunk/native/iis/jk_isapi_plugin.c
URL:
http://svn.apache.org/viewvc/tomcat/jk/trunk/native/iis/jk_isapi_plugin.c?rev=1195368&r1=1195367&r2=1195368&view=diff
==
--- tomcat/jk/trunk/native/iis/jk_isapi_plugin.c (original)
+++ tomcat/jk/trunk/native/iis/jk_isapi_plugin.c Mon Oct 31 08:13:57 2011
@@ -1227,7 +1227,7 @@ static int JK_METHOD iis_read(jk_ws_serv
"Attempting to read %d bytes from client", l);
}
if (p->lpEcb->ReadClient(p->lpEcb->ConnID, buf, (LPDWORD)&l)) {
-/* ReadClient will succeed with dwSize == 0 for last chunk
+/* ReadClient will succeed with dwSize == 0 for last chunk
if request chunk encoded */
*a += l;
}
@@ -3266,7 +3266,7 @@ static int init_ws_service(isapi_private
else if (!strnicmp(tmp, CONTENT_LENGTH,
sizeof(CONTENT_LENGTH) - 1)) {
need_content_length_header = FALSE;
-
+
/* If the content-length is unknown
* or larger then 4Gb do not send it.
* IIS can also create a synthetic Content-Length header
to make
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1195366 - in /tomcat/jk/trunk: native/iis/jk_isapi_plugin.c xdocs/miscellaneous/changelog.xml
Author: mturk Date: Mon Oct 31 07:53:11 2011 New Revision: 1195366 URL: http://svn.apache.org/viewvc?rev=1195366&view=rev Log: Require Windows 2003 SP1/Windows XP SP2 as minimum required version. Modified: tomcat/jk/trunk/native/iis/jk_isapi_plugin.c tomcat/jk/trunk/xdocs/miscellaneous/changelog.xml Modified: tomcat/jk/trunk/native/iis/jk_isapi_plugin.c URL: http://svn.apache.org/viewvc/tomcat/jk/trunk/native/iis/jk_isapi_plugin.c?rev=1195366&r1=1195365&r2=1195366&view=diff == --- tomcat/jk/trunk/native/iis/jk_isapi_plugin.c (original) +++ tomcat/jk/trunk/native/iis/jk_isapi_plugin.c Mon Oct 31 07:53:11 2011 @@ -26,7 +26,7 @@ // This define is needed to include wincrypt,h, needed to get client certificates #ifndef _WIN32_WINNT -#define _WIN32_WINNT 0x0500 +#define _WIN32_WINNT 0x0502 #endif #include #include Modified: tomcat/jk/trunk/xdocs/miscellaneous/changelog.xml URL: http://svn.apache.org/viewvc/tomcat/jk/trunk/xdocs/miscellaneous/changelog.xml?rev=1195366&r1=1195365&r2=1195366&view=diff == --- tomcat/jk/trunk/xdocs/miscellaneous/changelog.xml (original) +++ tomcat/jk/trunk/xdocs/miscellaneous/changelog.xml Mon Oct 31 07:53:11 2011 @@ -44,6 +44,10 @@ + +IIS: Use Windows Server 2003 SP1, Windows XP SP2 as minimal +version supported. (mturk) + 47038: Fix compiler warning when using --enable-flock for configure. (rjung) - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1195363 - /tomcat/jk/trunk/native/iis/pcre/pcre.amd64
Author: mturk
Date: Mon Oct 31 07:37:07 2011
New Revision: 1195363
URL: http://svn.apache.org/viewvc?rev=1195363&view=rev
Log:
Axe useless defines from 64-bit builds
Modified:
tomcat/jk/trunk/native/iis/pcre/pcre.amd64
Modified: tomcat/jk/trunk/native/iis/pcre/pcre.amd64
URL:
http://svn.apache.org/viewvc/tomcat/jk/trunk/native/iis/pcre/pcre.amd64?rev=1195363&r1=1195362&r2=1195363&view=diff
==
--- tomcat/jk/trunk/native/iis/pcre/pcre.amd64 (original)
+++ tomcat/jk/trunk/native/iis/pcre/pcre.amd64 Mon Oct 31 07:37:07 2011
@@ -66,7 +66,7 @@ LIB32_OBJS= \
$(LIB32_FLAGS) $(DEF_FLAGS) $(LIB32_OBJS)
<<
-CPP_PROJ=-nologo -MD -W3 -O2 -Ob2 -Oy- -Zi -EHsc /D "_WIN32" /D "NDEBUG" /D
"_WINDOWS" /D "_AMD64_=1" -DWIN64 /D "_WIN64" /Wp64 /FIPRE64PRA.H /D
"PCRE_STATIC" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\pcre_src" /FD /c
+CPP_PROJ=-nologo -MD -W3 -O2 -Ob2 -Oy- -Zi -EHsc /D "_WIN32" /D "NDEBUG" /D
"_WINDOWS" /D "_AMD64_=1" -DWIN64 /D "_WIN64" /D "PCRE_STATIC" /Fo"$(INTDIR)\\"
/Fd"$(INTDIR)\pcre_src" /FD /c
.c{$(INTDIR)}.obj::
$(CPP) @<<
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
