Simone Bordet
4ce4615597
414652 - WebSocket's sendMessage() may hang on congested connections.
...
Fixed by using Locks instead of the synchronized keyword, and by using tryLock()
in flushBuffer() and flush(), that are called by WebSocketConnection.handle().
It is quite a hack, but the real fix is in Jetty 9 where the architecture is different
and there are two different paths for reading and writing, so that this problem
could not even happen.
2013-08-08 12:09:11 +02:00
Greg Wilkins
dcf98fd675
414635 Modular start.d and jetty.base property
...
Made https and spdy mutually exclusive
2013-08-08 18:07:42 +10:00
Greg Wilkins
21e7b67cc7
414635 Modular start.d and jetty.base property
2013-08-08 17:53:52 +10:00
Jan Bartel
1f3ec4b538
Merge remote-tracking branch 'origin/master' into jetty-9.1
2013-08-08 14:31:33 +10:00
Jan Bartel
bd1b19b45c
Merge remote-tracking branch 'origin/jetty-8'
...
Conflicts:
jetty-annotations/src/main/java/org/eclipse/jetty/annotations/AnnotationParser.java
jetty-annotations/src/test/java/org/eclipse/jetty/annotations/TestAnnotationParser.java
2013-08-08 14:24:19 +10:00
Jan Bartel
f22217392b
Merge remote-tracking branch 'origin/jetty-7' into jetty-8
...
Conflicts:
jetty-annotations/src/main/java/org/eclipse/jetty/annotations/AnnotationParser.java
2013-08-08 12:28:51 +10:00
Greg Wilkins
6941dcb8c8
Merge remote-tracking branch 'origin/master' into jetty-9.1
2013-08-08 12:23:50 +10:00
Greg Wilkins
d2c68bb4aa
412830 Error Page match ServletException then root cause
2013-08-08 12:22:28 +10:00
Jan Bartel
f983629434
414507 AnnotationParser should skip classes in hidden dirs or with . name prefix
2013-08-08 12:09:29 +10:00
Greg Wilkins
a719418990
413568 Made AJP worker name generic
2013-08-08 12:05:24 +10:00
Greg Wilkins
89acff6bdf
Merge remote-tracking branch 'origin/master' into jetty-9.1
2013-08-08 11:06:14 +10:00
Greg Wilkins
95416bce76
413568 Made AJP worker name generic
2013-08-08 10:51:43 +10:00
Joakim Erdfelt
eb0d7da7f2
JSR-356 Making PongMessage work with @OnMessage annotation
2013-08-06 13:15:13 -07:00
Joakim Erdfelt
3e070f929e
JSR-356 addMessageHandler with Reader or InputStream should not NPE
2013-08-06 12:55:02 -07:00
Joakim Erdfelt
6278f8eb30
JSR-356 - making the JSR happy enough to start
2013-08-06 09:32:49 -07:00
Joakim Erdfelt
12f6853900
WebSocket - enabling WebSocket on distribution
2013-08-06 09:20:02 -07:00
Joakim Erdfelt
2354ad4c3d
Cleaning up javadoc
2013-08-06 09:19:49 -07:00
Jan Bartel
7c292c1799
Merge remote-tracking branch 'origin/master' into jetty-9.1
2013-08-06 09:21:40 +10:00
Jan Bartel
a900010f81
414235 RequestLogHandler configured on a context fails to handle forwarded requests
2013-08-06 09:14:28 +10:00
Simone Bordet
d86ceaf790
HttpClient optimizations.
...
HttpConnectionPool now puts "hot" idle connection in the front of a deque,
rather than at the end of a queue, so that the hotter they are the more they
are used.
HttpRequest is now initialized with better defaults so that
HttpConnection.normalizeRequest() has less work to do.
This reduced the number of branches to be executed for each request.
HttpDestination now produces less garbage by using Jetty's BlockingArrayQueue
instead of Java's LinkedBlockingQueue.
HttpClient has now a bigger response buffer, 16 KiB, by default.
2013-08-05 19:36:19 +02:00
Joakim Erdfelt
8636c7da45
Merge branch 'master' into jetty-9.1
...
Conflicts:
jetty-maven-plugin/pom.xml
pom.xml
2013-08-05 09:53:48 -07:00
Joakim Erdfelt
74991f90d6
Cleanup from merge
2013-08-05 09:13:32 -07:00
Joakim Erdfelt
e2d872fcc7
Merge branch 'jetty-8'
...
Conflicts:
jetty-server/src/main/java/org/eclipse/jetty/server/handler/RequestLogHandler.java
jetty-servlets/src/test/java/org/eclipse/jetty/servlets/MultipartFilterTest.java
jetty-spdy/spdy-client/pom.xml
jetty-spdy/spdy-core/pom.xml
jetty-util/src/main/java/org/eclipse/jetty/util/MultiPartInputStreamParser.java
jetty-util/src/test/java/org/eclipse/jetty/util/MultiPartInputStreamTest.java
pom.xml
tests/test-integration/src/test/java/org/eclipse/jetty/test/monitor/JmxServiceTest.java
tests/test-integration/src/test/java/org/eclipse/jetty/test/monitor/ProgramConfigTest.java
tests/test-integration/src/test/java/org/eclipse/jetty/test/monitor/XmlConfigTest.java
2013-08-05 08:47:24 -07:00
Jan Bartel
432964cf5f
Merge remote-tracking branch 'origin/jetty-7' into jetty-8
...
Conflicts:
jetty-servlets/src/main/java/org/eclipse/jetty/servlets/MultiPartFilter.java
2013-08-05 18:03:11 +10:00
Jan Bartel
f3f2bce36c
414393 StringIndexOutofBoundsException with > 8k multipart content without CR or LF
2013-08-05 17:18:44 +10:00
Jan Bartel
446820071b
Merge remote-tracking branch 'origin/jetty-7' into jetty-8
2013-08-05 12:35:16 +10:00
Jan Bartel
f5fb412eba
414235 - RequestLogHandler configured on a context fails to handle forwarded requests
2013-08-05 12:32:21 +10:00
Joakim Erdfelt
01786aa0c2
Merge branch 'jetty-7' into jetty-8
2013-08-02 15:11:05 -07:00
Joakim Erdfelt
79ac8ad22d
Fixing License Header to conform with standard with rest of project
2013-08-02 14:34:03 -07:00
Joakim Erdfelt
2057c4c17b
Upgrading Junit + Hamcrest
2013-08-02 14:25:53 -07:00
Joakim Erdfelt
dfd3d5af29
WebSocket - refactoring bits and pieces to make testing easier.
2013-08-02 09:33:15 -07:00
Simone Bordet
ed95ffbfea
Fixed lifecycle management.
2013-08-02 15:05:50 +02:00
Jan Bartel
47a8809ec7
413018 ServletContext.addListener() should throw IllegalArgumentException if arg is not correct type of listener
2013-08-02 12:26:54 +10:00
Joakim Erdfelt
89b33f5b88
WebSocket - fixing message (buffer) size settings and checks
2013-08-01 16:06:44 -07:00
Joakim Erdfelt
833aa6723d
WebSocket - More concurrency fixes found by FindBugs
2013-08-01 13:51:18 -07:00
Joakim Erdfelt
07041f6439
JSR-356 making HTTP Header map use TreeMap(String.CASE_INSENSITIVE_ORDER)
2013-08-01 10:50:01 -07:00
Joakim Erdfelt
cbaf68be20
Fixing license headers
2013-08-01 07:48:03 -07:00
Joakim Erdfelt
11bb7431d2
JSR-356 some more tests
2013-08-01 07:47:14 -07:00
Joakim Erdfelt
441c98544a
JSR-356 if mapping not found, allow default behavior
2013-08-01 07:47:02 -07:00
Joakim Erdfelt
589b03d64c
Adding example on how to get the HttpSession into your socket.
2013-08-01 06:11:01 -07:00
Jan Bartel
e15d83e061
Merge remote-tracking branch 'origin/jetty-8'
...
Conflicts:
VERSION.txt
aggregates/jetty-all/pom.xml
examples/async-rest/async-rest-jar/pom.xml
examples/async-rest/async-rest-webapp/pom.xml
examples/async-rest/pom.xml
examples/embedded/pom.xml
jetty-aggregate/jetty-all-server/pom.xml
jetty-aggregate/jetty-client/pom.xml
jetty-aggregate/jetty-server/pom.xml
jetty-aggregate/jetty-servlet/pom.xml
jetty-aggregate/jetty-webapp/pom.xml
jetty-aggregate/jetty-websocket/pom.xml
jetty-aggregate/pom.xml
jetty-annotations/pom.xml
jetty-client/pom.xml
jetty-continuation/pom.xml
jetty-deploy/pom.xml
jetty-distribution/pom.xml
jetty-http-spi/pom.xml
jetty-http/pom.xml
jetty-io/pom.xml
jetty-jaas/src/main/java/org/eclipse/jetty/jaas/spi/PropertyFileLoginModule.java
jetty-jaspi/pom.xml
jetty-jmx/pom.xml
jetty-jndi/pom.xml
jetty-jsp/pom.xml
jetty-monitor/pom.xml
jetty-nosql/pom.xml
jetty-osgi/jetty-osgi-boot-jsp/pom.xml
jetty-osgi/jetty-osgi-boot-warurl/pom.xml
jetty-osgi/jetty-osgi-boot/pom.xml
jetty-osgi/jetty-osgi-httpservice/pom.xml
jetty-osgi/pom.xml
jetty-osgi/test-jetty-osgi-context/pom.xml
jetty-osgi/test-jetty-osgi-webapp/pom.xml
jetty-osgi/test-jetty-osgi/pom.xml
jetty-overlay-deployer/pom.xml
jetty-plus/pom.xml
jetty-policy/pom.xml
jetty-proxy/pom.xml
jetty-rewrite/pom.xml
jetty-runner/pom.xml
jetty-security/pom.xml
jetty-server/pom.xml
jetty-servlet/pom.xml
jetty-servlets/pom.xml
jetty-spdy/pom.xml
jetty-spdy/spdy-client/pom.xml
jetty-spdy/spdy-core/pom.xml
jetty-spdy/spdy-example-webapp/pom.xml
jetty-spdy/spdy-server/pom.xml
jetty-start/pom.xml
jetty-util-ajax/pom.xml
jetty-util/pom.xml
jetty-webapp/pom.xml
jetty-websocket/pom.xml
jetty-xml/pom.xml
pom.xml
test-continuation/pom.xml
test-jetty-nested/pom.xml
test-jetty-servlet/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-mongodb-sessions/pom.xml
tests/test-sessions/test-sessions-common/pom.xml
tests/test-webapps/pom.xml
tests/test-webapps/test-jetty-webapp/pom.xml
tests/test-webapps/test-webapp-rfc2616/pom.xml
2013-08-01 13:21:32 +10:00
Jan Bartel
5094dc059d
Merge remote-tracking branch 'origin/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/jetty-websocket/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-spi/pom.xml
jetty-http/pom.xml
jetty-io/pom.xml
jetty-jaspi/pom.xml
jetty-jmx/pom.xml
jetty-jndi/pom.xml
jetty-jsp/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-context/pom.xml
jetty-osgi/test-jetty-osgi-webapp/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-spdy/pom.xml
jetty-spdy/spdy-core/pom.xml
jetty-spdy/spdy-jetty-http-webapp/pom.xml
jetty-spdy/spdy-jetty-http/pom.xml
jetty-spdy/spdy-jetty/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/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-mongodb-sessions/pom.xml
tests/test-sessions/test-sessions-common/pom.xml
tests/test-webapps/pom.xml
tests/test-webapps/test-webapp-rfc2616/pom.xml
2013-08-01 12:40:23 +10:00
Jan Bartel
e87eee1b46
412629 PropertyFileLoginModule doesn't cache user configuration file even for refreshInterval=0
2013-08-01 11:56:13 +10:00
Jan Bartel
1dbab40863
412629 PropertyFileLoginModule doesn't cache user configuration file even for refreshInterval=0
2013-08-01 10:55:10 +10:00
Jan Bartel
7dea4f85f9
414085 - Add jetty-continuations to plugin dependencies
2013-08-01 09:59:19 +10:00
Joakim Erdfelt
e2f02a7a8a
JSR-356 fixing ServerContainer.setDefault*() method behavior
2013-07-31 14:25:54 -07:00
Joakim Erdfelt
eb9fce2fa5
JSR-356: fixing Session.getProtocolVersion()
2013-07-31 13:41:46 -07:00
Joakim Erdfelt
0444b87961
414167 - WebSocket handshake upgrade from FireFox fails due to keep-alive
...
+ Making .isUpgradeRequest() multi-value aware, per spec
2013-07-31 13:00:16 -07:00
Joakim Erdfelt
9846aee917
JSR-356 returning empty string (per javadoc) instead of null for Session.getNegotiatedSubprotocol()
2013-07-31 11:42:42 -07:00
Joakim Erdfelt
153c844238
Adding Shutdown hook to ClientContainer
2013-07-31 10:48:23 -07:00
