Commit Graph

4913 Commits

Author SHA1 Message Date
Jesse McConnell 9315ed8b73 Merge branch 'master' of ssh://git.eclipse.org/gitroot/jetty/org.eclipse.jetty.project 2012-07-13 12:24:50 -05:00
Jesse McConnell 8ac5a2c488 Merge branch 'release' 2012-07-13 12:24:38 -05:00
Jesse McConnell 9353ef6461 reset for dev 2012-07-13 12:24:20 -05:00
Jesse McConnell 205e8f74f0 [maven-release-plugin] prepare for next development iteration 2012-07-13 10:20:48 -05:00
Jesse McConnell c3b5269d60 [maven-release-plugin] prepare release jetty-8.1.5.v20120713 2012-07-13 10:20:23 -05:00
Jesse McConnell cb9eaa7055 Merge branch 'jetty-8' into release-8 2012-07-13 09:54:53 -05:00
Jesse McConnell df4096245e fix api difference between jetty7 and jetty8 test 2012-07-13 09:52:32 -05:00
Thomas Becker 0fcb42e7bf spdy: add logging when ProxyEngineSelector resets a stream 2012-07-13 16:46:24 +02:00
Jesse McConnell 12ecc10c6a [maven-release-plugin] prepare for next development iteration 2012-07-13 09:35:08 -05:00
Jesse McConnell bf40110fb8 [maven-release-plugin] prepare release jetty-7.6.5.v20120713 2012-07-13 09:34:52 -05:00
Jesse McConnell 0d74198345 Updating VERSION.txt top section 2012-07-13 09:07:51 -05:00
Jesse McConnell bcd2d66907 Updating VERSION.txt top section 2012-07-13 09:07:50 -05:00
Jesse McConnell eedd4bfeef Merge branch 'jetty-8' into release-8 2012-07-13 09:06:26 -05:00
Jesse McConnell 108133bfe9 Merge branch 'master' into release 2012-07-13 09:06:07 -05:00
Jesse McConnell 5222459aa7 Merge branch 'master' into jetty-8 2012-07-13 09:05:05 -05:00
Joakim Erdfelt c7825731a7 Making DNS Hijacking more evident 2012-07-13 06:46:01 -07:00
Greg Wilkins acbf20af27 Merge branch 'jetty-9' of ssh://git.eclipse.org/gitroot/jetty/org.eclipse.jetty.project into jetty-9
Conflicts:
	jetty-websocket/websocket-core/src/main/java/org/eclipse/jetty/websocket/protocol/WebSocketFrame.java
