6788 Commits

Author SHA1 Message Date
Greg Wilkins
abcb4f163b Merge remote-tracking branch 'origin/jetty-7' into jetty-8
Conflicts:
	jetty-security/src/main/java/org/eclipse/jetty/security/ConstraintSecurityHandler.java
2013-04-05 16:35:37 +11:00
Greg Wilkins
cada28e8cf 404325 data constraint redirection does send default port 2013-04-05 16:32:51 +11:00
Greg Wilkins
39d690ed2a 404889 SelectorManager accepts attachments with sockets 2013-04-05 15:36:23 +11:00
Simone Bordet
c5931ad56f 404610 - Reintroduce ability to disallow TLS renegotiation.
After review with Greg, avoid to clear the encrypted buffer after detection of reconnection denied.
2013-04-05 01:26:51 +02:00
Greg Wilkins
4be4c954a5 Merge remote-tracking branch 'origin/jetty-8' 2013-04-05 09:59:03 +11:00
Greg Wilkins
6b3cb20720 Merge remote-tracking branch 'origin/jetty-7' into jetty-8 2013-04-05 09:58:33 +11:00
Greg Wilkins
b58066451e 404958 Fixed Resource.newSystemResource striped / handling 2013-04-05 09:58:05 +11:00
Greg Wilkins
36c41d6a5f Merge remote-tracking branch 'origin/jetty-8'
Conflicts:
	jetty-io/src/main/java/org/eclipse/jetty/io/nio/SelectChannelEndPoint.java
2013-04-05 09:52:06 +11:00
Greg Wilkins
c7b671d49d Merge remote-tracking branch 'origin/jetty-7' into jetty-8 2013-04-05 09:49:56 +11:00
Greg Wilkins
7d068ddb01 removed debug println - DOH! 2013-04-05 09:41:58 +11:00
Greg Wilkins
5d451e5fec Merge branch 'master' of ssh://git.eclipse.org/gitroot/jetty/org.eclipse.jetty.project 2013-04-05 08:31:48 +11:00
Greg Wilkins
1191142c97 Merge remote-tracking branch 'origin/jetty-8'
Conflicts:
	jetty-io/src/main/java/org/eclipse/jetty/io/nio/SelectChannelEndPoint.java
	jetty-servlet/src/main/java/org/eclipse/jetty/servlet/DefaultServlet.java
