Commit Graph

3335 Commits

Author SHA1 Message Date
Jan Bartel 70961bc53b Merge remote-tracking branch 'origin/master' into jetty-8 2012-01-10 18:23:55 +11:00
Jan Bartel 31bd00ab79 Merge branch 'master' of ssh://git.eclipse.org/gitroot/jetty/org.eclipse.jetty.project 2012-01-10 17:47:46 +11:00
Jan Bartel e4123d5d48 368215 Remove debug from jaspi 2012-01-10 17:47:14 +11:00
Jan Bartel 1fbec51c8a Merge remote-tracking branch 'origin/master' into jetty-8 2012-01-10 16:08:59 +11:00
Jesse McConnell 083c793b1c http-spi is 1.6 compiler required for the interface when its part of the jvm being used for environment 2012-01-09 15:18:25 -06:00
Jesse McConnell e0f117f2a8 resolve another maven warning 2012-01-09 15:16:59 -06:00
Jesse McConnell 0fa4fa9b23 clean up some warnings from maven 2012-01-09 14:57:21 -06:00
Simone Bordet 829686f1e1 Removed JDK 1.6-ism. 2012-01-09 21:51:15 +01:00
Simone Bordet 27cbf0bf78 367099 - Upgrade jetty-websocket for RFC 6455 - Addendum.
The WebSocket parser was forgot in the renaming.
Took also the chance to remove hardcoded "D13" string in toString() methods.
2012-01-09 20:27:46 +01:00
Simone Bordet 71ea564f0b 368189 - WebSocketClientFactory should not manage external thread pool. 2012-01-09 20:15:22 +01:00
Greg Wilkins 44fca44ddc Merge branch 'master' of ssh://git.eclipse.org/gitroot/jetty/org.eclipse.jetty.project 2012-01-09 13:18:57 +11:00
Jan Bartel 8222ef815c 368114 Protect against non-Strings in System properties for Log 2012-01-09 13:12:25 +11:00
Thomas Becker 9ba96f22dd 367974: Calculate wait times, etc. based on MAX_IDLE_TIME 2012-01-09 11:42:26 +11:00
Greg Wilkins 2451614381 366774 removed XSS vulnerbility 2012-01-09 11:38:07 +11:00
Thomas Becker c88a4551ae 366774: NumberFormatException when parsing Host header now causes a 400 return code 2012-01-09 11:33:06 +11:00
Thomas Becker bbaef55bd6 366774: Request.java code format 2012-01-09 11:31:11 +11:00
Greg Wilkins 58c57a9ea0 367635: report errors 2012-01-09 11:24:25 +11:00
Thomas Becker 48438dc914 367635: Add test for parsing start.d files, small changes 2012-01-09 11:23:24 +11:00
Greg Wilkins 90e9358ea5 367716 simplified maxIdleTime logic 2012-01-09 11:16:30 +11:00
Jan Bartel 6e3c8094f1 368112 NPE on <jsp-config><taglib> element parsing web.xml 2012-01-09 11:07:41 +11:00
Greg Wilkins 588b068c06 replaced break in finally with progres=false 2012-01-09 08:53:19 +11:00
Simone Bordet 69675d4d19 365048 - jetty Http client does not send proxy authentication when requesting a Https-resource through a web-proxy. 2012-01-06 16:19:05 +01:00
Thomas Becker 2fa5a63f3c 365048: Fix proxy issue. http-client dropped authentication header on connect requests before
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2012-01-06 15:56:15 +01:00
Thomas Becker 9e4fd4d385 365411: removed trailing whitespaces in ProxyServlet
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2012-01-06 15:46:31 +01:00
Thomas Becker 5e18130854 365411: Removed static logger from ProxyServlet
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2012-01-06 15:46:23 +01:00
Simone Bordet e666ed67cb 368035 - WebSocketClientFactory does not invoke super.doStop(). 2012-01-06 15:41:55 +01:00
Joakim Erdfelt df1e7f497b Merge branch 'release' 2012-01-05 10:55:05 -07:00
Joakim Erdfelt 505a76df05 Updating VERSION.txt top section 2012-01-05 10:54:42 -07:00
Joakim Erdfelt 51e3af89b8 [maven-release-plugin] prepare for next development iteration 2012-01-05 09:49:38 -07:00
Joakim Erdfelt 10d751fed8 [maven-release-plugin] prepare release jetty-7.6.0.RC3 2012-01-05 09:49:31 -07:00
Joakim Erdfelt bbe48ddfbb Updating version jetty-7.6.0.RC3 in VERSION.txt 2012-01-05 09:26:44 -07:00
Joakim Erdfelt 5115f6097c Merge branch 'master' into release 2012-01-05 09:24:51 -07:00
Thomas Becker 07afebafe5 367716: maxIdleTime fixes
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2012-01-05 13:31:36 +01:00
Thomas Becker d6e841beae 367716: maxIdleTime fixes for async http and new maxIdleTime tests
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2012-01-05 13:31:24 +01:00
Simone Bordet 06f0498a48 Made tests more reliable by waiting for the websocket connection to be established
and for onOpen() to be called.
2012-01-03 12:15:51 +01:00
Jan Bartel e7b787996f Fix build. 2012-01-02 08:26:29 +11:00
Jan Bartel 0ebd3d636b Merge remote-tracking branch 'origin/master' into bug-359329 2012-01-01 17:29:29 +11:00
Greg Wilkins 3141b50fa0 Merge remote-tracking branch 'origin/master' into jetty-8 2011-12-30 20:19:39 +11:00
Greg Wilkins d0cef1160c Merge branch 'jetty-8' of ssh://git.eclipse.org/gitroot/jetty/org.eclipse.jetty.project into jetty-8 2011-12-30 20:18:58 +11:00
Greg Wilkins 085c79d7d6 637638 limit number of form parameters to avoid DOS 2011-12-30 12:00:18 +11:00
Greg Wilkins f62c6edcb9 367635 Added support for start.d directory 2011-12-30 09:43:20 +11:00
Greg Wilkins 009f8176a1 JETTY-1467 close half closed when idle 2011-12-28 23:09:33 +11:00
Greg Wilkins 2b54d45280 367435 improved D00 test harness 2011-12-28 13:35:44 +11:00
Greg Wilkins ed5059bddc 367591 corrected configuration.xml version to 7.6 2011-12-28 11:22:08 +11:00
Greg Wilkins b35b3ec668 367591 Added Env element to XmlConfiguration 2011-12-28 11:13:15 +11:00
hmalphettes 4f8cff8ccd bug 367548 the nested package must not be imported twice in jetty-osgi-boot 2011-12-27 07:59:13 +08:00
Simone Bordet 3a1aff9221 Using a random port for the tests. 2011-12-23 23:59:05 +01:00
Simone Bordet 9e6dcc1c11 Restored constructor that was removed, used in CometD. 2011-12-23 23:54:55 +01:00
Simone Bordet 3cda41248e 367502 - WebSocket connections should be closed when application context is stopped. 2011-12-23 23:43:02 +01:00
Simone Bordet 62f47e0617 367502 - WebSocket connections should be closed when application context is stopped. 2011-12-23 17:20:57 +01:00