2012-07-13 22:59:05 +10:00
Greg Wilkins e70df19248 jetty-9 progress on more unit tests 2012-07-13 22:55:40 +10:00
Simone Bordet c50e547152 384980 - Jetty client unable to recover from Time outs when connection count per address hits max.
Test that shows that upon initial investigation, HttpClient works well, contrary to what reported in the bug.
2012-07-13 14:17:44 +02:00
Thomas Becker 198f713f7d spdy: spdy-proxy refactoring to allow multiple ProxyEngine implementations for different protocols. Header name fix to lowercase header names before creating the bytes to sent over the wire. 2012-07-13 11:53:56 +02:00
Greg Wilkins b442fef60b fixed syntax error in config file 2012-07-13 06:14:21 +10:00
Joakim Erdfelt fc658c3805 Fixing NPE 2012-07-12 11:29:40 -07:00
Joakim Erdfelt b0549d8bf9 Introducing IncomingFrames and OutgoingFrames interfaces for everything to use, including Extensions 2012-07-12 11:21:35 -07:00
Simone Bordet 067fa669c4 384847 - CrossOriginFilter is not working.
Added parameter "forwardPreflight" defaulting to true, to configure
whether preflight requests should be forwarded to the application or not.
2012-07-12 19:27:48 +02:00
Simone Bordet 1843324bab Added support for X-Forwarded-For header. 2012-07-12 17:45:00 +02:00
Simone Bordet a7dab4bd2d Fixed spin loop caused by interaction of HttpGenerator._bypass and HttpGenerator.isBufferFull().
In HttpOutput.write(), an infinite spin loop was triggered when a previous write() set _bypass to true,
but _bypass was not reset after the write was complete. An additional write would have caused
a call to isBufferFull(), implemented in terms of _bypass, which would have returned true erroneously,
and this would have caused the infinite spin loop.
Now we properly reset _bypass when we fully write a data frame, so that isBufferFull() can properly
return false and allow for further writes.
2012-07-12 17:16:57 +02:00
Simone Bordet 0ad04eca6e Fixed test that was broken by changes to the pushed URI header in spdy/2. 2012-07-12 15:13:47 +02:00
Jan Bartel 3bcfc29469 384280 Implement preliminary ServletRegistrations 2012-07-12 16:27:26 +10:00
Joakim Erdfelt f4c0b376d6 Removing discouraged form of Generator constructor 2012-07-11 13:08:02 -07:00
Jesse McConnell ce2dc33a0a Merge branch 'master' into jetty-8 2012-07-11 14:06:11 -05:00
Jesse McConnell 81d72052c8 merged master to jetty-8 2012-07-11 14:04:49 -05:00
Joakim Erdfelt 03fa76d333 Adding more TODOs 2012-07-11 12:01:02 -07:00
Joakim Erdfelt be0c372cad Moving Parser and Generator into .protocol. package 2012-07-11 11:59:03 -07:00
Joakim Erdfelt 9986f43272 Fixing license headers 2012-07-11 11:57:31 -07:00
Joakim Erdfelt d3a7ddbef0 Fixing license headers 2012-07-11 11:53:19 -07:00
Joakim Erdfelt d7f3bbb260 Fixing build issue 2012-07-11 11:43:12 -07:00
Joakim Erdfelt 6757160a94 Starting to piece together the Extensions 2012-07-11 11:42:26 -07:00
Jesse McConnell 319d4bc66c quick pass through to clean up missing or incorrect license blocks 2012-07-11 12:41:34 -05:00
Jesse McConnell aa941f5711 quick pass through to clean up missing or incorrect license blocks 2012-07-11 12:29:46 -05:00
Joakim Erdfelt 0d1fee5906 Making BlockHeadClient timeouts more sane 2012-07-11 09:53:18 -07:00
Joakim Erdfelt d3b599d67c Attempting to get timeouts working 2012-07-11 09:47:10 -07:00
Joakim Erdfelt c8821605fe Fixing fill interested 2012-07-11 09:33:58 -07:00
Jesse McConnell 0fa17c13b1 Merge branch 'master' into jetty-8 2012-07-11 10:10:00 -05:00
Jesse McConnell 5aeca2a138 added missing headers for io classes 2012-07-10 17:28:53 -05:00
Jesse McConnell 5e723bc9db [Bug 376717] Balancer Servlet with round robin support, contribution, added missing license 2012-07-10 17:28:39 -05:00
Joakim Erdfelt 3ab8a0e5b7 Adding support to detect bad UTF-8 text message 2012-07-10 15:03:47 -07:00
Thomas SEGISMONT 13e010ddeb Add balancer servlet
Balancer Servlet tests

ProxyPassReverse first draft

ProxyPassReverse fix
2012-07-10 16:49:34 -05:00
Joakim Erdfelt 8aa6e5db9b Fixing WebSocketAsyncConnection.write() of byte[] arrays 2012-07-10 14:45:37 -07:00
Joakim Erdfelt 4fd7ff76fb Merge branch 'jetty-9' of ssh://git.eclipse.org/gitroot/jetty/org.eclipse.jetty.project into jetty-9 2012-07-10 14:34:05 -07:00
Joakim Erdfelt eb07c173ca Fixing some server tests 2012-07-10 14:33:50 -07:00