Commit Graph

8404 Commits

Author SHA1 Message Date
Greg Wilkins de75b82f99 419350 Do not borrow space from passed arrays 2013-10-28 09:59:05 +11:00
Mikhail Mazursky c101e55c7f [Bug 420374] Call super.close() in a finally block
Signed-off-by: Mikhail Mazursky <mikhail.mazursky@gmail.com>
2013-10-26 12:43:06 +06:00
Greg Wilkins 05cab9bfb4 Merge remote-tracking branch 'origin/master' into jetty-9.1
Conflicts:
	jetty-client/src/main/java/org/eclipse/jetty/client/HttpSender.java
	jetty-server/src/main/java/org/eclipse/jetty/server/handler/StatisticsHandler.java
2013-10-26 11:01:25 +11:00
Simone Bordet abac85e129 420364 - Bad synchronization in HttpConversation. 2013-10-25 14:55:48 +02:00
Simone Bordet b9fcd6695c Merged via cherry-pick branch 'master' into 'jetty-9.1'. 2013-10-25 14:21:11 +02:00
Simone Bordet a28e4730ad 420362 - Response/request listeners called too many times.
Wrapped on[Request|Response]XXX(XXXListener) listeners into their
specific interface so that they don't get notified multiple times.
2013-10-25 14:08:55 +02:00
Simone Bordet 2e434ef1e8 Refactored HttpDestinationOverHTTP into a PoolingHttpDestination
base class for reuse from other transports.
2013-10-25 13:02:33 +02:00
Jesse McConnell c920d0475a set for dev 2013-10-24 17:27:42 -05:00
Jesse McConnell 1af0ec2e75 [maven-release-plugin] prepare for next development iteration 2013-10-24 16:38:04 -05:00
Jesse McConnell 35b67aa459 [maven-release-plugin] prepare release jetty-9.1.0.RC1 2013-10-24 16:37:53 -05:00
Jesse McConnell 66aa5a077f set for release 2013-10-24 16:10:35 -05:00
Jesse McConnell 9e8d07337b Merge branch 'jetty-9.1' into release-9.1 2013-10-24 16:09:18 -05:00
Joakim Erdfelt 5965e695fa Cleaning up modules 2013-10-24 14:06:50 -07:00
Joakim Erdfelt 5c850a9bbb 420103 - Split out jmx-remote module from existing jmx module
+ modules/jmx.mod not changed
+ etc/jetty-jmx.xml simplified greatly
+ etc/jetty-jmx-remote.xml contains specifics for making jmx listen on
  the port specified in properties
+ new modules/jmx-remote.mod for enabling this feature
2013-10-24 12:31:08 -07:00
Greg Wilkins 28566c72c8 420142 reimplemented graceful shutdown 2013-10-24 17:22:08 +11:00
Greg Wilkins d6e301d7fd Merge remote-tracking branch 'origin/master' into jetty-9.1 2013-10-24 16:02:35 +11:00
Greg Wilkins ac3787b167 420033 AsyncContext.onTimeout exceptions passed to onError
Conflicts:
	jetty-server/src/main/java/org/eclipse/jetty/server/AbstractHttpConnection.java
	jetty-server/src/main/java/org/eclipse/jetty/server/AsyncContinuation.java
	jetty-servlet/src/test/java/org/eclipse/jetty/servlet/AsyncContextTest.java
2013-10-24 15:33:08 +11:00
Jan Bartel 6ef9108cf6 415118 WebAppClassLoader.getResource(name) should strip .class from name 2013-10-24 15:08:04 +11:00
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