svn commit: r1793632 - /tomcat/trunk/java/org/apache/coyote/http11/filters/ChunkedOutputFilter.java

2017-05-03 Thread markt
Author: markt
Date: Wed May  3 09:31:30 2017
New Revision: 1793632

URL: http://svn.apache.org/viewvc?rev=1793632&view=rev
Log:
Clean-up. No functional change.

Modified:
tomcat/trunk/java/org/apache/coyote/http11/filters/ChunkedOutputFilter.java

Modified: 
tomcat/trunk/java/org/apache/coyote/http11/filters/ChunkedOutputFilter.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/http11/filters/ChunkedOutputFilter.java?rev=1793632&r1=1793631&r2=1793632&view=diff
==
--- tomcat/trunk/java/org/apache/coyote/http11/filters/ChunkedOutputFilter.java 
(original)
+++ tomcat/trunk/java/org/apache/coyote/http11/filters/ChunkedOutputFilter.java 
Wed May  3 09:31:30 2017
@@ -14,7 +14,6 @@
  *  See the License for the specific language governing permissions and
  *  limitations under the License.
  */
-
 package org.apache.coyote.http11.filters;
 
 import java.io.IOException;
@@ -32,25 +31,8 @@ import org.apache.tomcat.util.buf.HexUti
  */
 public class ChunkedOutputFilter implements OutputFilter {
 
-
-// -- Constants
-private static final byte[] END_CHUNK_BYTES = {(byte) '0', (byte) '\r', 
(byte) '\n',
-(byte) '\r', (byte) '\n'};
-
-
-//  Constructor
-
-
-/**
- * Default constructor.
- */
-public ChunkedOutputFilter() {
-chunkHeader.put(8, (byte) '\r');
-chunkHeader.put(9, (byte) '\n');
-}
-
-
-// - Instance Variables
+private static final byte[] END_CHUNK_BYTES =
+{(byte) '0', (byte) '\r', (byte) '\n', (byte) '\r', (byte) '\n'};
 
 
 /**
@@ -71,7 +53,10 @@ public class ChunkedOutputFilter impleme
 protected final ByteBuffer endChunk = ByteBuffer.wrap(END_CHUNK_BYTES);
 
 
-// - Properties
+public ChunkedOutputFilter() {
+chunkHeader.put(8, (byte) '\r');
+chunkHeader.put(9, (byte) '\n');
+}
 
 
 // --- OutputBuffer Methods
@@ -96,7 +81,6 @@ public class ChunkedOutputFilter impleme
 buffer.doWrite(chunkHeader);
 
 return result;
-
 }
 
 
@@ -121,7 +105,6 @@ public class ChunkedOutputFilter impleme
 
 // --- OutputFilter Methods
 
-
 /**
  * Some filters need additional parameters from the response. All the
  * necessary reading can occur in that method, as this method is called
@@ -147,15 +130,13 @@ public class ChunkedOutputFilter impleme
  * buffer.doWrite during the execution of this method.
  */
 @Override
-public long end()
-throws IOException {
+public long end() throws IOException {
 
 // Write end chunk
 buffer.doWrite(endChunk);
 endChunk.position(0).limit(endChunk.capacity());
 
 return 0;
-
 }
 
 



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



[Bug 61065] New: ImportHandler is using the wrong key to cache resolved classes

2017-05-03 Thread bugzilla
https://bz.apache.org/bugzilla/show_bug.cgi?id=61065

Bug ID: 61065
   Summary: ImportHandler is using the wrong key to cache resolved
classes
   Product: Tomcat 8
   Version: 8.0.17
  Hardware: All
OS: All
Status: NEW
  Severity: normal
  Priority: P2
 Component: EL
  Assignee: dev@tomcat.apache.org
  Reporter: jag...@arima.eu
  Target Milestone: 

The method resolveClass from ImportHandler class uses a Map to cache the
classes it resolves using their simple name as key.

  Class result = clazzes.get(name);

It has two methods to resolve a class. 
If we use the package name to import our class (my.package.*), it stores it in
the cache using the simple name (correct):

  clazzes.put(name, result);
  //
http://svn.apache.org/viewvc/tomcat/tc8.0.x/tags/TOMCAT_8_0_16/java/javax/el/ImportHandler.java?revision=1680308&view=markup#l180

But when we import the class in the jsp (my.package.Class), it stores it using
its full class name (incorrect):

  clazzes.put(className, clazz);
  //
http://svn.apache.org/viewvc/tomcat/tc8.0.x/tags/TOMCAT_8_0_16/java/javax/el/ImportHandler.java?revision=1680308&view=markup#l160

Classes resolved like this are always a miss in the cache.

So, when importing packages (<%@ page import="my.package.*" %>) the cache will
work as expected.
But if we import the class (<%@ page import="my.package.Class" %>) we will
always get a miss on the cache.

You can find this problem in versions 8.0.16 and up.

-- 
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 60362] Missing reason phrase in response

2017-05-03 Thread bugzilla
https://bz.apache.org/bugzilla/show_bug.cgi?id=60362

--- Comment #58 from thorsten.me...@knime.com ---
Even if this change doesn't break clients it will give a very bad impression to
users. For example if you use Java to issue HTTP request and and error was
returned by the server, the exception message reads "Server returned error 404:
Not Found" (or similar). Even for uses not knowing the HTTP status code the
"Not Found" is descriptive. Therefore I guess many Java applications displays
the exception message as is. With Tomcat 8.5 the exception message is "Server
returned error 404: null". Normal users don't have clue any more what's going
on and even for programmers this more looks like a NullPointerException
somewhere deep in the code. In order to restore a good user experience you now
have to interpret the exception messages and create new ones for every possible
status code.

Therefore my question is: why on earth has the reason phrase been removed in
the first place? In order to save a few bytes of traffic?

-- 
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: r1793682 - in /tomcat/trunk: java/org/apache/coyote/http2/Http2AsyncUpgradeHandler.java java/org/apache/coyote/http2/Http2UpgradeHandler.java webapps/docs/changelog.xml

2017-05-03 Thread markt
Author: markt
Date: Wed May  3 17:30:06 2017
New Revision: 1793682

URL: http://svn.apache.org/viewvc?rev=1793682&view=rev
Log:
Extend the fix for large headers to push requests.
Align the header writing implementations a little, with a view to refactoring

Modified:
tomcat/trunk/java/org/apache/coyote/http2/Http2AsyncUpgradeHandler.java
tomcat/trunk/java/org/apache/coyote/http2/Http2UpgradeHandler.java
tomcat/trunk/webapps/docs/changelog.xml

Modified: 
tomcat/trunk/java/org/apache/coyote/http2/Http2AsyncUpgradeHandler.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/http2/Http2AsyncUpgradeHandler.java?rev=1793682&r1=1793681&r2=1793682&view=diff
==
--- tomcat/trunk/java/org/apache/coyote/http2/Http2AsyncUpgradeHandler.java 
(original)
+++ tomcat/trunk/java/org/apache/coyote/http2/Http2AsyncUpgradeHandler.java Wed 
May  3 17:30:06 2017
@@ -193,34 +193,39 @@ public class Http2AsyncUpgradeHandler ex
 log.debug(sm.getString("upgradeHandler.writePushHeaders", 
connectionId,
 stream.getIdentifier(), Integer.toString(pushedStreamId)));
 }
