10e4027579
[maven-release-plugin] prepare for next development iteration
2012-09-10 13:59:34 -05:00
57a6258f96
[maven-release-plugin] prepare release jetty-8.1.7.v20120910
2012-09-10 13:59:10 -05:00
1ec8b2621b
[maven-release-plugin] prepare release jetty-7.6.7.v20120910
2012-09-10 13:47:05 -05:00
62322beaa9
merge from master
2012-09-10 13:14:24 -05:00
4180d7e1f5
prepare for release
2012-09-10 12:59:04 -05:00
18539cd903
Reverted log call at info level back to debug level.
2012-09-10 18:05:18 +02:00
73ebe89019
jetty-9 refactored configuration
2012-09-10 20:26:14 +10:00
a15d71932f
jetty-9 protection from double onFillable calls
2012-09-09 08:31:31 +10:00
2bb425d0b2
jetty-9 improved buffer recycling
2012-09-09 07:42:03 +10:00
1c306ad89c
Jetty9 - Removed code duplication for calculating the jetty version.
2012-09-06 09:16:34 +02:00
7231c82b69
Merged branch 'jetty-9' into jetty-9-client.
2012-09-06 08:41:48 +02:00
29b4418876
Merge branch 'jetty-9' of ssh://git.eclipse.org/gitroot/jetty/org.eclipse.jetty.project into jetty-9
2012-09-06 16:25:24 +10:00
605df36577
Add changeSessionId() method in preparation for servlet-3.1
2012-09-06 16:23:46 +10:00
2dfcebfc04
jetty-9 distribution working
2012-09-06 14:54:55 +10:00
3acf2e65ed
jetty-9 moved servlet dependencies out of jetty-http
2012-09-06 09:13:17 +10:00
0b3865d749
jetty-9 removed unused schedulers
2012-09-06 09:12:31 +10:00
b18ab0e76a
Jetty9 - First take at HTTP client implementation.
2012-09-04 19:20:29 +02:00
d37deeea74
[maven-release-plugin] prepare for next development iteration
2012-09-03 13:33:18 -05:00
b418b0dd57
[maven-release-plugin] prepare for next development iteration
2012-09-03 13:33:16 -05:00
41e9b1f6e2
[maven-release-plugin] prepare release jetty-7.6.6.v20120903
2012-09-03 13:33:10 -05:00
6c0b0af2fe
[maven-release-plugin] prepare release jetty-8.1.6.v20120903
2012-09-03 13:33:08 -05:00
6d2c793edc
Merge branch 'master' into jetty-8
2012-09-03 12:48:21 -05:00
fd01a1b496
JETTY-1541 fixed different behaviour for single byte writes
2012-09-03 17:57:37 +10:00
c3776764f4
jetty-9 ConcurrentScheduler refinements
2012-09-03 15:24:36 +10:00
a922d44ce0
388652 Do not flush on handle return if request is suspended
2012-09-03 13:48:17 +10:00
842f30fb87
Additional test to make sure that jetty sends a 500 response code when an exception is thrown.
2012-08-31 15:23:47 +02:00
c3844a43c9
388502 handle earlyEOF with 500
2012-08-31 19:00:42 +10:00
83dbca6553
jetty-9 reworked the schedulers
2012-08-31 13:22:58 +10:00
4de5b0ad63
Merged branch 'jetty-9' into jetty-9-client.
2012-08-30 17:24:49 +02:00
b710701d13
HttpServerTestBase small assertion text fix
2012-08-30 16:38:43 +02:00
f10729c3f8
HttpServerTestBase small assertion text fix
2012-08-30 16:13:27 +02:00
3a0e9e1733
Merge branch 'master' into jetty-8
2012-08-30 09:09:44 -05:00
c7b9081a52
Merge remote-tracking branch 'origin/master' into jetty-8
2012-08-30 16:16:44 +10:00
8920cd16b6
Jetty9 - Ported the HTTP SPDY Proxy code.
2012-08-29 18:12:28 +02:00
4180db6fae
Jetty9 - Removed unnecessary _server field.
2012-08-29 18:09:18 +02:00
8fbe6c59d5
jetty-9 merge
2012-08-29 17:27:26 +02:00
fe88df1def
jetty-9 move SimpleHttpParser and SimpleHttpResponse to jetty-test-helper
2012-08-29 15:53:51 +02:00
1191f5ab5d
Jetty9 - Added copyright header.
2012-08-28 21:57:09 +02:00
d84eee0b46
Jetty9 - Reverted AbstractConnector to use MappedByteBufferPool, as ArrayByteBufferPool is leaking buffers.
2012-08-28 18:14:22 +02:00
3c952da6ed
Merge branch 'master' of ssh://git.eclipse.org:29418/jetty/org.eclipse.jetty.project
2012-08-28 13:58:05 +02:00
7bbd9675cc
Jetty9 - Fixed test making it more reliable.
2012-08-28 12:48:37 +02:00
34ee7101cc
Jetty9 - Added calls to notify() also when calling shutdown() and earlyEOF(), to wake up threads waiting in blockForContent().
...
Also improved the blockForContent() loop condition, to exit when a shutdown or earlyEOF happens.
2012-08-28 09:31:30 +02:00
0acf2f9650
Jetty9 - Generified HttpChannel and HttpParser listeners to follow the generification of HttpInput.
2012-08-28 09:29:08 +02:00
cf1337264b
[Bug 388073] null session id from cookie causes NPE fixed
2012-08-27 11:32:12 -05:00
5e4a2508b1
Jetty9 - Removed System.err.println().
2012-08-27 17:34:46 +02:00
c2095d7170
Jetty9 - Moved wiring of SslConnection out of HttpServerConnectionFactory.
...
The wiring of SslConnection in HttpServerConnectionFactory was not the
right place because a ConnectionFactory should just create the Connection
instances, not also wiring them up.
It is responsibility of the connector to wire the SslConnection in.
Moving the wiring outside HttpServerConnectionFactory fixed also a few
SPDY tests, where the wiring was already done outside (and therefore
was done twice).
2012-08-27 17:07:00 +02:00
77c03ad45f
388079: AbstractHttpConnection. Flush the buffer before shutting output down on error condition
2012-08-27 12:02:50 +02:00
9a1a020f0e
jetty-9 renamed HttpTransport.{commit|write} to send
2012-08-27 14:43:29 +10:00
d8b287134f
jetty-9 improved range request processing and tests
2012-08-27 12:17:40 +10:00
353978726b
jetty-9 reverted isHead change
2012-08-27 11:14:19 +10:00
cb5dd493fb
jetty-9 merged jetty-9-aggregation
2012-08-27 10:24:34 +10:00
c743bf4081
Jetty9 - Using the correct length when copying bytes, otherwise BufferUnderflowExceptions are thrown.
2012-08-25 10:43:39 +02:00
cda0528625
Jetty9 - Second draft of SPDY wiring: more test cases pass, still work to do.
2012-08-24 19:36:10 +02:00
1d654a08cf
jetty-9 restructured graceful shutdown
2012-08-24 20:16:23 +10:00
06b2de17d5
Merge branch 'jetty-9-aggregation' into jetty-9-spdy-http
2012-08-24 11:52:29 +02:00
e92006390e
jetty-9 avoid SSL close issues with bad request responses
2012-08-24 18:06:32 +10:00
112ee65dcc
jetty-9 improved SSL shutdown input
2012-08-24 17:58:52 +10:00
c707ba11d1
jetty-9 improved SSL shutdown input
2012-08-24 17:56:22 +10:00
fac03a306b
jetty-9 more server test fixes
2012-08-24 16:53:36 +10:00
42f998fa1a
jetty-9 fixed RFC2616 tests
2012-08-24 10:13:53 +10:00
fd1ab0ed55
merge from master
2012-08-23 16:44:30 -05:00
8c9d4089ed
Jetty9 - Fixed and cleaned up tests to make them pass.
2012-08-23 20:36:54 +02:00
9173751438
387919: throw EOFException on early eof from client on http requests
2012-08-23 19:36:49 +02:00
5672a31432
Jetty9 - Fixed tests.
2012-08-23 18:37:55 +02:00
90029a14eb
Jetty9 - Added and used shortcut method getByteBufferPool() in place of getConnector().getByteBufferPool(), also used by tests.
2012-08-23 18:36:28 +02:00
c009cef661
Jetty9 - Improved tests to make them pass.
2012-08-23 18:05:43 +02:00
7a5997df9d
Jetty9 - Fixed a couple of tests (bad copy/paste) and ignored 2 tests due to pending considerations about how to properly handle 100-Continue.
2012-08-23 17:18:29 +02:00
f118c77f90
Jetty9 - Resetting the commit status when sending 1xx responses.
2012-08-23 17:17:13 +02:00
f48f98b4d4
Jetty9 - Improved tests.
2012-08-23 16:10:58 +02:00
1ecc3c19f2
Jetty9 - Calling response.sendError() in case of application exceptions only if not committed already.
2012-08-23 16:10:35 +02:00
3b9baad1f0
Jetty9 - Improved exception message.
2012-08-23 16:09:10 +02:00
85ffa8807e
Jetty9 - Cleaned up and fixed the failing tests.
2012-08-23 15:09:09 +02:00
e74a5cd105
Jetty9 - Remembering the content written also in case of aggregation.
2012-08-23 15:08:36 +02:00
f4fd02975d
Jetty9 - The output type should be set _after_ calling setCharacterEncoding().
2012-08-23 14:51:54 +02:00
c50e7ff742
jetty-9 moved connection:close handling to HttpChannelOverHttp
2012-08-23 19:58:42 +10:00
aaa7bf08b6
jetty-9 handle generator IOErrors
2012-08-23 18:32:34 +10:00
d59a47d376
jetty-9 simplified error handling
2012-08-23 17:32:10 +10:00
cd719bf979
jetty-9 cleanups and fixes after refactor
2012-08-23 14:07:10 +10:00
74e632cd34
jetty-9 fixed some test fails after refactor
2012-08-23 08:39:05 +10:00
ab5c8ee508
Jetty9 - More work on parser reentrancy, but more work needed.
2012-08-22 16:46:52 +02:00
c6094c2398
Jetty9 - Small cleanups.
2012-08-22 11:58:21 +02:00
783a296bc5
Jetty9 - Removed redundant field and cleaned up code.
2012-08-22 10:29:41 +02:00
fa06ae9762
Jetty9 - Removed old code not used anymore, greatly simplifying the implementation.
2012-08-22 09:39:03 +02:00
71e7f519c7
Jetty9 - Refactored error handling logic.
2012-08-21 23:40:08 +02:00
dc140f85b7
Jetty9 - Refactored HttpChannel: moved connection logic back to HttpConnection.
2012-08-21 15:09:54 +02:00
21494f97bb
Jetty9 - Refactored commit logic into HttpChannel.
2012-08-20 18:32:41 +02:00
df5e09df71
removed debugging
2012-08-20 23:32:26 +10:00
325bfc290d
jetty-9 work in progress on moving aggregation out of HttpChannel
2012-08-20 20:43:10 +10:00
9080882900
jetty-9 do not recyle Response Writers
2012-08-20 20:35:15 +10:00
593209529b
jetty-9 make TestHttpResponse inner class of SimpleHttpParser
2012-08-20 10:40:49 +02:00
e0276a8f65
JETTY-1515 Include cookies on 304 responses from DefaultServlet.
2012-08-20 14:52:33 +10:00
570bf6c580
jetty-9 added some @Overrides
2012-08-20 10:49:41 +10:00
70b2a3f88e
jetty-9 cleaned up and unit test for ContextHandler lifecycle
2012-08-20 10:45:33 +10:00
1d89bef7a2
jetty-9 fixed context restart for constraint test
2012-08-20 10:21:07 +10:00
4ff7ae6106
jetty-9 removed redirect race from form auth
2012-08-20 09:22:03 +10:00
2900b4df02
jetty-9 some post merge fixes
2012-08-18 10:37:09 +10:00
6ffaa478c4
standardize license headers
2012-08-17 16:09:49 -05:00
3d1d76d214
Merge from jetty-8 to jetty-9 (license header standarization)
2012-08-17 13:44:22 -07:00
5de0cee1eb
merge from master + license block standardization
2012-08-17 14:50:43 -05:00
ce6820b67b
jetty-9: extract common stuff from HttpManyWaysToCommitTest and HttpManyWaysToAsyncCommitTest into abstract class
2012-08-17 21:29:13 +02:00
095a15f9e8
Merge branch 'jetty-9' of ssh://git.eclipse.org/gitroot/jetty/org.eclipse.jetty.project into jetty-9
2012-08-17 17:35:33 +02:00
be73cf1972
jetty-9: HttpManyWaysToAsyncCommitTest added
2012-08-17 17:34:53 +02:00
086e74bed8
jetty-9 merged jetty-8
...
Merge remote-tracking branch 'origin/jetty-8' into jetty-9
Conflicts:
jetty-security/src/main/java/org/eclipse/jetty/security/authentication/FormAuthenticator.java
jetty-server/src/main/java/org/eclipse/jetty/server/AbstractHttpConnection.java
jetty-server/src/test/java/org/eclipse/jetty/server/HttpConnectionTest.java
jetty-util/src/main/java/org/eclipse/jetty/util/log/StdErrLog.java
jetty-util/src/main/java/org/eclipse/jetty/util/resource/JarFileResource.java
jetty-util/src/test/java/org/eclipse/jetty/util/log/StdErrLogTest.java
2012-08-17 23:35:42 +10:00
7c94fd5f3c
jetty-9 removed HttpParser.isPersistent
2012-08-17 22:06:55 +10:00
b0537707e3
jetty-9: Small HttpManyWaysToCommitTest fixes
2012-08-17 12:45:55 +02:00
e7cad67ace
jetty-9 moved more fields out of HttpChannel
2012-08-17 16:41:53 +10:00
78a529fc9d
jetty-9 moved more fields out of HttpChannel
2012-08-17 16:32:36 +10:00
2a66567a5b
jetty-9 improved handling of half close
2012-08-17 15:34:53 +10:00
00ed549898
standardize license header blocks
2012-08-16 19:11:27 -05:00
f8950b64bd
merge with jetty-9
2012-08-16 09:56:51 +02:00
aa22952368
interims commit
2012-08-16 09:47:33 +02:00
6d2da78aac
jetty-9 more commit fixes
2012-08-16 15:25:08 +10:00
ff76201050
jetty-9 setContentLength smaller than content written is an IllegalArgumentException
2012-08-16 14:00:14 +10:00
4907498886
jetty-9 added Commit tests and some fixes
2012-08-16 13:27:23 +10:00
ed76d97049
jetty-9 added commit test from tbecker. Fixed issue in HttpConnection, started commenting other tests that need some changes
2012-08-16 09:02:34 +10:00
c6805c3059
smoke remaining mbean files
2012-08-15 14:22:36 -05:00
5c3a1cfe8c
removed the wrapper element from the ManagedObject annotation, rejiggered object mbean to not need wrapper, also smoking the convert concept in objectMbean in favor of dynamically discovering it where needed since its easy with annotations
2012-08-14 16:52:17 -05:00
aae7c4da68
removed managed=true from ManagedOperation and ManagedAttribute
2012-08-13 17:19:59 -05:00
11dbce81c8
wire up way to remove the need for managed=true on ManagedAttribute
2012-08-13 16:48:52 -05:00
efce7e8421
more mbean -> annotation conversion
2012-08-13 12:41:02 -05:00
51eac5ddf7
more mbean -> annotation conversion
2012-08-13 11:56:25 -05:00
9f4375d1e5
add typing to context handler mbean and remove import from xmlconfiguration
2012-08-13 07:10:07 -05:00
279f24faaa
Jetty9 - Removed duplicate logger definitions.
2012-08-13 11:48:32 +02:00
360bdfa051
Jetty9 - Code cleanups: using generics, diamond operator, removed warnings, etc.
2012-08-13 11:46:09 +02:00
c84b496330
jetty-9 more work on stop/close. Turned on statistics all of the time, but still not enough. more work needed.
2012-08-12 11:24:24 +10:00
01f4bb2623
Merge branch 'jetty-9' of ssh://git.eclipse.org/gitroot/jetty/org.eclipse.jetty.project into jetty-9
2012-08-11 11:40:48 -05:00
86daeab0ca
Remove Managed annotation and convert the context handler over to the new usage
2012-08-11 11:40:32 -05:00
488f53f8d6
jetty-9 cleaned up the stop and stopTimeout handlng
2012-08-11 12:51:32 +10:00
b8de9a35a4
[multimap-ng] moving UrlEncoded over and fixing various other failing tests
2012-08-10 14:42:35 -07:00
dfebb117b7
[multimap-ng] step 2, make MultiMap a generic, and remove LazyList use
2012-08-10 12:46:30 -07:00
74490580da
Merge branch 'jetty-9' into multimap-ng
2012-08-10 11:32:42 -07:00
da0e5a1ef6
[multimap-ng] step 1, make MultiMap participate as a full fledged member of the Collections framework
2012-08-10 10:25:10 -07:00
c3dfd0c653
Jetty9 - Set stopTimeout to zero by default, and setting defaults for threaded component that need a non-zero stop timeout to stop properly.
2012-08-10 19:02:16 +02:00
136f7924fd
Jetty9 - Refactored usage of components that were using custom stop timeout to use the get/setStopTimeout() methods inherited from AbstractLifeCycle.
2012-08-10 19:02:16 +02:00
54ea5a7de2
jetty-9 better dispatching of events to SSL
2012-08-10 14:39:51 +10:00
731eb31c7e
interims changes
2012-08-09 18:54:41 +02:00
03ebcc881c
jetty-9 include more modules
2012-08-09 19:31:50 +10:00
0ddbdda280
Jetty9 - Test code cleanup.
2012-08-08 15:02:11 +02:00
c7a3409ed1
Jetty9 - Shutting down output *and* closing the connection in case the generator produces SHUTDOWN_OUT.
2012-08-08 13:40:42 +02:00
32c5f6c093
jetty-9 reduced LazyList usage
2012-08-08 11:58:50 +10:00
75c2b57f25
Jetty9 - Introduced configure_9_0.dtd to support constructor injection for the <Configure> element.
...
Also refactored, simplified, and moved to JDK 7 XmlConfiguration code.
2012-08-06 23:12:01 +02:00
2ce23df344
Jetty9 - Cleaned up implementation of Connector.Statistics, and changed order of lifecycle notifications for open events: first connector, then connection.
2012-08-06 15:52:18 +02:00
e3132d41d8
Jetty9 - Introduced ConnectionFactory for SelectChannelConnector.
...
This change abstracts out the connection creation from the connector itself,
so there can be only one connector managing all protocols, depending on
the configuration of the connection factories.
2012-08-03 18:35:34 +02:00
42583e2397
Merge remote-tracking branch 'origin/master' into jetty-8
2012-08-03 19:26:53 +10:00
7b61f5f04d
JETTY-1501 Setting custom error response message changes page title
2012-08-03 19:22:58 +10:00
c0dd05683b
Merge remote-tracking branch 'origin/master' into jetty-8
2012-08-03 17:25:24 +10:00
3f07564274
379423 Jetty URL Decoding fails for certain international characters
2012-08-03 17:20:58 +10:00
962a0d0889
jetty-9 ensure injected threadpool is managed
2012-08-03 08:44:49 +10:00
8366ae08c9
Merge branch 'jetty-9' into jetty-9-oneconnector
...
Conflicts:
jetty-jmx/src/test/java/org/eclipse/jetty/jmx/ObjectMBeanTest.java
2012-08-03 07:49:24 +10:00
373526f8ca
proxied and managed methods are working with annotations, converted impl and test to use the 3 annotations in place of @Managed
2012-08-02 16:34:00 -05:00
c998abc8bc
JETTY-1527 handle requests with URIs like http://host (ie no / )
2012-08-02 19:03:40 +10:00
53696692ec
jetty-9 fixed managed lifecycles
2012-08-02 18:17:06 +10:00
0865a9cfb0
jetty-9 removed more AsyncConnection names
2012-08-02 18:10:29 +10:00
b63e09df61
jetty-9 rudimentary connectionFactory impl
2012-08-02 17:44:29 +10:00
b52930be14
jetty-9 merged Async and non-Async classes for EndPoint and Connection
2012-08-02 16:08:49 +10:00
96b5c05674
jetty-9 one connector passing most tests
2012-08-02 11:51:54 +10:00
56a2cedaa5
jetty-9 further work on oneconnector... passing more tests
2012-08-02 08:14:02 +10:00
2a470631bf
Merge branch 'jetty-9' into jetty-9-oneconnector
...
Conflicts:
jetty-server/src/main/java/org/eclipse/jetty/server/ssl/SslSelectChannelConnector.java
2012-08-02 08:11:12 +10:00
b2a8fc02dc
jetty-9 renaming and javadoc to improve the understandability of SslConnection
2012-08-01 15:53:03 +10:00
0af40c4db2
Jetty9 - Added lifecycle callbacks for onOpen() for the application AsyncConnection linked to the SslConnection.
2012-07-29 14:57:29 +02:00
039499d610
Merge branch 'jetty-9' into jetty-9-oneconnector
2012-07-28 08:26:00 +10:00
592cb3432e
Jetty9 - Introduced NextProtoNego AsyncConnections to handle SSL with NPN.
2012-07-27 21:54:09 +02:00
369bc035fc
jetty-9: jetty-spdy refactored to match jetty-9.
2012-07-27 16:18:47 +02:00
7bee81fa82
jetty-9 factoring out HTTP dependencies from connectors
2012-07-27 20:37:42 +10:00
c67b2d89c0
Merge remote-tracking branch 'origin/master' into jetty-8
2012-07-27 16:05:15 +10:00
748f06cad7
JETTY-1529 Ensure new session that has just been authenticated does not get renewed
2012-07-27 15:31:34 +10:00
beaa87e3d2
Log & StdErrLog updates.
...
+ Removed deprecatd Log methods related to anonymous logging.
+ Added StdErrLog.LEVEL_OFF (and related properties *.LEVEL=OFF support)
2012-07-26 10:19:23 -07:00
3cdd533361
jetty-9 some renaming
2012-07-26 19:28:19 +10:00
7882a17581
jetty-9 removed excess synchronization
2012-07-26 19:28:06 +10:00
822abe514e
Jetty9 - Improved idle timeout handling.
...
Idle timeouts are not enforced anymore by polling the AsyncEndPoints from the SelectorManager,
but instead the AsyncEndPoints now take a SchedulerExecutorService as parameter and perform
their own enforcing of the idle timeout.
Also removed a few Timer usages (replaced by SchedulerExecutorService) and fixed XML files
referencing old APIs.
2012-07-24 10:38:28 +02:00
d6261cb714
fix attribute issue when not assocated with fields
2012-07-23 14:48:39 -05:00
100b5fb6cb
move @Name to annotation package and change @Managed to drop PARAMETER
2012-07-23 09:44:41 -05:00
d2a0cb5c50
Jetty9 - Fixed compilation problems.
2012-07-23 15:38:27 +02:00
6b4583b461
Jetty9 - Introduced a onReadTimeout() callback and refactored into AbstractAsyncConnection.onOpen() calls to onFillInterested() that were previously done by all subclasses.
2012-07-23 14:27:33 +02:00
5b57573596
jetty-9 scheduledexecutorservice
2012-07-23 19:20:29 +10:00
757323e120
jetty-9 unit test cleanups
2012-07-23 17:32:53 +10:00
ab298e511e
jetty-9 unit test cleanups
2012-07-23 17:11:59 +10:00
8101b67ce8
jetty-9 lots of code cleanups from findbugs, warnings and TODOs
2012-07-23 14:08:35 +10:00
8e0dc72b23
Merge remote-tracking branch 'origin/master' into jetty-8
...
Conflicts:
jetty-osgi/jetty-osgi-boot/src/main/java/org/eclipse/jetty/osgi/boot/internal/webapp/WebBundleDeployerHelper.java
jetty-osgi/jetty-osgi-servletbridge/pom.xml
jetty-osgi/pom.xml
2012-07-23 13:24:57 +10:00
07757a8cbb
[Bug 385448] @Managed annotation and example usage in the ContextHandler
2012-07-20 15:20:05 -05:00
b08bca2abb
Jetty9 - Test fixing.
2012-07-20 16:13:27 +02:00
851239ee56
Jetty9 - More refactorings and renamings.
2012-07-20 15:23:39 +02:00
6aba6d1e8c
Jetty9 - Refactored SelectorManager and SelectChannelEndPoint.
...
Simplified Selectable interface, and improved idle timeout checking.
2012-07-20 13:04:28 +02:00
b1750c0aae
jetty-9 fixed bad merge of poms
2012-07-20 15:20:57 +10:00
0e896d4204
jetty-9 cleanups and fixes after merge
2012-07-20 14:58:32 +10:00
bc2b770c6b
jetty-9 Cleaned up onOpen/onClose
...
Merge branch 'jetty-9' of ssh://git.eclipse.org/gitroot/jetty/org.eclipse.jetty.project into jetty-9
Conflicts:
jetty-io/src/main/java/org/eclipse/jetty/io/SelectorManager.java
2012-07-20 14:53:18 +10:00
154a926b1b
jetty-9 merge from jetty-8. Mostly compiling but some tests still failing.
...
Merge remote-tracking branch 'origin/jetty-8' into jetty-9
Conflicts:
example-async-rest/async-rest-jar/pom.xml
example-async-rest/async-rest-webapp/pom.xml
example-async-rest/pom.xml
example-jetty-embedded/pom.xml
jetty-aggregate/jetty-all-server/pom.xml
jetty-aggregate/jetty-all/pom.xml
jetty-aggregate/jetty-client/pom.xml
jetty-aggregate/jetty-plus/pom.xml
jetty-aggregate/jetty-server/pom.xml
jetty-aggregate/jetty-servlet/pom.xml
jetty-aggregate/jetty-webapp/pom.xml
jetty-aggregate/jetty-websocket/pom.xml
jetty-aggregate/pom.xml
jetty-ajp/pom.xml
jetty-annotations/pom.xml
jetty-client/pom.xml
jetty-continuation/pom.xml
jetty-deploy/pom.xml
jetty-distribution/pom.xml
jetty-http-spi/pom.xml
jetty-http/pom.xml
jetty-http/src/main/java/org/eclipse/jetty/http/HttpContent.java
jetty-http/src/main/java/org/eclipse/jetty/http/HttpFields.java
jetty-http/src/main/java/org/eclipse/jetty/http/HttpGenerator.java
jetty-http/src/main/java/org/eclipse/jetty/http/HttpParser.java
jetty-http/src/main/java/org/eclipse/jetty/http/gzip/CompressedResponseWrapper.java
jetty-http/src/main/java/org/eclipse/jetty/http/gzip/GzipStream.java
jetty-http/src/test/java/org/eclipse/jetty/http/HttpFieldsTest.java
jetty-http/src/test/java/org/eclipse/jetty/http/HttpGeneratorClientTest.java
jetty-io/pom.xml
jetty-io/src/main/java/org/eclipse/jetty/io/AbstractBuffers.java
jetty-io/src/main/java/org/eclipse/jetty/io/AbstractConnection.java
jetty-io/src/main/java/org/eclipse/jetty/io/AsyncEndPoint.java
jetty-io/src/main/java/org/eclipse/jetty/io/Buffer.java
jetty-io/src/main/java/org/eclipse/jetty/io/BuffersFactory.java
jetty-io/src/main/java/org/eclipse/jetty/io/ByteArrayBuffer.java
jetty-io/src/main/java/org/eclipse/jetty/io/ByteArrayEndPoint.java
jetty-io/src/main/java/org/eclipse/jetty/io/ConnectedEndPoint.java
jetty-io/src/main/java/org/eclipse/jetty/io/Connection.java
jetty-io/src/main/java/org/eclipse/jetty/io/PooledBuffers.java
jetty-io/src/main/java/org/eclipse/jetty/io/bio/StreamEndPoint.java
jetty-io/src/main/java/org/eclipse/jetty/io/bio/StringEndPoint.java
jetty-io/src/main/java/org/eclipse/jetty/io/nio/ChannelEndPoint.java
jetty-io/src/main/java/org/eclipse/jetty/io/nio/SelectChannelEndPoint.java
jetty-io/src/main/java/org/eclipse/jetty/io/nio/SelectorManager.java
jetty-io/src/main/java/org/eclipse/jetty/io/nio/SslConnection.java
jetty-io/src/test/java/org/eclipse/jetty/io/ChannelEndPointTest.java
jetty-io/src/test/java/org/eclipse/jetty/io/bio/SocketEndPointTest.java
jetty-io/src/test/java/org/eclipse/jetty/io/nio/SelectChannelEndPointSslTest.java
jetty-io/src/test/java/org/eclipse/jetty/io/nio/SelectChannelEndPointTest.java
jetty-jaspi/pom.xml
jetty-jmx/pom.xml
jetty-jndi/pom.xml
jetty-jsp/pom.xml
jetty-monitor/pom.xml
jetty-nested/pom.xml
jetty-nosql/pom.xml
jetty-osgi/jetty-osgi-boot-jsp/pom.xml
jetty-osgi/jetty-osgi-boot-warurl/pom.xml
jetty-osgi/jetty-osgi-boot/pom.xml
jetty-osgi/jetty-osgi-httpservice/pom.xml
jetty-osgi/pom.xml
jetty-osgi/test-jetty-osgi/pom.xml
jetty-overlay-deployer/pom.xml
jetty-plus/pom.xml
jetty-policy/pom.xml
jetty-proxy/src/test/java/org/eclipse/jetty/proxy/ProxyServletTest.java
jetty-rewrite/pom.xml
jetty-security/pom.xml
jetty-server/pom.xml
jetty-server/src/main/java/org/eclipse/jetty/server/AbstractConnector.java
jetty-server/src/main/java/org/eclipse/jetty/server/AbstractHttpConnection.java
jetty-server/src/main/java/org/eclipse/jetty/server/AsyncHttpConnection.java
jetty-server/src/main/java/org/eclipse/jetty/server/HttpChannelState.java
jetty-server/src/main/java/org/eclipse/jetty/server/Request.java
jetty-server/src/main/java/org/eclipse/jetty/server/Response.java
jetty-server/src/main/java/org/eclipse/jetty/server/Server.java
jetty-server/src/main/java/org/eclipse/jetty/server/handler/ConnectHandler.java
jetty-server/src/main/java/org/eclipse/jetty/server/handler/GzipHandler.java
jetty-server/src/main/java/org/eclipse/jetty/server/nio/SelectChannelConnector.java
jetty-server/src/test/java/org/eclipse/jetty/server/HttpServerTestBase.java
jetty-server/src/test/java/org/eclipse/jetty/server/LocalAsyncContextTest.java
jetty-server/src/test/java/org/eclipse/jetty/server/RequestTest.java
jetty-server/src/test/java/org/eclipse/jetty/server/ResponseTest.java
jetty-server/src/test/java/org/eclipse/jetty/server/SuspendHandler.java
jetty-server/src/test/java/org/eclipse/jetty/server/handler/ConnectHandlerTest.java
jetty-server/src/test/java/org/eclipse/jetty/server/session/SessionHandlerTest.java
jetty-server/src/test/java/org/eclipse/jetty/server/ssl/SSLCloseTest.java
jetty-server/src/test/java/org/eclipse/jetty/server/ssl/SSLEngineTest.java
jetty-server/src/test/java/org/eclipse/jetty/server/ssl/SslSocketServerTest.java
jetty-servlet/pom.xml
jetty-servlet/src/main/java/org/eclipse/jetty/servlet/DefaultServlet.java
jetty-servlets/pom.xml
jetty-servlets/src/main/java/org/eclipse/jetty/servlets/GzipFilter.java
jetty-servlets/src/test/java/org/eclipse/jetty/servlets/IncludableGzipFilterTest.java
jetty-servlets/src/test/java/org/eclipse/jetty/servlets/MultipartFilterTest.java
jetty-spdy/pom.xml
jetty-spdy/spdy-core/pom.xml
jetty-spdy/spdy-core/src/main/java/org/eclipse/jetty/spdy/CompressionDictionary.java
jetty-spdy/spdy-core/src/main/java/org/eclipse/jetty/spdy/CompressionFactory.java
jetty-spdy/spdy-core/src/main/java/org/eclipse/jetty/spdy/Controller.java
jetty-spdy/spdy-core/src/main/java/org/eclipse/jetty/spdy/ISession.java
jetty-spdy/spdy-core/src/main/java/org/eclipse/jetty/spdy/IStream.java
jetty-spdy/spdy-core/src/main/java/org/eclipse/jetty/spdy/IdleListener.java
jetty-spdy/spdy-core/src/main/java/org/eclipse/jetty/spdy/Promise.java
jetty-spdy/spdy-core/src/main/java/org/eclipse/jetty/spdy/PushSynInfo.java
jetty-spdy/spdy-core/src/main/java/org/eclipse/jetty/spdy/SessionException.java
jetty-spdy/spdy-core/src/main/java/org/eclipse/jetty/spdy/StandardCompressionFactory.java
jetty-spdy/spdy-core/src/main/java/org/eclipse/jetty/spdy/StandardSession.java
jetty-spdy/spdy-core/src/main/java/org/eclipse/jetty/spdy/StandardStream.java
jetty-spdy/spdy-core/src/main/java/org/eclipse/jetty/spdy/StreamException.java
jetty-spdy/spdy-core/src/main/java/org/eclipse/jetty/spdy/api/ByteBufferDataInfo.java
jetty-spdy/spdy-core/src/main/java/org/eclipse/jetty/spdy/api/BytesDataInfo.java
jetty-spdy/spdy-core/src/main/java/org/eclipse/jetty/spdy/api/DataInfo.java
jetty-spdy/spdy-core/src/main/java/org/eclipse/jetty/spdy/api/GoAwayInfo.java
jetty-spdy/spdy-core/src/main/java/org/eclipse/jetty/spdy/api/Headers.java
jetty-spdy/spdy-core/src/main/java/org/eclipse/jetty/spdy/api/HeadersInfo.java
jetty-spdy/spdy-core/src/main/java/org/eclipse/jetty/spdy/api/PingInfo.java
jetty-spdy/spdy-core/src/main/java/org/eclipse/jetty/spdy/api/ReplyInfo.java
jetty-spdy/spdy-core/src/main/java/org/eclipse/jetty/spdy/api/RstInfo.java
jetty-spdy/spdy-core/src/main/java/org/eclipse/jetty/spdy/api/SPDY.java
jetty-spdy/spdy-core/src/main/java/org/eclipse/jetty/spdy/api/SPDYException.java
jetty-spdy/spdy-core/src/main/java/org/eclipse/jetty/spdy/api/Session.java
jetty-spdy/spdy-core/src/main/java/org/eclipse/jetty/spdy/api/SessionFrameListener.java
jetty-spdy/spdy-core/src/main/java/org/eclipse/jetty/spdy/api/SessionStatus.java
jetty-spdy/spdy-core/src/main/java/org/eclipse/jetty/spdy/api/Settings.java
jetty-spdy/spdy-core/src/main/java/org/eclipse/jetty/spdy/api/SettingsInfo.java
jetty-spdy/spdy-core/src/main/java/org/eclipse/jetty/spdy/api/Stream.java
jetty-spdy/spdy-core/src/main/java/org/eclipse/jetty/spdy/api/StreamFrameListener.java
jetty-spdy/spdy-core/src/main/java/org/eclipse/jetty/spdy/api/StreamStatus.java
jetty-spdy/spdy-core/src/main/java/org/eclipse/jetty/spdy/api/StringDataInfo.java
jetty-spdy/spdy-core/src/main/java/org/eclipse/jetty/spdy/api/SynInfo.java
jetty-spdy/spdy-core/src/main/java/org/eclipse/jetty/spdy/api/server/ServerSessionFrameListener.java
jetty-spdy/spdy-core/src/main/java/org/eclipse/jetty/spdy/frames/ControlFrame.java
jetty-spdy/spdy-core/src/main/java/org/eclipse/jetty/spdy/frames/ControlFrameType.java
jetty-spdy/spdy-core/src/main/java/org/eclipse/jetty/spdy/frames/DataFrame.java
jetty-spdy/spdy-core/src/main/java/org/eclipse/jetty/spdy/frames/GoAwayFrame.java
jetty-spdy/spdy-core/src/main/java/org/eclipse/jetty/spdy/frames/HeadersFrame.java
jetty-spdy/spdy-core/src/main/java/org/eclipse/jetty/spdy/frames/NoOpFrame.java
jetty-spdy/spdy-core/src/main/java/org/eclipse/jetty/spdy/frames/PingFrame.java
jetty-spdy/spdy-core/src/main/java/org/eclipse/jetty/spdy/frames/RstStreamFrame.java
jetty-spdy/spdy-core/src/main/java/org/eclipse/jetty/spdy/frames/SettingsFrame.java
jetty-spdy/spdy-core/src/main/java/org/eclipse/jetty/spdy/frames/SynReplyFrame.java
jetty-spdy/spdy-core/src/main/java/org/eclipse/jetty/spdy/frames/SynStreamFrame.java
jetty-spdy/spdy-core/src/main/java/org/eclipse/jetty/spdy/frames/WindowUpdateFrame.java
jetty-spdy/spdy-core/src/main/java/org/eclipse/jetty/spdy/generator/ControlFrameGenerator.java
jetty-spdy/spdy-core/src/main/java/org/eclipse/jetty/spdy/generator/DataFrameGenerator.java
jetty-spdy/spdy-core/src/main/java/org/eclipse/jetty/spdy/generator/Generator.java
jetty-spdy/spdy-core/src/main/java/org/eclipse/jetty/spdy/generator/GoAwayGenerator.java
jetty-spdy/spdy-core/src/main/java/org/eclipse/jetty/spdy/generator/HeadersBlockGenerator.java
jetty-spdy/spdy-core/src/main/java/org/eclipse/jetty/spdy/generator/HeadersGenerator.java
jetty-spdy/spdy-core/src/main/java/org/eclipse/jetty/spdy/generator/NoOpGenerator.java
jetty-spdy/spdy-core/src/main/java/org/eclipse/jetty/spdy/generator/PingGenerator.java
jetty-spdy/spdy-core/src/main/java/org/eclipse/jetty/spdy/generator/RstStreamGenerator.java
jetty-spdy/spdy-core/src/main/java/org/eclipse/jetty/spdy/generator/SettingsGenerator.java
jetty-spdy/spdy-core/src/main/java/org/eclipse/jetty/spdy/generator/SynReplyGenerator.java
jetty-spdy/spdy-core/src/main/java/org/eclipse/jetty/spdy/generator/SynStreamGenerator.java
jetty-spdy/spdy-core/src/main/java/org/eclipse/jetty/spdy/generator/WindowUpdateGenerator.java
jetty-spdy/spdy-core/src/main/java/org/eclipse/jetty/spdy/parser/ControlFrameBodyParser.java
jetty-spdy/spdy-core/src/main/java/org/eclipse/jetty/spdy/parser/ControlFrameParser.java
jetty-spdy/spdy-core/src/main/java/org/eclipse/jetty/spdy/parser/DataFrameParser.java
jetty-spdy/spdy-core/src/main/java/org/eclipse/jetty/spdy/parser/GoAwayBodyParser.java
jetty-spdy/spdy-core/src/main/java/org/eclipse/jetty/spdy/parser/HeadersBlockParser.java
jetty-spdy/spdy-core/src/main/java/org/eclipse/jetty/spdy/parser/HeadersBodyParser.java
jetty-spdy/spdy-core/src/main/java/org/eclipse/jetty/spdy/parser/NoOpBodyParser.java
jetty-spdy/spdy-core/src/main/java/org/eclipse/jetty/spdy/parser/Parser.java
jetty-spdy/spdy-core/src/main/java/org/eclipse/jetty/spdy/parser/PingBodyParser.java
jetty-spdy/spdy-core/src/main/java/org/eclipse/jetty/spdy/parser/RstStreamBodyParser.java
jetty-spdy/spdy-core/src/main/java/org/eclipse/jetty/spdy/parser/SettingsBodyParser.java
jetty-spdy/spdy-core/src/main/java/org/eclipse/jetty/spdy/parser/SynReplyBodyParser.java
jetty-spdy/spdy-core/src/main/java/org/eclipse/jetty/spdy/parser/SynStreamBodyParser.java
jetty-spdy/spdy-core/src/main/java/org/eclipse/jetty/spdy/parser/UnknownControlFrameBodyParser.java
jetty-spdy/spdy-core/src/main/java/org/eclipse/jetty/spdy/parser/WindowUpdateBodyParser.java
jetty-spdy/spdy-core/src/test/java/org/eclipse/jetty/spdy/AsyncTimeoutTest.java
jetty-spdy/spdy-core/src/test/java/org/eclipse/jetty/spdy/StandardSessionTest.java
jetty-spdy/spdy-core/src/test/java/org/eclipse/jetty/spdy/StandardStreamTest.java
jetty-spdy/spdy-core/src/test/java/org/eclipse/jetty/spdy/api/ClientUsageTest.java
jetty-spdy/spdy-core/src/test/java/org/eclipse/jetty/spdy/api/ServerUsageTest.java
jetty-spdy/spdy-core/src/test/java/org/eclipse/jetty/spdy/frames/DataGenerateParseTest.java
jetty-spdy/spdy-core/src/test/java/org/eclipse/jetty/spdy/frames/GoAwayGenerateParseTest.java
jetty-spdy/spdy-core/src/test/java/org/eclipse/jetty/spdy/frames/HeadersGenerateParseTest.java
jetty-spdy/spdy-core/src/test/java/org/eclipse/jetty/spdy/frames/NoOpGenerateParseTest.java
jetty-spdy/spdy-core/src/test/java/org/eclipse/jetty/spdy/frames/PingGenerateParseTest.java
jetty-spdy/spdy-core/src/test/java/org/eclipse/jetty/spdy/frames/RstStreamGenerateParseTest.java
jetty-spdy/spdy-core/src/test/java/org/eclipse/jetty/spdy/frames/SettingsGenerateParseTest.java
jetty-spdy/spdy-core/src/test/java/org/eclipse/jetty/spdy/frames/SynReplyGenerateParseTest.java
jetty-spdy/spdy-core/src/test/java/org/eclipse/jetty/spdy/frames/SynStreamGenerateParseTest.java
jetty-spdy/spdy-core/src/test/java/org/eclipse/jetty/spdy/frames/TestSPDYParserListener.java
jetty-spdy/spdy-core/src/test/java/org/eclipse/jetty/spdy/frames/WindowUpdateGenerateParseTest.java
jetty-spdy/spdy-core/src/test/java/org/eclipse/jetty/spdy/parser/LiveChromiumRequestParserTest.java
jetty-spdy/spdy-core/src/test/java/org/eclipse/jetty/spdy/parser/ParseVersusCacheBenchmarkTest.java
jetty-spdy/spdy-core/src/test/java/org/eclipse/jetty/spdy/parser/UnknownControlFrameTest.java
jetty-spdy/spdy-jetty-http-webapp/pom.xml
jetty-spdy/spdy-jetty-http-webapp/src/main/config/etc/jetty-spdy.xml
jetty-spdy/spdy-jetty-http/pom.xml
jetty-spdy/spdy-jetty-http/src/main/java/org/eclipse/jetty/spdy/http/HTTPSPDYServerConnector.java
jetty-spdy/spdy-jetty-http/src/main/java/org/eclipse/jetty/spdy/http/PushStrategy.java
jetty-spdy/spdy-jetty-http/src/main/java/org/eclipse/jetty/spdy/http/ReferrerPushStrategy.java
jetty-spdy/spdy-jetty-http/src/main/java/org/eclipse/jetty/spdy/http/ServerHTTPAsyncConnectionFactory.java
jetty-spdy/spdy-jetty-http/src/main/java/org/eclipse/jetty/spdy/http/ServerHTTPSPDYAsyncConnection.java
jetty-spdy/spdy-jetty-http/src/main/java/org/eclipse/jetty/spdy/http/ServerHTTPSPDYAsyncConnectionFactory.java
jetty-spdy/spdy-jetty-http/src/test/java/org/eclipse/jetty/spdy/http/AbstractHTTPSPDYTest.java
jetty-spdy/spdy-jetty-http/src/test/java/org/eclipse/jetty/spdy/http/ConcurrentStreamsTest.java
jetty-spdy/spdy-jetty-http/src/test/java/org/eclipse/jetty/spdy/http/ProtocolNegotiationTest.java
jetty-spdy/spdy-jetty/pom.xml
jetty-spdy/spdy-jetty/src/main/java/org/eclipse/jetty/spdy/AsyncConnectionFactory.java
jetty-spdy/spdy-jetty/src/main/java/org/eclipse/jetty/spdy/EmptyAsyncConnection.java
jetty-spdy/spdy-jetty/src/main/java/org/eclipse/jetty/spdy/EmptyAsyncEndPoint.java
jetty-spdy/spdy-jetty/src/main/java/org/eclipse/jetty/spdy/SPDYAsyncConnection.java
jetty-spdy/spdy-jetty/src/main/java/org/eclipse/jetty/spdy/SPDYClient.java
jetty-spdy/spdy-jetty/src/main/java/org/eclipse/jetty/spdy/SPDYServerConnector.java
jetty-spdy/spdy-jetty/src/main/java/org/eclipse/jetty/spdy/ServerSPDYAsyncConnectionFactory.java
jetty-spdy/spdy-jetty/src/test/java/org/eclipse/jetty/spdy/AbstractTest.java
jetty-spdy/spdy-jetty/src/test/java/org/eclipse/jetty/spdy/ClosedStreamTest.java
jetty-spdy/spdy-jetty/src/test/java/org/eclipse/jetty/spdy/FlowControlTest.java
jetty-spdy/spdy-jetty/src/test/java/org/eclipse/jetty/spdy/GoAwayTest.java
jetty-spdy/spdy-jetty/src/test/java/org/eclipse/jetty/spdy/HeadersTest.java
jetty-spdy/spdy-jetty/src/test/java/org/eclipse/jetty/spdy/IdleTimeoutTest.java
jetty-spdy/spdy-jetty/src/test/java/org/eclipse/jetty/spdy/PingTest.java
jetty-spdy/spdy-jetty/src/test/java/org/eclipse/jetty/spdy/ProtocolViolationsTest.java
jetty-spdy/spdy-jetty/src/test/java/org/eclipse/jetty/spdy/PushStreamTest.java
jetty-spdy/spdy-jetty/src/test/java/org/eclipse/jetty/spdy/ResetStreamTest.java
jetty-spdy/spdy-jetty/src/test/java/org/eclipse/jetty/spdy/SPDYClientFactoryTest.java
jetty-spdy/spdy-jetty/src/test/java/org/eclipse/jetty/spdy/SPDYServerConnectorTest.java
jetty-spdy/spdy-jetty/src/test/java/org/eclipse/jetty/spdy/SSLEngineLeakTest.java
jetty-spdy/spdy-jetty/src/test/java/org/eclipse/jetty/spdy/SSLSynReplyTest.java
jetty-spdy/spdy-jetty/src/test/java/org/eclipse/jetty/spdy/SettingsTest.java
jetty-spdy/spdy-jetty/src/test/java/org/eclipse/jetty/spdy/SynDataReplyDataLoadTest.java
jetty-spdy/spdy-jetty/src/test/java/org/eclipse/jetty/spdy/SynReplyTest.java
jetty-spdy/spdy-jetty/src/test/java/org/eclipse/jetty/spdy/UnsupportedVersionTest.java
jetty-start/pom.xml
jetty-util/pom.xml
jetty-util/src/main/java/org/eclipse/jetty/util/URIUtil.java
jetty-webapp/pom.xml
jetty-websocket/pom.xml
jetty-websocket/src/main/java/org/eclipse/jetty/websocket/DeflateFrameExtension.java
jetty-websocket/src/main/java/org/eclipse/jetty/websocket/WebSocketConnectionD00.java
jetty-websocket/src/main/java/org/eclipse/jetty/websocket/WebSocketHandler.java
jetty-websocket/src/test/java/org/eclipse/jetty/websocket/SafariWebsocketDraft0Test.java
jetty-websocket/src/test/java/org/eclipse/jetty/websocket/WebSocketServletRFCTest.java
jetty-websocket/websocket-server/src/test/java/org/eclipse/jetty/websocket/server/helper/SafariD00.java
jetty-xml/pom.xml
jetty-xml/src/main/java/org/eclipse/jetty/xml/XmlConfiguration.java
jetty-xml/src/test/java/org/eclipse/jetty/xml/XmlConfigurationTest.java
pom.xml
test-continuation/pom.xml
test-jetty-nested/pom.xml
test-jetty-servlet/pom.xml
test-jetty-servlet/src/main/java/Jetty400Repro.java
test-jetty-servlet/src/main/java/org/eclipse/jetty/testing/HttpTester.java
test-jetty-servlet/src/test/java/org/eclipse/jetty/testing/HttpTesterTest.java
test-jetty-webapp/pom.xml
tests/pom.xml
tests/test-integration/pom.xml
tests/test-loginservice/pom.xml
tests/test-sessions/pom.xml
tests/test-sessions/test-hash-sessions/pom.xml
tests/test-sessions/test-jdbc-sessions/pom.xml
tests/test-sessions/test-sessions-common/pom.xml
tests/test-webapps/pom.xml
tests/test-webapps/test-webapp-rfc2616/pom.xml
2012-07-20 11:07:57 +10:00
68760ffc5f
Merge branch 'jetty-9' into jetty-9-client
2012-07-19 18:44:16 +02:00
dfeb761306
Jetty9 - Now calling SelectorManager.newConnection() from a single call site rather than having to duplicate the call in every newEndPoint() implementation.
2012-07-19 18:43:23 +02:00
ea1033dddc
Remove reference to unused class ClearablePrintWriter
2012-07-19 20:33:52 +10:00
3c6a6fa8e0
383304 Reset PrintWriter on response recycle
...
Backout changes based on jdk1.6 method and replace by nulling out AbstractHttpConnection._writer object.
2012-07-19 20:14:41 +10:00
03174b55a5
Merge branch 'jetty-9' into jetty-9-client
2012-07-19 11:52:19 +02:00
999f66b6a8
383304 PrintWriter error flag not recycled
2012-07-19 15:32:33 +10:00
ebb7806edc
Jetty9 - Implemented abstract methods on SelectorManager that were always implemented in the same way, making them consistent.
2012-07-18 19:47:10 +02:00
70915bb870
Intermediate commit.
2012-07-18 17:38:05 +02:00
136514948f
[maven-release-plugin] prepare for next development iteration
2012-07-16 13:24:49 -05:00
1bbc677a09
[maven-release-plugin] prepare release jetty-8.1.5.v20120716
2012-07-16 13:24:42 -05:00
f755d014cd
[maven-release-plugin] prepare for next development iteration
2012-07-16 13:23:59 -05:00
04b7e807a0
[maven-release-plugin] prepare release jetty-7.6.5.v20120716
2012-07-16 13:23:53 -05:00
c00bb2d6ca
reset for release
2012-07-16 12:55:22 -05:00
f59b2a0632
reset release
2012-07-16 12:54:36 -05:00
957d39da17
merge master
2012-07-16 12:51:18 -05:00
ef86919672
[Bug 385138] add getter for session path and max cookie age that seemed to disappear in a merge long ago
2012-07-16 11:38:55 -05:00
bc02ce4de7
jetty-9 progress on jetty-servlets test harnesses
2012-07-16 16:01:44 +10:00
b62473b58f
384896 JDBCSessionManager fails to load existing sessions on oracle when contextPath is /
2012-07-16 14:10:53 +10:00
205e8f74f0
[maven-release-plugin] prepare for next development iteration
2012-07-13 10:20:48 -05:00
c3b5269d60
[maven-release-plugin] prepare release jetty-8.1.5.v20120713
2012-07-13 10:20:23 -05:00
12ecc10c6a
[maven-release-plugin] prepare for next development iteration
2012-07-13 09:35:08 -05:00
bf40110fb8
[maven-release-plugin] prepare release jetty-7.6.5.v20120713
2012-07-13 09:34:52 -05:00
5222459aa7
Merge branch 'master' into jetty-8
2012-07-13 09:05:05 -05:00
c7825731a7
Making DNS Hijacking more evident
2012-07-13 06:46:01 -07:00
ce2dc33a0a
Merge branch 'master' into jetty-8
2012-07-11 14:06:11 -05:00
81d72052c8
merged master to jetty-8
2012-07-11 14:04:49 -05:00
319d4bc66c
quick pass through to clean up missing or incorrect license blocks
2012-07-11 12:41:34 -05:00
aa941f5711
quick pass through to clean up missing or incorrect license blocks
2012-07-11 12:29:46 -05:00
0fa17c13b1
Merge branch 'master' into jetty-8
2012-07-11 10:10:00 -05:00
d9711b7697
383251 500 for SocketExceptions
2012-07-04 15:29:39 +02:00
05f9ba8244
jetty-9 moved connection upgrade support to HttpConnection completed
2012-07-04 14:17:41 +02:00
f8187106fc
jetty-9 do not 200 until handled
2012-07-03 19:22:51 +02:00
016939e788
JETTY-1525 Show handle status in response debug message
2012-07-03 16:21:14 +02:00
7330974707
Bumping version identifier
2012-06-25 12:48:58 -07:00
31ed425361
Merge branch 'master' into jetty-8
2012-06-21 12:15:06 -05:00
2c384bb78d
[Bug 383251] socket timeout exception returns 504, ioexception returns 500 in connector handler
2012-06-21 12:14:23 -05:00
8c85f06c33
Merge branch 'master' into jetty-8
2012-06-21 11:46:19 -05:00
42843730ac
Merge branch 'master' of ssh://git.eclipse.org/gitroot/jetty/org.eclipse.jetty.project
2012-06-21 11:43:42 -05:00
9ddd3e5e04
[Bug 383251] socket timeout exception returns 504, ioexception returns 500 in connector handler
2012-06-21 11:43:30 -05:00
d1ec5a151f
Merge branch 'master' into jetty-8
2012-06-21 10:53:55 -05:00
7235751873
Merge branch 'master' of ssh://git.eclipse.org/gitroot/jetty/org.eclipse.jetty.project
2012-06-21 10:53:36 -05:00
82a02c578c
[Bug 383251] resolve npe and return 500 when remote server is unaccessible
2012-06-21 10:52:40 -05:00
9b2d7bb9bf
[Bug 383251] resolve npe and return 500 when remote server is unaccessible
2012-06-21 10:50:06 -05:00
ad689a6a57
jetty-9 more renaming and signature tuning
2012-06-07 17:17:37 +02:00
d1bc48de70
More SSL tests.
2012-06-07 14:02:43 +02:00
a7b1dd5e93
Merge remote-tracking branch 'origin/master' into jetty-8
2012-06-07 00:59:37 +02:00
3f80ec2bc2
jetty-9 lots of renaming
2012-06-06 21:35:51 +02:00
903e4cd0f2
jetty-9 many name and javadoc cleanups
2012-06-06 16:40:19 +02:00
0d38d30ff6
Make compatible with jdk1.5
2012-06-06 15:41:11 +02:00
792509d459
jetty-9 jetty-deployer passing tests
2012-06-06 15:27:56 +02:00
27b6d43164
381825 leave URI params in forwarded requestURI
2012-06-06 11:19:15 +02:00
c1f3545d7c
jetty-9 passing jetty-servlet tests!!!!
2012-06-05 18:11:20 +02:00
5415517cc0
jetty-9 organize imports
2012-06-05 14:06:18 +02:00
c318cb8167
jetty-9 jetty-security passing tests
2012-06-05 14:02:44 +02:00
96cbd53c47
jetty-9 jetty-server passing tests
2012-06-04 17:27:46 +02:00
9149a69446
Merge remote-tracking branch 'origin/master' into jetty-8
2012-06-04 13:49:25 +02:00
1bfb7df771
381402 Make ContextHandler take set of protected directories
2012-06-04 12:02:40 +02:00
3e5eff3719
Merge branch 'master' of ssh://git.eclipse.org/gitroot/jetty/org.eclipse.jetty.project
2012-06-04 08:26:54 +02:00
5f89c2fd0d
supress verbose warning of illegal cookie names
2012-06-04 07:55:20 +02:00
f9a917f538
379250 Server is added to shutdown hook twice
2012-06-02 11:55:10 +02:00
18141b68a3
380212: nobbled test that sometimes fails for SSL
2012-06-01 19:17:25 +02:00
b2a55556b0
jetty-9 sbordet more tests
2012-06-01 00:32:09 +02:00
80ff0586a8
jetty-9 new simple SslConnection (mostly working)
2012-05-31 00:53:25 +02:00
Jesse McConnell
Simone Bordet
Greg Wilkins
Jan Bartel
Thomas Becker
Joakim Erdfelt