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 |
|
Simone Bordet
|
ae62618a00
|
Reworked logging, and catching IOException during the processing of a close.
|
2011-10-01 17:56:48 +02:00 |
|
Simone Bordet
|
a134664b4c
|
Method close() should really close the underlying channel, not only send the SSL close message.
|
2011-09-29 23:01:43 +02:00 |
|
Greg Wilkins
|
79e431f330
|
cleanup
|
2011-09-29 17:36:23 +10:00 |
|
Greg Wilkins
|
d0a2557527
|
357240 fixed client connection recycle
|
2011-09-29 15:50:09 +10:00 |
|
Greg Wilkins
|
603ee3dae1
|
357240 fixed client tests
|
2011-09-29 00:23:31 +10:00 |
|
Greg Wilkins
|
1420253643
|
357240 improved ishut/oshut handling
|
2011-09-28 22:58:14 +10:00 |
|
Greg Wilkins
|
fbf0fad076
|
357240 improved ishut/oshut handling
|
2011-09-28 22:50:38 +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
|
c20ce1fc4e
|
357240 remove buffer counts
|
2011-09-28 10:44:43 +10:00 |
|
Greg Wilkins
|
ac7fcd9ab7
|
357240 work in progress
|
2011-09-28 00:29:17 +10:00 |
|
Greg Wilkins
|
16d54532d6
|
357240 work in progress
|
2011-09-28 00:08:40 +10:00 |
|
Greg Wilkins
|
61dd1493b1
|
357240 work in progress
|
2011-09-28 00:02:59 +10:00 |
|
Greg Wilkins
|
9f885dcc6e
|
357240 removed gather write
|
2011-09-27 23:41:49 +10:00 |
|
Simone Bordet
|
ded5143700
|
Split "if" statement in case of flushing while closing, so if the input is shutdown we do not call closeOutbound().
|
2011-09-27 15:00:20 +02:00 |
|
Greg Wilkins
|
44923230e3
|
357240 safer SSL close
|
2011-09-27 16:57:17 +10:00 |
|
Greg Wilkins
|
b28a53ad52
|
357240 safer SSL close
|
2011-09-27 11:13:20 +10:00 |
|
Greg Wilkins
|
8195103f01
|
358035 idle time only active if > 0
|
2011-09-23 14:12:40 +10:00 |
|
Greg Wilkins
|
6bebdceb3a
|
JETTY-1377 extra logging for busy selector
|
2011-09-21 16:45:32 +10:00 |
|
Greg Wilkins
|
e15e9ddc99
|
JETTY-1377 extra logging for busy selector
|
2011-09-21 16:17:35 +10:00 |
|
Greg Wilkins
|
ff29a1cc51
|
JETTY-1322 idle sweeper checks for closed endp
|
2011-09-21 13:46:48 +10:00 |
|
Greg Wilkins
|
a6988108c3
|
minor cleanups and extra debug
|
2011-09-16 15:29:28 +10:00 |
|
Simone Bordet
|
9c43e04bb4
|
Guarding against NPE in case of concurrent stop().
|
2011-09-12 21:01:08 +02:00 |
|
Jesse McConnell
|
97dee04a68
|
merge over from jetty7
|
2011-09-08 11:51:48 -05:00 |
|
Greg Wilkins
|
b8556bec76
|
fixes from running autobahn test suite
|
2011-09-08 11:35:39 +10:00 |
|
Jesse McConnell
|
7c7fc30b90
|
Merge over from jetty 7 master
|
2011-09-07 16:08:35 -05:00 |
|
Greg Wilkins
|
65a1e84886
|
misc findbugs cleanups
|
2011-09-07 15:57:18 +10:00 |
|
Jan Bartel
|
1e079f06c9
|
Merge remote-tracking branch 'origin/master' into jetty-8
|
2011-09-01 14:11:53 +10:00 |
|
Greg Wilkins
|
0d17559f7d
|
handle -1 maxIdleTime as disabled timeout
|
2011-08-30 23:37:41 +10:00 |
|
Greg Wilkins
|
45148353ec
|
293739 Hide stacks in named log testing. Various other minor log cleanups in output.
|
2011-08-30 16:05:21 +10:00 |
|
Greg Wilkins
|
33fa7afb47
|
356144 added SelectorManager.setSelectorPriorityDelta(int)
|
2011-08-30 14:24:28 +10:00 |
|
Joakim Erdfelt
|
f15617fbb2
|
293739 - Deprecate static Jetty Log usage in favor of named logs
+ Finished conversion of jetty-continuation, jetty-http, jetty-io
|
2011-08-24 12:51:39 -07:00 |
|
Jan Bartel
|
6e8afd6795
|
Merge remote-tracking branch 'origin/master' into jetty-8
Conflicts:
VERSION.txt
|
2011-08-16 11:35:46 +10:00 |
|
Greg Wilkins
|
2cb0cd377e
|
353073 better close messages
|
2011-08-15 15:19:14 +10:00 |
|
Jan Bartel
|
050cb83b35
|
Merge remote-tracking branch 'origin/master' into jetty-8
Conflicts:
jetty-osgi/jetty-osgi-equinoxtools/src/main/java/org/eclipse/jetty/osgi/equinoxtools/console/EquinoxConsoleWebSocketServlet.java
jetty-servlets/src/test/java/org/eclipse/jetty/servlets/GzipFilterTest.java
jetty-websocket/pom.xml
|
2011-08-12 18:43:15 +10:00 |
|
Greg Wilkins
|
6b9ecd0806
|
353073 Improved client API to use futures
|
2011-08-11 11:50:23 +10:00 |
|
Jan Bartel
|
93cc111a02
|
Merge remote-tracking branch 'origin/master' into jetty-8
Conflicts:
VERSION.txt
jetty-io/src/main/java/org/eclipse/jetty/io/nio/IndirectNIOBuffer.java
|
2011-07-25 17:42:30 +10:00 |
|
Greg Wilkins
|
2be177484e
|
Miscellaneous changes resulting from the optimization for 7.5.x
Mostly refining debug and toString()
Use shutdown for idle expiry
|
2011-07-22 18:12:56 +10:00 |
|
Greg Wilkins
|
d091003cfc
|
return EOF rather than throw EoFException
|
2011-07-18 14:30:04 +10:00 |
|
Jan Bartel
|
86f7e76c4d
|
Merge of jetty-7 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-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-nested/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/META-INF/MANIFEST.MF
jetty-osgi/jetty-osgi-boot/pom.xml
jetty-osgi/jetty-osgi-boot/src/main/java/org/eclipse/jetty/osgi/boot/OSGiAppProvider.java
jetty-osgi/jetty-osgi-equinoxtools/META-INF/MANIFEST.MF
jetty-osgi/jetty-osgi-equinoxtools/pom.xml
jetty-osgi/jetty-osgi-equinoxtools/src/main/java/org/eclipse/jetty/osgi/equinoxtools/console/EquinoxConsoleContinuationServlet.java
jetty-osgi/jetty-osgi-httpservice/pom.xml
jetty-osgi/jetty-osgi-servletbridge/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-servlets/src/main/java/org/eclipse/jetty/servlets/ProxyServlet.java
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-07-11 12:05:58 +10:00 |
|
Greg Wilkins
|
17e907c2fb
|
git diff 54e885d9670548c12cf9ffbd58702b73d373c186 remotes/origin/jetty-8-historical | patch -p1 ; git add -A
|
2011-07-07 18:18:24 +10:00 |
|
Greg Wilkins
|
b890ff8fb2
|
applied jetty-7p 7f68abf..b2e4270, 7f68abf..a900c5e, 9a93c9e..9f94539. decomposed async and blocking handling. Simplified HttpFields and Buffer handling from the HttpParser.
|
2011-07-07 12:16:58 +10:00 |
|
Greg Wilkins
|
5c9fe5b13e
|
350642 Dont close SCEP during NIOBuffer manipulation
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@3437 7e9141cc-0065-0410-87d8-b60c137991c4
|
2011-06-29 04:38:47 +00:00 |
|
Greg Wilkins
|
c2a6df4c47
|
350642 Do not close SCEP during NIOBuffer manipulation
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@3436 7e9141cc-0065-0410-87d8-b60c137991c4
|
2011-06-29 02:51:09 +00:00 |
|
Greg Wilkins
|
aa990479f6
|
349896 SCEP supports zero maxIdleTime
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@3408 7e9141cc-0065-0410-87d8-b60c137991c4
|
2011-06-21 04:09:30 +00:00 |
|
Greg Wilkins
|
e55c21ca5c
|
347898 Close channel on JVM exceptions
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@3374 7e9141cc-0065-0410-87d8-b60c137991c4
|
2011-06-01 11:32:13 +00:00 |
|
Greg Wilkins
|
af2050147c
|
JETTY-1342 recreate selector in change task
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@3365 7e9141cc-0065-0410-87d8-b60c137991c4
|
2011-06-01 01:18:58 +00:00 |
|
Simone Bordet
|
1bb56442a7
|
Improved SslSelectChannelEndPoint to free buffers when not needed, and added more truncation attack tests.
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@3253 7e9141cc-0065-0410-87d8-b60c137991c4
|
2011-05-25 09:56:04 +00:00 |
|
Simone Bordet
|
eca44d8983
|
Rolled back temporary log statements.
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@3240 7e9141cc-0065-0410-87d8-b60c137991c4
|
2011-05-23 18:04:44 +00:00 |
|