-// This ensures the Stream processing thread has control of the socket.
+
 boolean first = true;
 State state = null;
 ArrayList bufs = new ArrayList<>();
 byte[] pushedStreamIdBytes = new byte[4];
 ByteUtil.set31Bits(pushedStreamIdBytes, 0, pushedStreamId);
+// This ensures the Stream processing thread has control of the socket.
 while (state != State.COMPLETE) {
 byte[] header = new byte[9];
 ByteBuffer target = ByteBuffer.allocate(payloadSize);
 target.put(pushedStreamIdBytes);
 state = getHpackEncoder().encode(coyoteRequest.getMimeHeaders(), 
target);
 target.flip();
-ByteUtil.setThreeBytes(header, 0, target.limit());
-if (first) {
-first = false;
-header[3] = FrameType.PUSH_PROMISE.getIdByte();
-} else {
-header[3] = FrameType.CONTINUATION.getIdByte();
-}
-if (state == State.COMPLETE) {
-header[4] += FLAG_END_OF_HEADERS;
-}
-if (log.isDebugEnabled()) {
-log.debug(target.limit() + " bytes");
+if (state == State.COMPLETE || target.limit() > 0) {
+ByteUtil.setThreeBytes(header, 0, target.limit());
+if (first) {
+first = false;
+header[3] = FrameType.PUSH_PROMISE.getIdByte();
+} else {
+header[3] = FrameType.CONTINUATION.getIdByte();
+}
+if (state == State.COMPLETE) {
+header[4] += FLAG_END_OF_HEADERS;
+}
+if (log.isDebugEnabled()) {
+log.debug(target.limit() + " bytes");
+}
+ByteUtil.set31Bits(header, 5, 
stream.getIdentifier().intValue());
+bufs.add(ByteBuffer.wrap(header));
+bufs.add(target);
+} else if (state == State.UNDERFLOW) {
+payloadSize = payloadSize * 2;
 }
-ByteUtil.set31Bits(header, 5, stream.getIdentifier().intValue());
-bufs.add(ByteBuffer.wrap(header));
-bufs.add(target);
 }
 socketWrapper.write(BlockingMode.SEMI_BLOCK, getWriteTimeout(), 
TimeUnit.MILLISECONDS,
 null, SocketWrapperBase.COMPLETE_WRITE, 
applicationErrorCompletion,

Modified: tomcat/trunk/java/org/apache/coyote/http2/Http2UpgradeHandler.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/http2/Http2UpgradeHandler.java?rev=1793682&r1=1793681&r2=1793682&view=diff
==
--- tomcat/trunk/java/org/apache/coyote/http2/Http2UpgradeHandler.java 
(original)
+++ tomcat/trunk/java/org/apache/coyote/http2/Http2UpgradeHandler.java Wed May  
3 17:30:06 2017
@@ -614,35 +614,43 @@ class Http2UpgradeHandler extends Abstra
 log.debug(sm.getString("upgradeHandler.writePushHeaders", 
connectionId,
 stream.getIdentifier(), Integer.toString(pushedStreamId)));
 }
+
+byte[] header = new byte[9];
+ByteBuffer target = ByteBuffer.allocate(payloadSize);
+boolean first = true;
+State state = null;
+byte[] pushedStreamIdBytes = new byte[4];
+ByteUtil.set31Bits(pushedStreamIdBytes, 0, pushedStreamId);
 // This ensures the Stream processing thread has control of the socket.
 synchronized (socketWrapper) {
-byte[] header = new byte[9];
-ByteBuffer target = ByteBuffer.allocate(payloadSize);
-boolean first = true;
-State state = null;
-byte[] pushed

svn commit: r1793683 - /tomcat/trunk/java/org/apache/coyote/http2/Http2UpgradeHandler.java

2017-05-03 Thread markt
Author: markt
Date: Wed May  3 17:40:07 2017
New Revision: 1793683

URL: http://svn.apache.org/viewvc?rev=1793683&view=rev
Log:
Follow-up to r1708575
I/O errors during application initiated read/writes need to be handled at the 
point they occur since the application may swallow them.

Modified:
tomcat/trunk/java/org/apache/coyote/http2/Http2UpgradeHandler.java

Modified: tomcat/trunk/java/org/apache/coyote/http2/Http2UpgradeHandler.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/http2/Http2UpgradeHandler.java?rev=1793683&r1=1793682&r2=1793683&view=diff
==
--- tomcat/trunk/java/org/apache/coyote/http2/Http2UpgradeHandler.java 
(original)
+++ tomcat/trunk/java/org/apache/coyote/http2/Http2UpgradeHandler.java Wed May  
3 17:40:07 2017
@@ -642,9 +642,13 @@ class Http2UpgradeHandler extends Abstra
 log.debug(target.limit() + " bytes");
 }
 ByteUtil.set31Bits(header, 5, 
stream.getIdentifier().intValue());
-socketWrapper.write(true, header, 0, header.length);
-socketWrapper.write(true, target);
-socketWrapper.flush(true);
+try {
+socketWrapper.write(true, header, 0, header.length);
+socketWrapper.write(true, target);
+socketWrapper.flush(true);
+} catch (IOException ioe) {
+handleAppInitiatedIOException(ioe);
+}
 }
 if (state == State.UNDERFLOW && target.limit() == 0) {
 target = ByteBuffer.allocate(target.capacity() * 2);



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



svn commit: r1793685 - in /tomcat/tc8.5.x/trunk: ./ java/org/apache/coyote/http2/Http2UpgradeHandler.java webapps/docs/changelog.xml

2017-05-03 Thread markt
Author: markt
Date: Wed May  3 17:41:35 2017
New Revision: 1793685

URL: http://svn.apache.org/viewvc?rev=1793685&view=rev
Log:
Extend the fix for large headers to push requests.
Align the header writing implementations a little, with a view to refactoring

Modified:
tomcat/tc8.5.x/trunk/   (props changed)
tomcat/tc8.5.x/trunk/java/org/apache/coyote/http2/Http2UpgradeHandler.java
tomcat/tc8.5.x/trunk/webapps/docs/changelog.xml

Propchange: tomcat/tc8.5.x/trunk/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed May  3 17:41:35 2017
@@ -1 +1 @@
-/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,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,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,1747404,1747506,1747
 
536,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-1756289,1756408-1
 
756410,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-1762053,1762123,176216
 
8,1762172,1762182,1762201-1762202,1762204,1762208,1762288,1762296,1762324,1762348,1762353,1762362,1762374,1762492,1762503,1762505,1762541,1762608,1762710,1762753,1762766,1762769,1762944,1762947,1762953,1763167,1763179,1763232,1763259,1763271-1763272,1763276-1763277,1763319-1763320,1763370,1763372,1763375,1763377,1763393,1763412,1763430,1763450,1763462,176

svn commit: r1793686 - in /tomcat/tc8.5.x/trunk: ./ java/org/apache/coyote/http2/Http2UpgradeHandler.java

2017-05-03 Thread markt
Author: markt
Date: Wed May  3 17:42:01 2017
New Revision: 1793686

URL: http://svn.apache.org/viewvc?rev=1793686&view=rev
Log:
I/O errors during application initiated read/writes need to be handled at the 
point they occur since the application may swallow them.

Modified:
tomcat/tc8.5.x/trunk/   (props changed)
tomcat/tc8.5.x/trunk/java/org/apache/coyote/http2/Http2UpgradeHandler.java

Propchange: tomcat/tc8.5.x/trunk/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed May  3 17:42:01 2017
@@ -1 +1 @@
-/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,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,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,1747404,1747506,1747
 
536,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-1756289,1756408-1
 
756410,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-1762053,1762123,176216
 
8,1762172,1762182,1762201-1762202,1762204,1762208,1762288,1762296,1762324,1762348,1762353,1762362,1762374,1762492,1762503,1762505,1762541,1762608,1762710,1762753,1762766,1762769,1762944,1762947,1762953,1763167,1763179,1763232,1763259,1763271-1763272,1763276-1763277,1763319-1763320,1763370,1763372,1763375,1763377,1763393,1763412,1763430,1763450,1763462,1763505,1763511-1763512,1763516,1763518,1763520,

[Bug 60362] Missing reason phrase in response

2017-05-03 Thread bugzilla
https://bz.apache.org/bugzilla/show_bug.cgi?id=60362

--- Comment #59 from mgrigorov  ---
(In reply to thorsten.meinl from comment #58)
> Even if this change doesn't break clients it will give a very bad impression
> to users. For example if you use Java to issue HTTP request and and error
> was returned by the server, the exception message reads "Server returned
> error 404: Not Found" (or similar). Even for uses not knowing the HTTP

$ http http://localhost:8080/aaa
HTTP/1.1 404 
Content-Language: en
Content-Length: 1073
Content-Type: text/html;charset=utf-8
Date: Wed, 03 May 2017 18:35:43 GMT


Those are the response headers returned by Tomcat. 
The client may add "null", emojis, unicorns, ... and Tomcat (or any server) is
not to blame here!


> status code the "Not Found" is descriptive. Therefore I guess many Java
> applications displays the exception message as is. With Tomcat 8.5 the

No! It seems your client shows something it just made up!

> exception message is "Server returned error 404: null". Normal users don't
> have clue any more what's going on and even for programmers this more looks
> like a NullPointerException somewhere deep in the code. In order to restore
> a good user experience you now have to interpret the exception messages and
> create new ones for every possible status code.

Well, the HTTP protocol is pretty old! The error codes are very well known.
If a developer is confused that 404 may mean 500 then I think the time spend on
debugging this problem will be very well spend time in education! This
developer will learn something that will be very useful for him/her for the
rest of his/her career!
If a software (i.e. non-human) makes the mistake then it is really a bug in
this client software. Old clients can use old servers. Tomcat 8.5.x will be
maintained for several more years. Just switch the property on and continue.

> 
> Therefore my question is: why on earth has the reason phrase been removed in
> the first place? In order to save a few bytes of traffic?

The simple answer is that the HTTP specification has been updated. HTTP2 is all
about improvements and optimizations. And this is one of them.
Few bytes here, few bytes there and my web app can serve few more
hundreds/thousands users more!

-- 
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: r1793711 - in /tomcat/trunk: java/org/apache/coyote/http2/Http2UpgradeHandler.java webapps/docs/changelog.xml

2017-05-03 Thread markt
Author: markt
Date: Wed May  3 20:42:26 2017
New Revision: 1793711

URL: http://svn.apache.org/viewvc?rev=1793711&view=rev
Log: (empty)

Modified:
tomcat/trunk/java/org/apache/coyote/http2/Http2UpgradeHandler.java
tomcat/trunk/webapps/docs/changelog.xml

Modified: tomcat/trunk/java/org/apache/coyote/http2/Http2UpgradeHandler.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/http2/Http2UpgradeHandler.java?rev=1793711&r1=1793710&r2=1793711&view=diff
==
--- tomcat/trunk/java/org/apache/coyote/http2/Http2UpgradeHandler.java 
(original)
+++ tomcat/trunk/java/org/apache/coyote/http2/Http2UpgradeHandler.java Wed May  
3 20:42:26 2017
@@ -601,8 +601,10 @@ class Http2UpgradeHandler extends Abstra
 }
 }
 
