Eclipse
/
jetty.project
mirror of https://github.com/jetty/jetty.project.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
7,129 Commits 70 Branches 462 Tags 370 MiB
Commit Graph

7129 Commits

Author SHA1 Message Date
Greg Wilkins 4e4ffaa54c Merge remote-tracking branch 'origin/master' into servlet-3.1-api 
Conflicts:
	jetty-server/src/main/java/org/eclipse/jetty/server/HttpChannelState.java
	jetty-server/src/main/java/org/eclipse/jetty/server/HttpOutput.java
 2013-06-17 16:29:39 +10:00
Greg Wilkins 6ed36160f0 410893 async support defaults to false for spec created servlets and filters 
fixed up continuations for differen isAsyncStarted behaviour
 2013-06-17 16:03:41 +10:00
Greg Wilkins d6d5c04273 410893 async support defaults to false for spec created servlets and filters 2013-06-17 14:47:55 +10:00
Greg Wilkins 65a7f9f279 Merge remote-tracking branch 'origin/jetty-8' 
Conflicts:
	jetty-servlet/src/main/java/org/eclipse/jetty/servlet/FilterHolder.java
	jetty-servlet/src/main/java/org/eclipse/jetty/servlet/ServletHandler.java
 2013-06-17 14:46:10 +10:00
Jan Bartel 2ea7843d86 Merge remote-tracking branch 'origin/jetty-8' 2013-06-17 14:39:17 +10:00
Greg Wilkins 9bf7870c7c 410893 async support defaults to false for spec created servlets and filters 2013-06-17 14:21:53 +10:00
Jan Bartel 1908fff38f Merge remote-tracking branch 'origin/jetty-7' into jetty-8 2013-06-17 14:11:46 +10:00
Jan Bartel 59889bc149 Merge branch 'master' of ssh://git.eclipse.org/gitroot/jetty/org.eclipse.jetty.project 2013-06-17 13:17:14 +10:00
Jan Bartel 232eb4491a Merge remote-tracking branch 'origin/jetty-8' 
Conflicts:
	jetty-server/src/main/java/org/eclipse/jetty/server/handler/ContextHandler.java
	jetty-servlet/src/main/java/org/eclipse/jetty/servlet/ServletContextHandler.java
	jetty-servlet/src/main/java/org/eclipse/jetty/servlet/ServletHandler.java
	jetty-webapp/src/main/java/org/eclipse/jetty/webapp/WebAppContext.java
 2013-06-17 13:13:59 +10:00
