Eclipse/jetty.project
1
0
Fork 0
mirror of https://github.com/jetty/jetty.project.git synced 2025-02-24 16:35:03 +00:00
Code Issues Packages Projects Releases Wiki Activity
7,311 Commits 55 Branches 466 Tags
Commit Graph

7311 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Thomas Becker
beba00c5e0 410337 HttpOutput calls now HttpChannel.close() instead of closing the endPoint directly. That way the different implementations of HttpChannel can decide if the endPoint should be shutdown or not. 2013-06-11 16:17:15 +02:00
Jan Bartel
c5bdc019a2 409801 Jetty should allow webdefault to be specified using a relative location when running in OSGi 2013-06-11 18:39:15 +10:00
Greg Wilkins
6150f29382 Merge branch 'jetty-8' of ssh://git.eclipse.org/gitroot/jetty/org.eclipse.jetty.project into jetty-8 2013-06-11 15:50:29 +10:00
Greg Wilkins
2d661f18dd 410405 Avoid NPE for requestDispatcher(../) 
Test double encoded dot dot
 2013-06-11 15:30:40 +10:00
Greg Wilkins
2b1e6bf0de Merge remote-tracking branch 'origin/jetty-8' 
Conflicts:
	jetty-server/src/main/java/org/eclipse/jetty/server/AbstractHttpConnection.java
	jetty-server/src/main/java/org/eclipse/jetty/server/Request.java
	jetty-server/src/test/java/org/eclipse/jetty/server/HttpConnectionTest.java
 2013-06-11 15:11:23 +10:00
Greg Wilkins
9ec1378b73 fixed merge 2013-06-11 14:57:48 +10:00
Jan Bartel
d967ee2c3a 408806 getParameter returns null on Multipart request if called before request.getPart()/getParts() 2013-06-11 14:45:41 +10:00
Greg Wilkins
9b8a78392c 410405 Avoid NPE for requestDispatcher(../) 
Added extra tests for dotdot and encoded dotdot.
Also protected against dotdot in absolute URIs
 2013-06-11 14:44:26 +10:00
Greg Wilkins
ed04753111 410405 Avoid NPE for requestDispatcher(../) 2013-06-11 14:22:54 +10:00
Greg Wilkins
f8e0764fa5 Merge remote-tracking branch 'origin/master' into servlet-3.1-api 2013-06-11 14:07:46 +10:00
Greg Wilkins
06d3fbe5aa Merge remote-tracking branch 'origin/jetty-8' 
Conflicts:
	jetty-deploy/src/test/java/org/eclipse/jetty/deploy/providers/ScanningAppProviderRuntimeUpdatesTest.java
	tests/test-sessions/test-jdbc-sessions/src/test/java/org/eclipse/jetty/server/session/ReloadedSessionMissingClassTest.java
	tests/test-sessions/test-jdbc-sessions/src/test/java/org/eclipse/jetty/server/session/WebAppObjectInSessionTest.java
 2013-06-11 14:07:00 +10:00
Greg Wilkins
d660cfcff6 Merge remote-tracking branch 'origin/master' into servlet-3.1-api 
Conflicts:
	jetty-server/src/main/java/org/eclipse/jetty/server/HttpChannelState.java
	tests/test-continuation/src/test/java/org/eclipse/jetty/continuation/ContinuationBase.java
 2013-06-11 11:17:04 +10:00
Greg Wilkins
3de2ba33f1 fixed merge 2013-06-11 10:52:15 +10:00
Greg Wilkins
5d17bdcc27 fixed double dispatch in continuation tests 2013-06-11 10:50:15 +10:00
Joakim Erdfelt
ae9a776d06 410386 - WebSocket Session.getUpgradeRequest().getRequestURI() returns bad URI on server side 
+ Prior commit fixed this
 + Adding test to prevent regression in the future
 2013-06-10 14:20:14 -07:00
Joakim Erdfelt
e61c161ebd 410175 - WebSocketSession#isSecure() doesn't return true for SSL session on the server side 
+ Fixing server side support for Session.isSecure()
 + Standardizing the WSURI translation into new
   org.eclipse.jetty.websocket.api.util.WSURI class
 + Adding testcase for SSL on server side
 2013-06-10 13:48:18 -07:00
Thomas Becker
9abed8e85d 408904 Enhance CommandlineBuilder to not escape strings inside single quotes 2013-06-10 18:01:07 +02:00
Thomas Becker
fb5de72f76 410341 suppress stacktraces that happen during test setup shutdown after successful test run 2013-06-10 16:01:19 +02:00
Thomas Becker
ba6ce78fc2 @Ignore MaxConcurrentStreamsTest for now 2013-06-10 11:26:00 +02:00
Simone Bordet
27bc0b9d73 405188 - HTTP 1.0 with GET returns internal IP address. 
Introduced HostHeaderCustomizer.
 2013-06-10 10:29:05 +02:00
Simone Bordet
a2815c0611 410246 - HttpClient with proxy does not tunnel HTTPS requests. 
Modified HttpClient to tunnel properly requests, and ported tests from Jetty 7 to test this behavior.
 2013-06-08 00:38:11 +02:00