-// Add date header unless the application has already set one
-if (headers.getValue("date") == null) {
+
+// Add date header unless it is an informational response or the
+// application has already set one
+if (statusCode >= 200 && headers.getValue("date") == null) {
 
headers.addValue("date").setString(FastHttpDateFormat.getCurrentDate());
 }
 }

Modified: tomcat/trunk/webapps/docs/changelog.xml
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/changelog.xml?rev=1793711&r1=1793710&r2=1793711&view=diff
==
--- tomcat/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/trunk/webapps/docs/changelog.xml Wed May  3 20:42:26 2017
@@ -122,6 +122,10 @@
 60970: Extend the fix for large headers to push requests.
 (markt)
   
+  
+Do not include a Date header in HTTP/2 reponses with 
status
+codes less than 200. (markt)
+  
 
   
   



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



svn commit: r1793712 - in /tomcat/trunk: java/javax/el/ImportHandler.java webapps/docs/changelog.xml

2017-05-03 Thread violetagg
Author: violetagg
Date: Wed May  3 20:47:41 2017
New Revision: 1793712

URL: http://svn.apache.org/viewvc?rev=1793712&view=rev
Log:
Fix https://bz.apache.org/bugzilla/show_bug.cgi?id=61065
Ensure that once the class is resolved by it will be cached with the proper 
name.

Modified:
tomcat/trunk/java/javax/el/ImportHandler.java
tomcat/trunk/webapps/docs/changelog.xml

