5f2323418b
cleanups after the merge
2011-11-08 12:47:28 +11:00
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
9907125cff
improved no progress check
2011-11-07 17:14:39 +11:00
202475aad9
clean build
2011-11-07 15:34:33 +11:00
42179e193d
client tests passing
2011-11-07 10:23:08 +11:00
3e104548d5
fixed blocking client connection
2011-11-07 09:31:57 +11:00
cb778530a4
Merge branch 'master' of ssh://git.eclipse.org/gitroot/jetty/org.eclipse.jetty.project
2011-11-04 20:24:35 +01:00
acaa24595b
359031: Javadoc
...
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2011-11-04 20:23:56 +01:00
2cff05c531
Bug 362853 - Promoting all Websocket STRICT blocks to standard behavior
...
+ Removing BRUTAL flag, and promoting its logic to standard behavior.
2011-11-04 11:27:50 -07:00
373a2946be
Bug 362853 - Promoting all Websocket STRICT blocks to standard behavior
2011-11-04 09:40:32 -07:00
3d0300e60d
359031: CGI servlet changed to allow relative paths to webapp
...
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2011-11-04 15:56:18 +01:00
b9f45e9426
CGI.java code format
...
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2011-11-04 15:56:18 +01:00
f21752dbe3
Merge branch '360665'
2011-11-04 15:54:26 +01:00
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
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
f1251412e4
Modified behavior of shutdownInput() and shutdownOutput() to always shutdown either input or output.
...
Calling socket.close() does not imply that socket.isInputShutdown() returns true, so there was a
possibility that code was calling ChannelEndPoint.shutdownInput(), but the input was not really
shutdown, and a subsequent call to ChannelEndPoint.isInputShutdown() returned false.
2011-11-04 15:22:43 +01:00
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
9b60678fbf
blocking client connection passing more tests
2011-11-04 16:04:48 +11:00
5ca9dbb7d4
Undoing recent change as redundant, existing STRICT block does the same thing
2011-11-03 16:03:46 -07:00
de4253b5e6
Bug 362850 - Websocket allowing >125 octets on control frame payloads
2011-11-03 15:47:12 -07:00
afd2cedfa7
Merge branch 'master' of ssh://git.eclipse.org/gitroot/jetty/org.eclipse.jetty.project
2011-11-03 11:07:04 -07:00
e2f15522bd
Fixing junit test cases affected by close status code changes
2011-11-03 09:18:31 -07:00
c1d681551b
Bug 362740 - Websocket D13 close handling is off [autobahn]
...
+ Address autobahn 0.4.3 test cases 7.9.*
Description: Send close with invalid close code (999. 1004, 1005, 1006, 1011, 1100, 2000, 2999, 5000, 65535)
Expectation: Clean close with protocol error code
2011-11-02 20:04:03 -07:00
da60996ce5
Bug 362740 - Websocket D13 close handling is off [autobahn]
...
+ Address autobahn 0.4.3 test case 7.5.1
Description: Send a close frame with invalid UTF8 payload
Expectation: Clean close with protocol error or invalid utf8 code
2011-11-02 17:22:40 -07:00
e207ea357e
Minor update to invalid utf8 test case (expanding bad examples)
2011-11-02 17:22:32 -07:00
4314c55c77
Bug 362740 - Websocket D13 close handling is off [autobahn]
...
+ Address autobahn 0.4.3 test case 7.3.2
Description: Send a close frame with payload length 1
Expectation: Clean close with protocol error
2011-11-02 16:58:29 -07:00
cafbb47a2f
Bug 362740 - Websocket D13 close handling is off [autobahn]
...
+ Address autobahn 0.4.3 test case 7.3.1
Description: Send a close frame with payload length 0 (no close code, no close reason)
Expectation: Clean close with normal code
2011-11-02 16:47:48 -07:00
5f653aa87a
Minor tweak to SCEP.toString() to make it a bit more readable
2011-11-02 16:47:40 -07:00
81e58f1f71
[Bug 362447] add setMaxNonceAge() to DigestAuthenticator
2011-11-02 16:39:22 -05:00
c83b02c4a7
[Bug 362407] setTrustStore(Resource) -> setTrustStoreResource(R)
2011-11-02 14:37:02 -05:00
25f70e9060
[Bug 362696] expand virtual host configuration options to ContextHandler
...
and add associated test case for new behavior
2011-11-02 11:29:45 -05:00
317baa1010
[Bug 362696] additional virtual host configuration options to
...
ContextHandler
2011-11-02 11:29:45 -05:00
48cafe46a6
362614 NPE in accepting connection
2011-11-02 12:01:31 +11:00
971115a00a
enable tests-parent and tests-common-sessions so they are deployed for external users
2011-10-31 17:42:21 -05:00
56c1ddf117
JETTY-1442 add _hostHeader setter for ProxyRule
2011-10-31 14:43:20 +11:00
e088acc559
Resolving merge
2011-10-28 13:42:07 -07:00
a32c1186e2
362113 - Improve Test Coverage of org.eclipse.jetty.util.log classes
...
+ JavaUtilLog coverage improvements and bug fixes
+ More in-code comments about decisions
2011-10-28 13:29:22 -07:00
aa73830199
Updating java comments to make clear the purpose of this new static{} block
2011-10-28 10:57:32 -07:00
4947bf099a
Making Log use an optional jetty-logging.properties object for pre-loading its properties (with System.getProperty override)
2011-10-28 10:30:35 -07:00
c02f98b7e6
More classpath mucking about in Sfl4jTestJarsRunner
2011-10-28 09:48:59 -07:00
9c9f2bd7c3
Making Sfl4jTestJarsRunner use its own classloader for loading the test
2011-10-28 09:23:11 -07:00
21c43b1ab9
Making Sfl4jTestJarsRunner use its own classloader for loading the test
2011-10-28 09:21:46 -07:00
062ccd7e70
trial classloader
2011-10-28 11:15:02 -05:00
148459bc8f
trial classloader
2011-10-28 11:14:14 -05:00
5c516c9e7b
Making fixes to StdErrLogTest
2011-10-28 09:12:29 -07:00
c174304996
Making fixes to StdErrLogTest
2011-10-28 09:11:21 -07:00
f510e0daf9
Making fixes to StdErrLogTest
2011-10-28 09:07:03 -07:00
824e6ebc52
Merge branch 'master' into slf4j-testing
2011-10-28 08:44:44 -07:00
c19e1de62f
initial blocking client impl
2011-10-28 22:57:19 +11:00
84b07f359e
temporary disabled log format test
2011-10-28 15:25:10 +11:00
Greg Wilkins
Simone Bordet
Thomas Becker
Joakim Erdfelt
Jesse McConnell
David Rosell
Jan Bartel