Simone Bordet
3e602117b4
Improved send() implementation to be more clear, and covered also a
...
missing case where the callback may have not been notified.
2014-09-17 18:07:22 +02:00
Simone Bordet
193eaaf1c3
SelectChannelEndPoint should set the interestOps as requested.
...
Previously, SCEP was skipping the update of the interestOps in case it
was either input or output shutdown.
Now it always set the interestOps as requested and leaves to the
connection decide what interestOps needs to be set.
2014-09-17 17:44:49 +02:00
Simone Bordet
f93c1cf593
444214 - Socks4Proxy fails when reading less than 8 bytes.
2014-09-16 21:20:45 +02:00
Simone Bordet
1878b344c7
Added SOCKS 4 tests.
2014-09-16 14:24:45 +02:00
Simone Bordet
f02194d405
Made methods return boolean to indicate whether the update was
...
successful or not.
2014-09-12 12:58:35 +02:00
Jan Bartel
b0a3d0a159
443893 Make a module for weld
2014-09-12 15:10:31 +10:00
Joakim Erdfelt
2481be42fe
Adding timeouts for problematic test case
2014-09-11 10:47:43 -07:00
Joakim Erdfelt
1781add471
Minor edit to test new release branch
2014-09-11 06:01:09 -07:00
Joakim Erdfelt
2755746def
Merge branch 'jetty-http2'
2014-09-11 05:56:55 -07:00
Simone Bordet
15781da755
Fixed spinning loop that called onFillable() in case of closed
...
connection.
2014-09-11 00:33:47 +02:00
Simone Bordet
fd1c9dd8d2
443713 - Reduce number of SelectionKey.setInterestOps() calls.
...
Introduced a state machine to handle the various scenarios (ST = selector thread, Tx = pooled thread):
ST: call to SCEP.onSelected() moves from SELECTING -> PENDING.
ST: call to SCEP.updateKey() moves from PENDING -> UPDATING -> SELECTING
T1: call to SCEP.changeInterests() moves (SELECTING | PENDING) -> CHANGING -> SELECTING
The race between ST and T1 to move from PENDING to either UPDATING or CHANGING will be won
by one thread only, which will then perform the call to SelectionKey.setInterestOps().
Preferably, this will be done by ST during an updateKey() call. If updateKey() has already
been invoked, then changeInterests() will perform the call to SelectionKey.setInterestOps().
However, if T1 loses, it still has to perform the key update, so it will spin until ST
moves back to SELECTING.
2014-09-10 21:45:27 +02:00
Joakim Erdfelt
3e4c9909e0
443652 - Remove dependency on java.lang.management classes
...
* Created safer Uptime singleton for use
* Removed direct references to java.lang.management from
- Server.java
- Log.java
- AbstractLifeCycle.java
2014-09-10 10:30:26 -07:00
Simone Bordet
1ee11138a7
Introduced field "submitKeyUpdates" instead of relying on a system
...
property.
Modified method updateKey() to return a boolean to signal whether the
selector was woken up.
2014-09-10 11:11:12 +02:00
Simone Bordet
d45a5c861c
Introduced factory method to create the SelectorManager instance.
2014-09-10 11:11:12 +02:00
Simone Bordet
87cac64dff
Fixed typo, improved logging, removed unused type parameter.
2014-09-10 11:11:12 +02:00
Greg Wilkins
40d84ff1e3
443662 Consume buffer in write(ByteBuffer)
2014-09-10 17:41:14 +10:00
Jan Bartel
09e22c042c
443661 Rename manifest and service constants for jetty osgi resource fragment code
2014-09-10 16:28:29 +10:00
Greg Wilkins
5011993ddf
Merge remote-tracking branch 'origin/master' into jetty-http2
...
Conflicts:
VERSION.txt
aggregates/jetty-all/pom.xml
apache-jsp/pom.xml
apache-jstl/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
examples/pom.xml
jetty-alpn/jetty-alpn-client/pom.xml
jetty-alpn/jetty-alpn-server/pom.xml
jetty-alpn/pom.xml
jetty-annotations/pom.xml
jetty-ant/pom.xml
jetty-client/pom.xml
jetty-continuation/pom.xml
jetty-deploy/pom.xml
jetty-distribution/pom.xml
jetty-fcgi/fcgi-client/pom.xml
jetty-fcgi/fcgi-server/pom.xml
jetty-fcgi/pom.xml
jetty-http-spi/pom.xml
jetty-http/pom.xml
jetty-io/pom.xml
jetty-jaas/pom.xml
jetty-jaspi/pom.xml
jetty-jmx/pom.xml
jetty-jndi/pom.xml
jetty-jsp/pom.xml
jetty-jspc-maven-plugin/pom.xml
jetty-maven-plugin/pom.xml
jetty-monitor/pom.xml
jetty-nosql/pom.xml
jetty-osgi/jetty-osgi-alpn/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/jetty-osgi-npn/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-osgi/test-jetty-osgi/src/test/java/org/eclipse/jetty/osgi/test/TestJettyOSGiBootWithJsp.java
jetty-plus/pom.xml
jetty-proxy/pom.xml
jetty-quickstart/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-alpn-tests/pom.xml
jetty-spdy/spdy-client/pom.xml
jetty-spdy/spdy-core/pom.xml
jetty-spdy/spdy-example-webapp/pom.xml
jetty-spdy/spdy-http-client-transport/pom.xml
jetty-spdy/spdy-http-common/pom.xml
jetty-spdy/spdy-http-server/pom.xml
jetty-spdy/spdy-npn-tests/pom.xml
jetty-spdy/spdy-server/pom.xml
jetty-spring/pom.xml
jetty-start/pom.xml
jetty-util-ajax/pom.xml
jetty-util/pom.xml
jetty-webapp/pom.xml
jetty-websocket/javax-websocket-client-impl/pom.xml
jetty-websocket/javax-websocket-server-impl/pom.xml
jetty-websocket/pom.xml
jetty-websocket/websocket-api/pom.xml
jetty-websocket/websocket-client/pom.xml
jetty-websocket/websocket-common/pom.xml
jetty-websocket/websocket-server/pom.xml
jetty-websocket/websocket-servlet/pom.xml
jetty-xml/pom.xml
pom.xml
tests/pom.xml
tests/test-continuation/pom.xml
tests/test-integration/pom.xml
tests/test-loginservice/pom.xml
tests/test-quickstart/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-jaas-webapp/pom.xml
tests/test-webapps/test-jetty-webapp/pom.xml
tests/test-webapps/test-jndi-webapp/pom.xml
tests/test-webapps/test-mock-resources/pom.xml
tests/test-webapps/test-proxy-webapp/pom.xml
tests/test-webapps/test-servlet-spec/pom.xml
tests/test-webapps/test-servlet-spec/test-container-initializer/pom.xml
tests/test-webapps/test-servlet-spec/test-spec-webapp/pom.xml
tests/test-webapps/test-servlet-spec/test-web-fragment/pom.xml
tests/test-webapps/test-webapp-rfc2616/pom.xml
2014-09-10 14:38:18 +10:00
Greg Wilkins
c80f556139
Update Password.java
...
Fixed typo.
Trivial fix from github/pull/21
2014-09-10 10:06:00 +10:00
Jesse McConnell
7dfd9115a4
Merge branch 'release-9'
2014-09-09 10:27:21 -05:00
Jesse McConnell
6ce4760cd3
set for dev
2014-09-09 10:27:03 -05:00
Jesse McConnell
88b19abf52
[maven-release-plugin] prepare for next development iteration
2014-09-05 09:19:30 -05:00
Jesse McConnell
9bfeb2221f
[maven-release-plugin] prepare release jetty-9.2.3.v20140905
2014-09-05 09:19:23 -05:00
Jesse McConnell
480348aba9
set for release
2014-09-05 08:11:58 -05:00
Jesse McConnell
80d7237ea5
Merge branch 'master' into release-9
2014-09-05 08:10:24 -05:00
Jesse McConnell
c034544ab9
reset for release
2014-09-05 08:10:15 -05:00
Simone Bordet
063ad177b5
Fixed typo.
2014-09-05 15:04:38 +02:00
Simone Bordet
3fa302e287
Removed BenchmarkHelper in favour of the version present in the jetty-test-helper.
2014-09-05 15:04:38 +02:00
Jan Bartel
d9f285f5f5
Update versions of apache-jsp and servlet-api for osgi
2014-09-05 20:19:45 +10:00
Jan Bartel
18f9ec4c23
Merge branch 'apache-jsp-osgi' of ssh://git.eclipse.org/gitroot/jetty/org.eclipse.jetty.project into apache-jsp-osgi
2014-09-05 18:36:13 +10:00
Jan Bartel
7c882d76c5
Make annotations and JNDI wortk with OSGi
2014-09-05 18:35:15 +10:00
Jan Bartel
7199c6ceca
Switch to apache-jsp for jetty-osgi
2014-09-05 18:35:15 +10:00
Jan Bartel
e4454965d4
Make annotations and JNDI wortk with OSGi
2014-09-05 17:49:17 +10:00
Greg Wilkins
07ec47adfa
improved SSL debug logging
2014-09-04 19:09:39 +10:00
Greg Wilkins
5b97d652e1
Merge remote-tracking branch 'origin/master' into jetty-http2
...
Conflicts:
jetty-alpn/jetty-alpn-server/src/main/config/modules/protonego-impl/alpn.mod
jetty-http/src/main/java/org/eclipse/jetty/http/HttpParser.java
jetty-npn/jetty-npn-server/src/main/config/modules/protonego-impl/npn.mod
jetty-spdy/spdy-http-server/src/main/java/org/eclipse/jetty/spdy/server/http/HttpChannelOverSPDY.java
2014-09-04 17:43:18 +10:00
Greg Wilkins
8d332b0962
added npn and alpn license messages
2014-09-04 12:29:59 +10:00
Jan Bartel
2adb029764
443172 web-fragment.xml wrongly parsed for applications running in serlvet 2.4 mode
2014-09-04 12:10:55 +10:00
Jan Bartel
51715dbcdb
443231 java.lang.NullPointerException on scavenge scheduling when session id manager declared before shared scheduler
2014-09-04 11:31:08 +10:00
Jan Bartel
a1587d807e
443262 Distinguish situation where jetty looks for tlds in META-INF but finds none vs does not look
2014-09-04 10:22:40 +10:00
Greg Wilkins
610bac49b9
435322 Added a idleTimeout to the SharedBlockerCallback
2014-09-04 09:30:21 +10:00
Greg Wilkins
ed8abd1d53
443049 Improved HttpParser illegal character messages
2014-09-04 09:27:42 +10:00
Jan Bartel
c0aef8975d
Switch to apache-jsp for jetty-osgi
2014-09-04 08:16:35 +10:00
Greg Wilkins
5be1fb6270
Merge remote-tracking branch 'origin/master' into jetty-http2
...
Conflicts:
jetty-server/src/main/java/org/eclipse/jetty/server/HttpOutput.java
2014-09-03 15:19:54 +10:00
Greg Wilkins
c3647f9d9f
443158 Fixed HttpOutput spin
2014-09-03 15:01:10 +10:00
Greg Wilkins
e03b511415
trying to catch intermittent test failure
2014-09-03 15:00:40 +10:00
Greg Wilkins
0a2aeb54a1
435322 Added a idleTimeout to the SharedBlockerCallback
2014-09-03 10:46:18 +10:00
Simone Bordet
bb1d4946bc
Merged branch 'master' into 'jetty-http2'.
2014-09-02 10:25:31 +02:00
Simone Bordet
7be9f0d7a4
Fixed doStop() to call super before interrupting the reference queue thread.
2014-09-01 21:16:40 +02:00
Simone Bordet
5370f3c8cb
442950 - Embedded Jetty client requests to localhost hangs with high cpu usage (NIO OP_CONNECT Solaris/Sparc).
2014-09-01 12:06:18 +02:00
Simone Bordet
ee3ab1f8ea
Merged branch 'master' into 'jetty-http2'.
2014-09-01 11:57:09 +02:00
