[GUMP@vmgump-vm3]: Project tomcat-tc8.0.x-test-apr (in module tomcat-8.0.x) failed
To whom it may engage... This is an automated request, but not an unsolicited one. For more information please visit http://gump.apache.org/nagged.html, and/or contact the folk at gene...@gump.apache.org. Project tomcat-tc8.0.x-test-apr has an issue affecting its community integration. This issue affects 1 projects, and has been outstanding for 85 runs. The current state of this project is 'Failed', with reason 'Build Failed'. For reference only, the following projects are affected by this: - tomcat-tc8.0.x-test-apr : Tomcat 8.x, a web server implementing the Java Servlet 3.1, ... Full details are available at: http://vmgump-vm3.apache.org/tomcat-8.0.x/tomcat-tc8.0.x-test-apr/index.html That said, some information snippets are provided here. The following annotations (debug/informational/warning/error messages) were provided: -INFO- Failed with reason build failed -INFO- Project Reports in: /srv/gump/public/workspace/tomcat-8.0.x/output/logs-APR -INFO- Project Reports in: /srv/gump/public/workspace/tomcat-8.0.x/output/test-tmp-APR/logs -WARNING- No directory [/srv/gump/public/workspace/tomcat-8.0.x/output/test-tmp-APR/logs] The following work was performed: http://vmgump-vm3.apache.org/tomcat-8.0.x/tomcat-tc8.0.x-test-apr/gump_work/build_tomcat-8.0.x_tomcat-tc8.0.x-test-apr.html Work Name: build_tomcat-8.0.x_tomcat-tc8.0.x-test-apr (Type: Build) Work ended in a state of : Failed Elapsed: 24 mins 4 secs Command Line: /usr/lib/jvm/java-8-oracle/bin/java -Djava.awt.headless=true -Dbuild.sysclasspath=only -Dsun.zip.disableMemoryMapping=true org.apache.tools.ant.Main -Dgump.merge=/srv/gump/public/gump/work/merge.xml -Djunit.jar=/srv/gump/public/workspace/junit/target/junit-4.13-SNAPSHOT.jar -Djava.net.preferIPv4Stack=/srv/gump/public/workspace/tomcat-8.0.x/true -Dobjenesis.jar=/srv/gump/public/workspace/objenesis/main/target/objenesis-2.7-SNAPSHOT.jar -Dtest.reports=output/logs-APR -Dexecute.test.nio2=false -Dexamples.sources.skip=true -Dbase.path=/srv/gump/public/workspace/tomcat-8.0.x/tomcat-build-libs -Djdt.jar=/srv/gump/packages/eclipse/plugins/R-4.7.3a-201803300640/ecj-4.7.3a.jar -Dtest.apr.loc=/srv/gump/public/workspace/tomcat-native-12/dest-20180821/lib -Dtest.relaxTiming=true -Dcommons-daemon.jar=/srv/gump/public/workspace/apache-commons/daemon/target/commons-daemon-1.1.1-SNAPSHOT.jar -Dtest.temp=output/test-tmp-APR -Dtest.accesslog=true -Dexecute.test.nio=false -Dtest.openssl.p ath=/srv/gump/public/workspace/openssl-1.0.2/dest-20180821/bin/openssl -Dexecute.test.bio=false -Dexecute.test.apr=true -Dtest.excludePerformance=true -Deasymock.jar=/srv/gump/public/workspace/easymock/core/target/easymock-3.7-SNAPSHOT.jar -Dhamcrest.jar=/srv/gump/packages/hamcrest/hamcrest-core-1.3.jar -Dcglib.jar=/srv/gump/packages/cglib/cglib-nodep-2.2.jar test [Working Directory: /srv/gump/public/workspace/tomcat-8.0.x] CLASSPATH: /usr/lib/jvm/java-8-oracle/lib/tools.jar:/srv/gump/public/workspace/tomcat-8.0.x/output/build/webapps/examples/WEB-INF/classes:/srv/gump/public/workspace/tomcat-8.0.x/output/testclasses:/srv/gump/public/workspace/ant/dist/lib/ant.jar:/srv/gump/public/workspace/ant/dist/lib/ant-launcher.jar:/srv/gump/public/workspace/ant/dist/lib/ant-jmf.jar:/srv/gump/public/workspace/ant/dist/lib/ant-junit.jar:/srv/gump/public/workspace/ant/dist/lib/ant-junit4.jar:/srv/gump/public/workspace/ant/dist/lib/ant-swing.jar:/srv/gump/public/workspace/ant/dist/lib/ant-apache-resolver.jar:/srv/gump/public/workspace/ant/dist/lib/ant-apache-xalan2.jar:/srv/gump/public/workspace/xml-commons/java/build/resolver.jar:/srv/gump/public/workspace/tomcat-8.0.x/output/build/bin/bootstrap.jar:/srv/gump/public/workspace/tomcat-8.0.x/output/build/bin/tomcat-juli.jar:/srv/gump/public/workspace/tomcat-8.0.x/output/build/lib/annotations-api.jar:/srv/gump/public/workspace/tomcat-8.0.x/output/build/lib/servlet-api.ja r:/srv/gump/public/workspace/tomcat-8.0.x/output/build/lib/jsp-api.jar:/srv/gump/public/workspace/tomcat-8.0.x/output/build/lib/el-api.jar:/srv/gump/public/workspace/tomcat-8.0.x/output/build/lib/websocket-api.jar:/srv/gump/public/workspace/tomcat-8.0.x/output/build/lib/catalina.jar:/srv/gump/public/workspace/tomcat-8.0.x/output/build/lib/catalina-ant.jar:/srv/gump/public/workspace/tomcat-8.0.x/output/build/lib/catalina-storeconfig.jar:/srv/gump/public/workspace/tomcat-8.0.x/output/build/lib/tomcat-coyote.jar:/srv/gump/public/workspace/tomcat-8.0.x/output/build/lib/jasper.jar:/srv/gump/public/workspace/tomcat-8.0.x/output/build/lib/jasper-el.jar:/srv/gump/public/workspace/tomcat-8.0.x/output/build/lib/catalina-tribes.jar:/srv/gump/public/workspace/tomcat-8.0.x/output/build/lib/catalina-ha.jar:/srv/gump/public/workspace/tomcat-8.0.x/output/build/lib/tomcat-api.jar:/srv/gump/public/workspace/tomcat-8.0.x/output/build/lib/tomcat-jni.jar:/srv/gump/public/workspace/tomcat-8.0.x/output/bu
[Bug 62635] Async servlet over HTTP/2 response.flushBuffer() intermittently fails
https://bz.apache.org/bugzilla/show_bug.cgi?id=62635 --- Comment #5 from Dapeng Zhang --- I tested with the patch. All passed! I agree that although Servlet 4.0 must support HTTP/2 requests and responses, and the HTTP/2 protocol allows the HTTP/2 Request/Response Exchange to work in a full-duplex way easily ( https://httpwg.org/specs/rfc7540.html#rfc.section.8.1 ), it seems not required that the Servlet server to fully support full-duplex. I really appreciate the patch, given that it is a not-required (and complex) feature. Thanks a lot. -- 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
buildbot success in on tomcat-trunk
The Buildbot has detected a restored build on builder tomcat-trunk while building . Full details are available at: https://ci.apache.org/builders/tomcat-trunk/builds/3535 Buildbot URL: https://ci.apache.org/ Buildslave for this Build: silvanus_ubuntu Build Reason: The AnyBranchScheduler scheduler named 'on-tomcat-commit' triggered this build Build Source Stamp: [branch tomcat/trunk] 1838502 Blamelist: markt Build succeeded! Sincerely, -The Buildbot - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1838502 - /tomcat/trunk/java/org/apache/tomcat/util/net/SocketWrapperBase.java
Author: markt
Date: Mon Aug 20 22:07:56 2018
New Revision: 1838502
URL: http://svn.apache.org/viewvc?rev=1838502=rev
Log:
Fix Javadoc
Modified:
tomcat/trunk/java/org/apache/tomcat/util/net/SocketWrapperBase.java
Modified: tomcat/trunk/java/org/apache/tomcat/util/net/SocketWrapperBase.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/net/SocketWrapperBase.java?rev=1838502=1838501=1838502=diff
==
--- tomcat/trunk/java/org/apache/tomcat/util/net/SocketWrapperBase.java
(original)
+++ tomcat/trunk/java/org/apache/tomcat/util/net/SocketWrapperBase.java Mon Aug
20 22:07:56 2018
@@ -624,6 +624,10 @@ public abstract class SocketWrapperBase<
/**
* Separate method so it can be re-used by the socket write buffer to write
* data to the network
+ *
+ * @param from The ByteBuffer containing the data to be written
+ *
+ * @throws IOException If an IO error occurs during the write
*/
protected void writeNonBlockingInternal(ByteBuffer from) throws
IOException {
if (socketBufferHandler.isWriteBufferEmpty()) {
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1838504 - in /tomcat/tc8.5.x/trunk: ./ java/org/apache/tomcat/util/net/SocketWrapperBase.java
Author: markt Date: Mon Aug 20 22:08:20 2018 New Revision: 1838504 URL: http://svn.apache.org/viewvc?rev=1838504=rev Log: Fix Javadoc Modified: tomcat/tc8.5.x/trunk/ (props changed) tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/net/SocketWrapperBase.java Propchange: tomcat/tc8.5.x/trunk/ -- --- svn:mergeinfo (original) +++ svn:mergeinfo Mon Aug 20 22:08:20 2018 @@ -1,2 +1,2 @@ /tomcat/tc8.0.x/trunk:1809644 -/tomcat/trunk:1734785,1734799,1734845,1734928,1735041,1735044,1735480,1735577,1735597,1735599-1735600,1735615,1736145,1736162,1736209,1736280,1736297,1736299,1736489,1736646,1736703,1736836,1736849,1737104-1737105,1737112,1737117,1737119-1737120,1737155,1737157,1737192,1737280,1737339,1737632,1737664,1737715,1737748,1737785,1737834,1737860,1737903,1737959,1738005,1738007,1738014-1738015,1738018,1738022,1738039,1738043,1738059-1738060,1738147,1738149,1738174-1738175,1738261,1738589,1738623-1738625,1738643,1738816,1738850,1738855,1738946-1738948,1738953-1738954,1738979,1738982,1739079-1739081,1739087,1739113,1739153,1739172,1739176,1739191,1739474,1739492,1739726,1739762,1739775,1739814,1739817-1739818,1739975,1740131,1740324,1740465,1740495,1740508-1740509,1740520,1740535,1740707,1740803,1740810,1740969,1740980,1740991,1740997,1741015,1741033,1741036,1741058,1741060,1741080,1741147,1741159,1741164,1741173,1741181,1741190,1741197,1741202,1741208,1741213,1741221,1741225,1741232,1741409 ,1741501,1741677,1741892,1741896,1741984,1742023,1742042,1742071,1742090,1742093,1742101,1742105,1742111,1742139,1742146,1742148,1742166,1742181,1742184,1742187,1742246,1742248-1742251,1742263-1742264,1742268,1742276,1742369,1742387,1742448,1742509-1742512,1742917,1742919,1742933,1742975-1742976,1742984,1742986,1743019,1743115,1743117,1743124-1743125,1743134,1743425,1743554,1743679,1743696-1743698,1743700-1743701,1744058,1744064-1744065,1744125,1744149,1744194,1744229,1744270,1744323,1744432,1744684,1744697,1744705,1744713,1744760,1744786,1745083,1745142-1745143,1745145,1745177,1745179-1745180,1745227,1745248,1745254,1745337,1745467,1745473,1745535,1745576,1745735,1745744,1746304,1746306-1746307,1746319,1746327,1746338,1746340-1746341,1746344,1746427,1746441,1746473,1746490,1746492,1746495-1746496,1746499-1746501,1746503-1746507,1746509,1746549,1746551,1746554,1746556,1746558,1746584,1746620,1746649,1746724,1746939,1746989,1747014,1747028,1747035,1747210,1747225,1747234,1747253,1747 404,1747506,1747536,1747924,1747980,1747993,1748001,1748253,1748452,1748547,1748629,1748676,1748715,1749287,1749296,1749328,1749373,1749465,1749506,1749508,1749665-1749666,1749763,1749865-1749866,1749898,1749978,1749980,1750011,1750015,1750056,1750480,1750617,1750634,1750692,1750697,1750700,1750703,1750707,1750714,1750718,1750723,1750774,1750899,1750975,1750995,1751061,1751097,1751173,1751438,1751447,1751463,1751702,1752212,1752737,1752745,1753078,1753080,1753358,1753363,1754111,1754140-1754141,1754281,1754310,1754445,1754467,1754494,1754496,1754528,1754532-1754533,1754613,1754714,1754874,1754941,1754944,1754950-1754951,1755005,1755007,1755009,1755132,1755180-1755181,1755185,1755190,1755204-1755206,1755208,1755214,1755224,1755227,1755230,1755629,1755646-1755647,1755650,1755653,1755675,1755680,1755683,1755693,1755717,1755731-1755737,1755812,1755828,1755884,1755890,1755918-1755919,1755942,1755958,1755960,1755970,1755993,1756013,1756019,1756039,1756056,1756083-1756114,1756175,1756288-1 756289,1756408-1756410,1756778,1756798,1756878,1756898,1756939,1757123-1757124,1757126,1757128,1757132-1757133,1757136,1757145,1757167-1757168,1757175,1757180,1757182,1757195,1757271,1757278,1757347,1757353-1757354,1757363,1757374,1757399,1757406,1757408,1757485,1757495,1757499,1757527,1757578,1757684,1757722,1757727,1757790,1757799,1757813,1757853,1757883,1757903,1757976,1757997,1758000,1758058,1758072-1758075,1758078-1758079,1758223,1758257,1758261,1758276,1758292,1758369,1758378-1758383,1758421,1758423,1758425-1758427,1758430,1758443,1758448,1758459,1758483,1758486-1758487,1758499,1758525,1758556,1758580,1758582,1758584,1758588,1758842,1759019,1759212,1759224,1759227,1759252,1759274,1759513-1759516,1759611,1759757,1759785-1759790,1760005,1760022,1760109-1760110,1760135,1760200-1760201,1760227,1760300,1760397,1760446,1760454,1760640,1760648,1761057,1761422,1761491,1761498,1761500-1761501,1761550,1761553,1761572,1761574,1761625-1761626,1761628,1761682,1761740,1761752,1762051-176205
svn commit: r1838501 - in /tomcat/site/trunk: docs/download-taglibs.html xdocs/download-taglibs.xml
Author: markt Date: Mon Aug 20 22:04:39 2018 New Revision: 1838501 URL: http://svn.apache.org/viewvc?rev=1838501=rev Log: Update has links to use newly added SHA-512 Modified: tomcat/site/trunk/docs/download-taglibs.html tomcat/site/trunk/xdocs/download-taglibs.xml Modified: tomcat/site/trunk/docs/download-taglibs.html URL: http://svn.apache.org/viewvc/tomcat/site/trunk/docs/download-taglibs.html?rev=1838501=1838500=1838501=diff == --- tomcat/site/trunk/docs/download-taglibs.html (original) +++ tomcat/site/trunk/docs/download-taglibs.html Mon Aug 20 22:04:39 2018 @@ -240,7 +240,7 @@ every release file. This signature should be matched against the https://www.apache.org/dist/tomcat/taglibs/KEYS;>KEYS file which contains the OpenPGP keys of Taglib's Release Managers. We also -provide a SHA1 checksum for every release file. After you +provide a SHA512 checksum for every release file. After you download the file, you should calculate a checksum for your download, and make sure it is the same as ours. @@ -294,7 +294,7 @@ zip (https://www.apache.org/dist/tomcat/taglibs/taglibs-standard-1.2.5/taglibs-standard-1.2.5-source-release.zip.asc;>pgp, - https://www.apache.org/dist/tomcat/taglibs/taglibs-standard-1.2.5/taglibs-standard-1.2.5-source-release.zip.sha1;>sha1) + https://www.apache.org/dist/tomcat/taglibs/taglibs-standard-1.2.5/taglibs-standard-1.2.5-source-release.zip.sha512;>sha512) @@ -322,7 +322,7 @@ taglibs-standard-impl-1.2.5.jar (https://www.apache.org/dist/tomcat/taglibs/taglibs-standard-1.2.5/taglibs-standard-impl-1.2.5.jar.asc;>pgp, -https://www.apache.org/dist/tomcat/taglibs/taglibs-standard-1.2.5/taglibs-standard-impl-1.2.5.jar.sha1;>sha1) +https://www.apache.org/dist/tomcat/taglibs/taglibs-standard-1.2.5/taglibs-standard-impl-1.2.5.jar.sha512;>sha512) @@ -336,7 +336,7 @@ taglibs-standard-spec-1.2.5.jar (https://www.apache.org/dist/tomcat/taglibs/taglibs-standard-1.2.5/taglibs-standard-spec-1.2.5.jar.asc;>pgp, -https://www.apache.org/dist/tomcat/taglibs/taglibs-standard-1.2.5/taglibs-standard-spec-1.2.5.jar.sha1;>sha1) +https://www.apache.org/dist/tomcat/taglibs/taglibs-standard-1.2.5/taglibs-standard-spec-1.2.5.jar.sha512;>sha512) @@ -350,7 +350,7 @@ taglibs-standard-jstlel-1.2.5.jar (https://www.apache.org/dist/tomcat/taglibs/taglibs-standard-1.2.5/taglibs-standard-jstlel-1.2.5.jar.asc;>pgp, -https://www.apache.org/dist/tomcat/taglibs/taglibs-standard-1.2.5/taglibs-standard-jstlel-1.2.5.jar.sha1;>sha1) +https://www.apache.org/dist/tomcat/taglibs/taglibs-standard-1.2.5/taglibs-standard-jstlel-1.2.5.jar.sha512;>sha512) @@ -364,7 +364,7 @@ taglibs-standard-compat-1.2.5.jar (https://www.apache.org/dist/tomcat/taglibs/taglibs-standard-1.2.5/taglibs-standard-compat-1.2.5.jar.asc;>pgp, -https://www.apache.org/dist/tomcat/taglibs/taglibs-standard-1.2.5/taglibs-standard-compat-1.2.5.jar.sha1;>sha1) +https://www.apache.org/dist/tomcat/taglibs/taglibs-standard-1.2.5/taglibs-standard-compat-1.2.5.jar.sha512;>sha512) Modified: tomcat/site/trunk/xdocs/download-taglibs.xml URL: http://svn.apache.org/viewvc/tomcat/site/trunk/xdocs/download-taglibs.xml?rev=1838501=1838500=1838501=diff == --- tomcat/site/trunk/xdocs/download-taglibs.xml (original) +++ tomcat/site/trunk/xdocs/download-taglibs.xml Mon Aug 20 22:04:39 2018 @@ -30,7 +30,7 @@ every release file. This signature should be matched against the https://www.apache.org/dist/tomcat/taglibs/KEYS;>KEYS file which contains the OpenPGP keys of Taglib's Release Managers. We also -provide a SHA1 checksum for every release file. After you +provide a SHA512 checksum for every release file. After you download the file, you should calculate a checksum for your download, and make sure it is the same as ours. @@ -70,7 +70,7 @@ zip (https://www.apache.org/dist/tomcat/taglibs/taglibs-standard-1.2.5/taglibs-standard-1.2.5-source-release.zip.asc;>pgp, - https://www.apache.org/dist/tomcat/taglibs/taglibs-standard-1.2.5/taglibs-standard-1.2.5-source-release.zip.sha1;>sha1) + https://www.apache.org/dist/tomcat/taglibs/taglibs-standard-1.2.5/taglibs-standard-1.2.5-source-release.zip.sha512;>sha512) @@ -85,7 +85,7 @@ taglibs-standard-impl-1.2.5.jar
svn commit: r28866 - /release/tomcat/taglibs/taglibs-standard-1.2.5/
Author: markt Date: Mon Aug 20 21:58:32 2018 New Revision: 28866 Log: Add SHA-512 checksums Added: release/tomcat/taglibs/taglibs-standard-1.2.5/taglibs-standard-1.2.5-source-release.zip.sha512 release/tomcat/taglibs/taglibs-standard-1.2.5/taglibs-standard-compat-1.2.5.jar.sha512 release/tomcat/taglibs/taglibs-standard-1.2.5/taglibs-standard-impl-1.2.5.jar.sha512 release/tomcat/taglibs/taglibs-standard-1.2.5/taglibs-standard-jstlel-1.2.5.jar.sha512 release/tomcat/taglibs/taglibs-standard-1.2.5/taglibs-standard-spec-1.2.5.jar.sha512 Added: release/tomcat/taglibs/taglibs-standard-1.2.5/taglibs-standard-1.2.5-source-release.zip.sha512 == --- release/tomcat/taglibs/taglibs-standard-1.2.5/taglibs-standard-1.2.5-source-release.zip.sha512 (added) +++ release/tomcat/taglibs/taglibs-standard-1.2.5/taglibs-standard-1.2.5-source-release.zip.sha512 Mon Aug 20 21:58:32 2018 @@ -0,0 +1 @@ +ad4122cd75c66df901034e333c2b38ac3d2d8f5b0299abd36d0fd1c8f5975eacc71d66a475fc05638dd562ab0670ea532fe6a3ccb5497dfbeb9d859b03b659d0 *taglibs-standard-1.2.5-source-release.zip Added: release/tomcat/taglibs/taglibs-standard-1.2.5/taglibs-standard-compat-1.2.5.jar.sha512 == --- release/tomcat/taglibs/taglibs-standard-1.2.5/taglibs-standard-compat-1.2.5.jar.sha512 (added) +++ release/tomcat/taglibs/taglibs-standard-1.2.5/taglibs-standard-compat-1.2.5.jar.sha512 Mon Aug 20 21:58:32 2018 @@ -0,0 +1 @@ +e38bfba2877aa3b7acc9bb770477181052f6ad9f910ff420a3a93103fb431eafd517b9c8bd9d4727ea10525628b0bfa93368e5d6014a099dbec15c2761b9a83f *taglibs-standard-compat-1.2.5.jar Added: release/tomcat/taglibs/taglibs-standard-1.2.5/taglibs-standard-impl-1.2.5.jar.sha512 == --- release/tomcat/taglibs/taglibs-standard-1.2.5/taglibs-standard-impl-1.2.5.jar.sha512 (added) +++ release/tomcat/taglibs/taglibs-standard-1.2.5/taglibs-standard-impl-1.2.5.jar.sha512 Mon Aug 20 21:58:32 2018 @@ -0,0 +1 @@ +4f52748dcc333164a8abbd3a5964072afe6a91d771700bef15385fa33b618cd73cc34d3e2dfc6929cde52c45624b7c7735bf839ddd69c3e23c086672b96039d9 *taglibs-standard-impl-1.2.5.jar Added: release/tomcat/taglibs/taglibs-standard-1.2.5/taglibs-standard-jstlel-1.2.5.jar.sha512 == --- release/tomcat/taglibs/taglibs-standard-1.2.5/taglibs-standard-jstlel-1.2.5.jar.sha512 (added) +++ release/tomcat/taglibs/taglibs-standard-1.2.5/taglibs-standard-jstlel-1.2.5.jar.sha512 Mon Aug 20 21:58:32 2018 @@ -0,0 +1 @@ +14c45ff9a4bef71177cb838ca58096c152a3f1426b3381bff8bf3f97957df55b9204c8cf6614b55ba751acfed334d87644e4dd0ca2fe1e429ece0e47ce2c2a26 *taglibs-standard-jstlel-1.2.5.jar Added: release/tomcat/taglibs/taglibs-standard-1.2.5/taglibs-standard-spec-1.2.5.jar.sha512 == --- release/tomcat/taglibs/taglibs-standard-1.2.5/taglibs-standard-spec-1.2.5.jar.sha512 (added) +++ release/tomcat/taglibs/taglibs-standard-1.2.5/taglibs-standard-spec-1.2.5.jar.sha512 Mon Aug 20 21:58:32 2018 @@ -0,0 +1 @@ +3d377ed4df8372ab4816f99e53bf874c73338ad13666f1fd5c59d500a26240db3a6c3c06e81e610d2302a96b5d2372175c31008268af97b2fc19fe4b0f8ac174 *taglibs-standard-spec-1.2.5.jar - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r28865 - in /release/tomcat/tomcat-connectors/jk: ./ binaries/windows/
Author: markt Date: Mon Aug 20 21:55:46 2018 New Revision: 28865 Log: Drop 1.2.42 from mirrors Removed: release/tomcat/tomcat-connectors/jk/binaries/windows/tomcat-connectors-1.2.42-windows-i386-iis.zip release/tomcat/tomcat-connectors/jk/binaries/windows/tomcat-connectors-1.2.42-windows-i386-iis.zip.asc release/tomcat/tomcat-connectors/jk/binaries/windows/tomcat-connectors-1.2.42-windows-i386-iis.zip.sha1 release/tomcat/tomcat-connectors/jk/binaries/windows/tomcat-connectors-1.2.42-windows-x86_64-iis.zip release/tomcat/tomcat-connectors/jk/binaries/windows/tomcat-connectors-1.2.42-windows-x86_64-iis.zip.asc release/tomcat/tomcat-connectors/jk/binaries/windows/tomcat-connectors-1.2.42-windows-x86_64-iis.zip.sha1 release/tomcat/tomcat-connectors/jk/tomcat-connectors-1.2.42-src.tar.gz release/tomcat/tomcat-connectors/jk/tomcat-connectors-1.2.42-src.tar.gz.asc release/tomcat/tomcat-connectors/jk/tomcat-connectors-1.2.42-src.tar.gz.sha1 release/tomcat/tomcat-connectors/jk/tomcat-connectors-1.2.42-src.zip release/tomcat/tomcat-connectors/jk/tomcat-connectors-1.2.42-src.zip.asc release/tomcat/tomcat-connectors/jk/tomcat-connectors-1.2.42-src.zip.sha1 - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1838500 - in /tomcat/site/trunk: docs/download-native.html xdocs/download-native.xml
Author: markt Date: Mon Aug 20 21:52:48 2018 New Revision: 1838500 URL: http://svn.apache.org/viewvc?rev=1838500=rev Log: Switch to newly created SHA-512 hashes Modified: tomcat/site/trunk/docs/download-native.html tomcat/site/trunk/xdocs/download-native.xml Modified: tomcat/site/trunk/docs/download-native.html URL: http://svn.apache.org/viewvc/tomcat/site/trunk/docs/download-native.html?rev=1838500=1838499=1838500=diff == --- tomcat/site/trunk/docs/download-native.html (original) +++ tomcat/site/trunk/docs/download-native.html Mon Aug 20 21:52:48 2018 @@ -418,7 +418,7 @@ [https://www.apache.org/dist/tomcat/tomcat-connectors/native/1.1.34/source/tomcat-native-1.1.34-src.tar.gz.asc;>PGP], -[https://www.apache.org/dist/tomcat/tomcat-connectors/native/1.1.34/source/tomcat-native-1.1.34-src.tar.gz.sha1;>SHA1] +[https://www.apache.org/dist/tomcat/tomcat-connectors/native/1.1.34/source/tomcat-native-1.1.34-src.tar.gz.sha512;>SHA512] @@ -433,7 +433,7 @@ [https://www.apache.org/dist/tomcat/tomcat-connectors/native/1.1.34/source/tomcat-native-1.1.34-win32-src.zip.asc;>PGP], -[https://www.apache.org/dist/tomcat/tomcat-connectors/native/1.1.34/source/tomcat-native-1.1.34-win32-src.zip.sha1;>SHA1] +[https://www.apache.org/dist/tomcat/tomcat-connectors/native/1.1.34/source/tomcat-native-1.1.34-win32-src.zip.sha512;>SHA512] @@ -483,7 +483,7 @@ [https://www.apache.org/dist/tomcat/tomcat-connectors/native/1.1.34/binaries/tomcat-native-1.1.34-win32-bin.zip.asc;>PGP], - [https://www.apache.org/dist/tomcat/tomcat-connectors/native/1.1.34/binaries/tomcat-native-1.1.34-win32-bin.zip.sha1;>SHA1] + [https://www.apache.org/dist/tomcat/tomcat-connectors/native/1.1.34/binaries/tomcat-native-1.1.34-win32-bin.zip.sha512;>SHA512] @@ -499,7 +499,7 @@ [https://www.apache.org/dist/tomcat/tomcat-connectors/native/1.1.34/binaries/tomcat-native-1.1.34-ocsp-win32-bin.zip.asc;>PGP], - [https://www.apache.org/dist/tomcat/tomcat-connectors/native/1.1.34/binaries/tomcat-native-1.1.34-ocsp-win32-bin.zip.sha1;>SHA1] + [https://www.apache.org/dist/tomcat/tomcat-connectors/native/1.1.34/binaries/tomcat-native-1.1.34-ocsp-win32-bin.zip.sha512;>SHA512] @@ -527,10 +527,9 @@ every release file. This signature should be matched against the https://www.apache.org/dist/tomcat/tomcat-connectors/KEYS;>KEYS file which contains the OpenPGP keys of Tomcat's Release Managers. We -also provide SHA1/SHA512 -checksums for every release file. After you download the file, you -should calculate a checksum for your download, and make sure it is the -same as ours. +also provide SHA512 checksums for every release file. After +you download the file, you should calculate a checksum for your +download, and make sure it is the same as ours. Modified: tomcat/site/trunk/xdocs/download-native.xml URL: http://svn.apache.org/viewvc/tomcat/site/trunk/xdocs/download-native.xml?rev=1838500=1838499=1838500=diff == --- tomcat/site/trunk/xdocs/download-native.xml (original) +++ tomcat/site/trunk/xdocs/download-native.xml Mon Aug 20 21:52:48 2018 @@ -130,7 +130,7 @@ [https://www.apache.org/dist/tomcat/tomcat-connectors/native/1.1.34/source/tomcat-native-1.1.34-src.tar.gz.asc;>PGP], -[https://www.apache.org/dist/tomcat/tomcat-connectors/native/1.1.34/source/tomcat-native-1.1.34-src.tar.gz.sha1;>SHA1] +[https://www.apache.org/dist/tomcat/tomcat-connectors/native/1.1.34/source/tomcat-native-1.1.34-src.tar.gz.sha512;>SHA512] @@ -140,7 +140,7 @@ [https://www.apache.org/dist/tomcat/tomcat-connectors/native/1.1.34/source/tomcat-native-1.1.34-win32-src.zip.asc;>PGP], -[https://www.apache.org/dist/tomcat/tomcat-connectors/native/1.1.34/source/tomcat-native-1.1.34-win32-src.zip.sha1;>SHA1] +[https://www.apache.org/dist/tomcat/tomcat-connectors/native/1.1.34/source/tomcat-native-1.1.34-win32-src.zip.sha512;>SHA512] @@ -172,7 +172,7 @@ [https://www.apache.org/dist/tomcat/tomcat-connectors/native/1.1.34/binaries/tomcat-native-1.1.34-win32-bin.zip.asc;>PGP], -
svn commit: r28864 - in /release/tomcat/tomcat-connectors/native/1.1.34: binaries/ source/
Author: markt Date: Mon Aug 20 21:50:19 2018 New Revision: 28864 Log: Add SHA-512 hashes Added: release/tomcat/tomcat-connectors/native/1.1.34/binaries/tomcat-native-1.1.34-ocsp-win32-bin.zip.sha512 release/tomcat/tomcat-connectors/native/1.1.34/binaries/tomcat-native-1.1.34-win32-bin.zip.sha512 release/tomcat/tomcat-connectors/native/1.1.34/source/tomcat-native-1.1.34-src.tar.gz.sha512 release/tomcat/tomcat-connectors/native/1.1.34/source/tomcat-native-1.1.34-win32-src.zip.sha512 Added: release/tomcat/tomcat-connectors/native/1.1.34/binaries/tomcat-native-1.1.34-ocsp-win32-bin.zip.sha512 == --- release/tomcat/tomcat-connectors/native/1.1.34/binaries/tomcat-native-1.1.34-ocsp-win32-bin.zip.sha512 (added) +++ release/tomcat/tomcat-connectors/native/1.1.34/binaries/tomcat-native-1.1.34-ocsp-win32-bin.zip.sha512 Mon Aug 20 21:50:19 2018 @@ -0,0 +1 @@ +88dd2ee1993d02175aea0dc8d9c61dc7239d8219f9e17a1134e7a6e8a79c2a8890c13d88834f5b12ab5ab84dfd0463d6449d144f07a2e8f56d92bb123cb8cbd1 *tomcat-native-1.1.34-ocsp-win32-bin.zip Added: release/tomcat/tomcat-connectors/native/1.1.34/binaries/tomcat-native-1.1.34-win32-bin.zip.sha512 == --- release/tomcat/tomcat-connectors/native/1.1.34/binaries/tomcat-native-1.1.34-win32-bin.zip.sha512 (added) +++ release/tomcat/tomcat-connectors/native/1.1.34/binaries/tomcat-native-1.1.34-win32-bin.zip.sha512 Mon Aug 20 21:50:19 2018 @@ -0,0 +1 @@ +8fba34162dbf3e88257bf4e5afd72598d5293161182752b5a7de768d4a13722401fc64a233dc65f3d1efe171849f70fd8a9df1fec74b7dc699130d955bb68dd7 *tomcat-native-1.1.34-win32-bin.zip Added: release/tomcat/tomcat-connectors/native/1.1.34/source/tomcat-native-1.1.34-src.tar.gz.sha512 == --- release/tomcat/tomcat-connectors/native/1.1.34/source/tomcat-native-1.1.34-src.tar.gz.sha512 (added) +++ release/tomcat/tomcat-connectors/native/1.1.34/source/tomcat-native-1.1.34-src.tar.gz.sha512 Mon Aug 20 21:50:19 2018 @@ -0,0 +1 @@ +0f9370009e04c8dbf6357261e6e007ebabe2f391364aea8accc6ca99a4cb1cc96b2d6035f362a47410abd6074a83defa684d9205fd29339889c711cd9f75212d *tomcat-native-1.1.34-src.tar.gz Added: release/tomcat/tomcat-connectors/native/1.1.34/source/tomcat-native-1.1.34-win32-src.zip.sha512 == --- release/tomcat/tomcat-connectors/native/1.1.34/source/tomcat-native-1.1.34-win32-src.zip.sha512 (added) +++ release/tomcat/tomcat-connectors/native/1.1.34/source/tomcat-native-1.1.34-win32-src.zip.sha512 Mon Aug 20 21:50:19 2018 @@ -0,0 +1 @@ +1719a179646d26da6b1c5e1b13919ec5b7998642e52f5f5519a4028fe2eb23962e13339f15af429a5a3376cd640108b5bc2c68bfa67f7ed4c5985ba30c01b9fe *tomcat-native-1.1.34-win32-src.zip - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r28863 - /release/tomcat/tomcat-connectors/native/1.2.16/
Author: markt Date: Mon Aug 20 21:44:47 2018 New Revision: 28863 Log: Remove 1.2.16 from mirrors Removed: release/tomcat/tomcat-connectors/native/1.2.16/ - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1838498 - in /tomcat/site/trunk: docs/ xdocs/
Author: markt Date: Mon Aug 20 21:43:40 2018 New Revision: 1838498 URL: http://svn.apache.org/viewvc?rev=1838498=rev Log: Release policy has updated SHA-1 to "SHOULD NOT" use. Remove links to SHA-1 everywhere where there is a better alternative (SHA-512) Modified: tomcat/site/trunk/docs/download-70.html tomcat/site/trunk/docs/download-80.html tomcat/site/trunk/docs/download-90.html tomcat/site/trunk/docs/download-connectors.html tomcat/site/trunk/docs/download-native.html tomcat/site/trunk/docs/download-taglibs.html tomcat/site/trunk/xdocs/download-70.xml tomcat/site/trunk/xdocs/download-80.xml tomcat/site/trunk/xdocs/download-90.xml tomcat/site/trunk/xdocs/download-connectors.xml tomcat/site/trunk/xdocs/download-native.xml tomcat/site/trunk/xdocs/download-taglibs.xml Modified: tomcat/site/trunk/docs/download-70.html URL: http://svn.apache.org/viewvc/tomcat/site/trunk/docs/download-70.html?rev=1838498=1838497=1838498=diff == --- tomcat/site/trunk/docs/download-70.html (original) +++ tomcat/site/trunk/docs/download-70.html Mon Aug 20 21:43:40 2018 @@ -241,9 +241,9 @@ release file. This signature should be matched against the https://www.apache.org/dist/tomcat/tomcat-7/KEYS;>KEYS file which contains the OpenPGP keys of Tomcat's Release Managers. We also -provide SHA-1 and SHA-512 checksums for every -release file. After you download the file, you should calculate a -checksum for your download, and make sure it is the same as ours. +provide SHA-512 checksums for every release file. After you +download the file, you should calculate a checksum for your download, and +make sure it is the same as ours. @@ -298,7 +298,6 @@ zip (https://www.apache.org/dist/tomcat/tomcat-7/v[v]/bin/apache-tomcat-[v].zip.asc;>pgp, -https://www.apache.org/dist/tomcat/tomcat-7/v[v]/bin/apache-tomcat-[v].zip.sha1;>sha1, https://www.apache.org/dist/tomcat/tomcat-7/v[v]/bin/apache-tomcat-[v].zip.sha512;>sha512) @@ -306,7 +305,6 @@ tar.gz (https://www.apache.org/dist/tomcat/tomcat-7/v[v]/bin/apache-tomcat-[v].tar.gz.asc;>pgp, -https://www.apache.org/dist/tomcat/tomcat-7/v[v]/bin/apache-tomcat-[v].tar.gz.sha1;>sha1, https://www.apache.org/dist/tomcat/tomcat-7/v[v]/bin/apache-tomcat-[v].tar.gz.sha512;>sha512) @@ -314,7 +312,6 @@ 32-bit Windows zip (https://www.apache.org/dist/tomcat/tomcat-7/v[v]/bin/apache-tomcat-[v]-windows-x86.zip.asc;>pgp, -https://www.apache.org/dist/tomcat/tomcat-7/v[v]/bin/apache-tomcat-[v]-windows-x86.zip.sha1;>sha1, https://www.apache.org/dist/tomcat/tomcat-7/v[v]/bin/apache-tomcat-[v]-windows-x86.zip.sha512;>sha512) @@ -322,7 +319,6 @@ 64-bit Windows zip (https://www.apache.org/dist/tomcat/tomcat-7/v[v]/bin/apache-tomcat-[v]-windows-x64.zip.asc;>pgp, -https://www.apache.org/dist/tomcat/tomcat-7/v[v]/bin/apache-tomcat-[v]-windows-x64.zip.sha1;>sha1, https://www.apache.org/dist/tomcat/tomcat-7/v[v]/bin/apache-tomcat-[v]-windows-x64.zip.sha512;>sha512) @@ -330,7 +326,6 @@ 32-bit/64-bit Windows Service Installer (https://www.apache.org/dist/tomcat/tomcat-7/v[v]/bin/apache-tomcat-[v].exe.asc;>pgp, -https://www.apache.org/dist/tomcat/tomcat-7/v[v]/bin/apache-tomcat-[v].exe.sha1;>sha1, https://www.apache.org/dist/tomcat/tomcat-7/v[v]/bin/apache-tomcat-[v].exe.sha512;>sha512) @@ -345,7 +340,6 @@ tar.gz (https://www.apache.org/dist/tomcat/tomcat-7/v[v]/bin/apache-tomcat-[v]-fulldocs.tar.gz.asc;>pgp, -https://www.apache.org/dist/tomcat/tomcat-7/v[v]/bin/apache-tomcat-[v]-fulldocs.tar.gz.sha1;>sha1, https://www.apache.org/dist/tomcat/tomcat-7/v[v]/bin/apache-tomcat-[v]-fulldocs.tar.gz.sha512;>sha512) @@ -360,7 +354,6 @@ zip (https://www.apache.org/dist/tomcat/tomcat-7/v[v]/bin/apache-tomcat-[v]-deployer.zip.asc;>pgp, -https://www.apache.org/dist/tomcat/tomcat-7/v[v]/bin/apache-tomcat-[v]-deployer.zip.sha1;>sha1, https://www.apache.org/dist/tomcat/tomcat-7/v[v]/bin/apache-tomcat-[v]-deployer.zip.sha512;>sha512) @@ -368,7 +361,6 @@ tar.gz (https://www.apache.org/dist/tomcat/tomcat-7/v[v]/bin/apache-tomcat-[v]-deployer.tar.gz.asc;>pgp, -https://www.apache.org/dist/tomcat/tomcat-7/v[v]/bin/apache-tomcat-[v]-deployer.tar.gz.sha1;>sha1, https://www.apache.org/dist/tomcat/tomcat-7/v[v]/bin/apache-tomcat-[v]-deployer.tar.gz.sha512;>sha512)
svn commit: r1838497 - in /tomcat/tc7.0.x/trunk: ./ build.xml
Author: markt Date: Mon Aug 20 21:33:55 2018 New Revision: 1838497 URL: http://svn.apache.org/viewvc?rev=1838497=rev Log: SHA-1 has been moved to SHOULD NOT in the release policy Modified: tomcat/tc7.0.x/trunk/ (props changed) tomcat/tc7.0.x/trunk/build.xml Propchange: tomcat/tc7.0.x/trunk/ -- --- svn:mergeinfo (original) +++ svn:mergeinfo Mon Aug 20 21:33:55 2018 @@ -1,3 +1,3 @@ /tomcat/tc8.0.x/trunk:1636525,1637336,1637685,1637709,1638726,1640089,1640276,1640349,1640363,1640366,1640642,1640672,1640674,1640689,1640884,1641001,1641065,1641067,1641375,1641638,1641723,1641726,1641729-1641730,1641736,1641988,1642669-1642670,1642698,1642701,1643205,1643215,1643217,1643230,1643232,1643273,1643285,1643329-1643330,1643511,1643513,1643521,1643539,1643571,1643581-1643582,1643635,1643655,1643738,1643964,1644018,1644333,1644525,1644954,1644992,1645014,1645360,1645456,1645627,1645642,1645686,1645903-1645904,1645908-1645909,1645913,1645920,1646458,1646460-1646462,1646735,1646738-1646741,1646744,1646746,1646748-1646755,1646757,1646759-1646760,1647043,1648816,1651420-1651422,1651844,1652926,1652939-1652940,1652973,1653798,1653817,1653841,1654042,1654161,1654736,1654767,1654787,1656592,1659907,1662986,1663265,1663278,1663325,1663535,1663567,1663679,1663997,1664175,1664321,1664872,1665061,1665086,1666027,1666395,1666503,1666506,1666560,1666570,1666581,1666759,1666967,1666988 ,1667553-1667555,1667558,1667617,1667633,1667637,1667747,1667767,1667873,1668028,1668137,1668634,1669432,1669801,1669840,1669895-1669896,1670398,1670435,1670592,1670605-1670607,1670609,1670632,1670720,1670725,1670727,1670731,1671114,1672273,1672285,1673759,1674220,1674295,1675469,1675488,1675595,1675831,1676232,1676367-1676369,1676382,1676394,1676483,1676556,1676635,1678178,1679536,1679988,1680256,1681124,1681182,1681703,1681730,1681840,1681864,1681869,1682010,1682034,1682047,1682052-1682053,1682062,1682064,1682070,1682312,1682325,1682331,1682386,1684367,1684385,1685759,1685774,1685827,1685892,1687341,1688904,1689358,1689657,1689921,1692850,1693093,1693108,1693324,1694060,1694115,1694291,1694427,1694431,1694503,1694549,1694789,1694873,1694881,1695356,1695372,1695823-1695825,1696200,1696281,1696379,1696468,1700608,1700871,1700897,1700978,1701094,1701124,1701608,1701668,1701676,1701766,1701944,1702248,1702252,1702314,1702390,1702723,1702725,1702728,1702730,1702733,1702735,1702737,1702 739,1702742,1702744,1702748,1702751,1702754,1702758,1702760,1702763,1702766,1708779,1708782,1708806,1709314,1709670,1710347,1710442,1710448,1710490,1710574,1710578,1712226,1712229,1712235,1712255,1712618,1712649,1712655,1712860,1712899,1712903,1712906,1712913,1712926,1712975,1713185,1713262,1713287,1713613,1713621,1713872,1713976,1713994,1713998,1714004,1714013,1714059,1714538,1714580,1715189,1715207,1715544,1715549,1715637,1715639-1715645,1715667,1715683,1715866,1715978,1715981,1716216-1716217,1716355,1716414,1716421,1717208-1717209,1717257,1717283,1717288,1717291,1717421,1717517,1717529,1718797,1718840-1718843,1719348,1719357-1719358,1719400,1719491,1719737,1720235,1720396,1720442,1720446,1720450,1720463,1720658-1720660,1720756,1720816,1721813,1721818,1721831,1721861,1721867,1721882,1722523,1722527,1722800,1722926,1722941,1722997,1723130,1723440,1723488,1723890,1724434,1724674,1724792,1724803,1724902,1725128,1725131,1725154,1725167,1725911,1725921,1725929,1725963-1725965,1725970,1 725974,1726171-1726173,1726175,1726179-1726182,1726190-1726191,1726195-1726200,1726203,1726226,1726576,1726630,1726992,1727029,1727037,1727671,1727676,1727900,1728028,1728092,1728439,1728449,1729186,1729362,1731009,1731303,1731867,1731872,1731874,1731876,1731885,1731947,1731955,1731959,1731977,1731984,1732360,1732490,1732672,1732902,1733166,1733603,1733619,1733735,1733752,1733764,1733915,1733941,1733964,1734115,1734133,1734261,1734421,1734531,1736286,1737967,1738173,1738182,1738992,1739039,1739089-1739091,1739294,1739777,1739821,1739981,1740513,1740726,1741019,1741162,1741217,1743647,1743681,1744152,1744272,1746732,1746750,1752739,1754615,1755886,1756018,1758563,1759565,1761686,1762173,1762206,1766280,1767507-1767508,1767653,1767656,1769267,1772949,1773521,1773527,1774104,1777015,1777213,1779330,1783151,1784188,1784966,1785670,1786846,1788260,1788999,1789140,1789402,1791529,1791559,1795291,1796906,1797523,1799214,1800998-1800999,1801003,1801007-1801008,1801017,1801020,1802808,180281
svn commit: r1838496 - /tomcat/tc8.5.x/trunk/test/org/apache/coyote/http2/TestAsyncFlush.java
Author: markt
Date: Mon Aug 20 21:32:06 2018
New Revision: 1838496
URL: http://svn.apache.org/viewvc?rev=1838496=rev
Log:
Fix back-port to Java 7.
Modified:
tomcat/tc8.5.x/trunk/test/org/apache/coyote/http2/TestAsyncFlush.java
Modified: tomcat/tc8.5.x/trunk/test/org/apache/coyote/http2/TestAsyncFlush.java
URL:
http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/test/org/apache/coyote/http2/TestAsyncFlush.java?rev=1838496=1838495=1838496=diff
==
--- tomcat/tc8.5.x/trunk/test/org/apache/coyote/http2/TestAsyncFlush.java
(original)
+++ tomcat/tc8.5.x/trunk/test/org/apache/coyote/http2/TestAsyncFlush.java Mon
Aug 20 21:32:06 2018
@@ -113,7 +113,7 @@ public class TestAsyncFlush extends Http
}
@Override
-protected void doGet(HttpServletRequest request, HttpServletResponse
response)
+protected void doGet(final HttpServletRequest request, final
HttpServletResponse response)
throws IOException {
final AsyncContext asyncContext = request.startAsync();
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1838495 - in /tomcat/tc8.5.x/trunk: ./ build.xml
Author: markt Date: Mon Aug 20 21:31:27 2018 New Revision: 1838495 URL: http://svn.apache.org/viewvc?rev=1838495=rev Log: SHA-1 has been moved to SHOULD NOT in the release policy Modified: tomcat/tc8.5.x/trunk/ (props changed) tomcat/tc8.5.x/trunk/build.xml Propchange: tomcat/tc8.5.x/trunk/ -- --- svn:mergeinfo (original) +++ svn:mergeinfo Mon Aug 20 21:31:27 2018 @@ -1,2 +1,2 @@ /tomcat/tc8.0.x/trunk:1809644 -/tomcat/trunk:1734785,1734799,1734845,1734928,1735041,1735044,1735480,1735577,1735597,1735599-1735600,1735615,1736145,1736162,1736209,1736280,1736297,1736299,1736489,1736646,1736703,1736836,1736849,1737104-1737105,1737112,1737117,1737119-1737120,1737155,1737157,1737192,1737280,1737339,1737632,1737664,1737715,1737748,1737785,1737834,1737860,1737903,1737959,1738005,1738007,1738014-1738015,1738018,1738022,1738039,1738043,1738059-1738060,1738147,1738149,1738174-1738175,1738261,1738589,1738623-1738625,1738643,1738816,1738850,1738855,1738946-1738948,1738953-1738954,1738979,1738982,1739079-1739081,1739087,1739113,1739153,1739172,1739176,1739191,1739474,1739492,1739726,1739762,1739775,1739814,1739817-1739818,1739975,1740131,1740324,1740465,1740495,1740508-1740509,1740520,1740535,1740707,1740803,1740810,1740969,1740980,1740991,1740997,1741015,1741033,1741036,1741058,1741060,1741080,1741147,1741159,1741164,1741173,1741181,1741190,1741197,1741202,1741208,1741213,1741221,1741225,1741232,1741409 ,1741501,1741677,1741892,1741896,1741984,1742023,1742042,1742071,1742090,1742093,1742101,1742105,1742111,1742139,1742146,1742148,1742166,1742181,1742184,1742187,1742246,1742248-1742251,1742263-1742264,1742268,1742276,1742369,1742387,1742448,1742509-1742512,1742917,1742919,1742933,1742975-1742976,1742984,1742986,1743019,1743115,1743117,1743124-1743125,1743134,1743425,1743554,1743679,1743696-1743698,1743700-1743701,1744058,1744064-1744065,1744125,1744149,1744194,1744229,1744270,1744323,1744432,1744684,1744697,1744705,1744713,1744760,1744786,1745083,1745142-1745143,1745145,1745177,1745179-1745180,1745227,1745248,1745254,1745337,1745467,1745473,1745535,1745576,1745735,1745744,1746304,1746306-1746307,1746319,1746327,1746338,1746340-1746341,1746344,1746427,1746441,1746473,1746490,1746492,1746495-1746496,1746499-1746501,1746503-1746507,1746509,1746549,1746551,1746554,1746556,1746558,1746584,1746620,1746649,1746724,1746939,1746989,1747014,1747028,1747035,1747210,1747225,1747234,1747253,1747 404,1747506,1747536,1747924,1747980,1747993,1748001,1748253,1748452,1748547,1748629,1748676,1748715,1749287,1749296,1749328,1749373,1749465,1749506,1749508,1749665-1749666,1749763,1749865-1749866,1749898,1749978,1749980,1750011,1750015,1750056,1750480,1750617,1750634,1750692,1750697,1750700,1750703,1750707,1750714,1750718,1750723,1750774,1750899,1750975,1750995,1751061,1751097,1751173,1751438,1751447,1751463,1751702,1752212,1752737,1752745,1753078,1753080,1753358,1753363,1754111,1754140-1754141,1754281,1754310,1754445,1754467,1754494,1754496,1754528,1754532-1754533,1754613,1754714,1754874,1754941,1754944,1754950-1754951,1755005,1755007,1755009,1755132,1755180-1755181,1755185,1755190,1755204-1755206,1755208,1755214,1755224,1755227,1755230,1755629,1755646-1755647,1755650,1755653,1755675,1755680,1755683,1755693,1755717,1755731-1755737,1755812,1755828,1755884,1755890,1755918-1755919,1755942,1755958,1755960,1755970,1755993,1756013,1756019,1756039,1756056,1756083-1756114,1756175,1756288-1 756289,1756408-1756410,1756778,1756798,1756878,1756898,1756939,1757123-1757124,1757126,1757128,1757132-1757133,1757136,1757145,1757167-1757168,1757175,1757180,1757182,1757195,1757271,1757278,1757347,1757353-1757354,1757363,1757374,1757399,1757406,1757408,1757485,1757495,1757499,1757527,1757578,1757684,1757722,1757727,1757790,1757799,1757813,1757853,1757883,1757903,1757976,1757997,1758000,1758058,1758072-1758075,1758078-1758079,1758223,1758257,1758261,1758276,1758292,1758369,1758378-1758383,1758421,1758423,1758425-1758427,1758430,1758443,1758448,1758459,1758483,1758486-1758487,1758499,1758525,1758556,1758580,1758582,1758584,1758588,1758842,1759019,1759212,1759224,1759227,1759252,1759274,1759513-1759516,1759611,1759757,1759785-1759790,1760005,1760022,1760109-1760110,1760135,1760200-1760201,1760227,1760300,1760397,1760446,1760454,1760640,1760648,1761057,1761422,1761491,1761498,1761500-1761501,1761550,1761553,1761572,1761574,1761625-1761626,1761628,1761682,1761740,1761752,1762051-176205
svn commit: r1838494 - /tomcat/trunk/build.xml
Author: markt Date: Mon Aug 20 21:30:10 2018 New Revision: 1838494 URL: http://svn.apache.org/viewvc?rev=1838494=rev Log: SHA-1 has been moved to SHOULD NOT in the release policy Modified: tomcat/trunk/build.xml Modified: tomcat/trunk/build.xml URL: http://svn.apache.org/viewvc/tomcat/trunk/build.xml?rev=1838494=1838493=1838494=diff == --- tomcat/trunk/build.xml (original) +++ tomcat/trunk/build.xml Mon Aug 20 21:30:10 2018 @@ -1369,7 +1369,6 @@ - @@ -1386,7 +1385,6 @@ - @@ -2216,7 +2214,6 @@ skip.installer property in build.propert - @@ -2256,7 +2253,6 @@ skip.installer property in build.propert - @@ -3264,14 +3260,11 @@ Read the Building page on the Apache Tom - - - - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[Bug 62635] Async servlet over HTTP/2 response.flushBuffer() intermittently fails
https://bz.apache.org/bugzilla/show_bug.cgi?id=62635 --- Comment #4 from Mark Thomas --- The patch seems to work so I have committed it. Do let us know how you get on. -- 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: r1838493 - in /tomcat/tc8.5.x/trunk: ./ java/org/apache/coyote/http2/Stream.java test/org/apache/coyote/http2/TestAsyncFlush.java
Author: markt Date: Mon Aug 20 21:28:13 2018 New Revision: 1838493 URL: http://svn.apache.org/viewvc?rev=1838493=rev Log: Implement a workaround that prevents container threads from entering an indefinite wait() if an application performs an illegal blocking I/O operation Added: tomcat/tc8.5.x/trunk/test/org/apache/coyote/http2/TestAsyncFlush.java - copied unchanged from r1838492, tomcat/trunk/test/org/apache/coyote/http2/TestAsyncFlush.java Modified: tomcat/tc8.5.x/trunk/ (props changed) tomcat/tc8.5.x/trunk/java/org/apache/coyote/http2/Stream.java Propchange: tomcat/tc8.5.x/trunk/ -- --- svn:mergeinfo (original) +++ svn:mergeinfo Mon Aug 20 21:28:13 2018 @@ -1,2 +1,2 @@ /tomcat/tc8.0.x/trunk:1809644 -/tomcat/trunk:1734785,1734799,1734845,1734928,1735041,1735044,1735480,1735577,1735597,1735599-1735600,1735615,1736145,1736162,1736209,1736280,1736297,1736299,1736489,1736646,1736703,1736836,1736849,1737104-1737105,1737112,1737117,1737119-1737120,1737155,1737157,1737192,1737280,1737339,1737632,1737664,1737715,1737748,1737785,1737834,1737860,1737903,1737959,1738005,1738007,1738014-1738015,1738018,1738022,1738039,1738043,1738059-1738060,1738147,1738149,1738174-1738175,1738261,1738589,1738623-1738625,1738643,1738816,1738850,1738855,1738946-1738948,1738953-1738954,1738979,1738982,1739079-1739081,1739087,1739113,1739153,1739172,1739176,1739191,1739474,1739492,1739726,1739762,1739775,1739814,1739817-1739818,1739975,1740131,1740324,1740465,1740495,1740508-1740509,1740520,1740535,1740707,1740803,1740810,1740969,1740980,1740991,1740997,1741015,1741033,1741036,1741058,1741060,1741080,1741147,1741159,1741164,1741173,1741181,1741190,1741197,1741202,1741208,1741213,1741221,1741225,1741232,1741409 ,1741501,1741677,1741892,1741896,1741984,1742023,1742042,1742071,1742090,1742093,1742101,1742105,1742111,1742139,1742146,1742148,1742166,1742181,1742184,1742187,1742246,1742248-1742251,1742263-1742264,1742268,1742276,1742369,1742387,1742448,1742509-1742512,1742917,1742919,1742933,1742975-1742976,1742984,1742986,1743019,1743115,1743117,1743124-1743125,1743134,1743425,1743554,1743679,1743696-1743698,1743700-1743701,1744058,1744064-1744065,1744125,1744149,1744194,1744229,1744270,1744323,1744432,1744684,1744697,1744705,1744713,1744760,1744786,1745083,1745142-1745143,1745145,1745177,1745179-1745180,1745227,1745248,1745254,1745337,1745467,1745473,1745535,1745576,1745735,1745744,1746304,1746306-1746307,1746319,1746327,1746338,1746340-1746341,1746344,1746427,1746441,1746473,1746490,1746492,1746495-1746496,1746499-1746501,1746503-1746507,1746509,1746549,1746551,1746554,1746556,1746558,1746584,1746620,1746649,1746724,1746939,1746989,1747014,1747028,1747035,1747210,1747225,1747234,1747253,1747 404,1747506,1747536,1747924,1747980,1747993,1748001,1748253,1748452,1748547,1748629,1748676,1748715,1749287,1749296,1749328,1749373,1749465,1749506,1749508,1749665-1749666,1749763,1749865-1749866,1749898,1749978,1749980,1750011,1750015,1750056,1750480,1750617,1750634,1750692,1750697,1750700,1750703,1750707,1750714,1750718,1750723,1750774,1750899,1750975,1750995,1751061,1751097,1751173,1751438,1751447,1751463,1751702,1752212,1752737,1752745,1753078,1753080,1753358,1753363,1754111,1754140-1754141,1754281,1754310,1754445,1754467,1754494,1754496,1754528,1754532-1754533,1754613,1754714,1754874,1754941,1754944,1754950-1754951,1755005,1755007,1755009,1755132,1755180-1755181,1755185,1755190,1755204-1755206,1755208,1755214,1755224,1755227,1755230,1755629,1755646-1755647,1755650,1755653,1755675,1755680,1755683,1755693,1755717,1755731-1755737,1755812,1755828,1755884,1755890,1755918-1755919,1755942,1755958,1755960,1755970,1755993,1756013,1756019,1756039,1756056,1756083-1756114,1756175,1756288-1 756289,1756408-1756410,1756778,1756798,1756878,1756898,1756939,1757123-1757124,1757126,1757128,1757132-1757133,1757136,1757145,1757167-1757168,1757175,1757180,1757182,1757195,1757271,1757278,1757347,1757353-1757354,1757363,1757374,1757399,1757406,1757408,1757485,1757495,1757499,1757527,1757578,1757684,1757722,1757727,1757790,1757799,1757813,1757853,1757883,1757903,1757976,1757997,1758000,1758058,1758072-1758075,1758078-1758079,1758223,1758257,1758261,1758276,1758292,1758369,1758378-1758383,1758421,1758423,1758425-1758427,1758430,1758443,1758448,1758459,1758483,1758486-1758487,1758499,1758525,1758556,1758580,1758582,1758584,1758588,1758842,1759019,1759212,1759224,1759227,1759252,1759274,1759513-1759516,1759611,1759757,1759785-1759790,1760005,1760022,1760109-1760110,1760135,1760200-1760201,1760227,1760300,1760397,1760446,1760454,1760640,1760648,1761057,1761422,1761491,1761498,1761500-1761501,1761550,1761553,1761572,1761574,1761625-1761626,1761628,1761682,1761740,1761752,1762051-176205
svn commit: r1838492 - in /tomcat/trunk: java/org/apache/coyote/http2/Stream.java test/org/apache/coyote/http2/TestAsyncFlush.java
Author: markt
Date: Mon Aug 20 21:27:10 2018
New Revision: 1838492
URL: http://svn.apache.org/viewvc?rev=1838492=rev
Log:
Implement a workaround that prevents container threads from entering an
indefinite wait() if an application performs an illegal blocking I/O operation
Added:
tomcat/trunk/test/org/apache/coyote/http2/TestAsyncFlush.java (with props)
Modified:
tomcat/trunk/java/org/apache/coyote/http2/Stream.java
Modified: tomcat/trunk/java/org/apache/coyote/http2/Stream.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/http2/Stream.java?rev=1838492=1838491=1838492=diff
==
--- tomcat/trunk/java/org/apache/coyote/http2/Stream.java (original)
+++ tomcat/trunk/java/org/apache/coyote/http2/Stream.java Mon Aug 20 21:27:10
2018
@@ -868,7 +868,16 @@ class Stream extends AbstractStream impl
@Override
public void flush() throws IOException {
-flush(true);
+/*
+ * This method should only be called during blocking I/O. All the
+ * Servlet API calls that end up here are illegal during
+ * non-blocking I/O. Servlet 5.4.
+ * However, the wording Servlet specification states that the
+ * behaviour is undefined so we do the best we can which is to
+ * perform a flush using blocking I/O or non-blocking I/O based
+ * depending which is currently in use.
+ */
+flush(getCoyoteResponse().getWriteListener() == null);
}
@Override
Added: tomcat/trunk/test/org/apache/coyote/http2/TestAsyncFlush.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/coyote/http2/TestAsyncFlush.java?rev=1838492=auto
==
--- tomcat/trunk/test/org/apache/coyote/http2/TestAsyncFlush.java (added)
+++ tomcat/trunk/test/org/apache/coyote/http2/TestAsyncFlush.java Mon Aug 20
21:27:10 2018
@@ -0,0 +1,154 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.coyote.http2;
+
+import java.io.IOException;
+import java.nio.ByteBuffer;
+
+import javax.servlet.AsyncContext;
+import javax.servlet.ServletOutputStream;
+import javax.servlet.WriteListener;
+import javax.servlet.http.HttpServlet;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
+import org.junit.Assert;
+import org.junit.Test;
+
+import org.apache.catalina.Context;
+import org.apache.catalina.Wrapper;
+import org.apache.catalina.startup.Tomcat;
+
+/*
+ * Based on
+ * https://bz.apache.org/bugzilla/show_bug.cgi?id=62635
+ *
+ * Note: Calling blocking I/O methods (such as flushBuffer()) during
+ * non-blocking I/O is explicitly called out as illegal in the Servlet
+ * specification but also goes on to say the behaviour if such a call is
+ * made is undefined. Which means it is OK if the call works as expected
+ * (a non-blcoking flush is triggered) :).
+ * If any of these tests fail, that should not block a release since -
+ * while the specification allows this to work - it doesn't require that
+ * it does work.
+ */
+public class TestAsyncFlush extends Http2TestBase {
+
+private static final int BLOCK_SIZE = 1024;
+
+@Test
+public void testFlush() throws Exception {
+int blockCount = 2048;
+
+int targetSize = BLOCK_SIZE * blockCount;
+
+int totalWindow = ConnectionSettingsBase.DEFAULT_INITIAL_WINDOW_SIZE;
+
+enableHttp2();
+
+Tomcat tomcat = getTomcatInstance();
+
+Context ctxt = tomcat.addContext("", null);
+Tomcat.addServlet(ctxt, "simple", new SimpleServlet());
+ctxt.addServletMappingDecoded("/simple", "simple");
+Wrapper w = Tomcat.addServlet(ctxt, "async", new
AsyncFlushServlet(blockCount));
+w.setAsyncSupported(true);
+ctxt.addServletMappingDecoded("/async", "async");
+tomcat.start();
+
+openClientConnection();
+doHttpUpgrade();
+sendClientPreface();
+validateHttp2InitialResponse();
+
+// Reset
[Bug 62635] Async servlet over HTTP/2 response.flushBuffer() intermittently fails
https://bz.apache.org/bugzilla/show_bug.cgi?id=62635 --- Comment #3 from Mark Thomas --- This discussion is heading towards something that would be better held directly on the dev@ list. HTTP is not designed for the communication style you describe. The only model that us guaranteed to work is: - client writes request - server reads all of the request - server writes all of the response - client reads all of the response Anything else is going to be fragile depending on exactly what components (proxies, caches, etc.) site between the client and the server. The sort of communication you describe would work much better with WebSocket. Tomcat does maintain an output buffer at the network level and in the situation you describe it is not flushed. However..., I've been thinking some more about this and I might have a non-invasive patch that would allow flushBuffer() to trigger a non-blocking flush if non-blocking I/O was in use. Let me dig out the test I wrote for this and see how it copes... -- 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: r1838477 - in /tomcat/tc8.5.x/trunk: ./ java/org/apache/tomcat/util/net/Nio2Endpoint.java java/org/apache/tomcat/util/net/SocketWrapperBase.java
Author: markt Date: Mon Aug 20 19:53:54 2018 New Revision: 1838477 URL: http://svn.apache.org/viewvc?rev=1838477=rev Log: Fix refactoring of writing from the non-blocking write buffer to the network for NIO2. Modified: tomcat/tc8.5.x/trunk/ (props changed) tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/net/Nio2Endpoint.java tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/net/SocketWrapperBase.java Propchange: tomcat/tc8.5.x/trunk/ -- --- svn:mergeinfo (original) +++ svn:mergeinfo Mon Aug 20 19:53:54 2018 @@ -1,2 +1,2 @@ /tomcat/tc8.0.x/trunk:1809644 -/tomcat/trunk:1734785,1734799,1734845,1734928,1735041,1735044,1735480,1735577,1735597,1735599-1735600,1735615,1736145,1736162,1736209,1736280,1736297,1736299,1736489,1736646,1736703,1736836,1736849,1737104-1737105,1737112,1737117,1737119-1737120,1737155,1737157,1737192,1737280,1737339,1737632,1737664,1737715,1737748,1737785,1737834,1737860,1737903,1737959,1738005,1738007,1738014-1738015,1738018,1738022,1738039,1738043,1738059-1738060,1738147,1738149,1738174-1738175,1738261,1738589,1738623-1738625,1738643,1738816,1738850,1738855,1738946-1738948,1738953-1738954,1738979,1738982,1739079-1739081,1739087,1739113,1739153,1739172,1739176,1739191,1739474,1739492,1739726,1739762,1739775,1739814,1739817-1739818,1739975,1740131,1740324,1740465,1740495,1740508-1740509,1740520,1740535,1740707,1740803,1740810,1740969,1740980,1740991,1740997,1741015,1741033,1741036,1741058,1741060,1741080,1741147,1741159,1741164,1741173,1741181,1741190,1741197,1741202,1741208,1741213,1741221,1741225,1741232,1741409 ,1741501,1741677,1741892,1741896,1741984,1742023,1742042,1742071,1742090,1742093,1742101,1742105,1742111,1742139,1742146,1742148,1742166,1742181,1742184,1742187,1742246,1742248-1742251,1742263-1742264,1742268,1742276,1742369,1742387,1742448,1742509-1742512,1742917,1742919,1742933,1742975-1742976,1742984,1742986,1743019,1743115,1743117,1743124-1743125,1743134,1743425,1743554,1743679,1743696-1743698,1743700-1743701,1744058,1744064-1744065,1744125,1744149,1744194,1744229,1744270,1744323,1744432,1744684,1744697,1744705,1744713,1744760,1744786,1745083,1745142-1745143,1745145,1745177,1745179-1745180,1745227,1745248,1745254,1745337,1745467,1745473,1745535,1745576,1745735,1745744,1746304,1746306-1746307,1746319,1746327,1746338,1746340-1746341,1746344,1746427,1746441,1746473,1746490,1746492,1746495-1746496,1746499-1746501,1746503-1746507,1746509,1746549,1746551,1746554,1746556,1746558,1746584,1746620,1746649,1746724,1746939,1746989,1747014,1747028,1747035,1747210,1747225,1747234,1747253,1747 404,1747506,1747536,1747924,1747980,1747993,1748001,1748253,1748452,1748547,1748629,1748676,1748715,1749287,1749296,1749328,1749373,1749465,1749506,1749508,1749665-1749666,1749763,1749865-1749866,1749898,1749978,1749980,1750011,1750015,1750056,1750480,1750617,1750634,1750692,1750697,1750700,1750703,1750707,1750714,1750718,1750723,1750774,1750899,1750975,1750995,1751061,1751097,1751173,1751438,1751447,1751463,1751702,1752212,1752737,1752745,1753078,1753080,1753358,1753363,1754111,1754140-1754141,1754281,1754310,1754445,1754467,1754494,1754496,1754528,1754532-1754533,1754613,1754714,1754874,1754941,1754944,1754950-1754951,1755005,1755007,1755009,1755132,1755180-1755181,1755185,1755190,1755204-1755206,1755208,1755214,1755224,1755227,1755230,1755629,1755646-1755647,1755650,1755653,1755675,1755680,1755683,1755693,1755717,1755731-1755737,1755812,1755828,1755884,1755890,1755918-1755919,1755942,1755958,1755960,1755970,1755993,1756013,1756019,1756039,1756056,1756083-1756114,1756175,1756288-1 756289,1756408-1756410,1756778,1756798,1756878,1756898,1756939,1757123-1757124,1757126,1757128,1757132-1757133,1757136,1757145,1757167-1757168,1757175,1757180,1757182,1757195,1757271,1757278,1757347,1757353-1757354,1757363,1757374,1757399,1757406,1757408,1757485,1757495,1757499,1757527,1757578,1757684,1757722,1757727,1757790,1757799,1757813,1757853,1757883,1757903,1757976,1757997,1758000,1758058,1758072-1758075,1758078-1758079,1758223,1758257,1758261,1758276,1758292,1758369,1758378-1758383,1758421,1758423,1758425-1758427,1758430,1758443,1758448,1758459,1758483,1758486-1758487,1758499,1758525,1758556,1758580,1758582,1758584,1758588,1758842,1759019,1759212,1759224,1759227,1759252,1759274,1759513-1759516,1759611,1759757,1759785-1759790,1760005,1760022,1760109-1760110,1760135,1760200-1760201,1760227,1760300,1760397,1760446,1760454,1760640,1760648,1761057,1761422,1761491,1761498,1761500-1761501,1761550,1761553,1761572,1761574,1761625-1761626,1761628,1761682,1761740,1761752,1762051-176205
svn commit: r1838473 - in /tomcat/trunk/java/org/apache/tomcat/util/net: Nio2Endpoint.java SocketWrapperBase.java
Author: markt
Date: Mon Aug 20 19:53:18 2018
New Revision: 1838473
URL: http://svn.apache.org/viewvc?rev=1838473=rev
Log:
Fix refactoring of writing from the non-blocking write buffer to the network
for NIO2.
Modified:
tomcat/trunk/java/org/apache/tomcat/util/net/Nio2Endpoint.java
tomcat/trunk/java/org/apache/tomcat/util/net/SocketWrapperBase.java
Modified: tomcat/trunk/java/org/apache/tomcat/util/net/Nio2Endpoint.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/net/Nio2Endpoint.java?rev=1838473=1838472=1838473=diff
==
--- tomcat/trunk/java/org/apache/tomcat/util/net/Nio2Endpoint.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/net/Nio2Endpoint.java Mon Aug 20
19:53:18 2018
@@ -1183,6 +1183,19 @@ public class Nio2Endpoint extends Abstra
*/
@Override
protected void writeNonBlocking(ByteBuffer from) throws IOException {
+writeNonBlockingInternal(from);
+}
+
+
+/**
+ * {@inheritDoc}
+ *
+ * Overridden for NIO2 to enable a gathering write to be used to write
+ * all of the remaining data in a single additional write should a
+ * non-blocking write leave data in the buffer.
+ */
+@Override
+protected void writeNonBlockingInternal(ByteBuffer from) throws
IOException {
// Note: Possible alternate behavior:
// If there's non blocking abuse (like a test writing 1MB in a
single
// "non blocking" write), then block until the previous write is
Modified: tomcat/trunk/java/org/apache/tomcat/util/net/SocketWrapperBase.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/net/SocketWrapperBase.java?rev=1838473=1838472=1838473=diff
==
--- tomcat/trunk/java/org/apache/tomcat/util/net/SocketWrapperBase.java
(original)
+++ tomcat/trunk/java/org/apache/tomcat/util/net/SocketWrapperBase.java Mon Aug
20 19:53:18 2018
@@ -621,12 +621,11 @@ public abstract class SocketWrapperBase<
}
-/*
+/**
* Separate method so it can be re-used by the socket write buffer to write
* data to the network
*/
-void writeNonBlockingInternal(ByteBuffer from) throws IOException {
-// TODO Explore refactoring this method back into writeNonBlocking
+protected void writeNonBlockingInternal(ByteBuffer from) throws
IOException {
if (socketBufferHandler.isWriteBufferEmpty()) {
writeNonBlockingDirect(from);
} else {
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r28856 - /release/tomcat/tomcat-8/v8.5.32/
Author: markt Date: Mon Aug 20 19:46:35 2018 New Revision: 28856 Log: Drop 8.5.32 from mirrors Removed: release/tomcat/tomcat-8/v8.5.32/ - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[ANN] Apache Tomcat 8.5.33 available
The Apache Tomcat team announces the immediate availability of Apache Tomcat 8.5.33. Apache Tomcat 8 is an open source software implementation of the Java Servlet, JavaServer Pages, Java Unified Expression Language, Java WebSocket and Java Authentication Service Provider Interface for Containers technologies. Apache Tomcat 8.5.x replaces 8.0.x and includes new features pulled forward from the 9.0.x branch. The notable changes since 8.5.32 include: - Correctly decode URL paths (+ should not be decoded to a space in the path) in the RequestDispatcher and the web application class loader. - When pre-compiling with JspC, report all compilation errors rather than stopping after the first error. A new option -failFast can be used to restore the previous behaviour of stopping after the first error. Based on a patch provided by Marc Pompl. - Make the Jasper (JSP Engine) Java file generation process multi-threaded. By default, one thread will be used per core. Based on a patch by Dan Fabulich. Please refer to the change log for the complete list of changes: http://tomcat.apache.org/tomcat-8.5-doc/changelog.html Downloads: http://tomcat.apache.org/download-80.cgi Migration guides from Apache Tomcat 7.x and 8.0.x: http://tomcat.apache.org/migration.html Enjoy! - The Apache Tomcat team - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[Bug 59750] Amend "authenticate" method with context by means of HttpServletRequest
https://bz.apache.org/bugzilla/show_bug.cgi?id=59750 --- Comment #7 from Michael Osipov <1983-01...@gmx.net> --- (In reply to Christopher Schultz from comment #6) > (In reply to Michael Osipov from comment #5) > > GSSName or X509Certificate and like. I always prefer passing Object and the > > implementation decides about the cast. > > Seems reasonable. > > Tomcat only supports authentication for string usernames or X509 > certificates (where the "username" is extracted as a String value from the > certificate via a X509UsernameRetriever). Do you still feel there is a need > for the user-identifier to be a generic Object? I would always retain as much information as possible. Regaining it is impossible afterwards. -- You are receiving this mail because: You are the assignee for the bug. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[Bug 62635] Async servlet over HTTP/2 response.flushBuffer() intermittently fails
https://bz.apache.org/bugzilla/show_bug.cgi?id=62635 --- Comment #2 from Dapeng Zhang --- Thanks Mark for your quick response. It's fair that Tomcat implementation does not support flushBuffer() in non-blocking I/O mode because it's unspecified. May I ask some implementation details about Tomcat? Its behavior in the following scenario will affect whether/how gRPC bi-directional streaming will be supported. I assume a buffer is used for the response output stream even for the non-blocking I/O mode, and the buffer size set by ServletResponse.setBufferSize() before entering into AsyncContext will still be honored after getting into non-blocking I/O mode. It seems the buffer will be automatically flushed if (1) AsyncContext.complete() is called, or (2) the buffer is full, or (3) prior to the moment when WriteListener.onWritePossible() is invoked. However, it seems unspecified in non-blocking I/O mode in the following scenario: While the ServletOutputStream is ready I do some write() operations. Suppose only half of the buffer is used, and suppose the output stream is still ready. Then I will neither write more data to fully fill the buffer nor call AsyncContext.complete(), until the client send something in response to my data in the first half of the buffer. So I need the first half of the buffer to be drained in order to get something from the client. Will the first half of the buffer be automatically flushed in this case? Thanks a lot. -- 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: r1838438 - in /tomcat/site/trunk: ./ docs/ xdocs/
Author: markt Date: Mon Aug 20 16:55:20 2018 New Revision: 1838438 URL: http://svn.apache.org/viewvc?rev=1838438=rev Log: Update site for 8.5.33 release Modified: tomcat/site/trunk/build.properties.default tomcat/site/trunk/docs/download-80.html tomcat/site/trunk/docs/index.html tomcat/site/trunk/docs/migration-85.html tomcat/site/trunk/docs/oldnews.html tomcat/site/trunk/docs/whichversion.html tomcat/site/trunk/xdocs/download-80.xml tomcat/site/trunk/xdocs/index.xml tomcat/site/trunk/xdocs/migration-85.xml tomcat/site/trunk/xdocs/oldnews.xml tomcat/site/trunk/xdocs/whichversion.xml Modified: tomcat/site/trunk/build.properties.default URL: http://svn.apache.org/viewvc/tomcat/site/trunk/build.properties.default?rev=1838438=1838437=1838438=diff == --- tomcat/site/trunk/build.properties.default (original) +++ tomcat/site/trunk/build.properties.default Mon Aug 20 16:55:20 2018 @@ -38,7 +38,7 @@ tomcat.loc=http://www.apache.org/dist/to # - Tomcat versions - tomcat70=7.0.90 tomcat80=8.0.53 -tomcat85=8.5.32 +tomcat85=8.5.33 tomcat90=9.0.11 # - Download destination - Modified: tomcat/site/trunk/docs/download-80.html URL: http://svn.apache.org/viewvc/tomcat/site/trunk/docs/download-80.html?rev=1838438=1838437=1838438=diff == --- tomcat/site/trunk/docs/download-80.html (original) +++ tomcat/site/trunk/docs/download-80.html Mon Aug 20 16:55:20 2018 @@ -233,7 +233,7 @@ Quick Navigation -[define v]8.5.32[end] +[define v]8.5.33[end] [define w]8.0.53[end] https://www.apache.org/dist/tomcat/tomcat-8/KEYS;>KEYS | [v] | Modified: tomcat/site/trunk/docs/index.html URL: http://svn.apache.org/viewvc/tomcat/site/trunk/docs/index.html?rev=1838438=1838437=1838438=diff == --- tomcat/site/trunk/docs/index.html (original) +++ tomcat/site/trunk/docs/index.html Mon Aug 20 16:55:20 2018 @@ -254,7 +254,7 @@ project logo are trademarks of the Apach The Apache Tomcat Project is proud to announce the release of version 9.0.11 -of Apache Tomcat. The notable changes compared to 9.0.11 include: +of Apache Tomcat. The notable changes compared to 9.0.10 include: @@ -294,6 +294,56 @@ changelog. + +2018-08-17 Tomcat 8.5.33 Released + + + +The Apache Tomcat Project is proud to announce the release of version 8.5.33 +of Apache Tomcat. Apache Tomcat 8.5.x replaces 8.0.x and includes new features +pulled forward from Tomcat 9.0.x. The minimum Java version and implemented +specification versions remain unchanged. The notable changes compared +to 8.5.32 include: + + + +Correctly decode URL paths (+ should not be decoded to a space +in the path) in the RequestDispatcher and the web application class +loader. + +When pre-compiling with JspC, report all compilation errors rather +than stopping after the first error. A new option -failFast +can be used to restore the previous behaviour of stopping after the first +error. Based on a patch provided by Marc Pompl. + +Make the Jasper (JSP Engine) Java file generation process multi-threaded. +By default, one thread will be used per core. Based on a patch by Dan +Fabulich. + + + + + + +Note: A number of known issues remain using Servlet +asynchronous support with HTTP/2. These will be fixed in the next release. + + + + +Full details of these changes, and all the other changes, are available in the +Tomcat 8.5 +changelog. + + + + + +https://tomcat.apache.org/download-80.cgi;>Download + + + + 2018-07-06 Tomcat 7.0.90 Released @@ -360,46 +410,6 @@ changelog. - - -https://tomcat.apache.org/download-80.cgi;>Download - - - - - -2018-06-25 Tomcat 8.5.32 Released - - - -The Apache Tomcat Project is proud to announce the release of version 8.5.32 -of Apache Tomcat. Apache Tomcat 8.5.x is intended to replace 8.0.x and includes -new features pulled forward from Tomcat 9.0.x. The minimum Java version and -implemented specification versions remain unchanged. The notable changes -compared to 8.5.31 include: - - - -Add the RemoteCIDRFilter and RemoteCIDRValve that can be used to allow/deny -requests based on IPv4 and/or IPv6 client address where the IP ranges are -defined using CIDR notation. Based on a patch by Francis Galiegue. - -Update the packaged version of the Tomcat Native Library to 1.2.17 to pick -up the latest Windows binaries built with APR 1.6.3 and OpenSSL 1.0.2o. - -Correct a regression in the Host validation by removing the requirement that -the final component of a FQDN must be alphabetic. - - - - - -Full details of these changes, and all the other changes, are available in the -Tomcat 8.5 -changelog. - - - https://tomcat.apache.org/download-80.cgi;>Download Modified: tomcat/site/trunk/docs/migration-85.html
svn commit: r1838437 - in /tomcat/site/trunk/docs/tomcat-8.5-doc: ./ api/ api/org/apache/catalina/ api/org/apache/catalina/ant/ api/org/apache/catalina/ant/jmx/ api/org/apache/catalina/authenticator/
Author: markt Date: Mon Aug 20 16:53:33 2018 New Revision: 1838437 URL: http://svn.apache.org/viewvc?rev=1838437=rev Log: Update docs for 8.5.33 release [This commit notification would consist of 81 parts, which exceeds the limit of 50 ones, so it was shortened to the summary.] - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r28854 - /release/tomcat/tomcat-9/v9.0.10/
Author: markt Date: Mon Aug 20 16:40:04 2018 New Revision: 28854 Log: Drop 9.0.10 from mirrors Removed: release/tomcat/tomcat-9/v9.0.10/ - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[ANN] Apache Tomcat 9.0.11 available
The Apache Tomcat team announces the immediate availability of Apache
Tomcat 9.0.11.
Apache Tomcat 9 is an open source software implementation of the Java
Servlet, JavaServer Pages, Java Unified Expression Language, Java
WebSocket and JASPIC technologies.
Apache Tomcat 9.0.11 is a bugfix and feature release. The notable
changes compared to 9.0.10 include:
- Correctly decode URL paths (+ should not be decoded to a space in
the path) in the RequestDispatcher and the web application class
loader.
- Add a default location for the native library: ${catalina.home}/bin
- Make the Jasper (JSP Engine) Java file generation process
multi-threaded. By default, one thread will be used per core. Based
on a patch by Dan Fabulich.
Please refer to the change log for the complete list of changes:
http://tomcat.apache.org/tomcat-9.0-doc/changelog.html
Downloads:
http://tomcat.apache.org/download-90.cgi
Migration guides from Apache Tomcat 7.x and 8.x:
http://tomcat.apache.org/migration.html
Enjoy!
- The Apache Tomcat team
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1838436 - in /tomcat/site/trunk: build.properties.default xdocs/download-90.xml xdocs/index.xml xdocs/migration-9.xml xdocs/oldnews.xml xdocs/whichversion.xml
Author: markt
Date: Mon Aug 20 16:29:11 2018
New Revision: 1838436
URL: http://svn.apache.org/viewvc?rev=1838436=rev
Log:
Update for 9.0.11 release
Modified:
tomcat/site/trunk/build.properties.default
tomcat/site/trunk/xdocs/download-90.xml
tomcat/site/trunk/xdocs/index.xml
tomcat/site/trunk/xdocs/migration-9.xml
tomcat/site/trunk/xdocs/oldnews.xml
tomcat/site/trunk/xdocs/whichversion.xml
Modified: tomcat/site/trunk/build.properties.default
URL:
http://svn.apache.org/viewvc/tomcat/site/trunk/build.properties.default?rev=1838436=1838435=1838436=diff
==
--- tomcat/site/trunk/build.properties.default (original)
+++ tomcat/site/trunk/build.properties.default Mon Aug 20 16:29:11 2018
@@ -39,7 +39,7 @@ tomcat.loc=http://www.apache.org/dist/to
tomcat70=7.0.90
tomcat80=8.0.53
tomcat85=8.5.32
-tomcat90=9.0.10
+tomcat90=9.0.11
# - Download destination -
tomcat-site-docs.home=${base.path}/tomcat-site-docs/
Modified: tomcat/site/trunk/xdocs/download-90.xml
URL:
http://svn.apache.org/viewvc/tomcat/site/trunk/xdocs/download-90.xml?rev=1838436=1838435=1838436=diff
==
--- tomcat/site/trunk/xdocs/download-90.xml (original)
+++ tomcat/site/trunk/xdocs/download-90.xml Mon Aug 20 16:29:11 2018
@@ -18,7 +18,7 @@
Define variable to hold the current version number.
Documentation for ezt.py: https://code.google.com/p/ezt/wiki/Syntax
-->
-[define v]9.0.10[end]
+[define v]9.0.11[end]
https://www.apache.org/dist/tomcat/tomcat-9/KEYS;>KEYS |
[v] |
Browse |
Modified: tomcat/site/trunk/xdocs/index.xml
URL:
http://svn.apache.org/viewvc/tomcat/site/trunk/xdocs/index.xml?rev=1838436=1838435=1838436=diff
==
--- tomcat/site/trunk/xdocs/index.xml (original)
+++ tomcat/site/trunk/xdocs/index.xml Mon Aug 20 16:29:11 2018
@@ -39,6 +39,37 @@ project logo are trademarks of the Apach
+
+
+The Apache Tomcat Project is proud to announce the release of version 9.0.11
+of Apache Tomcat. The notable changes compared to 9.0.11 include:
+
+Correctly decode URL paths (+ should not be decoded to a space
+in the path) in the RequestDispatcher and the web application class
+loader.
+Add a default location for the native library:
+${catalina.home}/bin
+Make the Jasper (JSP Engine) Java file generation process multi-threaded.
+By default, one thread will be used per core. Based on a patch by Dan
+Fabulich.
+
+
+
+Note: A number of known issues remain using Servlet
+asynchronous support with HTTP/2. These will be fixed in the next release.
+
+
+
+Full details of these changes, and all the other changes, are available in the
+Tomcat 9
+changelog.
+
+
+
+Download
+
+
+
The Apache Tomcat Project is proud to announce the release of version 7.0.90 of
@@ -88,32 +119,6 @@ changelog.
-
-
-The Apache Tomcat Project is proud to announce the release of version 9.0.10
-of Apache Tomcat. The notable changes compared to 9.0.10 include:
-
-Add the RemoteCIDRFilter and RemoteCIDRValve that can be used to allow/deny
-requests based on IPv4 and/or IPv6 client address where the IP ranges are
-defined using CIDR notation. Based on a patch by Francis Galiegue.
-Use NIO2 API for websockets writes.
-Update the packaged version of the Tomcat Native Library to 1.2.17 to pick
-up the latest Windows binaries built with APR 1.6.3 and OpenSSL
1.0.2o.
-Correct a regression in the Host validation by removing the requirement
that
-the final component of a FQDN must be alphabetic.
-
-
-
-Full details of these changes, and all the other changes, are available in the
-Tomcat 9
-changelog.
-
-
-
-Download
-
-
-
The Apache Tomcat Project is proud to announce the release of version 8.5.32
Modified: tomcat/site/trunk/xdocs/migration-9.xml
URL:
http://svn.apache.org/viewvc/tomcat/site/trunk/xdocs/migration-9.xml?rev=1838436=1838435=1838436=diff
==
--- tomcat/site/trunk/xdocs/migration-9.xml (original)
+++ tomcat/site/trunk/xdocs/migration-9.xml Mon Aug 20 16:29:11 2018
@@ -343,7 +343,8 @@ of Apache Tomcat.
"9.0.6":"1825860",
"9.0.7":"1828274",
"9.0.8":"1830389",
- "9.0.10":"1833930"
+ "9.0.10":"1833930",
+ "9.0.11":"1837880"
};
formSubmit.action = "http://svn.apache.org/viewvc/tomcat/trunk/; +
@@ -392,8 +393,9 @@ of Apache Tomcat.
9.0.5
9.0.6
9.0.7
-9.0.8
-9.0.10
+9.0.8
+9.0.10
+9.0.11
, new version:
9.0.0.M1
@@ -420,7 +422,8 @@ of Apache Tomcat.
9.0.6
9.0.7
9.0.8
-9.0.10
+9.0.10
+9.0.11
trunk (unreleased)
Modified: tomcat/site/trunk/xdocs/oldnews.xml
URL:
svn commit: r1838435 - in /tomcat/site/trunk/docs: ./ tomcat-9.0-doc/ tomcat-9.0-doc/api/ tomcat-9.0-doc/api/org/apache/catalina/ tomcat-9.0-doc/api/org/apache/catalina/ant/ tomcat-9.0-doc/api/org/apa
Author: markt Date: Mon Aug 20 16:23:29 2018 New Revision: 1838435 URL: http://svn.apache.org/viewvc?rev=1838435=rev Log: Update docs for 9.0.11 release [This commit notification would consist of 89 parts, which exceeds the limit of 50 ones, so it was shortened to the summary.] - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1838434 - in /tomcat/tc8.5.x/trunk: ./ java/org/apache/tomcat/util/net/AprEndpoint.java java/org/apache/tomcat/util/net/SocketWrapperBase.java java/org/apache/tomcat/util/net/WriteBuffer.
Author: markt Date: Mon Aug 20 16:12:28 2018 New Revision: 1838434 URL: http://svn.apache.org/viewvc?rev=1838434=rev Log: Refactor for consistency Modified: tomcat/tc8.5.x/trunk/ (props changed) tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/net/AprEndpoint.java tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/net/SocketWrapperBase.java tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/net/WriteBuffer.java Propchange: tomcat/tc8.5.x/trunk/ -- --- svn:mergeinfo (original) +++ svn:mergeinfo Mon Aug 20 16:12:28 2018 @@ -1,2 +1,2 @@ /tomcat/tc8.0.x/trunk:1809644 -/tomcat/trunk:1734785,1734799,1734845,1734928,1735041,1735044,1735480,1735577,1735597,1735599-1735600,1735615,1736145,1736162,1736209,1736280,1736297,1736299,1736489,1736646,1736703,1736836,1736849,1737104-1737105,1737112,1737117,1737119-1737120,1737155,1737157,1737192,1737280,1737339,1737632,1737664,1737715,1737748,1737785,1737834,1737860,1737903,1737959,1738005,1738007,1738014-1738015,1738018,1738022,1738039,1738043,1738059-1738060,1738147,1738149,1738174-1738175,1738261,1738589,1738623-1738625,1738643,1738816,1738850,1738855,1738946-1738948,1738953-1738954,1738979,1738982,1739079-1739081,1739087,1739113,1739153,1739172,1739176,1739191,1739474,1739492,1739726,1739762,1739775,1739814,1739817-1739818,1739975,1740131,1740324,1740465,1740495,1740508-1740509,1740520,1740535,1740707,1740803,1740810,1740969,1740980,1740991,1740997,1741015,1741033,1741036,1741058,1741060,1741080,1741147,1741159,1741164,1741173,1741181,1741190,1741197,1741202,1741208,1741213,1741221,1741225,1741232,1741409 ,1741501,1741677,1741892,1741896,1741984,1742023,1742042,1742071,1742090,1742093,1742101,1742105,1742111,1742139,1742146,1742148,1742166,1742181,1742184,1742187,1742246,1742248-1742251,1742263-1742264,1742268,1742276,1742369,1742387,1742448,1742509-1742512,1742917,1742919,1742933,1742975-1742976,1742984,1742986,1743019,1743115,1743117,1743124-1743125,1743134,1743425,1743554,1743679,1743696-1743698,1743700-1743701,1744058,1744064-1744065,1744125,1744149,1744194,1744229,1744270,1744323,1744432,1744684,1744697,1744705,1744713,1744760,1744786,1745083,1745142-1745143,1745145,1745177,1745179-1745180,1745227,1745248,1745254,1745337,1745467,1745473,1745535,1745576,1745735,1745744,1746304,1746306-1746307,1746319,1746327,1746338,1746340-1746341,1746344,1746427,1746441,1746473,1746490,1746492,1746495-1746496,1746499-1746501,1746503-1746507,1746509,1746549,1746551,1746554,1746556,1746558,1746584,1746620,1746649,1746724,1746939,1746989,1747014,1747028,1747035,1747210,1747225,1747234,1747253,1747 404,1747506,1747536,1747924,1747980,1747993,1748001,1748253,1748452,1748547,1748629,1748676,1748715,1749287,1749296,1749328,1749373,1749465,1749506,1749508,1749665-1749666,1749763,1749865-1749866,1749898,1749978,1749980,1750011,1750015,1750056,1750480,1750617,1750634,1750692,1750697,1750700,1750703,1750707,1750714,1750718,1750723,1750774,1750899,1750975,1750995,1751061,1751097,1751173,1751438,1751447,1751463,1751702,1752212,1752737,1752745,1753078,1753080,1753358,1753363,1754111,1754140-1754141,1754281,1754310,1754445,1754467,1754494,1754496,1754528,1754532-1754533,1754613,1754714,1754874,1754941,1754944,1754950-1754951,1755005,1755007,1755009,1755132,1755180-1755181,1755185,1755190,1755204-1755206,1755208,1755214,1755224,1755227,1755230,1755629,1755646-1755647,1755650,1755653,1755675,1755680,1755683,1755693,1755717,1755731-1755737,1755812,1755828,1755884,1755890,1755918-1755919,1755942,1755958,1755960,1755970,1755993,1756013,1756019,1756039,1756056,1756083-1756114,1756175,1756288-1 756289,1756408-1756410,1756778,1756798,1756878,1756898,1756939,1757123-1757124,1757126,1757128,1757132-1757133,1757136,1757145,1757167-1757168,1757175,1757180,1757182,1757195,1757271,1757278,1757347,1757353-1757354,1757363,1757374,1757399,1757406,1757408,1757485,1757495,1757499,1757527,1757578,1757684,1757722,1757727,1757790,1757799,1757813,1757853,1757883,1757903,1757976,1757997,1758000,1758058,1758072-1758075,1758078-1758079,1758223,1758257,1758261,1758276,1758292,1758369,1758378-1758383,1758421,1758423,1758425-1758427,1758430,1758443,1758448,1758459,1758483,1758486-1758487,1758499,1758525,1758556,1758580,1758582,1758584,1758588,1758842,1759019,1759212,1759224,1759227,1759252,1759274,1759513-1759516,1759611,1759757,1759785-1759790,1760005,1760022,1760109-1760110,1760135,1760200-1760201,1760227,1760300,1760397,1760446,1760454,1760640,1760648,1761057,1761422,1761491,1761498,1761500-1761501,1761550,1761553,1761572,1761574,1761625-1761626,1761628,1761682,1761740,1761752,1762051-176205
svn commit: r1838433 - in /tomcat/trunk/java/org/apache/tomcat/util/net: AprEndpoint.java SocketWrapperBase.java WriteBuffer.java
Author: markt
Date: Mon Aug 20 16:11:52 2018
New Revision: 1838433
URL: http://svn.apache.org/viewvc?rev=1838433=rev
Log:
Refactor for consistency
Modified:
tomcat/trunk/java/org/apache/tomcat/util/net/AprEndpoint.java
tomcat/trunk/java/org/apache/tomcat/util/net/SocketWrapperBase.java
tomcat/trunk/java/org/apache/tomcat/util/net/WriteBuffer.java
Modified: tomcat/trunk/java/org/apache/tomcat/util/net/AprEndpoint.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/net/AprEndpoint.java?rev=1838433=1838432=1838433=diff
==
--- tomcat/trunk/java/org/apache/tomcat/util/net/AprEndpoint.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/net/AprEndpoint.java Mon Aug 20
16:11:52 2018
@@ -2598,9 +2598,9 @@ public class AprEndpoint extends Abstrac
@Override
-protected boolean writeNonBlockingDirect(ByteBuffer from) throws
IOException {
+protected void writeNonBlockingDirect(ByteBuffer from) throws
IOException {
if (from.isDirect()) {
-return super.writeNonBlockingDirect(from);
+super.writeNonBlockingDirect(from);
} else {
// The socket write buffer capacity is socket.appWriteBufSize
ByteBuffer writeBuffer = socketBufferHandler.getWriteBuffer();
@@ -2614,7 +2614,6 @@ public class AprEndpoint extends Abstrac
// Didn't write the whole amount of data in the last
// non-blocking write.
// Exit the loop.
-return true;
}
}
@@ -2622,8 +2621,6 @@ public class AprEndpoint extends Abstrac
socketBufferHandler.configureWriteBufferForWrite();
transfer(from, writeBuffer);
}
-
-return false;
}
}
Modified: tomcat/trunk/java/org/apache/tomcat/util/net/SocketWrapperBase.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/net/SocketWrapperBase.java?rev=1838433=1838432=1838433=diff
==
--- tomcat/trunk/java/org/apache/tomcat/util/net/SocketWrapperBase.java
(original)
+++ tomcat/trunk/java/org/apache/tomcat/util/net/SocketWrapperBase.java Mon Aug
20 16:11:52 2018
@@ -625,26 +625,24 @@ public abstract class SocketWrapperBase<
* Separate method so it can be re-used by the socket write buffer to write
* data to the network
*/
-boolean writeNonBlockingInternal(ByteBuffer from) throws IOException {
+void writeNonBlockingInternal(ByteBuffer from) throws IOException {
// TODO Explore refactoring this method back into writeNonBlocking
if (socketBufferHandler.isWriteBufferEmpty()) {
-return writeNonBlockingDirect(from);
+writeNonBlockingDirect(from);
} else {
socketBufferHandler.configureWriteBufferForWrite();
transfer(from, socketBufferHandler.getWriteBuffer());
if (!socketBufferHandler.isWriteBufferWritable()) {
doWrite(false);
if (socketBufferHandler.isWriteBufferWritable()) {
-return writeNonBlockingDirect(from);
+writeNonBlockingDirect(from);
}
}
}
-
-return !socketBufferHandler.isWriteBufferWritable();
}
-protected boolean writeNonBlockingDirect(ByteBuffer from) throws
IOException {
+protected void writeNonBlockingDirect(ByteBuffer from) throws IOException {
// The socket write buffer capacity is socket.appWriteBufSize
// TODO This only matters when using TLS. For non-TLS connections it
// should be possible to write the ByteBuffer in a single write
@@ -659,7 +657,7 @@ public abstract class SocketWrapperBase<
// Didn't write the whole amount of data in the last
// non-blocking write.
// Exit the loop.
-return true;
+return;
}
}
@@ -667,8 +665,6 @@ public abstract class SocketWrapperBase<
socketBufferHandler.configureWriteBufferForWrite();
transfer(from, socketBufferHandler.getWriteBuffer());
}
-
-return false;
}
Modified: tomcat/trunk/java/org/apache/tomcat/util/net/WriteBuffer.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/net/WriteBuffer.java?rev=1838433=1838432=1838433=diff
==
--- tomcat/trunk/java/org/apache/tomcat/util/net/WriteBuffer.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/net/WriteBuffer.java Mon Aug 20
16:11:52 2018
@@ -107,10 +107,12 @@ public class WriteBuffer {
[Bug 62641] libtool invocations should use --tag=CC
https://bz.apache.org/bugzilla/show_bug.cgi?id=62641 Michael Osipov <1983-01...@gmx.net> changed: What|Removed |Added Depends on|62640 | Referenced Bugs: https://bz.apache.org/bugzilla/show_bug.cgi?id=62640 [Bug 62640] libtool invocations should use --tag=CC -- You are receiving this mail because: You are the assignee for the bug. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[Bug 62641] New: libtool invocations should use --tag=CC
https://bz.apache.org/bugzilla/show_bug.cgi?id=62641 Bug ID: 62641 Summary: libtool invocations should use --tag=CC Product: Tomcat Native Version: 1.2.17 Hardware: All OS: HP-UX Status: NEW Severity: major Priority: P2 Component: Library Assignee: dev@tomcat.apache.org Reporter: 1983-01...@gmx.net Target Milestone: --- Created attachment 36104 --> https://bz.apache.org/bugzilla/attachment.cgi?id=36104=edit Patch --tag=CC This is a spinoff of https://bz.apache.org/bugzilla/show_bug.cgi?id=62640. If you use libtool on a different environment libtcnative is not properly linked against libapr. If you use an external libtool it complains that tag is missing: > libtool --silent --mode=link aCC -Ae -g -mt -DHAVE_CONFIG_H -DHPUX11 > -D_REENTRANT -D_HPUX_SOURCE -D_LARGEFILE64_SOURCE -g -DHAVE_OPENSSL > -I./include -I/opt/java8/include -I/opt/java8/include/hpux > -I/opt/openssl/include -I/opt/apr/include -version-info 2:17:2-o > libtcnative-1.la -rpath /usr/local/lib/hpux32 src/address.lo src/bb.lo > src/dir.lo src/error.lo src/file.lo src/info.lo src/jnilib.lo src/lock.lo > src/misc.lo src/mmap.lo src/multicast.lo src/network.lo src/os.lo src/poll.lo > src/pool.lo src/proc.lo src/shm.lo src/ssl.lo src/sslconf.lo > src/sslcontext.lo src/sslinfo.lo src/sslnetwork.lo src/sslutils.lo > src/stdlib.lo src/thread.lo src/user.lo os/unix/system.lo os/unix/uxpipe.lo > -L/opt/openssl/lib -Wl,+b: -lssl -lcrypto -L/usr/local/lib/hpux32 > /opt/apr/lib/libapr.la -lrt -lm -lpthread > libtool: link: unable to infer tagged configuration > libtool: error: specify a tag with '--tag' > Makefile:89: recipe for target 'libtcnative-1.la' failed > gmake[1]: *** [libtcnative-1.la] Error 1 > gmake[1]: Leaving directory '/tmp/tomcat-native-1.2.17-src/native' > /tmp/tomcat-native-1.2.17-src/native/build/rules.mk:118: recipe for target > 'all-recursive' failed > gmake: *** [all-recursive] Error 1 Attached is a patch which fixes the issue. -- You are receiving this mail because: You are the assignee for the bug. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[Bug 62641] libtool invocations should use --tag=CC
https://bz.apache.org/bugzilla/show_bug.cgi?id=62641 Michael Osipov <1983-01...@gmx.net> changed: What|Removed |Added CC||1983-01...@gmx.net Depends on||62640 Referenced Bugs: https://bz.apache.org/bugzilla/show_bug.cgi?id=62640 [Bug 62640] libtool invocations should use --tag=CC -- You are receiving this mail because: You are the assignee for the bug. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[Bug 59750] Amend "authenticate" method with context by means of HttpServletRequest
https://bz.apache.org/bugzilla/show_bug.cgi?id=59750 --- Comment #6 from Christopher Schultz --- (In reply to Michael Osipov from comment #5) > GSSName or X509Certificate and like. I always prefer passing Object and the > implementation decides about the cast. Seems reasonable. Tomcat only supports authentication for string usernames or X509 certificates (where the "username" is extracted as a String value from the certificate via a X509UsernameRetriever). Do you still feel there is a need for the user-identifier to be a generic Object? -- You are receiving this mail because: You are the assignee for the bug. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[Bug 62626] Tomcat 9.0.10 APR/Native crashes
https://bz.apache.org/bugzilla/show_bug.cgi?id=62626 --- Comment #14 from jan.pfei...@centrum.cz --- If logs did not help, can you point me where to get that DEBUG build of tcnative? -- You are receiving this mail because: You are the assignee for the bug. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[Bug 62626] Tomcat 9.0.10 APR/Native crashes
https://bz.apache.org/bugzilla/show_bug.cgi?id=62626 --- Comment #13 from jan.pfei...@centrum.cz --- (In reply to Christopher Schultz from comment #12) > Just to confirm: this is Java 8 with APR+OpenSSL, not NIO+OpenSSL, correct? Yes, actual configuration APR+OpenSSL Java 8. Three days without crash. > The Java stack traces are less important than the native stack trace. There > was only a single item in the native stack trace you already posted. Can you > post the part of the native report that is labelled "-- T H R E A D > ---"? > > That should include a lot more relevant information. Two last Thread reports: --- T H R E A D --- Current thread (0x2f30d800): JavaThread "https-openssl-apr-443-exec-69" daemon [_thread_in_native, id=36360, stack(0x3f5e,0x3f6e)] Stack: [0x3f5e,0x3f6e], sp=0x3f6ddd80, free space=1015k Native frames: (J=compiled Java code, j=interpreted, Vv=VM code, C=native code) C [tcnative-1.dll+0xe0a8f] Java frames: (J=compiled Java code, j=interpreted, Vv=VM code) J 10218 org.apache.tomcat.jni.Socket.sendb(JLjava/nio/ByteBuffer;II)I (0 bytes) @ 0x14d3c59f [0x14d3c540+0x005f] J 15904 c2 org.apache.tomcat.util.net.SocketWrapperBase.flushBlocking()V (90 bytes) @ 0x1545cbcc [0x1545c880+0x034c] J 16170 c2 org.apache.tomcat.util.net.SocketWrapperBase.flush(Z)Z (20 bytes) @ 0x14860a78 [0x14860a40+0x0038] J 15983 c2 org.apache.catalina.connector.CoyoteOutputStream.write([BII)V (26 bytes) @ 0x154a8f2c [0x154a51c0+0x3d6c] J 16090 c2 java.io.BufferedOutputStream.write([BII)V java.base@10.0.2 (67 bytes) @ 0x154e5660 [0x154e5560+0x0100] J 18370 c2 com.m2000.shop.controllers.DefaultController.image(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljavax/servlet/http/HttpServletResponse;Ljavax/servlet/http/HttpServletRequest;)V (1129 bytes) @ 0x159f12f4 [0x159ec920+0x49d4] J 19092 c2 jdk.internal.reflect.GeneratedMethodAccessor159.invoke(Ljava/lang/Object;[Ljava/lang/Object;)Ljava/lang/Object; (98 bytes) @ 0x15ba9be8 [0x15ba9b00+0x00e8] J 19001 c2 org.springframework.web.method.support.InvocableHandlerMethod.invokeForRequest(Lorg/springframework/web/context/request/NativeWebRequest;Lorg/springframework/web/method/support/ModelAndViewContainer;[Ljava/lang/Object;)Ljava/lang/Object; (148 bytes) @ 0x15b26018 [0x15b25ca0+0x0378] J 18530 c2 org.springframework.web.servlet.mvc.method.annotation.ServletInvocableHandlerMethod.invokeAndHandle(Lorg/springframework/web/context/request/ServletWebRequest;Lorg/springframework/web/method/support/ModelAndViewContainer;[Ljava/lang/Object;)V (142 bytes) @ 0x15a6e884 [0x15a6e840+0x0044] J 18568 c2 org.springframework.web.servlet.mvc.method.annotation.RequestMappingHandlerAdapter.invokeHandlerMethod(Ljavax/servlet/http/HttpServletRequest;Ljavax/servlet/http/HttpServletResponse;Lorg/springframework/web/method/HandlerMethod;)Lorg/springframework/web/servlet/ModelAndView; (328 bytes) @ 0x15a92a48 [0x15a90d60+0x1ce8] J 19592 c2 org.springframework.web.servlet.DispatcherServlet.doDispatch(Ljavax/servlet/http/HttpServletRequest;Ljavax/servlet/http/HttpServletResponse;)V (594 bytes) @ 0x15ca8c20 [0x15ca8140+0x0ae0] J 18099 c2 org.springframework.web.servlet.DispatcherServlet.doService(Ljavax/servlet/http/HttpServletRequest;Ljavax/servlet/http/HttpServletResponse;)V (360 bytes) @ 0x15948490 [0x15947ee0+0x05b0] J 18074 c2 org.springframework.web.servlet.FrameworkServlet.processRequest(Ljavax/servlet/http/HttpServletRequest;Ljavax/servlet/http/HttpServletResponse;)V (298 bytes) @ 0x15919044 [0x159171c0+0x1e84] J 19591 c2 javax.servlet.http.HttpServlet.service(Ljavax/servlet/http/HttpServletRequest;Ljavax/servlet/http/HttpServletResponse;)V (269 bytes) @ 0x15ca6d70 [0x15ca6bc0+0x01b0] J 14832 c2 org.apache.catalina.core.ApplicationFilterChain.internalDoFilter(Ljavax/servlet/ServletRequest;Ljavax/servlet/ServletResponse;)V (388 bytes) @ 0x152cec10 [0x152ce2e0+0x0930] J 17775 c2 org.apache.tomcat.websocket.server.WsFilter.doFilter(Ljavax/servlet/ServletRequest;Ljavax/servlet/ServletResponse;Ljavax/servlet/FilterChain;)V (139 bytes) @ 0x1580d614 [0x1580d5c0+0x0054] J 14832 c2 org.apache.catalina.core.ApplicationFilterChain.internalDoFilter(Ljavax/servlet/ServletRequest;Ljavax/servlet/ServletResponse;)V (388 bytes) @ 0x152ce6d8 [0x152ce2e0+0x03f8] J 18045 c2 com.m2000.shop.filters.ThreadLocalFilter.doFilter(Ljavax/servlet/ServletRequest;Ljavax/servlet/ServletResponse;Ljavax/servlet/FilterChain;)V (26