Modified: tomcat/trunk/java/javax/el/ImportHandler.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/javax/el/ImportHandler.java?rev=1793712&r1=1793711&r2=1793712&view=diff
==
--- tomcat/trunk/java/javax/el/ImportHandler.java (original)
+++ tomcat/trunk/java/javax/el/ImportHandler.java Wed May  3 20:47:41 2017
@@ -152,7 +152,7 @@ public class ImportHandler {
 if (className != null) {
 Class clazz = findClass(className, true);
 if (clazz != null) {
-clazzes.put(className, clazz);
+clazzes.put(name, clazz);
 return clazz;
 }
 }

Modified: tomcat/trunk/webapps/docs/changelog.xml
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/changelog.xml?rev=1793712&r1=1793711&r2=1793712&view=diff
==
--- tomcat/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/trunk/webapps/docs/changelog.xml Wed May  3 20:47:41 2017
@@ -135,6 +135,11 @@
 bytes used to detect the encoding since they are not part of a BOM.
 (markt)
   
+  
+61065: Ensure that once the class is resolved by
+javax.el.ImportHandler#resolveClass it will be cached with
+the proper name. (violetagg)
+  
 
   
   



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



svn commit: r1793714 - in /tomcat/tc8.5.x/trunk: ./ java/javax/el/ImportHandler.java webapps/docs/changelog.xml

2017-05-03 Thread violetagg
Author: violetagg
Date: Wed May  3 20:54:08 2017
New Revision: 1793714

URL: http://svn.apache.org/viewvc?rev=1793714&view=rev
Log:
Fix https://bz.apache.org/bugzilla/show_bug.cgi?id=61065
Ensure that once the class is resolved it will be cached with the proper name.

Modified:
tomcat/tc8.5.x/trunk/   (props changed)
tomcat/tc8.5.x/trunk/java/javax/el/ImportHandler.java
tomcat/tc8.5.x/trunk/webapps/docs/changelog.xml

Propchange: tomcat/tc8.5.x/trunk/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed May  3 20:54:08 2017
@@ -1 +1 @@
-/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,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,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,1747404,1747506,1747
 
536,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-1756289,1756408-1
 
756410,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-1762053,1762123,176216
 
8,1762172,1762182,1762201-1762202,1762204,1762208,1762288,1762296,1762324,1762348,1762353,1762362,1762374,1762492,1762503,1762505,1762541,1762608,1762710,1762753,1762766,1762769,1762944,1762947,1762953,1763167,1763179,1763232,1763259,1763271-1763272,1763276-1763277,1763319-1763320,1763370,1763372,1763375,1763377,1763393,1763412,1763430,1763450,1763462,1763505,17635

svn commit: r1793715 - in /tomcat/tc8.0.x/trunk: ./ java/javax/el/ImportHandler.java webapps/docs/changelog.xml

2017-05-03 Thread violetagg
Author: violetagg
Date: Wed May  3 20:56:39 2017
New Revision: 1793715

URL: http://svn.apache.org/viewvc?rev=1793715&view=rev
Log:
Fix https://bz.apache.org/bugzilla/show_bug.cgi?id=61065
Ensure that once the class is resolved it will be cached with the proper name.

Modified:
tomcat/tc8.0.x/trunk/   (props changed)
tomcat/tc8.0.x/trunk/java/javax/el/ImportHandler.java
tomcat/tc8.0.x/trunk/webapps/docs/changelog.xml

Propchange: tomcat/tc8.0.x/trunk/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed May  3 20:56:39 2017
@@ -1,2 +1,2 @@
 
/tomcat/tc8.5.x/trunk:1735042,1737966,1743139-1743140,1744151,1747537,1747925,1748002,1754614,1754643,1762124,1762183,1762203,1763792,1772948,1777014,1779719,1782037,1782240,1782386-1782387,1785669,1786845,1788249,1788324,1788905,1789216,1789335,1791528,1791558
-/tomcat/trunk:1636524,1637156,1637176,1637188,1637331,1637684,1637695,1637890,1637892,1638720-1638725,1639653,1640010,1640083-1640084,1640088,1640275,1640322,1640347,1640361,1640365,1640403,1640410,1640652,1640655-1640658,1640688,1640700-1640883,1640903,1640976,1640978,1641000,1641026,1641038-1641039,1641051-1641052,1641058,1641064,1641300,1641369,1641374,1641380,1641486,1641634,1641656-1641692,1641704,1641707-1641718,1641720-1641722,1641735,1641981,1642233,1642280,1642554,1642564,1642595,1642606,1642668,1642679,1642697,1642699,1642766,1643002,1643045,1643054-1643055,1643066,1643121,1643128,1643206,1643209-1643210,1643216,1643249,1643270,1643283,1643309-1643310,1643323,1643365-1643366,1643370-1643371,1643465,1643474,1643536,1643570,1643634,1643649,1643651,1643654,1643675,1643731,1643733-1643734,1643761,1643766,1643814,1643937,1643963,1644017,1644169,1644201-1644203,1644321,1644323,1644516,1644523,1644529,1644535,1644730,1644768,1644784-1644785,1644790,1644793,1644815,1644884,1644886
 
,1644890,1644892,1644910,1644924,1644929-1644930,1644935,1644989,1645011,1645247,1645355,1645357-1645358,1645455,1645465,1645469,1645471,1645473,1645475,1645486-1645488,1645626,1645641,1645685,1645743,1645763,1645951-1645953,1645955,1645993,1646098-1646106,1646178,1646220,1646302,1646304,1646420,1646470-1646471,1646476,1646559,1646717-1646723,1646773,1647026,1647042,1647530,1647655,1648304,1648815,1648907,1649973,1650081,1650365,1651116,1651120,1651280,1651470,1652938,1652970,1653041,1653471,1653550,1653574,1653797,1653815-1653816,1653819,1653840,1653857,1653888,1653972,1654013,1654030,1654050,1654123,1654148,1654159,1654513,1654515,1654517,1654522,1654524,1654725,1654735,1654766,1654785,1654851-1654852,1654978,1655122-1655124,1655126-1655127,1655129-1655130,1655132-1655133,1655312,1655351,1655438,1655441,1655454,168,1656087,1656299,1656319,1656331,1656345,1656350,1656590,1656648-1656650,1656657,1657041,1657054,1657374,1657492,1657510,1657565,1657580,1657584,1657586,1657589,1657
 
592,1657607,1657609,1657682,1657907,1658207,1658734,1658781,1658790,1658799,1658802,1658804,1658833,1658840,1658966,1659043,1659053,1659059,1659174,1659184,1659188-1659189,1659216,1659263,1659293,1659304,1659306-1659307,1659382,1659384,1659428,1659471,1659486,1659505,1659516,1659521,1659524,1659559,1659562,1659803,1659806,1659814,1659833,1659862,1659905,1659919,1659948,1659967,1659983-1659984,1660060,1660074,1660077,1660133,1660168,1660331-1660332,1660353,1660358,1660924,1661386,1661770,1661867,1661972,1661990,1662200,1662308-1662309,1662548,1662614,1662696,1662736,1662985,1662988-1662989,1663264,1663277,1663298,1663534,1663562,1663676,1663715,1663754,1663768,1663772,1663781,1663893,1663995,1664143,1664163,1664174,1664301,1664317,1664347,1664657,1664659,1664710,1664863-1664864,1664866,1665085,1665292,1665559,1665653,1665661,1665672,1665694,1665697,1665736,1665779,1665976-1665977,1665980-1665981,1665985-1665986,1665989,1665998,1666004,1666008,1666013,1666017,1666024,1666116,1666386-1
 
666387,1666494,1666496,1666552,1666569,1666579,137,149,1666757,1666966,1666972,1666985,1666995,1666997,1667292,1667402,1667406,1667546,1667615,1667630,1667636,1667688,1667764,1667871,1668026,1668135,1668193,1668593,1668596,1668630,1668639,1668843,1669353,1669370,1669451,1669800,1669838,1669876,1669882,1670394,1670433,1670591,1670598-1670600,1670610,1670631,1670719,1670724,1670726,1670730,1670940,1671112,1672272,1672284,1673754,1674294,1675461,1675486,1675594,1675830,1676231,1676250-1676251,1676364,1676381,1676393,1676479,1676525,1676552,1676615,1676630,1676634,1676721,1676926,1676943,1677140,1677802,1678011,1678162,1678174,1678339,1678426-1678427,1678694,1678701,1679534,1679708,1679710,1679716,1680034,1680246,1681056,1681123,1681138,1681280,1681283,1681286,1681450,1681697,1681699,1681701,1681729,1681770,1681779,1681793,1681807,1681837-1681838,1681854,1681862,1681958,1682028,1682033,1682311,1682315,1682317,1682320,1682324,1682330,1682842,1684172,1684366,1684383,1684526-168452
 
7,1684549-1684550,1685556,1685591,1685739,1685744,1685772,1685816,1685826,1685891,1687242,1687261,1

buildbot failure in on tomcat-trunk

2017-05-03 Thread buildbot
The Buildbot has detected a new failure on builder tomcat-trunk while building 
. Full details are available at:
https://ci.apache.org/builders/tomcat-trunk/builds/2364

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] 1793711
Blamelist: markt