Greg Wilkins 3ddb1d9727 Merge branch 'servlet-3.1-api' of ssh://git.eclipse.org/gitroot/jetty/org.eclipse.jetty.project into servlet-3.1-api 2013-06-17 11:25:45 +10:00
Greg Wilkins 969b90edeb extra test zip 2013-06-17 11:25:19 +10:00
Joakim Erdfelt 5c7f6937fd Giving a different test more time to complete on busy machines 2013-06-14 14:12:04 -07:00
Joakim Erdfelt 64a6d6f0bb Giving test more time to complete on busy machines 2013-06-14 13:45:24 -07:00
Joakim Erdfelt 0f6c7cdd69 Merge branch 'websocket-ssl' 2013-06-14 12:07:03 -07:00
Jesse McConnell 6c44b290a9 Add constructer fo fix broken test (suspect someone hasn't pushed) 2013-06-14 14:00:41 -05:00
Joakim Erdfelt 02de232411 405313 - Websocket client SSL hostname verification is broken, always defaults to raw IP as String 
+ After discussion with simone, we have changed from using IP address to
  hostnames in both websocket and spdy.
 2013-06-14 11:40:37 -07:00
Joakim Erdfelt d553f9f907 Making error message on Session.getRemote() more clear about connection state 2013-06-14 11:40:37 -07:00
Joakim Erdfelt b3c32651ff Merge branch 'master' into websocket-ssl 2013-06-14 11:40:02 -07:00
Joakim Erdfelt ce68faf9aa Reverting incompatible API change to WebSocketCreator. 
+ Added javadoc about casting of parameters and note about
  future change to API (possibly in 9.1)
 2013-06-14 11:39:14 -07:00
Joakim Erdfelt e4fb7fd397 Removing class that is annoying to simone. 2013-06-14 09:54:03 -07:00
Joakim Erdfelt 4a2b6ec596 405313 - Websocket client SSL hostname verification is broken, always defaults to raw IP as String 
+ After discussion with simone, we have changed from using IP address to
  hostnames in both websocket and spdy.
 2013-06-14 09:40:49 -07:00
Joakim Erdfelt f092eeb94c Making error message on Session.getRemote() more clear about connection state 2013-06-14 09:27:18 -07:00
Jesse McConnell 78cd94edb3 [Bug 396706] CGI support parameters 2013-06-14 11:24:30 -05:00
Thomas Becker e23bfc82bb spdy: uncomment pushStrategy in default config 2013-06-14 17:44:54 +02:00
Joakim Erdfelt 35bb3e5e14 Merge branch 'master' into websocket-ssl 2013-06-14 07:40:28 -07:00
Joakim Erdfelt f34ac9b920 Fixing parseProtocols 2013-06-14 07:40:02 -07:00
Thomas Becker 6d75e18661 410799 errors while creating push streams in HttpTransportOverSPDY are now logged to debug instead of warn 2013-06-14 13:27:16 +02:00
Joakim Erdfelt 83bd15559b Merge branch 'master' into websocket-ssl 
Conflicts:
	jetty-websocket/websocket-server/src/main/java/org/eclipse/jetty/websocket/server/ServletWebSocketRequest.java
 2013-06-13 16:05:26 -07:00
Joakim Erdfelt 762e91efbe Adding clirr to api-change profile 2013-06-13 16:04:17 -07:00
Marko Mihovilic 953ab44909 [Bug 410750] NoSQLSessions: implement session context data persistence across server restarts 2013-06-13 16:45:49 -05:00
Thomas Becker 391b0ee426 ChatServletTest fix test 2013-06-13 17:36:29 +02:00
Jesse McConnell a582b42d45 add logging properties for testing 2013-06-13 10:31:23 -05:00
Thomas Becker df17ef8b3a 408709 refactor test-webapp's chat application. Now there's only a single request for user login and initial chat message. 2013-06-13 16:58:57 +02:00
Jesse McConnell bd944080fc [Bug 397193] MongoSessionManager refresh updates last access time 2013-06-13 09:54:20 -05:00
Joakim Erdfelt b4913ef38c Fixing invalid <packaging> 2013-06-12 15:45:23 -07:00
Jesse McConnell f9e6cb932c [Bug 410630] MongoSessionManager conflicting session update op 2013-06-12 16:43:14 -05:00
Jesse McConnell eddb49941d [Bug 408600] set correct jetty.url in all pom files 2013-06-12 15:52:36 -05:00
Joakim Erdfelt a535381b53 410537 - Exceptions during @OnWebSocketConnect not reported to @OnWebSocketError 
+ Fixed EventDriver behavior with regards to unhandled throwables during
  calls to the various onMethod() calls
+ Adding testcase to verify intended behavior
 2013-06-12 11:05:01 -07:00
Joakim Erdfelt 9d89bc564e Adding StacklessLogging try-with-resources compatible convenience class 2013-06-12 11:04:00 -07:00
Joakim Erdfelt 5cd478c0fd 410522 - jetty start broken for command line options 
+ Adding tests for the different forms of property handling in start.jar
 2013-06-12 09:15:23 -07:00
Thomas Becker d93faf589c 409598 spdy: Fix NPE when a broken client tried to create duplicate stream IDs 2013-06-12 16:23:31 +02:00
Thomas Becker 9501ef3392 409796 fix intermittent test issue in ReferrerPushStrategy.testResourceOrder. Happened when the client got closed before the server finished sending all data frames. Client waits now until all data is received. 2013-06-12 10:54:57 +02:00
Thomas Becker f116d76290 410337 throw EofException instead of EOFException in HttpOutput.write() if HttpOutpyt is closed 2013-06-12 10:54:57 +02:00
Greg Wilkins 955e7e8d74 410559 Removed FillInterest race 2013-06-12 18:35:13 +10:00
Thomas Becker c5bf9c3d49 Increase buffer size of BufferUtil.writeTo to 4k 2013-06-12 08:43:25 +02:00
Jan Bartel 64d979a780 409449 Ensure servlets, filters and listeners added via dynamic registration, annotations or descriptors are cleaned on context restarts 2013-06-12 15:41:03 +10:00
Greg Wilkins 53270e7edb 410522 JETTY_PORT sets jetty.port property instead of -Djetty.port 2013-06-12 13:13:09 +10:00
Joakim Erdfelt a6f50006ee 410372 - Make SSL client certificate information available to server websockets 2013-06-11 12:51:53 -07:00
Joakim Erdfelt 7b79b4c5f9 410370 - WebSocketCreator.createWebSocket() should use servlet specific parameters 
+ Changing method signature of
  Object createWebSocket(UpgradeRequest req, UpgradeResponse resp)
    to
  Object createWebSocket(ServletUpgradeRequest req, ServletUpgradeResponse resp)
 2013-06-11 11:22:24 -07:00
Joakim Erdfelt 4cd1bd8ce4 Merge branch 'master' into websocket-ssl 2013-06-11 08:58:32 -07:00