Joakim Erdfelt
d95e316f2c Upgrading to jetty-test-helper 2.3 2013-06-07 13:33:11 -07:00
Thomas Becker
654dc1e007 409796 fix and cleanup ReferrerPushStrategy. There's more work to do here, so it remains @Ignore for now 2013-06-07 18:12:19 +02:00
Simone Bordet
2ff8962f9f 410083 - Jetty clients submits incomplete URL to proxy. 
Made the request URI absolute in case the HttpClient is configured with a forward proxy.
 2013-06-07 16:34:23 +02:00
Thomas Becker
937c3b13b8 410098 inject accept-encoding header for all http requests through SPDY as SPDY clients MUST support spdy. Also remove two new tests that have been to implementation agnostic and not needed anymore due to recent code changes 2013-06-07 15:13:59 +02:00
Greg Wilkins
d2794584e1 Merge remote-tracking branch 'origin/master' into servlet-3.1-api 
Conflicts:
	jetty-server/src/main/java/org/eclipse/jetty/server/HttpChannel.java
	jetty-server/src/main/java/org/eclipse/jetty/server/HttpOutput.java
	jetty-server/src/main/java/org/eclipse/jetty/server/Response.java
 2013-06-07 15:48:22 +10:00
Jan Bartel
52994f336a 408662 In pax-web servlet services requests even if init() has not finished running 2013-06-07 15:39:20 +10:00
Jan Bartel
b86344e269 Added new examples of embedding JNDI,annotations and updated realm.properties to match distro 2013-06-07 08:49:28 +10:00
Thomas Becker
bf9a4dd0c0 406759 supressed stacktrace in ReferrerPushStrategyTest 2013-06-06 16:46:45 +02:00
Simone Bordet
4c3a777ed5 408782 - Transparent Proxy - rewrite URL is ignoring query strings. 2013-06-06 15:38:51 +02:00
Thomas Becker
5c8b785962 406759 supressed two stacktraces thrown in ProxySPDYToHTTPTest 2013-06-06 14:48:03 +02:00
Thomas Becker
82b73c065f 409953 return buffer.slice() instead of buffer.asReadOnlyBuffer() in ResourceCache to avoid using inefficent path in BufferUtil.writeTo 2013-06-06 14:09:27 +02:00
Thomas Becker
d3b96328f9 409953 More efficient implementation of BufferUtil.writeTo(...) 2013-06-06 12:59:18 +02:00
Thomas Becker
4a10f4296c 409953 More efficient implementation of BufferUtil.writeTo(...) 2013-06-06 11:39:22 +02:00
Greg Wilkins
6732dcfe76 409403 fix IllegalStateException when SPDY is used and the response is written through BufferUtil.writeTo byte by byte 
Removed the clear from ChannelEndPoint#flush
 2013-06-06 17:13:45 +10:00
Thomas Becker
544b4414c3 409403 fix IllegalStateException when SPDY is used and the response is written through BufferUtil.writeTo byte by byte 
git removed a newline in the file. Fix the filesize in the test accordingly.
 2013-06-06 08:18:31 +02:00
Thomas Becker
38a0e4f6aa revert test in BufferUtilTest 2013-06-06 08:06:52 +02:00
Joakim Erdfelt
a23798321f Merge branch 'master' into javawebsocket-jsr 2013-06-05 20:10:14 -07:00
Greg Wilkins
100e8cbaef improved javadoc 2013-06-06 12:12:31 +10:00
Greg Wilkins
cefe657ad4 409796 ignored failing test 2013-06-06 12:09:22 +10:00
Greg Wilkins
bb8c58e315 409403 fix IllegalStateException when SPDY is used and the response is written through BufferUtil.writeTo byte by byte 
ignore broken test
 2013-06-06 11:25:46 +10:00
Greg Wilkins
229c44b44f 409403 fix IllegalStateException when SPDY is used and the response is written through BufferUtil.writeTo byte by byte 
backed out bad test
 2013-06-06 10:43:49 +10:00
Joakim Erdfelt
dc0a8a5d40 JSR-356, fixing build 2013-06-05 17:36:23 -07:00
Joakim Erdfelt
12d414c9fc Merge branch 'master' into javawebsocket-jsr 2013-06-05 17:16:02 -07:00
Joakim Erdfelt
822b639829 Removing travis build 2013-06-05 14:57:23 -07:00
Joakim Erdfelt
ffceb642c5 JSR-356 cleaning up MessageInputStream and MessageReader 2013-06-05 10:34:38 -07:00
Joakim Erdfelt
b01e6432a5 Merge branch 'master' into javawebsocket-jsr 2013-06-05 10:20:50 -07:00
Joakim Erdfelt
82b5acb0cf 409978 - Websocket shouldn't create HttpSession if not present 
+ Preventing creation of HttpSession
 + Adding Local/Remote address information lookup in
   ServletWebSocketRequest
 2013-06-05 09:22:23 -07:00
Thomas Becker
b274fdb0d6 409403 fix IllegalStateException when SPDY is used and the response is written through BufferUtil.writeTo byte by byte 2013-06-05 15:31:24 +02:00
Simone Bordet
e65e4e168d 409842 - Suspended request completed by a request thread does not set read interest. 
HttpConnection.completed() now performs the right check about the current connection.
 2013-06-05 11:34:12 +02:00