BUILD FAILED: failed compile_1

Sincerely,
 -The Buildbot




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



svn commit: r1793716 - in /tomcat/trunk/java/org/apache/coyote/http2: Http2AsyncUpgradeHandler.java Http2UpgradeHandler.java Stream.java

2017-05-03 Thread markt
Author: markt
Date: Wed May  3 20:59:53 2017
New Revision: 1793716

URL: http://svn.apache.org/viewvc?rev=1793716&view=rev
Log:
Refactor towards a single method for writing headers.

Modified:
tomcat/trunk/java/org/apache/coyote/http2/Http2AsyncUpgradeHandler.java
tomcat/trunk/java/org/apache/coyote/http2/Http2UpgradeHandler.java
tomcat/trunk/java/org/apache/coyote/http2/Stream.java

Modified: 
tomcat/trunk/java/org/apache/coyote/http2/Http2AsyncUpgradeHandler.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/http2/Http2AsyncUpgradeHandler.java?rev=1793716&r1=1793715&r2=1793716&view=diff
==
--- tomcat/trunk/java/org/apache/coyote/http2/Http2AsyncUpgradeHandler.java 
(original)
+++ tomcat/trunk/java/org/apache/coyote/http2/Http2AsyncUpgradeHandler.java Wed 
May  3 20:59:53 2017
@@ -133,7 +133,7 @@ public class Http2AsyncUpgradeHandler ex
 
 
 @Override
-void writeHeaders(Stream stream, Response coyoteResponse, int payloadSize)
+void writeHeaders(Stream stream, Response coyoteResponse, boolean 
endOfStream, int payloadSize)
 throws IOException {
 if (log.isDebugEnabled()) {
 log.debug(sm.getString("upgradeHandler.writeHeaders", connectionId,
@@ -144,8 +144,6 @@ public class Http2AsyncUpgradeHandler ex
 return;
 }
 
-prepareHeaders(coyoteResponse);
-
 boolean first = true;
 State state = null;
 ArrayList bufs = new ArrayList<>();
@@ -160,7 +158,7 @@ public class Http2AsyncUpgradeHandler ex
 if (first) {
 first = false;
 header[3] = FrameType.HEADERS.getIdByte();
-if (stream.getOutputBuffer().hasNoBody()) {
+if (endOfStream) {
 header[4] = FLAG_END_OF_STREAM;
 }
 } else {
@@ -194,6 +192,10 @@ public class Http2AsyncUpgradeHandler ex
 stream.getIdentifier(), Integer.toString(pushedStreamId)));
 }
 
+if (!stream.canWrite()) {
+return;
+}
+
 boolean first = true;
 State state = null;
 ArrayList bufs = new ArrayList<>();

Modified: tomcat/trunk/java/org/apache/coyote/http2/Http2UpgradeHandler.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/http2/Http2UpgradeHandler.java?rev=1793716&r1=1793715&r2=1793716&view=diff
==
--- tomcat/trunk/java/org/apache/coyote/http2/Http2UpgradeHandler.java 
(original)
+++ tomcat/trunk/java/org/apache/coyote/http2/Http2UpgradeHandler.java Wed May  
3 20:59:53 2017
@@ -49,8 +49,6 @@ import org.apache.coyote.http2.Http2Pars
 import org.apache.juli.logging.Log;
 import org.apache.juli.logging.LogFactory;
 import org.apache.tomcat.util.codec.binary.Base64;
-import org.apache.tomcat.util.http.FastHttpDateFormat;
-import org.apache.tomcat.util.http.MimeHeaders;
 import org.apache.tomcat.util.net.AbstractEndpoint.Handler.SocketState;
 import org.apache.tomcat.util.net.SSLSupport;
 import org.apache.tomcat.util.net.SocketEvent;
@@ -524,7 +522,7 @@ class Http2UpgradeHandler extends Abstra
 }
 }
 
