Eclipse
/
jetty.project
mirror of https://github.com/jetty/jetty.project.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
8,264 Commits 67 Branches 465 Tags 359 MiB
Commit Graph

8264 Commits

Author SHA1 Message Date
Simone Bordet eaefd17652 420012 - Improve ProxyServlet.Transparent configuration in case prefix="/". 2013-10-21 22:41:39 +02:00
Simone Bordet 0c80567c12 Using StandardCharset fields instead of Charset.forName(). 2013-10-21 16:14:18 +02:00
Simone Bordet 208382b07d Removed test dependencies on Ning's and Apache's HTTP client. 2013-10-21 11:27:23 +02:00
Simone Bordet 5cc0247a67 Merged branch 'master' into 'jetty-9.1'. 2013-10-21 10:49:15 +02:00
Simone Bordet 4b2756c4b0 419950 - Provide constructor for StringContentProvider that takes 
Charset.
 2013-10-21 10:48:34 +02:00
Simone Bordet df209b7b70 419901 - Client always adds extra user-agent header. 
Fixed handling of the user agent header.
 2013-10-21 10:42:41 +02:00
Simone Bordet 88541bef2f Merged branch 'master' into 'jetty-9.1'. 2013-10-21 10:41:01 +02:00
Simone Bordet 9fd27b2f8b 419901 - Client always adds extra user-agent header. 
Added test case.
 2013-10-21 10:39:37 +02:00
Simone Bordet 7520389c91 419901 - Client always adds extra user-agent header. 
Improved test case.
 2013-10-21 10:39:06 +02:00
Simone Bordet b46af29a42 419901 - Client always adds extra user-agent header. 
Added test case.
 2013-10-21 10:28:34 +02:00
Jan Bartel c5fe3bcfd3 Merge remote-tracking branch 'origin/master' into jetty-9.1 
Conflicts:
	jetty-annotations/src/main/java/org/eclipse/jetty/annotations/AnnotationParser.java
	jetty-maven-plugin/src/main/java/org/eclipse/jetty/maven/plugin/JettyWebAppContext.java
	jetty-maven-plugin/src/main/java/org/eclipse/jetty/maven/plugin/MavenAnnotationConfiguration.java
 2013-10-21 17:27:45 +11:00
Jan Bartel 3f852cf3db 416597 Allow classes and jars on the webappcontext extraclasspath to be scanned for annotations by jetty-maven-plugin 2013-10-21 16:44:33 +11:00
Jan Bartel b9020d200a 419655 AnnotationParser throws NullPointerException when scanning files from jar:file urls 2013-10-21 16:42:27 +11:00
Greg Wilkins cd1035d1d6 minor code cleanups 2013-10-21 16:30:22 +11:00
Greg Wilkins c44537fca8 419899 Do not wrap SSL Exception as EoFException 2013-10-21 16:29:20 +11:00
Greg Wilkins 33e2055468 minor code cleanups 2013-10-21 15:50:22 +11:00
Greg Wilkins bb7ab62c7a 419914 - QueuedThreadPool uses nanoTime 2013-10-21 15:12:07 +11:00
Greg Wilkins 972af9a219 Merge branch 'jetty-9.1' of ssh://git.eclipse.org/gitroot/jetty/org.eclipse.jetty.project into jetty-9.1 2013-10-21 14:56:35 +11:00
Greg Wilkins ffffd3938c fixed merge 2013-10-21 14:56:23 +11:00
Greg Wilkins 565bd3b331 419937 - Request isSecure cleared on recycle 2013-10-21 13:25:47 +11:00
Greg Wilkins 82a991dd07 Merge remote-tracking branch 'origin/master' into jetty-9.1 2013-10-21 12:32:54 +11:00
Jan Bartel c77dfa7bb6 Merge remote-tracking branch 'origin/master' into jetty-9.1 2013-10-21 12:30:21 +11:00
Greg Wilkins 24c1b30495 418732 - Add whiteListByPath mode to IPAccessHandler 
Fixed the contribution.

The PathMap changes were not correct as "" is the pattern for "/" path only.
Also removed the use of the lazy list
 2013-10-21 12:20:34 +11:00
Jan Bartel ad64ca831a 419846 JDBCSessionManager doesn't determine dirty state correctly 2013-10-21 12:16:04 +11:00
Jan Bartel 9ec06de3a3 419330 Allow access to setters on JspC in jetty-jspc-maven-plugin 2013-10-21 11:49:36 +11:00
Joakim Erdfelt dbc4f5357a Merge fixes 
+ @Ignore on PathMapTest
 2013-10-18 16:12:19 -07:00
Joakim Erdfelt d6d54e048b Merge branch 'master' into jetty-9.1 
Conflicts:
	jetty-server/src/main/java/org/eclipse/jetty/server/HttpChannel.java
	jetty-servlet/src/main/java/org/eclipse/jetty/servlet/ErrorPageErrorHandler.java
	jetty-websocket/websocket-client/src/main/java/org/eclipse/jetty/websocket/client/io/UpgradeConnection.java
	jetty-websocket/websocket-client/src/test/java/org/eclipse/jetty/websocket/client/WebSocketClientTest.java
	jetty-websocket/websocket-server/src/test/java/org/eclipse/jetty/websocket/server/AnnotatedMaxMessageSizeTest.java
 2013-10-18 16:12:00 -07:00