2013-04-05 08:31:31 +11:00
Simone Bordet
024936c2de Temporarily ignoring this test that fails spuriously (see https://bugs.eclipse.org/bugs/show_bug.cgi?id=404911). 2013-04-04 17:11:01 +02:00
Simone Bordet
72219d016b 404610 - Reintroduce ability to disallow TLS renegotiation. 2013-04-04 17:11:01 +02:00
Thomas Becker
fc31a16c23 404881 Allow regexs for SslContextFactory.setIncludeCipherSuites() and .setExcludeCipherSuites() 2013-04-04 15:08:15 +02:00
Greg Wilkins
e9185aa062 Merge remote-tracking branch 'origin/jetty-7' into jetty-8 2013-04-04 16:09:19 +11:00
Greg Wilkins
060389147b 404128 Add Vary headers rather than set them 2013-04-04 16:05:27 +11:00
Greg Wilkins
df6e18cc00 404517 Close connection if request received after half close 2013-04-04 15:38:15 +11:00
Greg Wilkins
3cd6d90e9f removed verbose output 2013-04-04 15:38:15 +11:00
Jesse McConnell
6f80105d74 merge 2013-04-03 09:10:32 -05:00
Jesse McConnell
05b2d988b0 add travis ci linkage 2013-04-03 09:07:13 -05:00
Simone Bordet
2bd6a703f9 Merge branch 'jetty-8' 2013-04-03 11:26:11 +02:00
Simone Bordet
ce7629c663 Merge branch 'jetty-7' into jetty-8 2013-04-03 11:24:02 +02:00
Simone Bordet
5df26a6a57 404789 - Support IPv6 addresses in DoSFilter white list. 2013-04-03 11:21:33 +02:00
Simone Bordet
f7eb78d849 404757 - SPDY can only be built with the latest JDK version. 2013-04-02 22:27:55 +02:00
Jesse McConnell
91b3ee638d empty 2013-04-02 11:33:09 -05:00
Jesse McConnell
24cd5aef80 testing out travis as ci 2013-04-02 11:23:50 -05:00
Simone Bordet
b312fffd7e 402666 - Improve handling of TLS exceptions due to raw socket close. 2013-03-29 16:57:05 +01:00
Simone Bordet
b921ed13c0 400689 - Add support for Proxy authentication. 2013-03-29 13:21:27 +01:00
Jan Bartel
4951b1ccc4 404176 Jetty's AnnotationConfiguration class does not scan non-jar resources on the container classpath 2013-03-28 19:33:52 +11:00
Greg Wilkins
ea60965803 404323 Improved parameterization of https and SPDY 2013-03-28 17:09:29 +11:00
Greg Wilkins
5b3d866a27 Merge branch 'master' of ssh://git.eclipse.org/gitroot/jetty/org.eclipse.jetty.project 2013-03-28 16:03:34 +11:00
Greg Wilkins
7db1b36be9 Merge remote-tracking branch 'origin/jetty-8'
Conflicts:
	jetty-server/src/main/java/org/eclipse/jetty/server/AbstractHttpConnection.java
	jetty-server/src/test/java/org/eclipse/jetty/server/ssl/SslBytesServerTest.java
2013-03-28 15:04:42 +11:00
Jan Bartel
af5f8aac33 403122 Session replication fails with ClassNotFoundException when session attribute is Java dynamic proxy 2013-03-28 15:02:33 +11:00
Greg Wilkins
1f9e4f3e5c Merge remote-tracking branch 'origin/jetty-7' into jetty-8 2013-03-28 14:05:24 +11:00
Greg Wilkins
72162c0342 404517 Close connection if request received after half close 2013-03-28 14:04:24 +11:00
Greg Wilkins
fd099aa77d 404511 Replaced all StringMap usage with Tries 2013-03-28 13:20:47 +11:00
Jesse McConnell
de0c0910dd wire monitor into distro, reenable setuid for osx 2013-03-26 10:32:45 -05:00
Jan Bartel
370df6e723 404036 JDBCSessionIdManager.doStart() method should not call cleanExpiredSessions() because Listeners can't be notified 2013-03-26 23:45:28 +11:00
Greg Wilkins
108a8e9dca 404326 set status when Request.setHandled(true) is called 2013-03-26 23:36:31 +11:00
Simone Bordet
968b315926 404204 - Exception from inputstream cause hang or timeout.
In case InputStreamContentProvider threw an exception after
the request was committed, the connection was not shutdown
leaving the server waiting for more data and eventually idle timeout.
2013-03-26 09:28:20 +01:00
Greg Wilkins
8c405f4503 404323 Improved parameterization of https and SPDY 2013-03-26 16:29:48 +11:00
Greg Wilkins
ab373a5503 404323 Improved parameterization of https and SPDY 2013-03-26 15:03:15 +11:00
Greg Wilkins
d5f84c661e 404323 Improved parameterization of https and SPDY 2013-03-26 13:44:15 +11:00
Greg Wilkins
9079bae9c0 404323 Improved parameterization of https and SPDY 2013-03-26 13:38:28 +11:00
Jesse McConnell
25626e743d open up the close latch await to combat test failing timing issues 2013-03-25 19:54:24 -05:00
Jan Bartel
be0e2d41f4 Merge remote-tracking branch 'origin/jetty-8'
Conflicts:
	jetty-util/src/main/java/org/eclipse/jetty/util/Scanner.java
2013-03-26 11:03:15 +11:00
Jan Bartel
28bb68a8ae Merge remote-tracking branch 'origin/jetty-7' into jetty-8 2013-03-26 10:57:16 +11:00
Jan Bartel
af53d94b8b 404283 org.eclipse.jetty.util.Scanner.scanFile() dies with an NPE if listFiles() returns null 2013-03-26 10:55:37 +11:00
Jan Bartel
5ebf6996c5 404283 org.eclipse.jetty.util.Scanner.scanFile() dies with an NPE if listFiles() returns null 2013-03-26 10:18:32 +11:00