Jan Bartel
503f292172
Fix typo in start.ini comments and switch ordering of jetty-plus.xml and jetty-annotations.xml
2013-01-25 10:54:25 +11:00
Greg Wilkins
3c6deaf83c
Merge remote-tracking branch 'origin/jetty-7' into jetty-8
2013-01-25 09:43:57 +11:00
Greg Wilkins
c9d026703f
removed System.outs
2013-01-25 09:42:51 +11:00
Simone Bordet
29d2854027
397769 - TimerScheduler does not relinquish cancelled tasks.
...
Now the scheduler submits itself as a task that runs every second to purge the task queue.
2013-01-24 16:06:20 +01:00
Simone Bordet
6980a8d9d2
398872 - SslConnection should not be notified of idle timeouts. First solution. Merge branch 'ssl_idle_timeout_ignored'.
2013-01-24 10:32:31 +01:00
Simone Bordet
2ba64a59e6
Made the test more reliable.
2013-01-24 10:32:05 +01:00
Simone Bordet
b2f3852fb3
398872 - SslConnection should not be notified of idle timeouts. First solution.
2013-01-24 10:29:27 +01:00
Greg Wilkins
fd25e3a742
Merge remote-tracking branch 'origin/jetty-7' into jetty-8
...
Conflicts:
jetty-servlets/src/test/java/org/eclipse/jetty/servlets/gzip/GzipTester.java
2013-01-24 14:30:45 +11:00
Greg Wilkins
161a14d9d0
381521 Only set Vary header when content could be compressed
2013-01-24 14:07:25 +11:00
Joakim Erdfelt
de0d5acdb9
Bumping up jetty-version-maven-plugin to 1.0.9
2013-01-23 13:59:21 -07:00
Joakim Erdfelt
b6d551675b
Merge branch 'jetty-7' into jetty-8
2013-01-23 13:58:34 -07:00
Joakim Erdfelt
a7aab0b6c6
Bumping up jetty-version-maven-plugin to 1.0.9
2013-01-23 13:56:05 -07:00
Joakim Erdfelt
7211ce230e
Removing unused websocket-core files, detrius from old merge
2013-01-23 10:50:37 -07:00
Joakim Erdfelt
bfba20565a
Removing out of date mux diagrams
2013-01-23 10:49:07 -07:00
Joakim Erdfelt
f9cb26b5a7
Removing jsr diagrams from common, should only exist in jsr branch (for now)
2013-01-23 10:48:51 -07:00
Joakim Erdfelt
c31f3a5501
Updating diagrams
2013-01-23 10:47:59 -07:00
Simone Bordet
b5df3a6b76
Made the test more reliable.
2013-01-23 12:18:01 +01:00
Jesse McConnell
9bc937a676
add line back into pom
2013-01-22 08:32:32 -06:00
Jan Bartel
92af54c3fc
Make IdleTimeoutTest jdk1.5 compliant
2013-01-22 08:58:35 +11:00
Greg Wilkins
dc4e525622
Merge remote-tracking branch 'origin/jetty-8'
...
Conflicts:
jetty-servlets/src/main/java/org/eclipse/jetty/servlets/GzipFilter.java
2013-01-21 17:04:22 +11:00
Jan Bartel
fe48239b34
Merge remote-tracking branch 'origin/jetty-7' into jetty-8
2013-01-21 16:54:06 +11:00
Jan Bartel
91a94f8213
362226 HttpConnection "wait" call causes thread resource exhaustion
2013-01-21 16:43:57 +11:00
Greg Wilkins
aba64046cf
Merge remote-tracking branch 'origin/jetty-7' into jetty-8
2013-01-21 12:13:10 +11:00
Greg Wilkins
b36411d382
381521 Only set Vary header when content could be compressed
2013-01-21 12:09:46 +11:00
Jesse McConnell
f244dee08c
Merge branch 'release-9'
2013-01-20 11:03:52 -06:00
Jesse McConnell
fcdc53f883
prep for dev
2013-01-20 11:03:31 -06:00
Jesse McConnell
94feb0d651
[maven-release-plugin] prepare for next development iteration
2013-01-19 19:54:23 -06:00
Jesse McConnell
4da026bca5
[maven-release-plugin] prepare release jetty-9.0.0.M5
2013-01-19 19:54:13 -06:00
Jesse McConnell
5d394859c5
set for release
2013-01-19 19:06:19 -06:00
Jesse McConnell
f49017cd8e
Merge branch 'master' into release-9
2013-01-19 19:04:50 -06:00
Jan Bartel
360615c51a
398582 Move lib/jta jar into lib/jndi
2013-01-20 11:07:01 +11:00
Jesse McConnell
3cd7c09347
[maven-release-plugin] prepare for next development iteration
2013-01-18 12:13:38 -06:00
Jesse McConnell
d24ab1f133
[maven-release-plugin] prepare release jetty-9.0.0.M5
2013-01-18 12:13:29 -06:00
Jesse McConnell
38319f4cb6
set for release
2013-01-18 10:49:25 -06:00
Jesse McConnell
40111d9474
Merge branch 'master' into release-9
2013-01-18 10:46:52 -06:00
Joakim Erdfelt
2e216dddb7
Consolidating WebSocketPolicy.setMax*Size() into single setMaxMessageSize()
2013-01-18 09:27:56 -07:00
Thomas Becker
99c34d5227
398280: SslContextFactory _trustAll defaults to false now
2013-01-18 14:07:24 +01:00
Simone Bordet
1ca0f004c3
Updated signature of setConnectTimeout(int) to setConnectTimeout(long)
...
to comply with field type and getter type.
Removed check that was throwing an exception if connect timeout was set
after start.
2013-01-18 10:35:20 +01:00
Jan Bartel
0c3ff5be4a
Improve --help output for jetty-runner
2013-01-18 14:44:33 +11:00
Joakim Erdfelt
a36e31277a
Updating javadoc external site references for the new snoracle reality
2013-01-17 16:40:16 -07:00
Joakim Erdfelt
b938245b14
Adding some javadoc, cleaning up package namespaces where appropriate
2013-01-17 15:41:33 -07:00
Simone Bordet
44e64aa309
Removed TimedResponseListener, since the timeout mechanism is now
...
provided by Request.timeout(...) for both blocking and asynchronous send().
2013-01-17 16:15:34 +01:00
Simone Bordet
cda27ae4a1
398285 - ProxyServlet mixes cookies from different clients.
...
Now ProxyServlet's HttpClient uses HttpCookieStore.Empty, so it never stores cookies.
2013-01-17 12:53:40 +01:00
Simone Bordet
b3f6739d51
Completed the implementation of DeferredContentProvider.
...
DeferredContentProvider is used to provide content after
Request.send(...) is called, a use case that is useful
in SPDY-to-HTTP proxies, where content arrives in SPDY
data frames at later times than the headers.
2013-01-17 12:53:39 +01:00
Simone Bordet
386fafe790
Avoid copying sensitive headers when copying a Request.
2013-01-17 12:53:39 +01:00
Simone Bordet
6cbac985e5
398285 - ProxyServlet mixes cookies from different clients.
...
Now ProxyServlet's HttpClient uses HttpCookieStore.Empty, so it never stores cookies.
2013-01-17 12:53:39 +01:00
Thomas Becker
8c3edce565
use existing keystore
2013-01-17 12:51:07 +01:00
Thomas Becker
c8f4332c34
add missing keystore
2013-01-17 12:39:46 +01:00
Thomas Becker
9ebea3938d
393385: Make hostname verification configurable in SslContextFactory and enable it by default (See http://www.ietf.org/rfc/rfc2818.txt section 3.1)
2013-01-17 10:28:15 +01:00
Greg Wilkins
46e13b305b
Merge remote-tracking branch 'origin/jetty-8'
...
Conflicts:
jetty-util/src/test/java/org/eclipse/jetty/util/URLEncodedTest.java
2013-01-17 11:00:20 +11:00