Greg Wilkins
7e3b8bcfd4
374611: do not redispatch if already dispatched when SSL reads content on write
2012-03-19 15:48:39 +11:00
Jesse McConnell
b4985ad0d5
[maven-release-plugin] prepare for next development iteration
2012-03-08 23:53:50 -06:00
Jesse McConnell
7a99af4ffe
[maven-release-plugin] prepare release jetty-8.1.2.v20120308
2012-03-08 23:53:42 -06:00
Jesse McConnell
246e3ed756
[maven-release-plugin] prepare for next development iteration
2012-03-08 21:09:46 -06:00
Jesse McConnell
a63b3fdc5e
[maven-release-plugin] prepare release jetty-7.6.2.v20120308
2012-03-08 21:09:37 -06:00
Jesse McConnell
2e61650264
merge from master and adjust osgi bits
2012-03-08 20:32:20 -06:00
Jesse McConnell
aff3e3f285
removing some tests due to expired keystores
2012-03-08 20:20:43 -06:00
Greg Wilkins
03525bfe46
jetty-9 javadoc and code cleanups
2012-03-08 15:18:17 +11:00
Jesse McConnell
50d92ec8ef
reset versions
2012-03-06 17:07:53 -06:00
Jesse McConnell
f12e3c390c
reset versions
2012-03-06 17:06:10 -06:00
Jesse McConnell
d1c8c477ea
[maven-release-plugin] prepare for next development iteration
2012-03-02 08:57:43 -06:00
Jesse McConnell
b75868e84f
[maven-release-plugin] prepare release jetty-8.1.2.v20120302
2012-03-02 08:57:19 -06:00
Jesse McConnell
51311d050e
[maven-release-plugin] prepare for next development iteration
2012-03-02 08:37:46 -06:00
Jesse McConnell
a8296ec3d5
[maven-release-plugin] prepare release jetty-7.6.2.v20120302
2012-03-02 08:37:38 -06:00
Jesse McConnell
ac79497dee
[maven-release-plugin] prepare for next development iteration
2012-02-15 14:29:36 -06:00
Jesse McConnell
3705b424c8
[maven-release-plugin] prepare release jetty-8.1.1.v20120215
2012-02-15 14:29:28 -06:00
Jesse McConnell
efb6883cf0
[maven-release-plugin] prepare for next development iteration
2012-02-15 14:22:19 -06:00
Jesse McConnell
baf2b94f77
[maven-release-plugin] prepare release jetty-7.6.1.v20120215
2012-02-15 14:22:12 -06:00
Greg Wilkins
824509b0fb
jetty-9 removed plurals from enum type names
2012-02-10 00:42:44 +11:00
Greg Wilkins
c1bcec61d5
jetty-9 jetty-io mostly working with all NIO buffers. Occassional failure in SSL stress test
2012-02-07 11:32:00 +11:00
Jesse McConnell
6b079ae3d8
merge from master
2012-02-01 17:25:08 -06:00
Joakim Erdfelt
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
Greg Wilkins
8c34d05516
365828: avoid DNS lookup for local address
2012-01-31 14:49:00 +11:00
Jesse McConnell
6e44f4db5f
[maven-release-plugin] prepare for next development iteration
2012-01-27 08:15:45 -06:00
Jesse McConnell
9d1ca3593e
[maven-release-plugin] prepare release jetty-8.1.0.v20120127
2012-01-27 08:15:38 -06:00
Jesse McConnell
ad6126553b
[maven-release-plugin] prepare for next development iteration
2012-01-27 08:13:06 -06:00
Jesse McConnell
4e25f7bb05
[maven-release-plugin] prepare release jetty-7.6.0.v20120127
2012-01-27 08:13:00 -06:00
Jesse McConnell
f2d0fd3cc8
revert back to 8.1.0-SNAPSHOT
2012-01-26 10:45:06 -06:00
Jesse McConnell
7ac9eb585f
revert back to 7.6.0-SNAPSHOT
2012-01-26 10:42:11 -06:00
Jesse McConnell
e98ae91ca6
[maven-release-plugin] prepare for next development iteration
2012-01-25 11:16:11 -06:00
Jesse McConnell
fb30166a7f
[maven-release-plugin] prepare release jetty-8.1.0.v20120125
2012-01-25 11:16:05 -06:00
Jesse McConnell
0c96fc40ea
[maven-release-plugin] prepare for next development iteration
2012-01-25 09:31:06 -06:00
Jesse McConnell
b455b7d94e
[maven-release-plugin] prepare release jetty-7.6.0.v20120125
2012-01-25 09:30:55 -06:00
Jesse McConnell
ec731e691d
[maven-release-plugin] prepare for next development iteration
2012-01-20 12:28:31 -06:00
Jesse McConnell
6004fd4553
[maven-release-plugin] prepare release jetty-8.1.0.RC5
2012-01-20 12:28:24 -06:00
Jesse McConnell
8f9722bf4a
Merge branch 'master' into jetty-8
2012-01-20 11:42:18 -06:00
Joakim Erdfelt
80ffe47e7e
Tweaking test assertion for variety of values seen in various JVMs (with comments)
2012-01-20 10:32:03 -07:00
Greg Wilkins
f7b3a2cdfc
Merge remote-tracking branch 'origin/master' into jetty-8
2012-01-18 17:05:42 +11:00
Greg Wilkins
c696f14450
368821 improved test harness
2012-01-18 15:24:20 +11:00
Jan Bartel
98684397fd
Merge remote-tracking branch 'origin/master' into jetty-8
2012-01-18 14:17:41 +11:00
Greg Wilkins
9ff8633554
368821 SslConnection.handle always calls wrapped Connection.handle, so state can be processed
2012-01-18 13:39:24 +11:00
Simone Bordet
e609a65e61
368821 - SSL Spin on asyncDispatch.
...
Test (for now ignored) that reproduces the problem.
2012-01-17 23:05:41 +01:00
Jesse McConnell
16e33c3d1e
Merge branch 'master' into jetty-8
2012-01-13 08:21:29 -06:00
Simone Bordet
cf30b19f7e
Added one more SSL bytes tests that send RST while the server is read blocked.
2012-01-13 11:03:03 +01:00
Greg Wilkins
b8e0258faf
Merge remote-tracking branch 'origin/master' into jetty-8
...
Conflicts:
jetty-server/src/test/java/org/eclipse/jetty/server/SelectChannelTimeoutTest.java
2012-01-12 11:01:03 +11:00
Simone Bordet
d4f522b9d4
Corrected SslConnection to clear the _inbound buffer if the input is shutdown
...
and the unwrapping yielded a buffer underflow.
This is important because isInputShutdown() returns true only if the _inbound
buffer is empty, and the check for the input shutdown is made in several places.
Added also more SSL bytes tests that send RST in order to test cases that throw
exceptions.
2012-01-11 22:22:42 +01:00
Jan Bartel
691efcc7ca
Merge remote-tracking branch 'origin/master' into jetty-8
2012-01-11 16:35:57 +11:00
Greg Wilkins
d66f45f2da
368240: renamed to use manage/unmanage instead of join/disjoin
2012-01-11 11:16:31 +11:00
Greg Wilkins
cb22cfdbe5
368240: renamed to use manage/unmanage instead of join/disjoin
2012-01-11 11:06:14 +11:00
Simone Bordet
b6f5edecb5
368240 - Better handling of locally created ThreadPool. Forgot to null out field.
2012-01-10 19:02:48 +01:00
Simone Bordet
3a30b4b7a5
368240 - Better handling of locally created ThreadPool.
2012-01-10 18:05:44 +01:00
Simone Bordet
ba57d711c6
Cosmetics.
2012-01-10 17:39:17 +01:00
Greg Wilkins
a7783ae568
368240: Fixed the start of dependent beans
2012-01-11 01:04:01 +11:00
Greg Wilkins
968a2ac95b
368240: Added concept of join to AggregateLifeCycle. Used by HttpClient and AbstractConnector
2012-01-11 00:09:34 +11:00
Jan Bartel
1fbec51c8a
Merge remote-tracking branch 'origin/master' into jetty-8
2012-01-10 16:08:59 +11:00
Simone Bordet
829686f1e1
Removed JDK 1.6-ism.
2012-01-09 21:51:15 +01:00
Simone Bordet
69675d4d19
365048 - jetty Http client does not send proxy authentication when requesting a Https-resource through a web-proxy.
2012-01-06 16:19:05 +01:00
Thomas Becker
2fa5a63f3c
365048: Fix proxy issue. http-client dropped authentication header on connect requests before
...
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2012-01-06 15:56:15 +01:00
Greg Wilkins
3141b50fa0
Merge remote-tracking branch 'origin/master' into jetty-8
2011-12-30 20:19:39 +11:00
Simone Bordet
371e998b62
367485 - HttpExchange canceled before response do not release connection.
2011-12-23 11:51:14 +01:00
Greg Wilkins
d5f4b157d9
Merge remote-tracking branch 'origin/master' into jetty-8
2011-12-23 00:38:35 +11:00
Jesse McConnell
6a967ff2fe
Skip two failing unit tests on mac and windows for the time being, tests
...
are commented on what the underlying open question is
2011-12-22 07:02:05 -06:00
Greg Wilkins
b36425b7aa
Merge remote-tracking branch 'origin/master' into jetty-8
...
Conflicts:
jetty-server/src/main/java/org/eclipse/jetty/server/handler/ContextHandler.java
2011-12-22 09:52:11 +11:00
Greg Wilkins
b99e03c465
364921 moved setCheckForIdle handling to AsyncHttpConnection
2011-12-22 00:48:25 +11:00
Simone Bordet
ef23bf11b8
Merged from origin/master.
2011-12-21 10:45:06 +01:00
Simone Bordet
744f76f6c9
Added an idle timeout test.
2011-12-21 10:34:33 +01:00
Jan Bartel
c3643d9937
Merge remote-tracking branch 'origin/master' into jetty-8
2011-12-21 12:37:23 +11:00
Greg Wilkins
a606529710
364921 SslConnection does real close on idle if already oshut
2011-12-21 10:06:55 +11:00
Simone Bordet
ecb88f836e
367175 - SSL 100% CPU spin in case of blocked write and RST.
2011-12-20 13:25:55 +01:00
Greg Wilkins
b7d8bd4f28
364638 HttpParser closes if data received while seeking EOF. Tests fixed to cope
2011-12-20 10:55:56 +11:00
Greg Wilkins
f7103d88f9
364638 reverted write after shutdown handling
2011-12-19 21:56:42 +11:00
Greg Wilkins
b027779830
364638 check for idle after shutdown output
2011-12-19 16:53:14 +11:00
Joakim Erdfelt
44de94f185
Attempting to write a better timeout test
2011-12-16 14:45:38 -07:00
Joakim Erdfelt
a5d18d48ad
Attempting to get a non-ssl version of the timeout bug into a unit test
2011-12-16 14:16:32 -07:00
Simone Bordet
d52ed502b0
Sketch of test for idle expiration on SSL.
2011-12-16 21:26:37 +01:00
Simone Bordet
a88e2c5ebb
Updated toString() implementations.
2011-12-16 20:53:15 +01:00
Greg Wilkins
bc48eb1f5b
366730 pass the time idle to onIdleExpire
2011-12-14 11:41:32 -08:00
Jan Bartel
468e6c284d
365267 NullPointerException in bad Address
2011-12-02 10:04:03 +11:00
Greg Wilkins
de005c68fd
Revert "Merge branch 'release-8'"
...
This reverts commit 9e72457941
, reversing
changes made to df12605f0e
.
2011-11-30 16:27:30 +11:00
Greg Wilkins
631b0ba1b6
[maven-release-plugin] prepare for next development iteration
2011-11-30 13:16:54 +11:00
Greg Wilkins
9d3745f999
[maven-release-plugin] prepare release jetty-8.1.0.RC0
2011-11-30 13:16:41 +11:00
Greg Wilkins
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
Greg Wilkins
b969de1788
organized imports
2011-11-28 15:32:14 +11:00
Greg Wilkins
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
Simone Bordet
cfef7c631b
Made SslBytesClientTest more robust by avoiding a race in establishing connection with the proxy.
2011-11-24 23:08:57 +01:00
Simone Bordet
ccfbb3e623
Bumped number of parses to avoid test failures.
2011-11-24 22:34:30 +01:00
Simone Bordet
b3ae06888e
First pass at implementing SSL bytes tests for the client.
2011-11-24 21:15:11 +01:00
Simone Bordet
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
Simone Bordet
c6103f2d53
Removed usages of ThreadDeath.
2011-11-24 20:39:04 +01:00
Simone Bordet
59c111bde1
Rewritten toString() methods using String.format().
2011-11-24 15:20:06 +01:00
Simone Bordet
0b85184722
Added dump() code in case the test hangs, to understand why (still not clear).
2011-11-24 10:19:23 +01:00
Simone Bordet
8f1fff78c0
Improved dumping capabilities of HttpClient, and rewritten toString() methods using String.format().
2011-11-24 10:16:19 +01:00
Greg Wilkins
eaa83f29d1
added trap for rare error
2011-11-23 09:39:31 +11:00
Simone Bordet
bff3a5e72e
Disabled log debugging in SslBytesServerTest enabled in previous commit, and added check to not fail the tests if the JDK does not support TLS renegotiations.
2011-11-22 18:09:37 +01:00
Simone Bordet
a1eabe2b32
Enabled log debugging in SslBytesServerTest to see why it fails on CI.
2011-11-22 10:00:54 +01:00
Greg Wilkins
aa0b71f928
Merge branch 'master' of ssh://git.eclipse.org/gitroot/jetty/org.eclipse.jetty.project
2011-11-22 13:16:40 +11:00
Greg Wilkins
6cb2d13abd
Client idle connection uses onIdleExpired rather than close
2011-11-22 12:57:32 +11:00
Simone Bordet
111000befa
Slightly increased handles count to cover edge cases without failures.
2011-11-21 21:35:18 +01:00
Jan Bartel
0e9449ac85
Merge remote-tracking branch 'origin/master' into jetty-8
2011-11-21 18:18:09 +11:00
Simone Bordet
5b67abdf02
Made SslBytesServerTest more robust in case of automatic proxy flow.
2011-11-18 21:39:18 +01:00
Simone Bordet
a313d2f542
Added more SSL tests renegotiation in the middle of content with split boundary.
2011-11-18 12:20:34 +01:00
Simone Bordet
9c804921de
Added more SSL tests for split boundary handshake and renegotiation in the middle of content.
2011-11-18 11:54:31 +01:00
Simone Bordet
324f2049f3
Merge branch 'master' of ssh://git.eclipse.org/gitroot/jetty/org.eclipse.jetty.project
2011-11-17 12:40:56 +01:00
Simone Bordet
d1592cf5b5
Added more SSL tests to detect spinning conditions.
2011-11-17 12:40:32 +01:00
Greg Wilkins
584bbd4bce
improved siege
2011-11-17 16:31:22 +11:00
Greg Wilkins
89d0cb765f
improved siege like load tester
2011-11-17 14:45:41 +11:00
Greg Wilkins
97c711613f
added siege like load tester
2011-11-17 14:08:46 +11:00
Jan Bartel
b8b5df27d6
Merge remote-tracking branch 'origin/master' into jetty-8
2011-11-17 11:03:07 +11:00
Jan Bartel
127a5af8d7
Merge remote-tracking branch 'origin/master' into jetty-8
2011-11-17 10:59:54 +11:00
Greg Wilkins
e322a28753
made test timing less sensitive to Virtual machine quantums
2011-11-16 17:54:35 +11:00
Greg Wilkins
400bdd1e9a
349110 fixed bypass chunk handling
2011-11-16 08:36:42 +11:00
Simone Bordet
ca8873593a
Cleaned up and made test more robust.
2011-11-11 15:02:45 +01:00
Greg Wilkins
a62061944e
removed EndPoint.isBufferingInput
2011-11-11 11:41:29 +11:00
Simone Bordet
09999a629d
Removed EndPoint.isBufferingOutput().
2011-11-10 21:52:33 +01:00
Greg Wilkins
629b6360de
removed EndPoint.isBuffered
2011-11-10 13:15:41 +11:00
Greg Wilkins
144195d435
removed redundant setConnection
2011-11-10 12:47:50 +11:00
Greg Wilkins
e3cf7a8898
improved ThreadDeath handling
2011-11-10 12:40:29 +11:00
Greg Wilkins
7a9b8f1e9d
reverted last changes due to instability
2011-11-10 12:11:58 +11:00
Greg Wilkins
d61258ec4e
clean ups from review from sbordet.
...
Removed isBufferred
fixed instanceof ThreadDeath
avoid race with onInputShutdown
2011-11-10 10:12:37 +11:00
Greg Wilkins
70cd06f461
only handle early EOF if exchange is not done
2011-11-09 09:18:59 +11:00
Greg Wilkins
8cfa671253
only handle early EOF if exchange is not done
2011-11-09 09:16:04 +11:00
Jesse McConnell
2a6b8696d7
Merge branch 'master' into jetty-8
2011-11-08 15:59:55 -06:00
Joakim Erdfelt
4e79ea0dca
Highlight test failure with DEBUG
2011-11-08 14:51:00 -07:00
Greg Wilkins
4808239cbd
copyright and comments
2011-11-09 08:17:56 +11:00
Greg Wilkins
5bf6f60396
copyright and comments
2011-11-09 08:13:29 +11:00
Greg Wilkins
5f2323418b
cleanups after the merge
2011-11-08 12:47:28 +11:00
Greg Wilkins
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
Greg Wilkins
42179e193d
client tests passing
2011-11-07 10:23:08 +11:00
Greg Wilkins
3e104548d5
fixed blocking client connection
2011-11-07 09:31:57 +11:00
Simone Bordet
0a40c3d750
Cleaned up test case and implementation for #360665 (Proxying HTTPS request to HTTP port causes exception loop).
...
Class SelectConnector.ProxySelectChannelEndPoint did not follow the latest changes to interface EndPoint, and was
returning wrong values for isInputShutdown() and other few methods.
Also suppressed expected exceptions in the test case.
2011-11-04 15:31:00 +01:00
Simone Bordet
9aee1affe5
Merged the handling of the case where there will not be more input, but the parser is in a middle state.
...
This case may happen when the client sends content and signal the end of the content by closing the connection.
The parser will be in a middle state, waiting for more content, and needs to read the connection close, otherwise
it may erroneously think that the exchange has failed.
2011-11-04 15:27:39 +01:00
Thomas Becker
f01877e738
360665: Fixed an endless loop on https proxy requests + added tests
...
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2011-11-04 10:20:52 +01:00
Greg Wilkins
9b60678fbf
blocking client connection passing more tests
2011-11-04 16:04:48 +11:00
Greg Wilkins
c19e1de62f
initial blocking client impl
2011-10-28 22:57:19 +11:00
Greg Wilkins
a89dc67ba2
improved close incomplete handling
2011-10-28 13:26:14 +11:00
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
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
44ea5c4d85
Merge remote-tracking branch 'origin/master' into jetty-7.6
2011-10-21 10:21:54 +11:00