5397f16559
Merge remote-tracking branch 'origin/master' into servlet-3.1-api
...
Conflicts:
jetty-server/src/main/java/org/eclipse/jetty/server/HttpOutput.java
2013-05-17 14:09:17 +10:00
8a6ab9ab9d
408117 isAsyncStarted is false on redispatch
2013-05-17 11:41:22 +10:00
b22d280e2a
398467 Servlet 3.1 Non Blocking IO
...
Cleaned up exceptions and HttpOutput.write
2013-05-16 19:00:00 +10:00
67a1b2a18f
Merge remote-tracking branch 'origin/jetty-8'
...
Conflicts:
jetty-server/src/main/java/org/eclipse/jetty/server/session/HashSessionManager.java
jetty-server/src/main/java/org/eclipse/jetty/server/session/HashedSession.java
2013-05-16 16:06:41 +10:00
427c59e2f2
Merge remote-tracking branch 'origin/jetty-7' into jetty-8
2013-05-16 15:47:22 +10:00
51c1017b3d
408077 HashSessionManager leaves file handles open after being stopped
2013-05-16 15:39:50 +10:00
01768562ca
398467 Servlet 3.1 Non Blocking IO
...
fixed ResourceHandler
2013-05-16 14:27:32 +10:00
76b767fc22
Merge remote-tracking branch 'origin/jetty-8'
...
Conflicts:
jetty-server/src/main/java/org/eclipse/jetty/server/session/JDBCSessionIdManager.java
2013-05-16 12:33:08 +10:00
4a562f8d89
Merge remote-tracking branch 'origin/jetty-7' into jetty-8
2013-05-16 12:25:19 +10:00
8a1ea2f69c
407976 JDBCSessionIdManager potentially leaves server in bad state after startup
2013-05-16 12:18:04 +10:00
76d4859eda
398467 Servlet 3.1 Non Blocking IO
...
Improved sendContent API and javadoc. Added FastFileServer example
2013-05-16 09:26:37 +10:00
cbac0ea5fa
Merge remote-tracking branch 'origin/master' into servlet-3.1-api
2013-05-16 07:24:49 +10:00
c03cb95e8a
removed debug prints
2013-05-14 17:57:52 +10:00
4dd80e9128
398467 Servlet 3.1 Non Blocking IO
...
More refinements to avoid duplicate code and optimise common paths
2013-05-14 17:52:46 +10:00
0116f45ff0
398467 Servlet 3.1 Non Blocking IO
...
Asynchronous default servlet
2013-05-14 10:09:09 +10:00
9f3e4dc5b7
398467 Servlet 3.1 Non Blocking IO
...
Added callbacks to HttpOutput
2013-05-14 10:09:09 +10:00
73bee3af4b
407708 - HttpUpgradeHandler must support injection
2013-05-13 17:47:53 +10:00
fe582e544a
398467 Non Blocking IO
...
Working towards 3.1 by exposing more of the underlying async IO operations.
added async support to write in HttpChannel
2013-05-10 20:11:19 +10:00
ccc7a71c74
398467 Non Blocking IO
...
Working towards 3.1 by exposing more of the underlying async IO operations.
2013-05-10 19:45:32 +10:00
09476ac235
406923 Accept CRLF or LF but not CR as line termination
...
Better handling of FF character
2013-05-09 15:01:50 +10:00
b182f09b2c
405944 Check annotation and resource injection is supported for AsyncListener
2013-05-06 16:32:38 +10:00
8d0cf5e949
Merge remote-tracking branch 'origin/master' into servlet-3.1-api
2013-05-06 14:46:28 +10:00
e7564c9dcd
Merge remote-tracking branch 'origin/jetty-8'
2013-05-06 13:30:53 +10:00
488c1755e0
Merge remote-tracking branch 'origin/jetty-7' into jetty-8
2013-05-06 13:22:26 +10:00
9ec10734e5
fixed warn output
2013-05-06 13:04:39 +10:00
f10a1d709b
407173 java.lang.IllegalStateException: null when using JDBCSessionManager
2013-05-06 12:24:53 +10:00
11dccd7677
reduced test output
2013-05-06 11:43:37 +10:00
98d260dd92
407075 Do not dispatch from complete
...
Call HttpChannel.handle directly from thread calling complete
2013-05-06 11:14:53 +10:00
215f3f1f56
406617 Spin in Request.recycle
...
Improved output in warning
2013-05-06 09:40:49 +10:00
fe1b71f4a0
Reduced build logging for Travis.
2013-05-04 00:26:29 +02:00
c4ad43d0cd
Removed ugly code that does not seem to be any useful.
2013-05-03 19:50:13 +02:00
cb952931d5
connection events in debughandler
2013-05-03 18:54:50 +10:00
f544d6e701
405422 Implement servlet3.1 spec sections 4.4.3 and 8.1.4 for new HttpSessionIdListener class
2013-05-03 18:27:51 +10:00
0d181d9a75
Merge remote-tracking branch 'origin/master' into servlet-3.1-api
2013-05-03 16:59:39 +10:00
d351e0790a
406617 Spin in Request.recycle
...
Numerous code cleanups with the handling of early closes of requests, specially when the response has already been sent.
2013-05-03 15:15:03 +10:00
827a7f48b8
Made the test more robust.
2013-05-02 18:50:24 +02:00
0b15aa5a76
406617 Spin in Request.recylce
...
Some more cleanups of the loops
2013-05-02 20:02:29 +10:00
348cbc2173
405435 Implement servlet3.1 section 13.6.3 for 303 redirects for Form auth
2013-05-02 17:34:06 +10:00
22b0098be7
406617 Spin in Request.recylce
...
removed loop from read, so only a single attempt a blocking for content.
2013-05-02 12:57:48 +10:00
e7ecfd2b2b
Merge remote-tracking branch 'origin/master' into servlet-3.1-api
...
Conflicts:
jetty-server/src/test/java/org/eclipse/jetty/server/ResponseTest.java
2013-05-02 09:07:24 +10:00
b99a04c674
406962 Improve attribute names in Request
2013-05-01 17:53:33 +10:00
7590ad6795
406390 406617 removed tiny race from handling of suspend and complete
2013-05-01 09:14:26 +10:00
e26d8e67e5
406861 Fixed IPv6 redirect
2013-04-30 18:49:29 +10:00
4e62b953e1
406861 Fixed IPv6 redirect
2013-04-30 16:00:17 +10:00
e781393258
406768 Improved handling of static content resources
2013-04-30 15:52:11 +10:00
68b9115e07
406768 Close inputstream and channels for 0 length resources
2013-04-30 14:24:05 +10:00
7ce709519a
405327 Merge branch jetty-9-modularstart
2013-04-29 15:44:56 +10:00
e5967344a9
406202 re-enabled connector statistics
2013-04-29 15:11:45 +10:00
89da7623dc
Merge remote-tracking branch 'origin/master' into jetty-9-modularstart
2013-04-29 14:03:16 +10:00
7955548d10
406390 Close if at END and content remaining
2013-04-29 14:01:11 +10:00
cbb76283c9
406390 Close if at END and content remaining
2013-04-29 10:40:05 +10:00
a5c701c237
406390 Close if at END and content remaining
2013-04-29 09:55:34 +10:00
9558d7e815
modular start.ini files and --download start option
2013-04-26 13:53:28 +10:00
2360f5dcd5
Merge remote-tracking branch 'origin/master' into servlet-3.1-api
...
Conflicts:
jetty-security/src/main/java/org/eclipse/jetty/security/ConstraintSecurityHandler.java
2013-04-23 15:08:56 +10:00
0f7d6547fe
405530 Wrap AsyncContext to throw ISE after complete
2013-04-23 14:13:58 +10:00
03fd068ebc
Merge remote-tracking branch 'origin/jetty-8'
...
Conflicts:
jetty-server/src/main/java/org/eclipse/jetty/server/ResourceCache.java
2013-04-22 14:20:03 +10:00
db48bce49d
Merge remote-tracking branch 'origin/jetty-7' into jetty-8
2013-04-22 14:15:51 +10:00
3c498f0a2c
405281 allow filemappedbuffers to not be used
2013-04-22 14:15:14 +10:00
a275c8fb37
Merge branch 'master' into servlet-3.1-api
2013-04-22 12:10:13 +10:00
c3325e8b04
405530 Wrap AsyncContext to throw ISE after complete
2013-04-22 11:33:44 +10:00
f9f2a2c405
Merge remote-tracking branch 'origin/master' into servlet-3.1-api
2013-04-19 13:56:34 +10:00
22c3151ad6
added some more properties to the configuration
2013-04-18 17:05:03 +10:00
d34bd7aec7
Merge remote-tracking branch 'origin/master' into servlet-3.1-api
2013-04-18 12:16:24 +10:00
db21b42b4f
Update to newer 3.1 api jar published by oracle (3.1-b08 - note DOES NOT contain xsds and dtds).
2013-04-15 17:44:35 +10:00
a03a5c340b
405540 ServletContextListeners call in reverse in doStop
2013-04-15 14:31:41 +10:00
4e3c7367af
virtual host example
2013-04-15 12:29:08 +10:00
de7adaf0d2
Reverted usages of ConcurrentArrayBlockingQueue until proven it's correctly implemented.
2013-04-12 13:58:31 +02:00
07b844bf85
Merge remote-tracking branch 'origin/master' into servlet-3.1-api
2013-04-11 15:55:04 +10:00
9bb0260410
improved shutdown handling for travis CI
2013-04-11 12:01:01 +10:00
4c04f5dd40
403591 do not use the ConcurrentArrayBlockingQueue for thread pool, selector and async request log
2013-04-11 11:46:07 +10:00
e8d9625dcc
adjust tests to make them more travis CI compatible
2013-04-11 08:33:28 +10:00
44ec0b3f49
403360 Named connectors
2013-04-08 09:25:54 +10:00
5d451e5fec
Merge branch 'master' of ssh://git.eclipse.org/gitroot/jetty/org.eclipse.jetty.project
2013-04-05 08:31:48 +11:00
1191142c97
Merge remote-tracking branch 'origin/jetty-8'
...
Conflicts:
jetty-io/src/main/java/org/eclipse/jetty/io/nio/SelectChannelEndPoint.java
jetty-servlet/src/main/java/org/eclipse/jetty/servlet/DefaultServlet.java
2013-04-05 08:31:31 +11:00
72219d016b
404610 - Reintroduce ability to disallow TLS renegotiation.
2013-04-04 17:11:01 +02:00
e9185aa062
Merge remote-tracking branch 'origin/jetty-7' into jetty-8
2013-04-04 16:09:19 +11:00
3cd6d90e9f
removed verbose output
2013-04-04 15:38:15 +11:00
7523c5234c
Merge remote-tracking branch 'origin/master' into servlet-3.1-api
...
Conflicts:
jetty-jsp/pom.xml
2013-04-04 13:31:33 +11:00
b312fffd7e
402666 - Improve handling of TLS exceptions due to raw socket close.
2013-03-29 16:57:05 +01:00
5b3d866a27
Merge branch 'master' of ssh://git.eclipse.org/gitroot/jetty/org.eclipse.jetty.project
2013-03-28 16:03:34 +11:00
7db1b36be9
Merge remote-tracking branch 'origin/jetty-8'
...
Conflicts:
jetty-server/src/main/java/org/eclipse/jetty/server/AbstractHttpConnection.java
jetty-server/src/test/java/org/eclipse/jetty/server/ssl/SslBytesServerTest.java
2013-03-28 15:04:42 +11:00
af5f8aac33
403122 Session replication fails with ClassNotFoundException when session attribute is Java dynamic proxy
2013-03-28 15:02:33 +11:00
1f9e4f3e5c
Merge remote-tracking branch 'origin/jetty-7' into jetty-8
2013-03-28 14:05:24 +11:00
72162c0342
404517 Close connection if request received after half close
2013-03-28 14:04:24 +11:00
fd099aa77d
404511 Replaced all StringMap usage with Tries
2013-03-28 13:20:47 +11:00
370df6e723
404036 JDBCSessionIdManager.doStart() method should not call cleanExpiredSessions() because Listeners can't be notified
2013-03-26 23:45:28 +11:00
108a8e9dca
404326 set status when Request.setHandled(true) is called
2013-03-26 23:36:31 +11:00
8c405f4503
404323 Improved parameterization of https and SPDY
2013-03-26 16:29:48 +11:00
9079bae9c0
404323 Improved parameterization of https and SPDY
2013-03-26 13:38:28 +11:00
6c9f090479
removed System.outs
2013-03-22 11:34:11 +11:00
bcdf071a9c
404067 If cannot connect to db fail startup of JDBCSessionIdManager
2013-03-22 10:00:05 +11:00
7c2321b9d4
403510 HttpSession maxInactiveInterval is not serialized in HashSession
2013-03-21 12:23:52 +11:00
b2f3a05503
403591 do not use the ConcurrentArrayBlockingQueue for thread pool, selector and async request log
2013-03-21 09:24:02 +11:00
bb7a1d4ca6
396562 - Add an implementation of RequestLog that supports Slf4j
2013-03-20 13:17:14 -07:00
a4d3740900
Merge branch 'jetty-8' -> 'master'
2013-03-18 12:34:57 -07:00
279dff381c
Merge remote-tracking branch 'origin/master' into servlet-3.1-api
...
Conflicts:
jetty-osgi/pom.xml
jetty-server/src/main/java/org/eclipse/jetty/server/Response.java
jetty-servlets/pom.xml
tests/test-webapps/test-jetty-webapp/pom.xml
2013-03-18 16:00:23 +11:00
8514e8452b
403591 use the ConcurrentArrayBlockingQueue for thread pool, selector and async request log
2013-03-18 15:37:00 +11:00
b69b52d984
Merge remote-tracking branch 'origin/jetty-7' into jetty-8
2013-03-18 15:27:10 +11:00
25f5e38e13
403513 jetty:run goal cannot be executed twice during the maven build
2013-03-18 14:33:49 +11:00
5f1980f408
merged unsafe blocking Q, removed unsafe usage and usage of Q
2013-03-18 13:27:37 +11:00
ba9d70589a
Merge branch 'master' into unsafe
2013-03-18 12:02:37 +11:00
47bf3eef0c
use async request log by default
2013-03-18 11:09:50 +11:00
e8d76ef12c
Merge remote-tracking branch 'origin/jetty-8'
...
Conflicts:
examples/embedded/src/main/java/org/eclipse/jetty/embedded/SpdyServer.java
jetty-client/src/test/java/org/eclipse/jetty/client/HttpExchangeTest.java
jetty-io/src/test/java/org/eclipse/jetty/io/ThreadLocalBuffersTest.java
jetty-server/src/main/config/etc/jetty-requestlog.xml
jetty-server/src/test/java/org/eclipse/jetty/server/AsyncStressTest.java
jetty-server/src/test/java/org/eclipse/jetty/server/HttpServerTestFixture.java
jetty-server/src/test/java/org/eclipse/jetty/server/StressTest.java
jetty-servlets/pom.xml
2013-03-18 11:09:13 +11:00
d21c8e5ca4
Merge remote-tracking branch 'origin/jetty-7' into jetty-8
2013-03-18 10:53:14 +11:00
63f2719938
403570 Asynchronous Request Logging
2013-03-18 10:48:06 +11:00
b15f9340d0
Merge remote-tracking branch 'origin/jetty-7' into jetty-8
2013-03-15 14:40:19 +11:00
41feea7e01
402844 STOP.PORT & STOP.KEY behaviour has changed
2013-03-15 14:38:53 +11:00
c577783fa6
inject new Q into ThreadPool
2013-03-15 12:30:49 +11:00
8a96cc8c4a
Merge branch 'jetty-7' into jetty-8
2013-03-14 16:54:35 -07:00
5084a1430f
Fixing build.
...
+ Bumping jetty-test-helper to 2.0
+ Bumping jetty-version-maven-plugin to 1.0.10
+ Fixing JDK 1.5 build warts
+ Updating Stress use for new "test.stress" property introduced by upgrades
2013-03-14 16:52:52 -07:00
93efdcf080
384552 add comment to jetty-https.xml describing keymanager password
2013-03-14 11:23:55 +01:00
29b83dff9b
402626 Do not required endpoint host checking by default
2013-03-14 09:25:28 +11:00
0834ad259c
402706 HttpSession.setMaxInactiveInterval(int) does not change JDBCSession expiry
2013-03-11 19:31:39 +11:00
11442814fa
Merge remote-tracking branch 'origin/jetty-8'
...
Conflicts:
jetty-servlet/src/main/java/org/eclipse/jetty/servlet/ServletHandler.java
2013-03-11 17:23:54 +11:00
f1cd726ba2
Merge remote-tracking branch 'origin/jetty-8'
2013-03-08 14:27:24 +11:00
9055132144
Merge remote-tracking branch 'origin/jetty-7' into jetty-8
2013-03-08 13:45:56 +11:00
57cff606fd
400144 When loading a session fails the JDBCSessionManger produces duplicate session IDs
2013-03-08 13:33:48 +11:00
b7aded6e55
392129 fixed merged of handling of timeouts after startAsync
2013-03-08 11:22:07 +11:00
ae7248b6d2
Merge remote-tracking branch 'origin/jetty-8'
...
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/Request.java
jetty-servlets/src/test/java/org/eclipse/jetty/servlets/AbstractDoSFilterTest.java
2013-03-08 11:21:05 +11:00
face3b3584
392129 fixed handling of timeouts after startAsync
2013-03-08 09:35:08 +11:00
f714504acc
Merge remote-tracking branch 'origin/jetty-8'
...
Conflicts:
jetty-server/src/main/java/org/eclipse/jetty/server/session/JDBCSessionManager.java
2013-03-07 12:56:42 +11:00
621b1489e1
Merge remote-tracking branch 'origin/jetty-7' into jetty-8
2013-03-07 12:17:20 +11:00
a636fbfe7b
400142 ConcurrentModificationException in JDBC SessionManger
...
As part of this fix, refactored the JDBCSession to remove the SessionData object.
2013-03-07 12:02:27 +11:00
e283d72f25
Merge remote-tracking branch 'origin/jetty-8'
...
Conflicts:
jetty-server/src/main/java/org/eclipse/jetty/server/session/AbstractSessionIdManager.java
2013-03-07 09:09:23 +11:00
60a6340f8f
Merge remote-tracking branch 'origin/jetty-7' into jetty-8
2013-03-07 08:36:23 +11:00
1e0b9d4d97
402485 reseed secure random
2013-03-07 08:34:42 +11:00
0f415a735a
399799 do not hold lock while calling invalidation listeners
2013-03-05 17:05:50 +11:00
0c941a878d
Merge remote-tracking branch 'origin/jetty-7' into jetty-8
2013-03-05 14:42:55 +11:00
777817dd0f
399799 do not hold lock while calling invalidation listeners
2013-03-05 14:32:17 +11:00
3bc0411e65
401904 fixed getRemoteAddr to return IP instead of hostname
2013-03-04 17:10:27 +11:00
8933a8bdca
less verbose exception
2013-03-04 16:22:03 +11:00
7d7769475c
removed printStackTrace
2013-03-04 15:44:30 +11:00
663b45770a
Merge branch 'master' of ssh://git.eclipse.org/gitroot/jetty/org.eclipse.jetty.project
2013-03-02 12:56:06 +11:00
afbf98bd88
Merge remote-tracking branch 'origin/jetty-8'
2013-03-02 10:29:15 +11:00
3ed3dfc7a1
402048 org.eclipse.jetty.server.ShutdownMonitor doesn't stop after the jetty server is stopped
2013-03-02 10:12:24 +11:00
6478306812
Merge branch 'master' of ssh://git.eclipse.org/gitroot/jetty/org.eclipse.jetty.project
...
Conflicts:
jetty-server/src/main/config/etc/jetty.xml
2013-03-02 09:32:57 +11:00
e6fed09129
402075 - Massive old gen growth when hit by lots of non persistent connections.
...
Replaced usages of TimerScheduler with ScheduledExecutorScheduler.
2013-03-01 15:19:51 +01:00
41952ebf1d
402075 Dont allocate the parser trie unless needed
2013-03-01 22:16:54 +11:00
bf154404fe
402048 org.eclipse.jetty.server.ShutdownMonitor thread doesn't stop after the jetty server is stopped
2013-03-01 19:58:44 +11:00
90b5ea2c5e
Merge remote-tracking branch 'origin/jetty-8'
...
Conflicts:
jetty-annotations/src/main/java/org/eclipse/jetty/annotations/ServletContainerInitializerListener.java
jetty-server/src/main/java/org/eclipse/jetty/server/handler/ContextHandler.java
2013-03-01 19:08:09 +11:00
caa0199efe
400312 ServletContextListener.contextInitialized() is not called when added in ServletContainerInitializer.onStartup
2013-03-01 18:09:19 +11:00
859710c2c5
401643 Improved Authentication exception messages and provided quiet servlet exception
2013-02-25 13:59:56 +11:00
6d850146fb
jetty-9 fixed error from doco change
2013-02-24 09:27:05 +11:00
0671514e34
jetty-9 fixed error from doco change
2013-02-24 09:15:40 +11:00
999db7f4d8
refined jetty embedded examples
2013-02-22 16:19:06 +11:00
c302a404cd
refined jetty embedded examples
2013-02-22 15:51:17 +11:00
b82a781113
400864 Added LowResourcesMonitor
2013-02-18 20:03:36 +11:00
f15d4c0376
400738 - ResourceHandler doesn't support range requests
...
+ Adding testcase to replicate issue.
2013-02-13 14:27:26 -07:00
6d0f233c80
362854 - Continuation implementations may deadlock.
...
HttpChannelState was already notifying listeners from outside synchronized blocks,
apart one case, in expired().
Also taken the chance to cleanup the class from warnings.
2013-02-13 16:00:40 +01:00
ef81982579
400631 - Calling flush() on HttpServletResponse.getOutputStream() after last byte of body causes EofException.
...
Now flush() is a no-operation if the stream is already closed, consistently with previous Jetty versions.
2013-02-13 12:03:31 +01:00
e09d401fd2
add configuration option to not send server version
2013-02-12 10:08:56 -06:00
209d5bc12f
399721 - Change <Ref id= ...> to <Ref refid= ...>
2013-02-01 13:03:11 +01:00
9194fe1b7b
399566 Running org.eclipse.jetty.server.session.MaxInactiveMigrationTest produces stack trace
2013-01-31 15:42:27 +11:00
b132663c2b
jetty-9 made WebAppContext configuration additive
2013-01-31 12:21:04 +11:00
3b6cab63e2
Merge branch 'jetty-7' into jetty-8
2013-01-29 13:42:29 -06:00
a086451bc7
[Bug 393933] remove deprecated classes/methods and consolidate some static methods to SslContextFactory
2013-01-28 16:15:34 -06:00
988206c36a
393968 fix typo in javadoc
2013-01-28 16:11:33 +01:00
2cbb630f8e
Merge branch 'jetty-8'
2013-01-25 16:53:46 -06:00
f16fc7e7b7
Merge branch 'jetty-7' into jetty-8
2013-01-25 16:53:18 -06:00
1a31067369
Add note about getCanonicalFile check and fix IdleSession test in test hash sessions
2013-01-25 16:25:59 -06:00
b3043276bc
add corresponding correct file removal check
2013-01-25 16:12:08 -06:00
a7c074a86c
merge from jetty-8
2013-01-25 15:32:08 -06:00
4bed164462
Merge branch 'jetty-7' into jetty-8
2013-01-25 15:31:13 -06:00
111bd19634
doh, header
2013-01-25 15:30:59 -06:00
d8a3b76862
Merge branch 'jetty-7' into jetty-8
2013-01-25 15:24:41 -06:00
d4568feba6
[Bug 399132] check parent dir of session store against file to be removed
2013-01-25 15:22:16 -06:00
5435cd3365
385306 added getURI method
2013-01-25 13:52:32 +11:00
ff350c3740
Merge remote-tracking branch 'origin/jetty-8'
...
Conflicts:
jetty-client/src/main/java/org/eclipse/jetty/client/BlockingHttpConnection.java
jetty-servlets/src/main/java/org/eclipse/jetty/servlets/GzipFilter.java
jetty-servlets/src/main/java/org/eclipse/jetty/servlets/gzip/AbstractCompressedStream.java
jetty-servlets/src/test/java/org/eclipse/jetty/servlets/gzip/GzipTester.java
2013-01-25 11:46:03 +11:00
3c6deaf83c
Merge remote-tracking branch 'origin/jetty-7' into jetty-8
2013-01-25 09:43:57 +11:00
c9d026703f
removed System.outs
2013-01-25 09:42:51 +11:00
fd25e3a742
Merge remote-tracking branch 'origin/jetty-7' into jetty-8
...
Conflicts:
jetty-servlets/src/test/java/org/eclipse/jetty/servlets/gzip/GzipTester.java
2013-01-24 14:30:45 +11:00
161a14d9d0
381521 Only set Vary header when content could be compressed
2013-01-24 14:07:25 +11:00
e1c516c7d1
merge from jetty-8 and update license blocks.
2013-01-11 17:04:53 -06:00
863944873d
merge from 7 and update license blocks for 2013
2013-01-11 15:01:16 -06:00
a4dbb5823c
update license blocks for 2013
2013-01-11 14:57:51 -06:00
3a0291929c
removed some TODOs
2013-01-11 23:53:26 +11:00
27c31fb403
jetty-9 organised imports. Cleaned up some TODOs
2013-01-11 16:37:32 +11:00
e6d3397c1c
jetty-9 removed alias option
2013-01-11 08:50:09 +11:00
25324b666c
jetty-9 made Trie abstract and added TreeTrie for the HttpParser cache to save space
2013-01-10 17:31:57 +11:00
3efcc2af41
Merge remote-tracking branch 'origin/jetty-8'
...
Conflicts:
jetty-server/src/main/java/org/eclipse/jetty/server/Request.java
jetty-server/src/main/java/org/eclipse/jetty/server/handler/ContextHandler.java
jetty-servlet/src/main/java/org/eclipse/jetty/servlet/DefaultServlet.java
jetty-servlets/src/main/java/org/eclipse/jetty/servlets/GzipFilter.java
2013-01-10 16:24:41 +11:00
3cba027390
Merge remote-tracking branch 'origin/jetty-7' into jetty-8
...
Conflicts:
jetty-server/src/test/java/org/eclipse/jetty/server/handler/ContextHandlerAliasTest.java
2013-01-08 09:13:39 +11:00
64ed66db8b
Remove test needing java 7
2013-01-08 09:12:08 +11:00
83aa65415b
Fixing for JDK 6
2013-01-07 09:37:13 -07:00
2aab780eba
Merge remote-tracking branch 'origin/jetty-7' into jetty-8
...
Conflicts:
jetty-server/src/main/java/org/eclipse/jetty/server/handler/ContextHandler.java
tests/test-integration/src/test/java/org/eclipse/jetty/test/jsp/JspMatchingTest.java
2013-01-07 23:45:38 +11:00
96fd7dc562
Merge branch 'jetty-7' of ssh://git.eclipse.org/gitroot/jetty/org.eclipse.jetty.project into jetty-7
2013-01-07 20:12:49 +11:00
3265c334cb
397130 maxFormContentSize set in jetty.xml is ignored
2013-01-07 20:10:54 +11:00
ccda9bb10b
397535 Support pluggable alias checking to support symbolic links
2013-01-07 19:57:52 +11:00
4037e6111f
395885 - ResourceCache should honor useFileMappedBuffer if set
2013-01-02 14:47:02 -07:00
31def06214
jetty-9 URI parsing passed ByteBuffer so that strange query string encodings can be supported
2012-12-24 19:17:00 +11:00
aa3b829fb1
Revert "395794 slightly modified fix for empty file extenstion to mime type mapping. Added a default, so it will also work with unknown file extensions"
...
This reverts commit 72cdab4934
2012-12-24 14:11:15 +11:00
37ac5e7b16
Merge remote-tracking branch 'origin/jetty-8'
...
Conflicts:
jetty-http/src/main/java/org/eclipse/jetty/http/HttpURI.java
jetty-servlets/src/test/java/org/eclipse/jetty/servlets/MultipartFilterTest.java
jetty-util/src/main/java/org/eclipse/jetty/util/MultiPartInputStream.java
jetty-util/src/test/java/org/eclipse/jetty/util/MultiPartInputStreamTest.java
jetty-util/src/test/java/org/eclipse/jetty/util/URLEncodedTest.java
2012-12-22 16:42:33 +11:00
346918577f
Merge remote-tracking branch 'origin/jetty-8'
...
Conflicts:
jetty-client/src/main/java/org/eclipse/jetty/client/AsyncHttpConnection.java
jetty-server/src/main/java/org/eclipse/jetty/server/AbstractHttpConnection.java
jetty-server/src/main/java/org/eclipse/jetty/server/Server.java
jetty-servlet/src/main/java/org/eclipse/jetty/servlet/ServletHandler.java
jetty-servlets/src/main/java/org/eclipse/jetty/servlets/MultiPartFilter.java
jetty-servlets/src/test/java/org/eclipse/jetty/servlets/MultipartFilterTest.java
jetty-util/src/main/java/org/eclipse/jetty/util/MultiPartInputStream.java
jetty-util/src/test/java/org/eclipse/jetty/util/MultiPartInputStreamTest.java
jetty-webapp/src/test/java/org/eclipse/jetty/webapp/WebAppContextTest.java
test-jetty-servlet/src/main/java/org/eclipse/jetty/testing/ServletTester.java
test-jetty-webapp/src/main/java/com/acme/CookieDump.java
test-jetty-webapp/src/main/java/com/acme/HelloWorld.java
2012-12-22 15:12:17 +11:00
d4c4637f4d
Merge remote-tracking branch 'origin/jetty-7' into jetty-8
2012-12-22 12:30:20 +11:00
810ff3802f
397110 Accept %uXXXX encodings in URIs
2012-12-22 12:00:54 +11:00
191040b736
Merge remote-tracking branch 'origin/jetty-7' into jetty-8
2012-12-21 14:00:13 +11:00
32e1d0f29c
Merge remote-tracking branch 'origin/jetty-7' into jetty-8
...
Conflicts:
jetty-server/src/main/java/org/eclipse/jetty/server/Server.java
jetty-servlets/src/main/java/org/eclipse/jetty/servlets/MultiPartFilter.java
jetty-servlets/src/test/java/org/eclipse/jetty/servlets/MultipartFilterTest.java
2012-12-21 13:00:14 +11:00
5e4711fdb0
Fixing confusing output
2012-12-20 17:32:34 -07:00
a371a8963d
Fixing NPE
2012-12-20 17:30:46 -07:00
b65973afdd
Bug 391623 - Add option to --stop to wait for target jetty to stop
...
* Reworked ShutdownMonitor to better support multiple servers +
jetty-maven-plugin requirements.
2012-12-20 15:32:36 -07:00
69b9856998
Squashing JMX warnings on jetty startup
2012-12-19 13:50:51 -07:00
a5c1ced201
Merge branch 'jetty-7' into jetty-7-graceful-stop
2012-12-19 12:40:46 -07:00
72cdab4934
395794 slightly modified fix for empty file extenstion to mime type mapping. Added a default, so it will also work with unknown file extensions
2012-12-18 13:09:21 +01:00
3ce8c2ba58
jetty-9 recycle response print writers
2012-12-17 16:02:06 +11:00
2966192aa4
395794 NullPointerException in when requesting a file without extension
2012-12-17 13:58:39 +11:00
c87ebcb4a5
jetty-9 avoid additional dispatch for pipelined requests to optimize pipeline handling
2012-12-17 11:35:26 +11:00
ecf7563a79
jetty-9 use direct buffers for generated headers
2012-12-14 14:07:42 +11:00
f9e76b1620
Merge remote-tracking branch 'origin/jetty-7' into jetty-8
...
Conflicts:
jetty-servlet/src/main/java/org/eclipse/jetty/servlet/ServletHandler.java
jetty-servlets/src/main/java/org/eclipse/jetty/servlets/MultiPartFilter.java
jetty-util/src/main/java/org/eclipse/jetty/util/ReadLineInputStream.java
2012-12-14 11:48:55 +11:00
6bfc19be1b
jetty-9 optimisation to dispatch before parsing so that handling is done in same thread
2012-12-14 09:50:22 +11:00
5b8a9bb95e
jetty-9 use spare space in content buffer for header
2012-12-14 08:30:46 +11:00
e5679d42c0
jetty-9 use spare space in content buffer for header
2012-12-14 07:41:22 +11:00
08a7cd86e3
Revert "jetty-9 added null constructor"
2012-12-13 20:17:25 +11:00
0c16c774ca
jetty-9 use spare space in content buffer for header
2012-12-13 18:49:54 +11:00
a478271828
JETTY-1533 handle URL with no path
2012-12-13 07:59:21 +11:00
6f098dd69c
jetty-9 use DateCache timer to set Date header once per second
2012-12-10 12:58:14 +11:00
f01da31a0a
jetty-9 some optimizations
2012-12-08 01:41:01 +11:00
620d051087
jetty-9 recycle content-type
2012-12-08 01:41:01 +11:00
3e151901bf
jetty-9 Use public HttpField
2012-12-08 01:41:01 +11:00
7abd512b32
391623 - Making --stop with STOP.WAIT perform graceful shutdown
...
+ Moving jetty-start Monitor to jetty-server ShutdownMonitor and
using ShutdownThread to perform a graceful shutdown instead.
2012-12-04 10:18:54 -07:00
c9db4ca815
Merge remote-tracking branch 'origin/master' into servlet-3.1-api
...
Conflicts:
jetty-proxy/pom.xml
pom.xml
2012-11-30 15:45:36 +11:00
9931ddec94
jetty-9 fixed test webapp TestServer and improved error message
2012-11-29 17:03:40 +11:00
9f5801c3fd
395215 Multipart mime with just LF and no CRLF
2012-11-29 15:57:16 +11:00
16844eafc5
jetty-9 javadoc
2012-11-29 13:29:24 +11:00
0805f131a8
jetty-9 added null constructor
2012-11-29 10:10:53 +11:00
9a4e5f3301
jetty-9 Added proxy test webapp. Refined no servlet context handling
2012-11-26 16:57:37 +11:00
0eeef6ab4e
393770 Error in ContextHandler.setEventListeners(EventListener[])
2012-11-26 11:09:21 +11:00
f89909e301
jetty-9 cleaning up dependencies
2012-11-23 16:25:57 +11:00
ba8057867e
Merge remote-tracking branch 'origin/jetty-8'
2012-11-23 15:04:20 +11:00
8241089364
Merge remote-tracking branch 'origin/jetty-7' into jetty-8
2012-11-23 14:45:34 +11:00
769260f251
392417 Prevent Cookie parsing interpreting unicode chars
2012-11-23 12:29:53 +11:00
7737dc8c76
394854 Implemented Promise
2012-11-23 12:18:51 +11:00
f0cc03ede5
Merge remote-tracking branch 'origin/jetty-8'
...
Conflicts:
jetty-server/src/main/java/org/eclipse/jetty/server/Response.java
jetty-server/src/main/java/org/eclipse/jetty/server/session/HashSessionManager.java
jetty-server/src/main/java/org/eclipse/jetty/server/session/HashedSession.java
jetty-server/src/test/java/org/eclipse/jetty/server/ResponseTest.java
jetty-servlets/src/test/java/org/eclipse/jetty/servlets/MultipartFilterTest.java
2012-11-22 17:01:55 +11:00
e42b5bf970
Merge remote-tracking branch 'origin/jetty-7' into jetty-8
2012-11-22 16:35:26 +11:00
90a86d3a6b
Merge remote-tracking branch 'origin/jetty-7' into jetty-8
2012-11-22 16:26:38 +11:00
14162c6154
394514 Preserve URI parameters in sendRedirect
2012-11-22 16:10:19 +11:00
8920fcc128
394829 Session can not be restored after SessionManager.setIdleSavePeriod has saved the session
2012-11-22 15:50:01 +11:00
139de22bc0
394370 correctly handle last content and responses with no content
2012-11-16 12:42:52 +11:00
49de22ea48
jetty-9 improved javadoc
2012-11-15 17:31:43 +11:00
f35f32ac48
Eliminated jetty-proxy module.
...
Moved ConnectHandler to jetty-server and ProxyServlet to jetty-servlets.
2012-11-13 17:11:46 +01:00
ba40f7897d
Completed port of ConnectHandler and ProxyServlet implementations.
2012-11-13 15:35:51 +01:00
d72feaa941
jetty-9 javadoc improvement
2012-11-13 07:59:53 +11:00
650ce2be66
jetty-9 javadoc improvement
2012-11-13 07:30:49 +11:00
cf4c5e6024
Added getter for the request buffer; this is needed by the ConnectHandler
...
to transfer pipelined requests that are present after the CONNECT.
Modified the logic to make the generator persistent to take in account
also the method: if it's a CONNECT, then the generator is always persistent.
2012-11-12 19:07:36 +01:00
9ab2a96715
removed incorrect log.info from listener initialiser
2012-11-12 13:05:06 +11:00
8ff291d223
Merge remote-tracking branch 'origin/jetty-8'
...
Conflicts:
jetty-http/src/main/java/org/eclipse/jetty/http/HttpContent.java
jetty-overlay-deployer/src/main/java/org/eclipse/jetty/overlays/OverlayedAppProvider.java
jetty-overlay-deployer/src/main/java/org/eclipse/jetty/overlays/TemplateContext.java
jetty-server/src/main/java/org/eclipse/jetty/server/AbstractHttpConnection.java
jetty-server/src/main/java/org/eclipse/jetty/server/ResourceCache.java
jetty-server/src/main/java/org/eclipse/jetty/server/handler/ResourceHandler.java
jetty-server/src/test/java/org/eclipse/jetty/server/ResourceCacheTest.java
jetty-servlet/src/main/java/org/eclipse/jetty/servlet/DefaultServlet.java
jetty-servlet/src/test/java/org/eclipse/jetty/servlet/DefaultServletTest.java
jetty-servlets/src/main/java/org/eclipse/jetty/servlets/GzipFilter.java
jetty-servlets/src/main/java/org/eclipse/jetty/servlets/gzip/AbstractCompressedStream.java
jetty-servlets/src/main/java/org/eclipse/jetty/servlets/gzip/CompressedResponseWrapper.java
2012-11-12 12:30:26 +11:00
3d3b035b22
Merge remote-tracking branch 'origin/jetty-7' into jetty-8
...
Conflicts:
jetty-servlet/src/test/java/org/eclipse/jetty/servlet/DefaultServletTest.java
2012-11-12 09:08:53 +11:00
75aedbbf45
393947 implement ETags and update gzip filter to handle them
2012-11-11 09:52:26 +11:00
a1d0efc2bb
393832 start connectors last
2012-11-08 19:30:58 +11:00
f336511f87
Merge remote-tracking branch 'origin/jetty-8'
...
Conflicts:
VERSION.txt
jetty-http/src/main/java/org/eclipse/jetty/http/HttpParser.java
jetty-server/src/main/java/org/eclipse/jetty/server/AbstractHttpConnection.java
2012-11-08 14:58:10 +11:00
b3274a6baa
Merge remote-tracking branch 'origin/jetty-7' into jetty-8
...
Conflicts:
VERSION.txt
2012-11-08 14:41:01 +11:00
e615504889
392492 expect headers only examined for requests>=HTTP/1.1
2012-11-08 14:37:07 +11:00
Greg Wilkins
Jan Bartel
Simone Bordet
Joakim Erdfelt
Thomas Becker
Jesse McConnell