c7b671d49d
Merge remote-tracking branch 'origin/jetty-7' into jetty-8
2013-04-05 09:49:56 +11:00
7d068ddb01
removed debug println - DOH!
2013-04-05 09:41:58 +11:00
e9185aa062
Merge remote-tracking branch 'origin/jetty-7' into jetty-8
2013-04-04 16:09:19 +11:00
df6e18cc00
404517 Close connection if request received after half close
2013-04-04 15:38:15 +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
6a48749f0c
Merge remote-tracking branch 'origin/jetty-7' into jetty-8
...
Conflicts:
jetty-annotations/src/main/java/org/eclipse/jetty/annotations/AnnotationParser.java
2013-02-22 11:32:57 +11:00
ecfd7f74e6
376273 - Early EOF because of SSL Protocol Error on https://api-3t.paypal.com/nvp .
...
This was caused by the fact that the other peer closed the raw socket after sending data.
SslConnection was reading the data, but not notifying the application of the data, then
reading the abrupt close, which was causing an exception, ending up in the application
never being notified of the data that arrived.
Now we catch and ignore the exception during SSLEngine.closeInbound(), and we properly
send an alert to the other peer (instead of hard closing the connection as well).
In this way, the application has the chance to read the data and then close the connection.
2013-02-21 17:15:19 +01:00
68f3319719
Merge remote-tracking branch 'origin/jetty-7' into jetty-8
2013-02-15 12:14:48 +11:00
c7d985fa02
400859 limit max size of writes from cached content
2013-02-15 11:20:29 +11: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
8723408731
Merge remote-tracking branch 'origin/jetty-7' into jetty-8
...
Conflicts:
jetty-servlets/src/main/java/org/eclipse/jetty/servlets/MultiPartFilter.java
2012-11-02 13:17:53 +11:00
65202e9abe
393363 Use Locale.ENGLISH for all toUpperCase and toLowerCase calls
2012-11-02 11:55:00 +11:00
944b23240e
388706 Avoid unnecessary indirection through Charset.name
2012-09-13 17:03:10 +10:00
5de0cee1eb
merge from master + license block standardization
2012-08-17 14:50:43 -05:00
00ed549898
standardize license header blocks
2012-08-16 19:11:27 -05:00
3c6a6fa8e0
383304 Reset PrintWriter on response recycle
...
Backout changes based on jdk1.6 method and replace by nulling out AbstractHttpConnection._writer object.
2012-07-19 20:14:41 +10:00
999f66b6a8
383304 PrintWriter error flag not recycled
2012-07-19 15:32:33 +10:00
81d72052c8
merged master to jetty-8
2012-07-11 14:04:49 -05:00
aa941f5711
quick pass through to clean up missing or incorrect license blocks
2012-07-11 12:29:46 -05:00
0fa17c13b1
Merge branch 'master' into jetty-8
2012-07-11 10:10:00 -05:00
5aeca2a138
added missing headers for io classes
2012-07-10 17:28:53 -05:00
88d92f584b
384254 revert change to writable when not dispatched
2012-07-05 12:38:42 +02:00
ae65cf6b5e
Merge branch 'master' into jetty-8
2012-05-24 15:12:15 -05:00
c7979d399a
379046 idle close dispatched to own thread and deregistered from further idle calls
2012-05-24 21:57:30 +02:00
cf214ffeef
Merge branch 'master' into jetty-8
2012-05-24 08:35:22 -05:00
d80be96e41
379046 avoid closing idle connections from selector thread
2012-05-24 13:20:44 +02:00
2131a40559
Merge remote-tracking branch 'origin/master' into jetty-8
2012-05-07 13:54:30 +02:00
011ae1f447
377587: UnitTest for ConnectHandler.write() with partial writes and non full buffer.
...
Change-Id: I8a8a3d57cba7a9c3502d1b6af6ff6eb5ac4e4ef5
377587: UnitTest for ConnectHandler.write() with partial writes and non full buffer.
Change-Id: I8d104d54de55e22325d14e69b474b245fe9d126c
2012-04-27 11:13:44 +02:00
5e83df20c8
various sonar/findbug code cleanups
2012-04-25 00:00:54 +10:00
b5e9de1cd8
Merge remote-tracking branch 'origin/master' into jetty-8
2012-04-12 17:16:22 +10:00
a565c72adb
374550: remove printStackTrace calls
2012-04-12 16:51:59 +10:00
17269583fb
Merge remote-tracking branch 'origin/master' into jetty-8
2012-03-30 12:05:46 +11:00
65725b0025
357318: make the cancel key work around conditional on running on windows
2012-03-23 09:21:00 +11:00
d8b1d80e4e
Merge remote-tracking branch 'origin/master' into jetty-8
...
Conflicts:
jetty-spdy/spdy-jetty-http-webapp/pom.xml
jetty-spdy/spdy-jetty-http/pom.xml
jetty-spdy/spdy-jetty/pom.xml
2012-03-19 17:22:02 +11:00
7e3b8bcfd4
374611: do not redispatch if already dispatched when SSL reads content on write
2012-03-19 15:48:39 +11:00
7842e9c101
374450: use temp read only buffers instead of synchronisation
2012-03-16 10:05:38 +11:00
a6eda90594
fixed merge issue
2012-03-16 09:16:46 +11:00
fef74963af
Forgotten modifications from Jetty7
2012-03-14 19:39:21 +01:00
5624a5721e
Merged from master.
2012-03-14 18:24:57 +01:00
2e2247bde5
Merge branch 'master' of ssh://git.eclipse.org/gitroot/jetty/org.eclipse.jetty.project
2012-03-14 16:32:03 +01:00
4a02fdb6c0
374252 - SslConnection.onClose() does not forward to nested connection.
2012-03-14 16:12:46 +01:00
708f8ccaeb
374158: do not asyncDispatch from SSL if suspended
2012-03-14 11:48:06 +11:00
381615f52d
merge from master
2012-03-07 16:44:31 -06:00
ff75d9e38a
373394: fix for IllegalArgumentException in SelectChannelEndpoint.blockWritable() when wait is called with a negative value.
2012-03-06 21:26:46 +01:00
ffdcfa5dde
Avoid reading field twice (may lead to spurious NPEs).
2012-03-06 18:09:58 +01:00
54493cd80d
Merge "373246: IOTest.testReset uses dynamic port now instead of static hard coded one"
2012-03-05 09:18:08 -05:00
0adec36c29
373246: IOTest.testReset uses dynamic port now instead of static hard coded one
...
Change-Id: I9b254937fa02ba745832bf1b5c99069bea641bbd
2012-03-05 15:15:23 +01:00
959a4a2743
Merge remote-tracking branch 'origin/master' into jetty-8
2012-03-02 10:39:17 +11:00
Greg Wilkins
Joakim Erdfelt
Jan Bartel
Simone Bordet
Jesse McConnell
Thomas Becker
Greg Wilkins