495 Commits

Author SHA1 Message Date
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
Greg Wilkins
8adf552c80 418888 Added strict mode to HttpGenerator 2013-11-22 22:54:09 +11:00
Greg Wilkins
f567bddad9 global clean up imports 2013-11-04 13:48:03 +11:00
Greg Wilkins
eb3bb660b5 Merge remote-tracking branch 'origin/master' into jetty-9.1
Conflicts:
	jetty-client/src/main/java/org/eclipse/jetty/client/util/DigestAuthentication.java
	jetty-client/src/test/java/org/eclipse/jetty/client/HttpReceiverTest.java
	jetty-client/src/test/java/org/eclipse/jetty/client/HttpSenderTest.java
	jetty-http/src/main/java/org/eclipse/jetty/http/HttpField.java
	jetty-server/src/test/java/org/eclipse/jetty/server/AbstractHttpTest.java
	jetty-servlets/src/test/java/org/eclipse/jetty/servlets/AbstractDoSFilterTest.java
	jetty-spdy/spdy-core/src/main/java/org/eclipse/jetty/spdy/generator/HeadersBlockGenerator.java
	jetty-spdy/spdy-core/src/main/java/org/eclipse/jetty/spdy/parser/HeadersBlockParser.java
	jetty-websocket/websocket-client/src/main/java/org/eclipse/jetty/websocket/client/ClientUpgradeRequest.java
	jetty-websocket/websocket-common/src/main/java/org/eclipse/jetty/websocket/common/WebSocketFrame.java
	jetty-websocket/websocket-common/src/main/java/org/eclipse/jetty/websocket/common/WebSocketSession.java
	jetty-websocket/websocket-common/src/test/java/org/eclipse/jetty/websocket/common/extensions/compress/DeflateCompressionMethodTest.java
	jetty-websocket/websocket-common/src/test/java/org/eclipse/jetty/websocket/common/extensions/compress/PerMessageDeflateExtensionTest.java
2013-11-03 18:22:09 +11:00
Mikhail Mazursky
6b0269a16d [Bug 420930] Use Charset to specify character encoding
Signed-off-by: Mikhail Mazursky <mikhail.mazursky@gmail.com>
2013-11-02 14:44:36 +06:00
Greg Wilkins
d5f83a8159 420034 Removed threads/timers from Date caching 2013-10-24 11:09:17 +11:00
Greg Wilkins
cd1035d1d6 minor code cleanups 2013-10-21 16:30:22 +11:00
Greg Wilkins
33e2055468 minor code cleanups 2013-10-21 15:50:22 +11:00
Greg Wilkins
82a991dd07 Merge remote-tracking branch 'origin/master' into jetty-9.1 2013-10-21 12:32:54 +11:00
Greg Wilkins
24c1b30495 418732 - Add whiteListByPath mode to IPAccessHandler
Fixed the contribution.

The PathMap changes were not correct as "" is the pattern for "/" path only.
Also removed the use of the lazy list
2013-10-21 12:20:34 +11:00
Joakim Erdfelt
dbc4f5357a Merge fixes
+ @Ignore on PathMapTest
2013-10-18 16:12:19 -07:00
Joakim Erdfelt
d6d54e048b Merge branch 'master' into jetty-9.1
Conflicts:
	jetty-server/src/main/java/org/eclipse/jetty/server/HttpChannel.java
	jetty-servlet/src/main/java/org/eclipse/jetty/servlet/ErrorPageErrorHandler.java
	jetty-websocket/websocket-client/src/main/java/org/eclipse/jetty/websocket/client/io/UpgradeConnection.java
	jetty-websocket/websocket-client/src/test/java/org/eclipse/jetty/websocket/client/WebSocketClientTest.java
	jetty-websocket/websocket-server/src/test/java/org/eclipse/jetty/websocket/server/AnnotatedMaxMessageSizeTest.java
