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

8279 Commits

Author SHA1 Message Date
Greg Wilkins d5f83a8159 420034 Removed threads/timers from Date caching 2013-10-24 11:09:17 +11:00
Joakim Erdfelt ebf11ebfb8 Fixing javadoc 2013-10-23 16:59:30 -07:00
Joakim Erdfelt 275008d207 attempting to fix occasional test failure 2013-10-23 12:19:22 -07:00
Greg Wilkins 323572708c Merge remote-tracking branch 'origin/master' into jetty-9.1 
Conflicts:
	jetty-util/src/main/java/org/eclipse/jetty/util/resource/FileResource.java
 2013-10-23 11:51:19 +11:00
Greg Wilkins d38233c52d 420048 - DefaultServlet alias checks configured resourceBase 
Fixed false positive alias detection for ; encoded as %3B in file name
 2013-10-23 11:46:58 +11:00
Greg Wilkins 353357e816 Merge remote-tracking branch 'origin/master' into jetty-9.1 2013-10-23 11:28:55 +11:00
Greg Wilkins 55b279cc3d 420048 - DefaultServlet alias checks configured resourceBase 
Conflicts:
	jetty-server/src/main/java/org/eclipse/jetty/server/handler/ContextHandler.java
 2013-10-23 08:00:30 +11:00
Simone Bordet 61dcf9895e Removed warn logging statement from Adapter.failed(Throwable) since 
it just clutter the logs.
 2013-10-22 19:18:34 +02:00
Simone Bordet 1df50f86f9 Improved logging and toString() implementations. 2013-10-22 19:17:35 +02:00
Simone Bordet 8d9fd6ad71 Improved connection/destination close, so that a connection can 
always notify its destination that it has been closed.
 2013-10-22 18:00:55 +02:00
Simone Bordet c705bb9480 Avoid overwrite of the abort cause. 2013-10-22 14:03:09 +02:00
Simone Bordet dcbc0d9a21 Merged branch 'master' into 'jetty-9.1'. 2013-10-22 13:34:06 +02:00
Simone Bordet 1ce2ec0007 420039 - BufferingResponseListener continues processing after 
aborting request.
 2013-10-22 13:33:19 +02:00
Simone Bordet 41eed8f836 419904 - Data corruption on proxy PUT requests. 
Fixed InputStreamContentProvider to not reuse the byte[] to read from
the stream.
 2013-10-22 12:40:32 +02:00
Simone Bordet 25f2fcc691 Avoid to specify a content in the proxied request if there is none in 
the original request.
 2013-10-21 22:42:49 +02:00
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