b6acc24121
Merge "369214: HotSwapHandler code format"
2012-03-05 08:51:29 -05:00
e1fdbb17a5
Merge "372115: Cleanup of AsyncContextTest.java"
2012-03-05 08:41:52 -05:00
35a0386df0
373037 jetty.server.Response.setContentLength(int) should not close a Writer when length=0
2012-03-05 15:19:34 +11:00
51311d050e
[maven-release-plugin] prepare for next development iteration
2012-03-02 08:37:46 -06:00
a8296ec3d5
[maven-release-plugin] prepare release jetty-7.6.2.v20120302
2012-03-02 08:37:38 -06:00
9f68c6e6bf
369214: HotSwapHandler uses AggregateLifeCycles.addBean()
2012-03-01 15:32:22 +01:00
ab5592daf0
369214: HotSwapHandler code format
2012-03-01 15:32:22 +01:00
3a94e45050
372115: Cleanup of AsyncContextTest.java
2012-03-01 15:14:56 +01:00
97c37f68ba
372487 JDBCSessionManager does not work with Oracle
2012-03-01 17:05:54 +11:00
4530cf9e0c
372115: set pathInContext for suspend with request (without debug)
2012-02-28 13:28:58 +11:00
763bd6b190
372115: set pathInContext for suspend with request
2012-02-28 13:25:45 +11:00
8e1b863deb
371903: modified patch for jetty-7
2012-02-27 18:45:19 +11:00
265d35324a
371903: Implement servlet 3.0 spec change (spec section 9.4) to not commit response in Dispatcher.forward() when request.isAysncStarted()
...
Signed-off-by: Greg Wilkins <gregw@webtide.com>
2012-02-27 16:46:15 +11:00
7a58f3408e
371635: set all async attributes when the request is suspended
2012-02-27 16:32:50 +11:00
c9c5bd3b47
372457 - Big response + slow clients + pipelined requests cause Jetty spinning and eventually closing connections.
2012-02-24 10:40:22 +01:00
a90c3201e8
[Bug #371635 ] and [Bug #371649 ] add missing attributes (non-optimal) and resolve async flow issue with scoping
2012-02-21 10:34:11 -06:00
efb6883cf0
[maven-release-plugin] prepare for next development iteration
2012-02-15 14:22:19 -06:00
baf2b94f77
[maven-release-plugin] prepare release jetty-7.6.1.v20120215
2012-02-15 14:22:12 -06:00
b949fb7622
JETTY-1484 Add option for HashSessionManager to delete session files if it can't restore them
2012-02-09 19:21:10 +11:00
c7814d88d7
Added factory method for HttpGenerator.
2012-02-08 18:45:24 +01:00
74faad2ef6
Merge branch 'spdy'
2012-02-07 14:06:25 +01:00
b0119e4d62
Forwarded HttpParser.EventHandler methods from the inner class to the outer class (AbstractHttpConnection itself)
...
to allow other protocols such as SPDY to fake the emission of HTTP events by calling the EventHandler methods.
2012-02-07 14:05:40 +01:00
9207423ca0
Fixing JDK5 build abort due to bad javadocs
2012-02-06 10:01:44 -07:00
f98aa75b8f
a couple more pom tweaks
2012-02-01 15:27:33 -06:00
fdaad62b63
Migrating old javax.* deps to new org.eclipse.jetty.orbit deps
...
+ Removed old deps in javax.*, geronimo, and asm in favor of
new org.eclipse.jetty.orbit deps
+ Added enforcer rule to prevent reintroducing the old deps.
2012-01-31 15:21:58 -07:00
ad6126553b
[maven-release-plugin] prepare for next development iteration
2012-01-27 08:13:06 -06:00
4e25f7bb05
[maven-release-plugin] prepare release jetty-7.6.0.v20120127
2012-01-27 08:13:00 -06:00
7ac9eb585f
revert back to 7.6.0-SNAPSHOT
2012-01-26 10:42:11 -06:00
0c96fc40ea
[maven-release-plugin] prepare for next development iteration
2012-01-25 09:31:06 -06:00
b455b7d94e
[maven-release-plugin] prepare release jetty-7.6.0.v20120125
2012-01-25 09:30:55 -06:00
067e3f17cb
avoid NPE with jdk 7u4ea8 changed behaviour of SslContext init
2012-01-23 16:58:29 +11:00
8e69edaf9e
368992 avoid non-blocking flush when writing to avoid setting !_writable without _writeblocked
2012-01-20 12:40:34 +11:00
3e04cac272
JETTY-1475 made output state fields volatile to provide memory barrier for non dispatched thread IO
2012-01-18 14:16:09 +11:00
9ff8633554
368821 SslConnection.handle always calls wrapped Connection.handle, so state can be processed
2012-01-18 13:39:24 +11:00
1ac71de645
368632 Remove superfluous removal of org.apache.catalina.jsp_file
2012-01-18 07:41:16 +11:00
c1b2eedadc
368773 process data constraints without realm
2012-01-17 22:53:53 +11:00
50fe23882a
368787 always set token view to new header buffers in httpparser
2012-01-17 15:24:52 +11:00
ef9ac7760d
368635 moved lifecycle state reporting from toString to dump
2012-01-16 15:24:31 +11:00
f81a8a3d9c
367716: Enhance maxIdleTests for SelectChannelTimeout
...
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2012-01-11 17:07:50 +01:00
1697fcfa5a
368060 do not encode sendRedirect URLs
2012-01-11 12:23:04 +11:00
2d24eb8240
368191: fixed numerical overflow converting seconds to ms
2012-01-11 12:17:26 +11:00
d0b81a185c
367638: 361316: protected multipart filter from DoS
2012-01-11 11:51:04 +11:00
cb22cfdbe5
368240: renamed to use manage/unmanage instead of join/disjoin
2012-01-11 11:06:14 +11:00
a42721f321
Merge branch 'master' of ssh://git.eclipse.org/gitroot/jetty/org.eclipse.jetty.project
2012-01-10 20:55:45 +01:00
49b3239aa6
clear up the last of the maven warnings I see
2012-01-10 13:45:39 -06:00
297625b446
Removed redundant code and cleaned up.
2012-01-10 17:42:52 +01:00
bb0a320102
Improved toString().
2012-01-10 17:41:32 +01:00
8fcc22df32
368240: Improved handling of dispatch failure
2012-01-11 01:12:36 +11:00
968a2ac95b
368240: Added concept of join to AggregateLifeCycle. Used by HttpClient and AbstractConnector
2012-01-11 00:09:34 +11:00
9ba96f22dd
367974: Calculate wait times, etc. based on MAX_IDLE_TIME
2012-01-09 11:42:26 +11:00
2451614381
366774 removed XSS vulnerbility
2012-01-09 11:38:07 +11:00
c88a4551ae
366774: NumberFormatException when parsing Host header now causes a 400 return code
2012-01-09 11:33:06 +11:00
bbaef55bd6
366774: Request.java code format
2012-01-09 11:31:11 +11:00
90e9358ea5
367716 simplified maxIdleTime logic
2012-01-09 11:16:30 +11:00
588b068c06
replaced break in finally with progres=false
2012-01-09 08:53:19 +11:00
07afebafe5
367716: maxIdleTime fixes
...
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2012-01-05 13:31:36 +01:00
d6e841beae
367716: maxIdleTime fixes for async http and new maxIdleTime tests
...
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2012-01-05 13:31:24 +01:00
085c79d7d6
637638 limit number of form parameters to avoid DOS
2011-12-30 12:00:18 +11:00
009f8176a1
JETTY-1467 close half closed when idle
2011-12-28 23:09:33 +11:00
a4bba4f99c
364921 Made test less time sensitive for ssl
2011-12-23 01:23:59 +11:00
b4ab738ca9
364921 Made test less time sensitive for ssl
2011-12-23 00:57:26 +11:00
31471e11cc
364921 Made test less time sensitive
2011-12-23 00:35:32 +11:00
b99e03c465
364921 moved setCheckForIdle handling to AsyncHttpConnection
2011-12-22 00:48:25 +11:00
ef23bf11b8
Merged from origin/master.
2011-12-21 10:45:06 +01:00
55c98c010e
Merge branch 'master' of ssh://git.eclipse.org/gitroot/jetty/org.eclipse.jetty.project
2011-12-21 12:59:14 +11:00
2028bbb444
JETTY-1465 NPE in ContextHandler.toString
2011-12-21 12:57:33 +11:00
93a89026ce
364921 Improved timeout tests
2011-12-21 12:44:50 +11:00
569e930185
367048 test harness for guard on suspended requests
2011-12-20 11:13:45 +11:00
f767d8d910
367048 improved handleRequest guard for suspended requests
2011-12-19 15:15:00 +11:00
3e05c1e59d
Merged from origin/master.
2011-12-16 21:30:45 +01:00
2b626be186
Minor fixes for Windows build isues
2011-12-15 16:04:07 -07:00
e515b5b7dc
JETTY-1460 suppress PrintWriter exceptions
2011-12-15 20:19:04 +11:00
bc48eb1f5b
366730 pass the time idle to onIdleExpire
2011-12-14 11:41:32 -08:00
0b1becf58d
364936 use Resource for opening URL streams
2011-12-08 12:16:36 +11:00
15ab626410
Merge branch 'master' of ssh://git.eclipse.org/gitroot/jetty/org.eclipse.jetty.project
2011-12-05 08:31:49 +11:00
c6480fc659
365375 ResourceHandler should be a HandlerWrapper
2011-12-02 15:32:33 +11:00
7e9fbc7493
handle no jetty-dir css
2011-12-02 09:43:15 +11:00
de005c68fd
Revert "Merge branch 'release-8'"
...
This reverts commit 9e72457941df12605f0e
2011-11-30 16:27:30 +11:00
631b0ba1b6
[maven-release-plugin] prepare for next development iteration
2011-11-30 13:16:54 +11:00
9d3745f999
[maven-release-plugin] prepare release jetty-8.1.0.RC0
2011-11-30 13:16:41 +11:00
55d5020980
Merge remote-tracking branch 'origin/master' into jetty-8
...
Conflicts:
VERSION.txt
jetty-server/src/main/java/org/eclipse/jetty/server/AbstractHttpConnection.java
jetty-server/src/main/java/org/eclipse/jetty/server/Response.java
jetty-servlet/src/main/java/org/eclipse/jetty/servlet/ServletHandler.java
2011-11-29 09:06:25 +11:00
b969de1788
organized imports
2011-11-28 15:32:14 +11:00
ddce35a2e6
364638 SCEP does idle timestamp checking. New setCheckForIdle method controls onIdleExpired callback.
...
364921 a second onIdleExpired callback will result in close rather than a shutdown output.
2011-11-28 11:51:01 +11:00
8e913fe7c0
Fixed bug in AsyncEndPoint.hasProgressed() handling: the progressing status
...
must be remembered until a call to hasProgressed() is made.
Additional code cleanups.
2011-11-24 20:58:59 +01:00
c6103f2d53
Removed usages of ThreadDeath.
2011-11-24 20:39:04 +01:00
59c111bde1
Rewritten toString() methods using String.format().
2011-11-24 15:20:06 +01:00
7c0445f425
Merge branch 'master' of ssh://git.eclipse.org/gitroot/jetty/org.eclipse.jetty.project
2011-11-24 10:16:49 +01:00
8f1fff78c0
Improved dumping capabilities of HttpClient, and rewritten toString() methods using String.format().
2011-11-24 10:16:19 +01:00
1907944aef
364657 Support HTTP only cookies from standard API
2011-11-24 09:11:52 +11:00
024cf605e5
sensible sized default buffers
2011-11-22 16:48:39 +11:00
6cb2d13abd
Client idle connection uses onIdleExpired rather than close
2011-11-22 12:57:32 +11:00
0e9449ac85
Merge remote-tracking branch 'origin/master' into jetty-8
2011-11-21 18:18:09 +11:00
a00f790bc5
fixed close on early shutdown
2011-11-21 10:25:26 +11:00
712d250d3e
Merge remote-tracking branch 'origin/master'
2011-11-18 12:45:05 +01:00
ef49f079c8
363488 ShutdownHandler use stopper thread
2011-11-18 15:31:43 +11:00
324f2049f3
Merge branch 'master' of ssh://git.eclipse.org/gitroot/jetty/org.eclipse.jetty.project
2011-11-17 12:40:56 +01:00
d1592cf5b5
Added more SSL tests to detect spinning conditions.
2011-11-17 12:40:32 +01:00
89d0cb765f
improved siege like load tester
2011-11-17 14:45:41 +11:00
cd41752b9c
Merge remote-tracking branch 'origin/master' into jetty-8
2011-11-17 11:18:49 +11:00
127a5af8d7
Merge remote-tracking branch 'origin/master' into jetty-8
2011-11-17 10:59:54 +11:00
97b48a5b93
avoid double request handling when suspended
2011-11-17 10:35:14 +11:00
9beadb5f3a
Merge branch 'master' of ssh://git.eclipse.org/gitroot/jetty/org.eclipse.jetty.project
2011-11-15 18:01:30 +11:00
c9e08217d8
fixed read while suspended issue with double dispatch
2011-11-15 17:09:10 +11:00
8458df32cb
363381 Throw IllegalStateException if Request uri is null on getServerName
2011-11-15 14:43:09 +11:00
722f390800
numerous findbugs inspired cleanups
2011-11-15 11:22:35 +11:00
a82d429e0b
improved test
2011-11-15 08:09:16 +11:00
f7c1c414b5
Merge branch 'master' of ssh://git.eclipse.org/gitroot/jetty/org.eclipse.jetty.project
2011-11-14 12:12:18 +11:00
e723b90de4
363488 ShutdownHandler pollutes the log during shutdown
2011-11-14 12:11:39 +11:00
26bf17f9c1
removed lock from HttpParser. Altered way that returnBuffers called to avoid nulling buffer for other thread
2011-11-14 12:08:21 +11:00
09999a629d
Removed EndPoint.isBufferingOutput().
2011-11-10 21:52:33 +01:00
7cc526b9dd
remove confused test
2011-11-10 15:39:17 +11:00
921b285235
Avoid flush if no content to flush
2011-11-10 14:45:28 +11:00
144195d435
removed redundant setConnection
2011-11-10 12:47:50 +11:00
e3cf7a8898
improved ThreadDeath handling
2011-11-10 12:40:29 +11:00
7a9b8f1e9d
reverted last changes due to instability
2011-11-10 12:11:58 +11:00
d61258ec4e
clean ups from review from sbordet.
...
Removed isBufferred
fixed instanceof ThreadDeath
avoid race with onInputShutdown
2011-11-10 10:12:37 +11:00
af4c40d793
fixed SSL buffer pool
2011-11-09 17:39:59 +11:00
a36342438c
cleaned up some unit tests
2011-11-09 17:03:11 +11:00
4808239cbd
copyright and comments
2011-11-09 08:17:56 +11:00
5bf6f60396
copyright and comments
2011-11-09 08:13:29 +11:00
fc24e24693
361135 Allow session cookies to NEVER be marked as secure, even on HTTPS requests.
2011-11-08 18:22:32 +11:00
7a082280f1
Merge remote-tracking branch 'origin/master' into jetty-7.6
...
Conflicts:
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/pom.xml
jetty-ajp/pom.xml
jetty-annotations/pom.xml
jetty-client/pom.xml
jetty-client/src/main/java/org/eclipse/jetty/client/HttpConnection.java
jetty-client/src/main/java/org/eclipse/jetty/client/SelectConnector.java
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/ssl/SslContextFactory.java
jetty-io/pom.xml
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-jaspi/pom.xml
jetty-jmx/pom.xml
jetty-jndi/pom.xml
jetty-jsp-2.1/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-logback/pom.xml
jetty-osgi/jetty-osgi-boot-warurl/pom.xml
jetty-osgi/jetty-osgi-boot/pom.xml
jetty-osgi/jetty-osgi-equinoxtools/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-rewrite/pom.xml
jetty-security/pom.xml
jetty-server/pom.xml
jetty-servlet/pom.xml
jetty-servlets/pom.xml
jetty-start/pom.xml
jetty-util/pom.xml
jetty-util/src/test/java/org/eclipse/jetty/util/log/LogTest.java
jetty-util/src/test/java/org/eclipse/jetty/util/log/NamedLogTest.java
jetty-webapp/pom.xml
jetty-websocket/pom.xml
jetty-websocket/src/main/java/org/eclipse/jetty/websocket/WebSocketConnectionD13.java
jetty-xml/pom.xml
pom.xml
test-continuation-jetty6/pom.xml
test-continuation/pom.xml
test-jetty-nested/pom.xml
test-jetty-servlet/pom.xml
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
2011-11-07 18:09:31 +11:00
9907125cff
improved no progress check
2011-11-07 17:14:39 +11:00
202475aad9
clean build
2011-11-07 15:34:33 +11:00
2b6fec713c
Merge branch 'master' into jetty-8
2011-11-02 16:47:04 -05:00
25f70e9060
[Bug 362696] expand virtual host configuration options to ContextHandler
...
and add associated test case for new behavior
2011-11-02 11:29:45 -05:00
317baa1010
[Bug 362696] additional virtual host configuration options to
...
ContextHandler
2011-11-02 11:29:45 -05:00
48cafe46a6
362614 NPE in accepting connection
2011-11-02 12:01:31 +11:00
5aac176fbd
some Async client tests passing
2011-10-28 11:38:41 +11:00
738cbfdccc
refactored client to use upgradeable endpoint. Instert SslConnection when needed
2011-10-27 16:37:07 +11:00
3dfd8b7698
jetty-server passing tests
2011-10-27 00:38:05 +11:00
4258b6f385
SslConnection server side mostly working
2011-10-26 22:55:02 +11:00
61664d3c0f
Added concept of SslConnection
2011-10-26 01:15:59 +11:00
d5320d95ba
[maven-release-plugin] prepare for next development iteration
2011-10-24 15:02:30 -05:00
d02f74a50c
[maven-release-plugin] prepare release jetty-8.0.4.v20111024
2011-10-24 15:02:23 -05:00
1d86da8f68
[maven-release-plugin] prepare for next development iteration
2011-10-24 14:52:54 -05:00
5f349ecc92
[maven-release-plugin] prepare release jetty-7.5.4.v20111024
2011-10-24 14:52:48 -05:00
6a17c69bfb
Non SSL client working
2011-10-24 17:14:56 +11:00
fc497fe1e8
Merge remote-tracking branch 'origin/master' into jetty-8
2011-10-24 16:30:10 +11:00
a642f7b55c
Merge remote-tracking branch 'origin/master' into jetty-7.6
...
Conflicts:
jetty-http/src/main/java/org/eclipse/jetty/http/HttpGenerator.java
jetty-io/src/main/java/org/eclipse/jetty/io/nio/SslSelectChannelEndPoint.java
2011-10-24 11:27:42 +11:00
5ee01184ac
reworked async client connection
2011-10-24 11:23:29 +11:00
cd0628ab66
Added isDebugEnabled guards to debugging that generates garbage
2011-10-22 09:39:54 +11:00
0ba6fc7408
Merge remote-tracking branch 'origin/master' into jetty-8
2011-10-21 14:55:39 +11:00
5140a95144
refactored HttpConnection name
2011-10-20 15:12:19 +11:00
0e284f78f5
Protected HttpParser from multiple entry.
2011-10-20 12:18:10 +11:00
74fd2e8965
Merge branch 'master' into jetty-7.6
...
Conflicts:
jetty-client/src/main/java/org/eclipse/jetty/client/HttpConnection.java
jetty-io/src/main/java/org/eclipse/jetty/io/nio/SslSelectChannelEndPoint.java
2011-10-19 17:43:55 +11:00
4c89a79449
JETTY-1444 start threadpool before selector manager
2011-10-19 17:23:03 +11:00
c93e1c297f
360836 Accept parameters with bad UTF-8. Use replacement character
2011-10-19 16:23:56 +11:00
d63577b4e9
361325 359292 Allow KeyStore to be set
2011-10-19 15:20:01 +11:00
0fd0f5a7a1
361135 secure cookies for sessions
2011-10-19 12:21:26 +11:00
49f8b0de1a
Websocket partially refactored and passing tests
2011-10-18 21:59:49 +11:00
6edb7c1930
organised imports
2011-10-18 15:05:22 +11:00
e43b718fb1
Refactored NIO to better handle half closes. Applied the following policy:
...
Call shutdownOutput to signal the other end that you have written all the data that your are going to write (eg and the end of a non persistent HTTP response). This can be done either by generator (when it is complete) or coordinator or handle - but we need to decide which and have only 1 doing it.
Call shutdownInput to signal your own end that you have read -1 and to allow other local code to check that with an isInputShutdown. Ideally we could get by without any calls at all to shutdownInput, so long as we well handle reading -1 (Currently we don't). This should be done by whatever does the IO read.
Calling close should always be a real TCP close, even with SSL. SSL shutdown
The default handling of an idle callback should be close. But some connections (NOT endpoints) may implement idle as initiating a shutdown exchange (eg websocket close). If they do, this is state that should be held in the connection or parser - ie do-this-exhange-and-then-shutdown
Call close when you want to shutdown Output and you have already read -1, so input is already shutdown. We need to double verify that this is correct and that if a FIN has been received from the other end, that a close will not result in a reset. I'll do that today.
Call close when you want to shutdown Input and output has already been shutdown. This means you have read -1 after having sent a FIN.
Call close on any errors.
The current state is that server HttpConnection appears to be working well. Other connection types have not been updated and/or tested
2011-10-18 14:38:02 +11:00
f2bf8c277b
360938 Connections closed after a while.
...
Resetting _total_no_progress when progress is made, to avoid that the endpoint is closed after a while of normal activity.
2011-10-14 12:45:41 +02:00
2700581906
Merge from master
2011-10-13 07:59:30 -05:00
160385606c
358263 - JDBCSessionIdManager add setDatasource(DataSource) method
2011-10-13 13:58:25 +11:00
a38f2a9e68
[maven-release-plugin] prepare for next development iteration
2011-10-11 10:16:54 -05:00
55a1be5435
[maven-release-plugin] prepare release jetty-8.0.3.v20111011
2011-10-11 10:16:47 -05:00
925335dab2
merge from master
2011-10-11 09:43:27 -05:00
7d10182034
[maven-release-plugin] prepare for next development iteration
2011-10-11 08:47:07 -05:00
b6ac542604
[maven-release-plugin] prepare release jetty-7.5.3.v20111011
2011-10-11 08:47:00 -05:00
3b80b206f3
reduce verbosity of no progress checks
2011-10-11 01:37:15 +11:00
4ca2828ace
Added javadoc with shutdown example
2011-10-07 10:20:33 -05:00
b55ec9bac1
[maven-release-plugin] prepare for next development iteration
2011-10-06 17:59:52 -05:00
e32e8b1377
[maven-release-plugin] prepare release jetty-8.0.2.v20111006
2011-10-06 17:59:46 -05:00
eadc1d418a
Removed dead code.
2011-10-06 17:28:17 -05:00
0c55c774d4
[maven-release-plugin] prepare for next development iteration
2011-10-06 17:25:38 -05:00
4d822759de
[maven-release-plugin] prepare release jetty-7.5.2.v20111006
2011-10-06 17:25:32 -05:00
b58006b4a4
[maven-release-plugin] prepare for next development iteration
2011-10-06 09:43:37 -05:00
7eca345e8d
[maven-release-plugin] prepare release jetty-7.5.2.v20111006
2011-10-06 09:43:31 -05:00
8d61ce374b
Removed dead code.
2011-10-06 16:07:19 +02:00
d862348b4c
Merge remote-tracking branch 'origin/master' into jetty-8
...
Conflicts:
jetty-server/src/main/java/org/eclipse/jetty/server/HttpConnection.java
2011-10-06 18:31:57 +11:00
c6b3bab6d7
cleanup debug output
2011-10-05 21:41:01 +11:00
f778867f32
357240 ensure half closed is not schedule with no progress
2011-10-05 14:48:47 +11:00
07aa997568
357240 test that triggers no progress handling
2011-10-05 10:01:34 +11:00
32dbb1bddb
Merge remote-tracking branch 'origin/master' into jetty-8
...
Conflicts:
VERSION.txt
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/pom.xml
jetty-ajp/pom.xml
jetty-annotations/pom.xml
jetty-client/pom.xml
jetty-continuation/pom.xml
jetty-deploy/pom.xml
jetty-deploy/src/main/config/etc/jetty-deploy.xml
jetty-distribution/pom.xml
jetty-http/pom.xml
jetty-io/pom.xml
jetty-jaspi/pom.xml
jetty-jmx/pom.xml
jetty-jndi/pom.xml
jetty-jsp-2.1/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-jsp/src/main/java/org/eclipse/jetty/osgi/boot/jsp/FragmentActivator.java
jetty-osgi/jetty-osgi-boot-logback/pom.xml
jetty-osgi/jetty-osgi-boot-warurl/pom.xml
jetty-osgi/jetty-osgi-boot/pom.xml
jetty-osgi/jetty-osgi-equinoxtools/pom.xml
jetty-osgi/jetty-osgi-httpservice/pom.xml
jetty-osgi/jetty-osgi-servletbridge/pom.xml
jetty-osgi/jetty-osgi-servletbridge/src/main/java/org/eclipse/jetty/osgi/servletbridge/FrameworkLauncherExtended.java
jetty-osgi/jetty-osgi-servletbridge/src/main/webapp/WEB-INF/web.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-rewrite/pom.xml
jetty-security/pom.xml
jetty-server/pom.xml
jetty-server/src/main/java/org/eclipse/jetty/server/HttpOutput.java
jetty-servlet/pom.xml
jetty-servlets/pom.xml
jetty-start/pom.xml
jetty-util/pom.xml
jetty-webapp/pom.xml
jetty-websocket/pom.xml
jetty-xml/pom.xml
pom.xml
test-continuation-jetty6/pom.xml
test-continuation/pom.xml
test-jetty-nested/pom.xml
test-jetty-servlet/pom.xml
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
2011-10-04 17:45:15 +11:00
b30ac39868
Merge branch 'master' into sslClose
2011-10-03 10:50:11 +11:00
211e196dc6
add license block
2011-09-30 08:09:42 -05:00
727d293264
minor formatting tweaks and one scope change
2011-09-30 07:58:39 -05:00
3e73e79c1e
code convention fixes, javadoc update
2011-09-30 07:58:39 -05:00
37845a1a4f
357687: Add ShutdownHandler + UnitTest
2011-09-30 07:58:39 -05:00
7cb3246624
Merge branch 'master' into sslClose
2011-09-29 15:50:42 +10:00
d0a2557527
357240 fixed client connection recycle
2011-09-29 15:50:09 +10:00
3dc0120d57
[Bug 359309] adjust previous test for servletPath to include pathInfo
2011-09-28 18:43:43 -05:00
7ecea5afd0
[Bug 359309] resolve include and forward issues related to resource handler
2011-09-28 18:30:20 -05:00
45e6cfa790
[Bug 359309] fix unit test to use HttpServlet*Wrappers and reformat the resourcehandler a bit to debug last two issues
2011-09-28 18:02:27 -05:00
21a111db27
Merge branch 'master' into sslClose
...
Conflicts:
jetty-client/src/main/java/org/eclipse/jetty/client/HttpExchange.java
2011-09-29 08:10:39 +10:00
af698b0023
Add a ResourceHandler test, we seem to be missing even a basic one
2011-09-28 14:38:14 -05:00
fbf0fad076
357240 improved ishut/oshut handling
2011-09-28 22:50:38 +10:00
444c09fce7
357240 switch fix
2011-09-28 20:37:31 +10:00
dbf636df4d
357240 work in progress
2011-09-28 20:33:03 +10:00
6eaa1364e3
357240 work in progress
2011-09-28 16:21:57 +10:00
72dbbd3461
357240 safer SSL close
2011-09-27 22:37:27 +10:00
44923230e3
357240 safer SSL close
2011-09-27 16:57:17 +10:00
27753fa747
removed debug
2011-09-26 23:00:57 +10:00
8195103f01
358035 idle time only active if > 0
2011-09-23 14:12:40 +10:00
75645cef0e
358674 Added include/exclude protocols to SslContextFactory
2011-09-23 08:02:42 +10:00
e15e9ddc99
JETTY-1377 extra logging for busy selector
2011-09-21 16:17:35 +10:00
fe489224e6
Merge branch 'master' of ssh://git.eclipse.org/gitroot/jetty/org.eclipse.jetty.project
2011-09-21 13:46:21 +10:00
790f6be8a6
JETTY-1130 Access Sessions from HashSessionIdManager
2011-09-21 11:41:43 +10:00
Jesse McConnell
Jan Bartel
Thomas Becker
Greg Wilkins
Simone Bordet
Joakim Erdfelt
Jan Bartel