Greg Wilkins
5aac176fbd
some Async client tests passing
2011-10-28 11:38:41 +11:00
Greg Wilkins
738cbfdccc
refactored client to use upgradeable endpoint. Instert SslConnection when needed
2011-10-27 16:37:07 +11:00
Greg Wilkins
3dfd8b7698
jetty-server passing tests
2011-10-27 00:38:05 +11:00
Greg Wilkins
4258b6f385
SslConnection server side mostly working
2011-10-26 22:55:02 +11:00
Greg Wilkins
61664d3c0f
Added concept of SslConnection
2011-10-26 01:15:59 +11:00
Jesse McConnell
d5320d95ba
[maven-release-plugin] prepare for next development iteration
2011-10-24 15:02:30 -05:00
Jesse McConnell
d02f74a50c
[maven-release-plugin] prepare release jetty-8.0.4.v20111024
2011-10-24 15:02:23 -05:00
Jesse McConnell
1d86da8f68
[maven-release-plugin] prepare for next development iteration
2011-10-24 14:52:54 -05:00
Jesse McConnell
5f349ecc92
[maven-release-plugin] prepare release jetty-7.5.4.v20111024
2011-10-24 14:52:48 -05:00
Greg Wilkins
6a17c69bfb
Non SSL client working
2011-10-24 17:14:56 +11:00
Jan Bartel
fc497fe1e8
Merge remote-tracking branch 'origin/master' into jetty-8
2011-10-24 16:30:10 +11:00
Greg Wilkins
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
Greg Wilkins
5ee01184ac
reworked async client connection
2011-10-24 11:23:29 +11:00
Greg Wilkins
cd0628ab66
Added isDebugEnabled guards to debugging that generates garbage
2011-10-22 09:39:54 +11:00
Jan Bartel
0ba6fc7408
Merge remote-tracking branch 'origin/master' into jetty-8
2011-10-21 14:55:39 +11:00
Greg Wilkins
5140a95144
refactored HttpConnection name
2011-10-20 15:12:19 +11:00
Greg Wilkins
0e284f78f5
Protected HttpParser from multiple entry.
2011-10-20 12:18:10 +11:00
Greg Wilkins
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
Greg Wilkins
4c89a79449
JETTY-1444 start threadpool before selector manager
2011-10-19 17:23:03 +11:00
Greg Wilkins
c93e1c297f
360836 Accept parameters with bad UTF-8. Use replacement character
2011-10-19 16:23:56 +11:00
Greg Wilkins
d63577b4e9
361325 359292 Allow KeyStore to be set
2011-10-19 15:20:01 +11:00
Greg Wilkins
0fd0f5a7a1
361135 secure cookies for sessions
2011-10-19 12:21:26 +11:00
Greg Wilkins
49f8b0de1a
Websocket partially refactored and passing tests
2011-10-18 21:59:49 +11:00
Greg Wilkins
6edb7c1930
organised imports
2011-10-18 15:05:22 +11:00
Greg Wilkins
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
Simone Bordet
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
Jesse McConnell
2700581906
Merge from master
2011-10-13 07:59:30 -05:00
Jan Bartel
160385606c
358263 - JDBCSessionIdManager add setDatasource(DataSource) method
2011-10-13 13:58:25 +11:00
Jesse McConnell
a38f2a9e68
[maven-release-plugin] prepare for next development iteration
2011-10-11 10:16:54 -05:00
Jesse McConnell
55a1be5435
[maven-release-plugin] prepare release jetty-8.0.3.v20111011
2011-10-11 10:16:47 -05:00
Jesse McConnell
925335dab2
merge from master
2011-10-11 09:43:27 -05:00
Jesse McConnell
7d10182034
[maven-release-plugin] prepare for next development iteration
2011-10-11 08:47:07 -05:00
Jesse McConnell
b6ac542604
[maven-release-plugin] prepare release jetty-7.5.3.v20111011
2011-10-11 08:47:00 -05:00
Greg Wilkins
3b80b206f3
reduce verbosity of no progress checks
2011-10-11 01:37:15 +11:00
Jesse McConnell
4ca2828ace
Added javadoc with shutdown example
2011-10-07 10:20:33 -05:00
Jesse McConnell
b55ec9bac1
[maven-release-plugin] prepare for next development iteration
2011-10-06 17:59:52 -05:00
Jesse McConnell
e32e8b1377
[maven-release-plugin] prepare release jetty-8.0.2.v20111006
2011-10-06 17:59:46 -05:00
Simone Bordet
eadc1d418a
Removed dead code.
2011-10-06 17:28:17 -05:00
Jesse McConnell
0c55c774d4
[maven-release-plugin] prepare for next development iteration
2011-10-06 17:25:38 -05:00
Jesse McConnell
4d822759de
[maven-release-plugin] prepare release jetty-7.5.2.v20111006
2011-10-06 17:25:32 -05:00
Jesse McConnell
b58006b4a4
[maven-release-plugin] prepare for next development iteration
2011-10-06 09:43:37 -05:00
Jesse McConnell
7eca345e8d
[maven-release-plugin] prepare release jetty-7.5.2.v20111006
2011-10-06 09:43:31 -05:00
Simone Bordet
8d61ce374b
Removed dead code.
2011-10-06 16:07:19 +02:00
Jan Bartel
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
Greg Wilkins
c6b3bab6d7
cleanup debug output
2011-10-05 21:41:01 +11:00
Greg Wilkins
f778867f32
357240 ensure half closed is not schedule with no progress
2011-10-05 14:48:47 +11:00
Greg Wilkins
07aa997568
357240 test that triggers no progress handling
2011-10-05 10:01:34 +11:00
Jan Bartel
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
Greg Wilkins
b30ac39868
Merge branch 'master' into sslClose
2011-10-03 10:50:11 +11:00
Jesse McConnell
211e196dc6
add license block
2011-09-30 08:09:42 -05:00
Jesse McConnell
727d293264
minor formatting tweaks and one scope change
2011-09-30 07:58:39 -05:00
Thomas Becker
3e73e79c1e
code convention fixes, javadoc update
2011-09-30 07:58:39 -05:00
Thomas Becker
37845a1a4f
357687: Add ShutdownHandler + UnitTest
2011-09-30 07:58:39 -05:00
Greg Wilkins
7cb3246624
Merge branch 'master' into sslClose
2011-09-29 15:50:42 +10:00
Greg Wilkins
d0a2557527
357240 fixed client connection recycle
2011-09-29 15:50:09 +10:00
Jesse McConnell
3dc0120d57
[Bug 359309] adjust previous test for servletPath to include pathInfo
2011-09-28 18:43:43 -05:00
Jesse McConnell
7ecea5afd0
[Bug 359309] resolve include and forward issues related to resource handler
2011-09-28 18:30:20 -05:00
Jesse McConnell
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
Greg Wilkins
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
Jesse McConnell
af698b0023
Add a ResourceHandler test, we seem to be missing even a basic one
2011-09-28 14:38:14 -05:00
Greg Wilkins
fbf0fad076
357240 improved ishut/oshut handling
2011-09-28 22:50:38 +10:00
Greg Wilkins
444c09fce7
357240 switch fix
2011-09-28 20:37:31 +10:00
Greg Wilkins
dbf636df4d
357240 work in progress
2011-09-28 20:33:03 +10:00
Greg Wilkins
6eaa1364e3
357240 work in progress
2011-09-28 16:21:57 +10:00
Greg Wilkins
72dbbd3461
357240 safer SSL close
2011-09-27 22:37:27 +10:00
Greg Wilkins
44923230e3
357240 safer SSL close
2011-09-27 16:57:17 +10:00
Greg Wilkins
27753fa747
removed debug
2011-09-26 23:00:57 +10:00
Greg Wilkins
8195103f01
358035 idle time only active if > 0
2011-09-23 14:12:40 +10:00
Greg Wilkins
75645cef0e
358674 Added include/exclude protocols to SslContextFactory
2011-09-23 08:02:42 +10:00
Greg Wilkins
e15e9ddc99
JETTY-1377 extra logging for busy selector
2011-09-21 16:17:35 +10:00
Greg Wilkins
fe489224e6
Merge branch 'master' of ssh://git.eclipse.org/gitroot/jetty/org.eclipse.jetty.project
2011-09-21 13:46:21 +10:00
Greg Wilkins
790f6be8a6
JETTY-1130 Access Sessions from HashSessionIdManager
2011-09-21 11:41:43 +10:00
Greg Wilkins
f8b8a2e770
JETTY-1277 Fixed sendRedirect encoding of relative locations
2011-09-21 11:30:40 +10:00
Jesse McConnell
f6d26c2007
[Bug 358263] add method for osgi users to register a driver as Class.forName does not work for them
2011-09-20 14:09:26 -05:00
Greg Wilkins
dacb8962f0
356144 Allow SelectorManager thread priority to be set
2011-09-20 15:23:25 +10:00
Greg Wilkins
94d43e4229
356274 Start SSL socket factory in call to open()
2011-09-20 15:19:19 +10:00
Greg Wilkins
978f06242b
357240 extra debug
2011-09-20 14:50:53 +10:00
Greg Wilkins
0949443fab
358164 Dispatch from servlet to handler
2011-09-20 12:59:22 +10:00
Jan Bartel
4cec8627b9
353267 Request._parameters initialization bug
...
Add some extra tests.
2011-09-19 19:09:55 +10:00
Jan Bartel
479d9606ec
353267 Request._parameters initialization bug
2011-09-19 19:05:49 +10:00
Jan Bartel
c984d25871
358027 NullPointerException in ResourceHandler with jetty-stylesheet.css
2011-09-19 17:57:48 +10:00
Jan Bartel
8e765f12c6
JETTY-1431
2011-09-19 10:32:43 +10:00
Greg Wilkins
949975e46a
358035 servlet streams access max idle time from endp
2011-09-19 08:09:20 +10:00
Greg Wilkins
a6988108c3
minor cleanups and extra debug
2011-09-16 15:29:28 +10:00
Jesse McConnell
d5304b2cbc
[maven-release-plugin] prepare for next development iteration
2011-09-08 12:20:15 -05:00
Jesse McConnell
c33548d38a
[maven-release-plugin] prepare release jetty-8.0.1.v20110908
2011-09-08 12:19:24 -05:00
Jesse McConnell
ebdb89dc23
[maven-release-plugin] prepare for next development iteration
2011-09-08 12:00:16 -05:00
Jesse McConnell
932245a114
[maven-release-plugin] prepare release jetty-7.5.1.v20110908
2011-09-08 12:00:10 -05:00
Jesse McConnell
721c8ab682
updating version.txt and resetting pom version to 8.0.1-SNAPSHOT
2011-09-08 11:54:53 -05:00
Jesse McConnell
f8c1858efb
Merge branch 'jetty-8' into release-8
2011-09-08 11:52:23 -05:00
Jesse McConnell
97dee04a68
merge over from jetty7
2011-09-08 11:51:48 -05:00
Jesse McConnell
37d0f53b0a
updating version.txt and resetting pom versions to 7.5.1-SNAPSHOT
2011-09-08 11:40:37 -05:00
Jesse McConnell
4a575d4958
Merge branch 'master' into release
2011-09-08 11:36:48 -05:00
Greg Wilkins
a75b9bfb0c
357058 Acceptor thread blocking
2011-09-09 01:36:24 +10:00
Jesse McConnell
4e47d6a7fa
[maven-release-plugin] prepare for next development iteration
2011-09-07 18:16:58 -05:00
Jesse McConnell
d77a12962b
[maven-release-plugin] prepare release jetty-8.0.1.v20110907
2011-09-07 18:16:50 -05:00
Jesse McConnell
6b614a54f0
[maven-release-plugin] prepare for next development iteration
2011-09-07 18:12:16 -05:00
Jesse McConnell
ce55c8c601
[maven-release-plugin] prepare release jetty-7.5.1.v20110907
2011-09-07 18:12:09 -05:00
Jesse McConnell
7c7fc30b90
Merge over from jetty 7 master
2011-09-07 16:08:35 -05:00
Jesse McConnell
1744b5bce1
reset from release
2011-09-07 11:09:46 -05:00