2013-10-18 16:12:00 -07:00
Constantine Linnick
b4052a2b53 [Bug 418732] Swap PathMap with IPAddressMap, also fix PathMap initialization bug
Signed-off-by: Constantine Linnick <theaspect@gmail.com>
2013-10-18 01:05:44 -04:00
Greg Wilkins
f3b393aa5d Refactored complexity out of HttpFields
In preparation of merging Fields class and supporting HTTP/2.0 HPACK
2013-10-17 21:35:11 +11:00
Greg Wilkins
0fd656dcbe Merge remote-tracking branch 'origin/master' into jetty-9.1 2013-09-30 13:20:54 +10:00
Greg Wilkins
a59439241f 418227 Null cookie value test 2013-09-30 12:59:34 +10:00
Joakim Erdfelt
ac40e7ab6a Fixing various javadoc errors 2013-09-25 08:11:32 -07:00
Greg Wilkins
4708c907c1 417284 Precompiled regex in HttpField 2013-09-23 15:19:41 +10:00
Greg Wilkins
843e94e4e0 Merge remote-tracking branch 'origin/master' into jetty-9.1
Conflicts:
	jetty-server/src/test/java/org/eclipse/jetty/server/RequestTest.java
2013-09-09 17:11:38 +10:00
Greg Wilkins
e2e1b47edf 416015 Handle null Accept-Language and other headers 2013-09-09 16:51:37 +10:00
Greg Wilkins
070ce9dd22 Merge remote-tracking branch 'origin/master' into jetty-9.1
Conflicts:
	jetty-start/src/main/java/org/eclipse/jetty/start/Main.java
	jetty-webapp/src/main/java/org/eclipse/jetty/webapp/WebAppContext.java
2013-09-09 15:41:17 +10:00
Mikhail Mazursky
767faece5c [Bug 415999] Fix some of FindBugs warnings
Mostly not closed streams/DB resources are fixed. But also less
important things.

Signed-off-by: Mikhail Mazursky <mikhail.mazursky@gmail.com>
2013-09-09 00:24:31 -04:00
Jan Bartel
cdd95bb551 Merge remote-tracking branch 'origin/jetty-8' 2013-09-09 12:42:56 +10:00
Jan Bartel
11085742c8 416787 StringIndexOutOfBounds with a pathMap of "" 2013-09-09 12:41:28 +10:00
Jan Bartel
67bdc29b9b 416787 StringIndexOutOfBounds with a pathMap of "" 2013-09-09 12:30:52 +10:00
Simone Bordet
400f0ce5a2 Made remove() methods return the removed value. 2013-09-08 23:02:24 +02:00
Simone Bordet
8422dd5b1a Relaxed accessibility modifiers of a few methods to support FCGI
parsing, and introduced method setResponseStatus(int) to set the
response status programmatically (since in FCGI the response line does
not exist and therefore it is not parsed).
2013-09-03 16:10:07 +02:00
Greg Wilkins
44b07f44bb Merge remote-tracking branch 'origin/master' into jetty-9.1 2013-08-15 10:01:19 +10:00
Greg Wilkins
89f927ad0f 414898 Only upgrade v0 to v1 cookies on dquote , ; backslash space and tab in the value 2013-08-15 09:11:41 +10:00
Joakim Erdfelt
aef8071d1d Fixing malformed Javadoc warnings in jetty-http 2013-08-14 12:46:25 -07:00
Greg Wilkins
1e25778d57 Merge remote-tracking branch 'origin/master' into jetty-9.1
Conflicts:
	jetty-http/src/main/java/org/eclipse/jetty/http/HttpParser.java
	jetty-server/src/test/java/org/eclipse/jetty/server/HttpServerTestBase.java
2013-08-13 00:44:39 +10:00
Greg Wilkins
43946c62e0 414449 Added HttpParser strict mode for case sensitivity 2013-08-12 23:02:08 +10:00
Greg Wilkins
009113aacb 414640 HTTP header value encoding
fixed issues with merge
2013-08-09 16:31:11 +10:00