Joakim Erdfelt
8a72a153a1
Merge branch 'jetty-9.2.x'
2014-10-28 12:32:55 -07:00
Joakim Erdfelt
264e0bce39
Revert "Moving HttpTester to "tests" scoped jetty-http artifact."
...
This reverts commit 8d85940077
.
2014-10-28 07:50:56 -07:00
Greg Wilkins
31e448ffd6
Removed duplication of HttpGenerator$Info vs http.MetaData
...
Use MetaData throughout code base
2014-10-24 15:51:20 +11:00
Greg Wilkins
738c47bc55
447515 Remove GzipFilter
...
Moved all usages of GzipFilter to GzipHandler
added support to ServerContextHandler to create a GzipHandler
2014-10-24 08:17:05 +11:00
Greg Wilkins
ec79a6f88e
Improve HTTP header pre-encoding
...
The HttpContent class has been reworked to store HttpField instances, we may be generated on
demand or instances of PreEncodedHttpField.
The encoding of HTTP2 fields has been generalized to handle both indexed and literal fields, selected
by header enum set.
Default servlet and response classes have been cleaned up in how they set response headers.
2014-10-16 12:31:37 +11:00
Simone Bordet
fb590a5fff
Fixed merge conflict.
2014-10-13 17:10:03 +02:00
Simone Bordet
e7d830c26e
Merged branch 'jetty-9.2.x' into 'master'.
2014-10-13 16:57:52 +02:00
Joakim Erdfelt
8d85940077
Moving HttpTester to "tests" scoped jetty-http artifact.
...
+ HttpTester, a testing class, was used by jetty-servlets,
embedded-jetty-examples, and test-integration, all from
those testing scopes. Moved the HttpTester into the
pre-existing jetty-http "tests" classified artifact.
2014-10-13 07:35:12 -07:00
Joakim Erdfelt
1511be8c97
Committing proper testcase for bug 440823
2014-10-11 22:51:15 -07:00
Greg Wilkins
a94e0287b9
446559 Avoid spin consuming extra data
2014-10-10 22:30:54 +11:00
Greg Wilkins
bb2d77f00b
Merge remote-tracking branch 'origin/jetty-9.2.x'
2014-10-10 14:20:30 +11:00
Greg Wilkins
cd15bb187d
446559 Avoid spin consuming extra data
2014-10-10 13:16:41 +11:00
Jan Bartel
f07387c703
442942 Content sent with status 204 (No Content)
2014-10-10 12:58:45 +11:00
Greg Wilkins
40a7d5984e
444222 replace CRLF in header values with whitespace rather than ?
2014-09-23 11:33:44 +02:00
Greg Wilkins
28cc68b210
444222 replace CRLF in header values with whitespace rather than ?
2014-09-19 09:49:09 +10:00
Greg Wilkins
2018098225
Merge remote-tracking branch 'origin/jetty-9.2.x'
...
Conflicts:
jetty-io/src/main/java/org/eclipse/jetty/io/ssl/SslConnection.java
2014-09-18 16:36:51 +10:00
Greg Wilkins
88f4e5ab86
444222 added explicit folded header test
2014-09-18 14:36:24 +10:00
Greg Wilkins
5b97d652e1
Merge remote-tracking branch 'origin/master' into jetty-http2
...
Conflicts:
jetty-alpn/jetty-alpn-server/src/main/config/modules/protonego-impl/alpn.mod
jetty-http/src/main/java/org/eclipse/jetty/http/HttpParser.java
jetty-npn/jetty-npn-server/src/main/config/modules/protonego-impl/npn.mod
jetty-spdy/spdy-http-server/src/main/java/org/eclipse/jetty/spdy/server/http/HttpChannelOverSPDY.java
2014-09-04 17:43:18 +10:00
Greg Wilkins
ed8abd1d53
443049 Improved HttpParser illegal character messages
2014-09-04 09:27:42 +10:00
Greg Wilkins
e5c1d66916
avoid default port in http2 push
2014-08-22 16:25:20 +10:00
Greg Wilkins
98b654ba20
Merge remote-tracking branch 'origin/master' into jetty-http2
...
Conflicts:
jetty-distribution/pom.xml
2014-08-14 08:38:25 +10:00
Greg Wilkins
2af613a28b
improved debugging output
2014-08-13 15:56:02 +10:00
Greg Wilkins
68a3ca8e31
improved debug logging of settings
2014-08-13 12:00:32 +10:00
Greg Wilkins
4d7ead76ce
basic push cache filter
2014-08-08 17:01:05 +10:00
Greg Wilkins
a4d4b3ab57
fix work around classloaders for field preencoders
2014-08-07 09:22:22 +10:00
Greg Wilkins
64e49a1fe5
work around classloaders for field preencoders
2014-08-07 09:10:35 +10:00
Greg Wilkins
17f46665df
preencoded httpfield optimisation
2014-08-06 21:09:26 +10:00
Greg Wilkins
b5971484a5
Basic push mechanism skeleton
2014-08-06 10:50:55 +10:00
Greg Wilkins
8108a811f0
extra HttpFields tests
2014-08-06 10:15:55 +10:00
Greg Wilkins
a00e65cb1f
optimised HttpFields fixes
2014-08-05 17:43:31 +10:00
Greg Wilkins
bec34b460f
optimised HttpFields
2014-08-05 17:26:27 +10:00
Greg Wilkins
d7f2c42e2d
misc optimisation of http2 field creation
2014-08-05 12:55:37 +10:00
Greg Wilkins
1fb07644a1
Use HttpHeader enum for :path and similar h2 fields
2014-08-02 16:37:43 +10:00
Greg Wilkins
cd59d0085e
improve known header handling in hpack encoding
2014-08-02 15:40:15 +10:00
Greg Wilkins
9c3eedfea8
Updates to hpack for hpack-09 draft
2014-07-31 13:26:23 +10:00
Greg Wilkins
a14b2be0e6
Merge branch 'jetty-http2' into refset
2014-07-31 11:58:30 +10:00
Greg Wilkins
8905b979ec
RFC7238 Permanent Redirect 308 defined
2014-07-28 15:27:17 +10:00
Greg Wilkins
093eea62b9
Revert "RFC7238 Permanent Redirect 308 defined"
...
This reverts commit 5d289c0a7b
.
Keep RFC723x changes in 9.3 branch
2014-07-28 15:24:44 +10:00
Greg Wilkins
5d289c0a7b
RFC7238 Permanent Redirect 308 defined
2014-07-28 14:58:03 +10:00
Greg Wilkins
c13be6d932
Merge branch 'jetty-http2' into refset
...
Conflicts:
jetty-http2/http2-hpack/src/test/java/org/eclipse/jetty/http2/hpack/HpackEncoderTest.java
2014-07-25 18:33:10 +10:00
Greg Wilkins
eaf374fa58
refactored Dispatcher for new HttpURI
2014-07-25 17:28:35 +10:00
Greg Wilkins
22e57ef7b7
refactored Request to use new HttpURI
2014-07-25 15:03:51 +10:00
Greg Wilkins
30123607c6
Major refactor of metadata and HttpURI
...
This refactor strives to remove duplication between the Metadata class and the HttpURI class.
Both classes have been made mutable (as they partially were anyway so best not to pretend).
HttpURI now holds the decomposed strings rather than a single string with indexes. This allows it to be rebuilt after changing just parts of the URI. It is now a lot more similar to the
JVM URI class and we could consider replacing it (after checking peformance).
Next step is to refactor the Request class to prevent it duplicating these fields.
2014-07-24 15:49:52 +10:00
Greg Wilkins
7f62f2600b
refactored URI handling
2014-07-20 10:23:47 +10:00
Greg Wilkins
d4e7c0a279
update encoding strategy for no ref-set
2014-07-18 15:59:41 +10:00
Greg Wilkins
64e5c1e0ce
Merge remote-tracking branch 'origin/master' into jetty-http2
2014-07-17 11:32:27 +10:00
Joakim Erdfelt
cecb8d6d04
Minor typo fix
2014-07-17 08:31:08 +10:00
Greg Wilkins
6893027ecd
Merge remote-tracking branch 'origin/master' into jetty-http2
...
Conflicts:
jetty-http/src/main/java/org/eclipse/jetty/http/HttpParser.java
jetty-server/src/main/java/org/eclipse/jetty/server/Request.java
2014-07-16 17:23:29 +10:00
Greg Wilkins
5f033b48d5
438204 leave IPv6 addresses [] wrapped in getServerName
2014-07-16 16:39:02 +10:00
Greg Wilkins
4d2a580c2c
439375 preferred rfc7231 format is mime;charset=lowercase-9
2014-07-11 17:56:08 +10:00
Greg Wilkins
f9ffefbe13
refactored to avoid copying MetaData.Request instances
2014-07-11 16:35:25 +10:00
Greg Wilkins
fff2dd2f2d
misc test fixes for rfc7230 issues
2014-07-11 16:10:06 +10:00
Greg Wilkins
f594a6fc66
HttpField.contains ignores ;q=0 items
2014-07-11 16:08:18 +10:00
Greg Wilkins
5e281dd449
Merge remote-tracking branch 'origin/master' into jetty-http2
...
Conflicts:
jetty-util/src/main/java/org/eclipse/jetty/util/IteratingCallback.java
2014-07-10 14:43:39 +10:00
Greg Wilkins
55ca09a00e
438190 findbug improvements
2014-07-10 14:41:32 +10:00
Greg Wilkins
068ec21419
438204 getServerName returns IPv6 addresses wrapped in []
2014-07-09 16:44:34 +10:00
Greg Wilkins
42e1a60d65
438204 getServerName returns IPv6 addresses wrapped in []
2014-07-09 14:38:06 +10:00
Greg Wilkins
c8ee504291
rfc7230 ignore null value headers
2014-07-03 15:53:12 +10:00
Simone Bordet
66f3913527
Merged branch 'origin/master' into 'jetty-http2'.
2014-06-25 12:34:19 +02:00
Simone Bordet
3ff4195dbc
Guarded calls to LOG.debug() with if (LOG.isDebugEnabled()) to reduce allocation of varargs Object[].
2014-06-25 12:26:45 +02:00
Greg Wilkins
f93a409589
Merge remote-tracking branch 'origin/master' into jetty-http2
2014-06-24 17:33:51 +02:00
Greg Wilkins
28ad689bcb
437996 avoid async status race by not setting 200 on handled
2014-06-24 12:27:03 +02:00
Greg Wilkins
9acf971cc1
cache path URI in table
2014-06-18 15:26:33 +02:00
Greg Wilkins
7fa4f1e9f8
cleaned up authority handling
2014-06-17 19:40:09 +02:00
Greg Wilkins
3fcb910c1a
improved HttpField.contains
2014-06-17 19:02:53 +02:00
Simone Bordet
3832a8645d
Properly implemented hashCode() and equals().
2014-06-17 18:52:42 +02:00
Simone Bordet
2b494fde0e
Miscellaneous refactorings.
2014-06-17 16:23:06 +02:00
Greg Wilkins
85cb290e1c
minor clean ups
2014-06-17 15:39:55 +02:00
Greg Wilkins
0539b48b8a
nicer constructors
2014-06-17 15:28:40 +02:00
Greg Wilkins
25295456ae
renamed HTTP/2.0 to HTTP/2
2014-06-17 00:12:57 +02:00
Greg Wilkins
272e1d8da5
Refactored HttpChannel to not have direct HttpParser dependency
2014-06-17 00:02:50 +02:00
Simone Bordet
adaeeefe32
Merged branch 'master' into 'jetty-http2'.
2014-06-16 16:08:40 +02:00
Greg Wilkins
1666f54b50
revert httpfields
2014-06-11 17:41:52 +02:00
Greg Wilkins
c319c19125
convert MetaData to HttpField as a list
2014-06-11 16:53:17 +02:00
Greg Wilkins
bbd61f8e19
Multiple mixed in changes and improvements
...
Simplified HttpParser as per rfc7230
implemented local/remote hpack max table sizes
2014-06-11 15:16:40 +02:00
Jan Bartel
144a460407
436894 GzipFilter code cleanup
2014-06-10 16:28:45 +02:00
Greg Wilkins
3c321e9b8f
split authority field and hold results in header table
2014-06-09 15:34:09 +02:00
Greg Wilkins
b2296cc2d4
simplified startRequest
2014-06-09 14:12:46 +02:00
Greg Wilkins
58ed30e710
header table mostly functional
2014-06-08 11:10:34 +02:00
Greg Wilkins
d19eef3403
more tests
2014-06-04 12:05:31 +02:00
Jesse McConnell
5e3e0930e0
Revert "434810 better handling of bad messages"
...
This reverts commit 1e524f378e
.
2014-05-26 11:20:07 -05:00
Greg Wilkins
1e524f378e
434810 better handling of bad messages
2014-05-21 20:13:21 +02:00
Simone Bordet
43454ebd0a
Merged branch 'master' into '431642'.
2014-04-30 15:34:54 +02:00
Simone Bordet
95c6bad654
Improved handling of return values from parser callback, by returning
...
as early as possible to avoid race conditions with application code
that may have returned true and reentered the parsing code.
2014-04-30 14:58:14 +02:00
Greg Wilkins
2e261b75d6
433692 improved buffer resizing
2014-04-29 20:36:13 +02:00
Greg Wilkins
4785121a53
431642 Allow for immediate return from content callback in HttpParser
2014-04-10 12:59:07 +10:00
Greg Wilkins
4dbabd72f2
429734 Implemented the HA ProxyProtocol
2014-04-04 08:47:37 +11:00
Simone Bordet
1089a33578
Fixed imports referencing JUnit 3 and old matcher libraries.
2014-03-27 15:34:48 +01:00
Greg Wilkins
31a377d829
425991 added qml mime type
2014-03-20 12:49:49 +11:00
Greg Wilkins
f092561a8a
428383 limit white space between requests
2014-02-18 10:02:00 +11:00
Simone Bordet
3486046f1e
426870 - HTTP 1.0 Request with Connection: keep-alive and response
...
content hangs.
Refactored tests.
2014-01-29 18:26:32 +01:00
Simone Bordet
cbdfd87d78
426870 - HTTP 1.0 Request with Connection: keep-alive and response
...
content hangs.
Fixed HttpGenerator to stay in the EOF_CONTENT mode if such case is
detected (while before it was moving to NO_CONTENT mode).
By staying in EOF_CONTENT mode the generator is made non-persistent
and eventually the connection is closed, signaling the end-of-content
to the client.
2014-01-29 11:20:00 +01:00
Joakim Erdfelt
5ed1a9dfb4
Adding parameterized version of HttpGeneratorServerTest.testHTTP()
2014-01-28 11:57:44 -07:00
Simone Bordet
7ce6aee304
426739 - Response with Connection: keep-alive truncated.
...
Fixed copy/paste error.
Also removed unnecessary constant.
2014-01-27 18:57:24 +01:00
Simone Bordet
a22cfbd885
425049 - add json mime mapping to mime.properties.
2014-01-07 21:46:22 +01:00
Joakim Erdfelt
a12fd9ea03
Happy New Year - 2014!
2014-01-02 14:50:14 -07:00
Greg Wilkins
084ed61711
423695 - <HT> Horizontal-tab used as HTTP Header Field separator unsupported
...
Added tests to confirm that multivalue parsing is OK
2013-12-12 15:15:54 +11:00
Joakim Erdfelt
3eb959a1e2
423695 - <HT> Horizontal-tab used as HTTP Header Field separator unsupported
...
+ Adding suggested fix to HttpParser
2013-12-10 06:58:00 -07:00
Joakim Erdfelt
a345bdf4ff
423695 - <HT> Horizontal-tab used as HTTP Header Field separator unsupported
...
+ Adding @Ignore'd testcase HttpParserTest.testHeaderTab()
2013-12-10 06:31:56 -07:00
Greg Wilkins
f1fc661a2c
reenabled integration and RFC2616 tests
2013-11-29 17:33:05 +11:00