Commit Graph

8311 Commits

Author SHA1 Message Date
Joakim Erdfelt e2da5fc7f1 Removing unused imports 2013-10-30 09:29:57 -07:00
Joakim Erdfelt 12ec4e74ed enabling pipeline tests 2013-10-30 09:29:57 -07:00
Jan Bartel 44ce72164e 420687 XML errors in jetty-plus/src/test/resources/web-fragment-*.xml 2013-10-30 10:52:02 +11:00
Simone Bordet edcb39cc89 Catching Throwable and closing channels rigorously. 2013-10-29 10:03:31 +01:00
Simone Bordet 00867b094b Making classes implement Closeable, rather than AutoCloseable,
since it is more semantically correct.
2013-10-29 10:03:31 +01:00
Jan Bartel e9925bcba2 Merge remote-tracking branch 'origin/master' into jetty-9.1 2013-10-29 12:26:58 +11:00
Jan Bartel b6a306a6b8 420530 AbstractLoginModule never fails a login
Conflicts:
	jetty-jaas/src/main/java/org/eclipse/jetty/jaas/spi/AbstractLoginModule.java
	jetty-jaas/src/main/java/org/eclipse/jetty/jaas/spi/PropertyFileLoginModule.java
2013-10-29 12:24:03 +11:00
Simone Bordet c822ee4f82 Make sure we never exit the selector loop unless stopped. 2013-10-28 12:19:16 +01:00
Simone Bordet 3066b673e9 Merged branch 'master' into 'jetty-9.1'. 2013-10-28 11:18:09 +01:00
Simone Bordet 3a10aa4164 419964 - InputStreamContentProvider does not close provided
InputStream.

Now closing the provided InputStream when reading -1 or when an
exception is thrown.
2013-10-28 11:13:17 +01:00
Jan Bartel f671fbaa85 419330 Allow access to setters on jetty-jspc-maven-plugin 2013-10-28 18:09:54 +11:00
Jan Bartel f4e95be443 Merge remote-tracking branch 'origin/master' into jetty-9.1 2013-10-28 18:01:43 +11:00
Jan Bartel 7818d2f0c6 Merge "[Bug 420374] Call super.close() in a finally block" 2013-10-28 02:55:24 -04:00
Jan Bartel 9d756dc018 294531 Unpacking webapp twice to the same directory name causes problems with updated jars in WEB-INF/lib 2013-10-28 15:25:21 +11:00
Jan Bartel fc6493b5b1 Remove accidental checkin of println 2013-10-28 13:09:26 +11:00
Greg Wilkins 4b87c4683d Merge remote-tracking branch 'origin/master' into jetty-9.1
Conflicts:
	jetty-server/src/main/java/org/eclipse/jetty/server/HttpOutput.java
2013-10-28 10:22:16 +11:00
Greg Wilkins 979ddd958b fixed merge 2013-10-28 10:17:55 +11:00
Greg Wilkins 960c03b8ac 419350 Do not borrow space from passed arrays 2013-10-28 10:14:12 +11:00
Greg Wilkins 121e725740 Merge remote-tracking branch 'origin/master' into jetty-9.1 2013-10-28 09:59:47 +11:00
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
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