-void writeHeaders(Stream stream, Response coyoteResponse, int payloadSize)
+void writeHeaders(Stream stream, Response coyoteResponse, boolean 
endOfStream, int payloadSize)
 throws IOException {
 if (log.isDebugEnabled()) {
 log.debug(sm.getString("upgradeHandler.writeHeaders", connectionId,
@@ -535,8 +533,6 @@ class Http2UpgradeHandler extends Abstra
 return;
 }
 
-prepareHeaders(coyoteResponse);
-
 byte[] header = new byte[9];
 ByteBuffer target = ByteBuffer.allocate(payloadSize);
 boolean first = true;
@@ -551,7 +547,7 @@ class Http2UpgradeHandler extends Abstra
 if (first) {
 first = false;
 header[3] = FrameType.HEADERS.getIdByte();
-if (stream.getOutputBuffer().hasNoBody()) {
+if (endOfStream) {
 header[4] = FLAG_END_OF_STREAM;
 }
 } else {
@@ -582,34 +578,6 @@ class Http2UpgradeHandler extends Abstra
 }
 
 
-protected void prepareHeaders(Response coyoteResponse) {
-MimeHeaders headers = coyoteResponse.getMimeHeaders();
-int statusCode = coyoteResponse.getStatus();
-
-// Add the pseudo header for status
-headers.addValue(":status").setString(Integer.toString(statusCode));
-
-// Check to see if a response body is present
-if (!(statusCode < 200 || statusCode == 205 || statusCode == 304)) {
-String contentType = coyoteResponse.getContentType();
-if (contentType != null) {
-head

[Bug 61065] ImportHandler is using the wrong key to cache resolved classes

2017-05-03 Thread bugzilla
https://bz.apache.org/bugzilla/show_bug.cgi?id=61065

Violeta Georgieva  changed:

   What|Removed |Added

 Status|NEW |RESOLVED
 Resolution|--- |FIXED

--- Comment #1 from Violeta Georgieva  ---
Hi,

Thanks for the report.
The fix was committed in:
- trunk for 9.0.0.M21 onwards
- 8.5.x for 8.5.15 onwards
- 8.0.x for 8.0.44 onwards

Regards,
Violeta

-- 
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: r1793719 - /tomcat/trunk/test/org/apache/coyote/http2/TestHttp2Section_8_1.java

2017-05-03 Thread markt
Author: markt
Date: Wed May  3 21:19:36 2017
New Revision: 1793719

URL: http://svn.apache.org/viewvc?rev=1793719&view=rev
Log:
100-Continue response no longer has a date header

Modified:
tomcat/trunk/test/org/apache/coyote/http2/TestHttp2Section_8_1.java

Modified: tomcat/trunk/test/org/apache/coyote/http2/TestHttp2Section_8_1.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/coyote/http2/TestHttp2Section_8_1.java?rev=1793719&r1=1793718&r2=1793719&view=diff
==
--- tomcat/trunk/test/org/apache/coyote/http2/TestHttp2Section_8_1.java 
(original)
+++ tomcat/trunk/test/org/apache/coyote/http2/TestHttp2Section_8_1.java Wed May 
 3 21:19:36 2017
@@ -114,7 +114,6 @@ public class TestHttp2Section_8_1 extend
 
 Assert.assertEquals("3-HeadersStart\n" +
 "3-Header-[:status]-[100]\n" +
-"3-Header-[date]-["+ DEFAULT_DATE + "]\n" +
 "3-HeadersEnd\n",
 output.getTrace());
 output.clearTrace();



-
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

2017-05-03 Thread buildbot
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/2367

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] 1793719
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



[Bug 60362] Missing reason phrase in response

2017-05-03 Thread bugzilla
https://bz.apache.org/bugzilla/show_bug.cgi?id=60362

--- Comment #60 from Mark Thomas  ---
To provide a some context / background.

7.0.x, 8.0.x always send the reason phrase
8.5.x does not send the reason phrase by default but can be configured to do so
9.0.x does not send the reason phrase and can not be configured to do so

Based on the typical lifetime of Tomcat release branches (roughly a decade or a
little over and seemingly getting longer) there will be a Tomcat version
(8.5.x) that can provide a reason phrase for at least 6 years, probably longer.

There were multiple reasons for dropping the reason phrase in 9.0.x:
- RFC 7230 states that clients SHOULD ignore it and therefore why bother
sending it
- HTTP/2 doesn't support the reason phrase at all
- It has always (going back to at least RFC 2616) been optional - i.e. spec
compliant clients should accept a zero length reason phrase
- It does save a few bytes although this will be in the noise for most users
- It allowed a little complexity to be removed (the possibility of custom
reason phrases and ensuring that they were safe) from the processing of every
request. This will be in the noise for most users.

Generally, the view was (and is) that the change is beneficial for the majority
of spec compliant clients and for those clients that can't handle a missing
reason phrase there is a viable option (8.5.x) for a relatively (in IT terms)
long period.

On a related point, it is worth noting that, as a result of vulnerabilities
such as CVE-2016-6816, Tomcat, and HTTP servers generally, are becoming more
strict in what will be accepted. Clients that do not follow the relevant
specifications and cannot be easily fixed when problems are identified are
likely to become increasingly problematic.

-- 
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 60362] Missing reason phrase in response

2017-05-03 Thread bugzilla
https://bz.apache.org/bugzilla/show_bug.cgi?id=60362

--- Comment #61 from Ralph Moser  ---
Ok. 
You have the code to add the reason phrase. It's in contrast to headers not
easily fixable in most reverse proxies. Why aren't you just keeping the option
to add it? We have 3000 devices out there which rely on the reason phrase. Yes
we could update them but it's cumbersome. You know embedded developers? They
don't read standards. They just tailor their firmware to the servers. 
Your next argument is that you are going to provide maintenance forever for
8.5. That's great but we may want to use new features. Also we regularly
upgrade our spring boot version which also updates Tomcat.

-- 
You are receiving this mail because:
You are the assignee for the bug.
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org



Re: Release plans

2017-05-03 Thread Mark Thomas
On 02/05/17 18:03, Mark Thomas wrote:
> Hi all,
> 
> A new month has started so I'm intending to do a 9.0.x and 8.5.x release
> fairly soon. There are a couple of issues that I think need to be
> resolved first:
> 
> - https://bz.apache.org/bugzilla/show_bug.cgi?id=61057 (ECJ)
> - https://bz.apache.org/bugzilla/show_bug.cgi?id=61003 (WebSocket)
> - Trailer header support (Servlet 4.0)
> 
> I'm currently expecting to be able to tag some time in the next 12 to 48
> hours depending on how work on those issues progresses.

FYI, response trailer header support and HTTP/2 is taking me a little
longer than expected. I'm trying to reduce some code duplication so we
don't end up with 6 copies of nearly identical code.

Mark


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



[Bug 60362] Missing reason phrase in response

2017-05-03 Thread bugzilla
https://bz.apache.org/bugzilla/show_bug.cgi?id=60362

--- Comment #62 from mgrigorov  ---
(In reply to Ralph Moser from comment #61)
> Your next argument is that you are going to provide maintenance forever for
> 8.5. That's great but we may want to use new features. Also we regularly

How your old embedded devices will use the new features (e.g. HTTP2 features)
without being upgraded ? You will need HTTP2 enabled client in the embedded
device!
If you are going to update the client then it is a perfect time to relax the
check for the reason phrase!

> upgrade our spring boot version which also updates Tomcat.

The version of the dependencies in Spring Boot applications is *very* easy to
control with Maven/Gradle properties/settings! I.e. in your application!

Tomcat 9 won't be released until Java EE 8 / Servlet 4.0 is released. So this
will take a while!
But even when Tomcat 9 is released 
1) Spring Boot won't upgrade to it immediately. They will wait for a while so
any newly introduced bugs are flushed.
2) you will be still able to use 8.5.x by overriding the version

-- 
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: r1793736 - in /tomcat/trunk: conf/web.xml webapps/docs/changelog.xml

2017-05-03 Thread violetagg
Author: violetagg
Date: Thu May  4 06:13:03 2017
New Revision: 1793736

URL: http://svn.apache.org/viewvc?rev=1793736&view=rev
Log:
Fix https://bz.apache.org/bugzilla/show_bug.cgi?id=61047
Add MIME mapping for woff2 fonts in the default web.xml. Patch provided by 
Justin Williamson.

Modified:
tomcat/trunk/conf/web.xml
tomcat/trunk/webapps/docs/changelog.xml

Modified: tomcat/trunk/conf/web.xml
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/conf/web.xml?rev=1793736&r1=1793735&r2=1793736&view=diff
==
--- tomcat/trunk/conf/web.xml (original)
+++ tomcat/trunk/conf/web.xml Thu May  4 06:13:03 2017
@@ -4310,6 +4310,10 @@
 application/x-font-woff
 
 
+woff2
+font/woff2
+
+
 wpd
 application/vnd.wordperfect
 

Modified: tomcat/trunk/webapps/docs/changelog.xml
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/changelog.xml?rev=1793736&r1=1793735&r2=1793736&view=diff
==
--- tomcat/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/trunk/webapps/docs/changelog.xml Thu May  4 06:13:03 2017
@@ -108,6 +108,10 @@
 Update the Servlet 4.0 implementation to add support for obtaining
 trailer fields from chunked HTTP requests. (markt)
   
+  
+61047: Add MIME mapping for woff2 fonts in the default
+web.xml. Patch provided by Justin Williamson. (violetagg)
+  
 
   
   



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



svn commit: r1793737 - in /tomcat/tc8.5.x/trunk: ./ conf/web.xml webapps/docs/changelog.xml

2017-05-03 Thread violetagg
Author: violetagg
Date: Thu May  4 06:17:53 2017
New Revision: 1793737

URL: http://svn.apache.org/viewvc?rev=1793737&view=rev
Log:
Fix https://bz.apache.org/bugzilla/show_bug.cgi?id=61047
Add MIME mapping for woff2 fonts in the default web.xml. Patch provided by 
Justin Williamson.

Modified:
tomcat/tc8.5.x/trunk/   (props changed)
tomcat/tc8.5.x/trunk/conf/web.xml
tomcat/tc8.5.x/trunk/webapps/docs/changelog.xml

Propchange: tomcat/tc8.5.x/trunk/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu May  4 06:17:53 2017
@@ -1 +1 @@
-/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,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,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,1747404,1747506,1747
 
536,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-1756289,1756408-1
 
756410,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-1762053,1762123,176216
 
8,1762172,1762182,1762201-1762202,1762204,1762208,1762288,1762296,1762324,1762348,1762353,1762362,1762374,1762492,1762503,1762505,1762541,1762608,1762710,1762753,1762766,1762769,1762944,1762947,1762953,1763167,1763179,1763232,1763259,1763271-1763272,1763276-1763277,1763319-1763320,1763370,1763372,1763375,1763377,1763393,1763412,1763430,1763450,1763462,1763505,1763511-1

svn commit: r1793738 - in /tomcat/tc8.0.x/trunk: ./ conf/web.xml webapps/docs/changelog.xml

2017-05-03 Thread violetagg
Author: violetagg
Date: Thu May  4 06:20:44 2017
New Revision: 1793738

URL: http://svn.apache.org/viewvc?rev=1793738&view=rev
Log:
Fix https://bz.apache.org/bugzilla/show_bug.cgi?id=61047
Add MIME mapping for woff2 fonts in the default web.xml. Patch provided by 
Justin Williamson.

Modified:
tomcat/tc8.0.x/trunk/   (props changed)
tomcat/tc8.0.x/trunk/conf/web.xml
tomcat/tc8.0.x/trunk/webapps/docs/changelog.xml

Propchange: tomcat/tc8.0.x/trunk/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu May  4 06:20:44 2017
@@ -1,2 +1,2 @@
 
/tomcat/tc8.5.x/trunk:1735042,1737966,1743139-1743140,1744151,1747537,1747925,1748002,1754614,1754643,1762124,1762183,1762203,1763792,1772948,1777014,1779719,1782037,1782240,1782386-1782387,1785669,1786845,1788249,1788324,1788905,1789216,1789335,1791528,1791558
-/tomcat/trunk:1636524,1637156,1637176,1637188,1637331,1637684,1637695,1637890,1637892,1638720-1638725,1639653,1640010,1640083-1640084,1640088,1640275,1640322,1640347,1640361,1640365,1640403,1640410,1640652,1640655-1640658,1640688,1640700-1640883,1640903,1640976,1640978,1641000,1641026,1641038-1641039,1641051-1641052,1641058,1641064,1641300,1641369,1641374,1641380,1641486,1641634,1641656-1641692,1641704,1641707-1641718,1641720-1641722,1641735,1641981,1642233,1642280,1642554,1642564,1642595,1642606,1642668,1642679,1642697,1642699,1642766,1643002,1643045,1643054-1643055,1643066,1643121,1643128,1643206,1643209-1643210,1643216,1643249,1643270,1643283,1643309-1643310,1643323,1643365-1643366,1643370-1643371,1643465,1643474,1643536,1643570,1643634,1643649,1643651,1643654,1643675,1643731,1643733-1643734,1643761,1643766,1643814,1643937,1643963,1644017,1644169,1644201-1644203,1644321,1644323,1644516,1644523,1644529,1644535,1644730,1644768,1644784-1644785,1644790,1644793,1644815,1644884,1644886
 
,1644890,1644892,1644910,1644924,1644929-1644930,1644935,1644989,1645011,1645247,1645355,1645357-1645358,1645455,1645465,1645469,1645471,1645473,1645475,1645486-1645488,1645626,1645641,1645685,1645743,1645763,1645951-1645953,1645955,1645993,1646098-1646106,1646178,1646220,1646302,1646304,1646420,1646470-1646471,1646476,1646559,1646717-1646723,1646773,1647026,1647042,1647530,1647655,1648304,1648815,1648907,1649973,1650081,1650365,1651116,1651120,1651280,1651470,1652938,1652970,1653041,1653471,1653550,1653574,1653797,1653815-1653816,1653819,1653840,1653857,1653888,1653972,1654013,1654030,1654050,1654123,1654148,1654159,1654513,1654515,1654517,1654522,1654524,1654725,1654735,1654766,1654785,1654851-1654852,1654978,1655122-1655124,1655126-1655127,1655129-1655130,1655132-1655133,1655312,1655351,1655438,1655441,1655454,168,1656087,1656299,1656319,1656331,1656345,1656350,1656590,1656648-1656650,1656657,1657041,1657054,1657374,1657492,1657510,1657565,1657580,1657584,1657586,1657589,1657
 
592,1657607,1657609,1657682,1657907,1658207,1658734,1658781,1658790,1658799,1658802,1658804,1658833,1658840,1658966,1659043,1659053,1659059,1659174,1659184,1659188-1659189,1659216,1659263,1659293,1659304,1659306-1659307,1659382,1659384,1659428,1659471,1659486,1659505,1659516,1659521,1659524,1659559,1659562,1659803,1659806,1659814,1659833,1659862,1659905,1659919,1659948,1659967,1659983-1659984,1660060,1660074,1660077,1660133,1660168,1660331-1660332,1660353,1660358,1660924,1661386,1661770,1661867,1661972,1661990,1662200,1662308-1662309,1662548,1662614,1662696,1662736,1662985,1662988-1662989,1663264,1663277,1663298,1663534,1663562,1663676,1663715,1663754,1663768,1663772,1663781,1663893,1663995,1664143,1664163,1664174,1664301,1664317,1664347,1664657,1664659,1664710,1664863-1664864,1664866,1665085,1665292,1665559,1665653,1665661,1665672,1665694,1665697,1665736,1665779,1665976-1665977,1665980-1665981,1665985-1665986,1665989,1665998,1666004,1666008,1666013,1666017,1666024,1666116,1666386-1
 
666387,1666494,1666496,1666552,1666569,1666579,137,149,1666757,1666966,1666972,1666985,1666995,1666997,1667292,1667402,1667406,1667546,1667615,1667630,1667636,1667688,1667764,1667871,1668026,1668135,1668193,1668593,1668596,1668630,1668639,1668843,1669353,1669370,1669451,1669800,1669838,1669876,1669882,1670394,1670433,1670591,1670598-1670600,1670610,1670631,1670719,1670724,1670726,1670730,1670940,1671112,1672272,1672284,1673754,1674294,1675461,1675486,1675594,1675830,1676231,1676250-1676251,1676364,1676381,1676393,1676479,1676525,1676552,1676615,1676630,1676634,1676721,1676926,1676943,1677140,1677802,1678011,1678162,1678174,1678339,1678426-1678427,1678694,1678701,1679534,1679708,1679710,1679716,1680034,1680246,1681056,1681123,1681138,1681280,1681283,1681286,1681450,1681697,1681699,1681701,1681729,1681770,1681779,1681793,1681807,1681837-1681838,1681854,1681862,1681958,1682028,1682033,1682311,1682315,1682317,1682320,1682324,1682330,1682842,1684172,1684366,1684383,1684526-168452
 
7,1684549-1684550,1685556,1685591,1685739,1685744,1685772,1685816,1685826,1685891,1687242,1687261,16872

svn commit: r1793739 - in /tomcat/tc7.0.x/trunk: ./ conf/web.xml webapps/docs/changelog.xml

2017-05-03 Thread violetagg
Author: violetagg
Date: Thu May  4 06:26:09 2017
New Revision: 1793739

URL: http://svn.apache.org/viewvc?rev=1793739&view=rev
Log:
Fix https://bz.apache.org/bugzilla/show_bug.cgi?id=61047
Add MIME mapping for woff2 fonts in the default web.xml. Patch provided by 
Justin Williamson.

Modified:
tomcat/tc7.0.x/trunk/   (props changed)
tomcat/tc7.0.x/trunk/conf/web.xml
tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml

Propchange: tomcat/tc7.0.x/trunk/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu May  4 06:26:09 2017
@@ -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,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,1702739,1702
 
742,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,1725974,1
 
726171-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,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
 
/tomcat/tc8.5.x/trunk:1735579,1736839,1737199,1737966,1738042,1738044,1738162,1738165,1738178,1739157,1739173,1739177,1739476,1740132,1740521,1740536,1740804,1740811,1740981,1741165,1741174,1741182,1741191,1741203,1741209,1741226,1741233,1741410,1742277,1743118,1743126,1743139-1743140,1743718,1743722,1743724,1744059,1744127,1744151,1744232,1744377,1744687,1744698,1744706,1745228,1746940,1748548,1748716,1749288,1749375,1749668-1749669,1750016,1750057,1750976,1751000,1751062,1751098

[Bug 61047] Missing MIME type for woff2 fonts

2017-05-03 Thread bugzilla
https://bz.apache.org/bugzilla/show_bug.cgi?id=61047

Violeta Georgieva  changed:

   What|Removed |Added

 Resolution|--- |FIXED
 Status|NEW |RESOLVED

--- Comment #4 from Violeta Georgieva  ---
Hi,

Thanks for the report and the patches.
The fix was committed in:
- trunk for 9.0.0.M21 onwards
- 8.5.x for 8.5.15 onwards
- 8.0.x for 8.0.44 onwards
- 7.0.x for 7.0.78 onwards

Regards,
Violeta

-- 
You are receiving this mail because:
You are the assignee for the bug.
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org



Re: Release plans

2017-05-03 Thread Violeta Georgieva
Hi,

2017-05-04 1:10 GMT+03:00 Mark Thomas :
>
> On 02/05/17 18:03, Mark Thomas wrote:
> > Hi all,
> >
> > A new month has started so I'm intending to do a 9.0.x and 8.5.x release
> > fairly soon. There are a couple of issues that I think need to be
> > resolved first:
> >
> > - https://bz.apache.org/bugzilla/show_bug.cgi?id=61057 (ECJ)
> > - https://bz.apache.org/bugzilla/show_bug.cgi?id=61003 (WebSocket)

I can handle these bug reports if you did start to fix them.

Regards,
Violeta

> > - Trailer header support (Servlet 4.0)
> >
> > I'm currently expecting to be able to tag some time in the next 12 to 48
> > hours depending on how work on those issues progresses.
>
> FYI, response trailer header support and HTTP/2 is taking me a little
> longer than expected. I'm trying to reduce some code duplication so we
> don't end up with 6 copies of nearly identical code.
>
> Mark
>
>
> -
> To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
> For additional commands, e-mail: dev-h...@tomcat.apache.org
>


Re: Release plans

2017-05-03 Thread Violeta Georgieva
2017-05-04 9:33 GMT+03:00 Violeta Georgieva :
>
> Hi,
>
> 2017-05-04 1:10 GMT+03:00 Mark Thomas :
> >
> > On 02/05/17 18:03, Mark Thomas wrote:
> > > Hi all,
> > >
> > > A new month has started so I'm intending to do a 9.0.x and 8.5.x
release
> > > fairly soon. There are a couple of issues that I think need to be
> > > resolved first:
> > >
> > > - https://bz.apache.org/bugzilla/show_bug.cgi?id=61057 (ECJ)
> > > - https://bz.apache.org/bugzilla/show_bug.cgi?id=61003 (WebSocket)
>
> I can handle these bug reports if you did start to fix them.

I meant "didn't start ..."

>
> Regards,
> Violeta
>
> > > - Trailer header support (Servlet 4.0)
> > >
> > > I'm currently expecting to be able to tag some time in the next 12 to
48
> > > hours depending on how work on those issues progresses.
> >
> > FYI, response trailer header support and HTTP/2 is taking me a little
> > longer than expected. I'm trying to reduce some code duplication so we
> > don't end up with 6 copies of nearly identical code.
> >
> > Mark
> >
> >
> > -
> > To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
> > For additional commands, e-mail: dev-h...@tomcat.apache.org
> >