Joakim Erdfelt 61dc8e1eff 419814 - Annotation properties maxMessageSize and inputBufferSize don't work 
+ Ensured that WebSocketPolicy from annotations is propagated properly
  during connection creation.
 2013-10-18 10:25:51 -07:00
Joakim Erdfelt 15e32cc9b0 419814 - Annotation properties maxMessageSize and inputBufferSize don't work 
+ Adding extra testcase for maxMessageSize
 2013-10-18 09:39:48 -07:00
Simone Bordet 2d6190da59 Refactored class Fields to a better API. 2013-10-18 13:55:49 +02:00
Constantine Linnick f451a14e04 [Bug 418732] Add whiteListByPath mode to IPAccessHandler 
Signed-off-by: Constantine Linnick <theaspect@gmail.com>
 2013-10-18 01:10:35 -04:00
Constantine Linnick b4052a2b53 [Bug 418732] Swap PathMap with IPAddressMap, also fix PathMap initialization bug 
Signed-off-by: Constantine Linnick <theaspect@gmail.com>
 2013-10-18 01:05:44 -04:00
Greg Wilkins b31466839a 419799 Async timeout dispatches to error page 
Conflicts:
	jetty-server/src/main/java/org/eclipse/jetty/server/AbstractHttpConnection.java
	jetty-server/src/main/java/org/eclipse/jetty/server/AsyncContinuation.java
	jetty-server/src/main/java/org/eclipse/jetty/server/handler/ErrorHandler.java
	jetty-servlet/src/main/java/org/eclipse/jetty/servlet/ErrorPageErrorHandler.java
	jetty-servlet/src/test/java/org/eclipse/jetty/servlet/AsyncContextTest.java
 2013-10-18 14:50:01 +11:00
Simone Bordet 0d8956cad8 Merged branch 'master' into 'jetty-9.1'. 2013-10-17 15:07:54 +02:00
Simone Bordet 0b673393c3 Added NPN profile for JDK 7u45. 2013-10-17 15:06:49 +02:00
Simone Bordet 591cf9badf Deleted class org.eclipse.jetty.util.thread.Timeout, replacing its 
usages with o.e.j.u.t.Scheduler.
 2013-10-17 13:25:15 +02:00
Simone Bordet c1832b29fb Merged branch 'master' into 'jetty-9.1'. 2013-10-17 12:37:37 +02:00
Simone Bordet 7618826349 419687 - HttpClient's query parameters must be case sensitive. 
Modified class Fields to take a boolean parameter that defines
whether it is case sensitive or not, and updated HttpRequest to use
a case sensitive Fields instance for the query parameters.
 2013-10-17 12:37:01 +02:00
Greg Wilkins f3b393aa5d Refactored complexity out of HttpFields 
In preparation of merging Fields class and supporting HTTP/2.0 HPACK
 2013-10-17 21:35:11 +11:00
Simone Bordet e408bd64c7 Improved HttpClient's proxy configuration by using Strings as 
included and excluded addresses. This allows to pass in Strings such
as 127.0.0.1/8 or other wildcard formats.
 2013-10-17 10:44:39 +02:00
Simone Bordet 4da6ddc94f 403591 - improve the Blocking Q implementation. 
Removed ConcurrentArrayBlockingQueue implementations as they were not
 up to par performance wise.
 2013-10-17 10:44:39 +02:00
Simone Bordet 16b317ea60 418212 - org.eclipse.jetty.spdy.server.http.SSLExternalServerTest 
hangs.
 2013-10-17 10:44:39 +02:00
Jan Bartel 557b12a082 416300 Order ServletContainerInitializer callbacks 2013-10-17 18:37:24 +11:00
Greg Wilkins 27a3ceeb27 Optimised SelectorManager to avoid changeQ for interest ops 2013-10-17 12:43:28 +11:00
Simone Bordet 6c2a14396e 410840 - Change SSLSession.getPeerCertificateChain() to 
SSLSession.getPeerCertificates().
 2013-10-16 17:31:40 +02:00
Simone Bordet 879c3eb6f5 Improved code in case of connection failures: close the connection, 
and cancel the connect timeout task.
 2013-10-16 17:24:43 +02:00
Simone Bordet 45e6ac2a5d Javadocs: clarified that timeouts are in milliseconds. 2013-10-16 17:23:32 +02:00
Simone Bordet 8bd6ab0beb Removed class SocketBased, not necessary. 2013-10-16 16:36:23 +02:00
Simone Bordet 114a95234b Merged branch 'master' into 'jetty-9.1'. 2013-10-16 16:30:04 +02:00
Simone Bordet 45828ee906 418892 - SSL session caching so unreliable it effectively does not 
work.

Fixed by making sure that we completely decrypt read bytes.

Before the fix, it was possible that we returned after the decryption
of one TLS frame, while another was still present in the
_encryptedBuffer.
This lead to non-clean closes of the connection, which hampered the
capability of session reuse by clients.

Now we decrypt in a loop and only return if there is nothing more
that we can decrypt.
 2013-10-16 16:27:36 +02:00