Eclipse/jetty.project
1
0
Fork 0
mirror of https://github.com/jetty/jetty.project.git synced 2025-02-24 08:28:54 +00:00
Code Issues Packages Projects Releases Wiki Activity
8,568 Commits 55 Branches 466 Tags
Commit Graph

660 Commits

Author SHA1 Message Date
Joakim Erdfelt
499d811ba7 Merge branch 'master' into jetty-9.1 2013-09-30 20:00:26 -07:00
Joakim Erdfelt
1315096192 Disabling broken external server test 2013-09-30 20:00:02 -07:00
Greg Wilkins
2d7f1a2272 ignore test dependent on external server 2013-10-01 11:18:09 +10:00
Jesse McConnell
856a24b65a [maven-release-plugin] prepare for next development iteration 2013-09-30 14:46:09 -05:00
Jesse McConnell
f466f03c6a [maven-release-plugin] prepare release jetty-9.0.6.v20130930 2013-09-30 14:46:00 -05:00
Jesse McConnell
0b3f431d27 set version back to 9.0.6-SNAPSHOT 2013-09-30 12:33:06 -05:00
Jesse McConnell
af2e6ff911 Merge branch 'master' into release-9 2013-09-30 12:28:04 -05:00
Joakim Erdfelt
8d312b9e5d 418212 - org.eclipse.jetty.spdy.server.http.SSLExternalServerTest hangs 
+ Adding timeout on test
 2013-09-27 11:40:35 -07:00
Joakim Erdfelt
273f61210e 418212 - org.eclipse.jetty.spdy.server.http.SSLExternalServerTest hangs 
+ Adding timeout on test
 2013-09-27 11:39:52 -07:00
Thomas Becker
2ef4a4fb1c fix SimpleHTTPBenchmarkTest 2013-09-23 15:07:47 +02:00
Thomas Becker
bfb90523d6 SPDY remove unnecessary flush calls 2013-09-23 14:39:49 +02:00
Greg Wilkins
f2f8ec54c6 Merge remote-tracking branch 'origin/master' into jetty-9.1 
Conflicts:
	aggregates/jetty-all/pom.xml
	examples/embedded/src/main/java/org/eclipse/jetty/embedded/MinimalServlets.java
	examples/embedded/src/main/java/org/eclipse/jetty/embedded/SecuredHelloHandler.java
 2013-09-23 13:38:43 +10:00
Jesse McConnell
0525498ad3 [maven-release-plugin] prepare for next development iteration 2013-09-19 15:06:31 -05:00
Jesse McConnell
c05a725db6 [maven-release-plugin] prepare release jetty-9.0.6.v20130919 2013-09-19 15:06:17 -05:00
Thomas Becker
5346e06d4a 417289 SPDY replace use of direct buffers with indirect buffers or make it configurable 2013-09-19 15:43:07 +02:00
Greg Wilkins
156c936754 comments explaining other NPN boot versions 2013-09-12 18:35:16 +10:00
Jan Bartel
710806b4fd Update npn mod for different version of npn boot jar 2013-09-12 13:01:56 +10:00
Jan Bartel
b24928db81 Move npn profiles to parent pom so that npn.version is available to other modules (eg osgi) 2013-09-12 11:55:21 +10:00
Jan Bartel
be2ecca599 Move npn profiles to parent pom so that npn.version is available to other modules (eg osgi) 2013-09-12 10:06:01 +10:00
Simone Bordet
c49ba7bdcc Merged branch 'master' into 'jetty-9.1'. 2013-09-11 09:16:39 +02:00
Simone Bordet
9910db17cb Added profile for JDK 1.7.0_40. 2013-09-11 09:15:39 +02:00
Greg Wilkins
070ce9dd22 Merge remote-tracking branch 'origin/master' into jetty-9.1 
Conflicts:
	jetty-start/src/main/java/org/eclipse/jetty/start/Main.java
	jetty-webapp/src/main/java/org/eclipse/jetty/webapp/WebAppContext.java
 2013-09-09 15:41:17 +10:00
Mikhail Mazursky
767faece5c [Bug 415999] Fix some of FindBugs warnings 
Mostly not closed streams/DB resources are fixed. But also less
important things.

Signed-off-by: Mikhail Mazursky <mikhail.mazursky@gmail.com>
 2013-09-09 00:24:31 -04:00
Simone Bordet
3cdf4dece1 Refactored some behaviour to base classes to ease the FCGI 
implementation, and taken the chance to remove redundant code.
 2013-09-07 00:36:31 +02:00
Simone Bordet
e09415145f Removed unchecked warning. 2013-09-06 23:38:46 +02:00
Greg Wilkins
ace43502ad refined start.jar mechanism to align with updated documentation 2013-09-06 16:10:03 +10:00
Greg Wilkins
5c3f498624 create directories on module ini 2013-09-06 13:06:15 +10:00
Simone Bordet
4663fa4992 Renamed "Empty" inner classes to "Adapter" to comply with the rest of 
the codebase.
 2013-09-04 13:15:23 +02:00
Greg Wilkins
2e444d2f17 Merge remote-tracking branch 'origin/master' into jetty-9.1 
Conflicts:
	jetty-io/src/main/java/org/eclipse/jetty/io/AbstractConnection.java
	jetty-server/src/test/java/org/eclipse/jetty/server/HttpServerTestBase.java
	jetty-spdy/spdy-http-server/src/main/java/org/eclipse/jetty/spdy/server/proxy/ProxyHTTPSPDYConnection.java
 2013-09-02 17:00:07 +10:00
Thomas Becker
d22fa0dae1 416251 ProxyHTTPToSPDYConnection now sends a 502 to the client if it receives a rst frame from the upstream spdy server 2013-08-30 17:22:11 +02:00
Thomas Becker
85c0f47337 416251 ProxyHTTPToSPDYConnection now sends a 502 to the client if it receives a rst frame from the upstream spdy server 2013-08-30 17:22:05 +02:00
Thomas Becker
669ee75720 415548 migrate ProxyHTTPToSPDYTest to use HttpClient to avoid intermittent NPE part 2 2013-08-30 17:21:59 +02:00
Thomas Becker
8ba45188db merge ProxyHTTPSPDYConnection change with 9.1 2013-08-30 17:19:47 +02:00
Thomas Becker
8e4bae0ccf 415548 migrate ProxyHTTPToSPDYTest to use HttpClient to avoid intermittent NPE part 2 2013-08-30 17:16:22 +02:00
Thomas Becker
b370da6783 415548 migrate ProxyHTTPToSPDYTest to use HttpClient to avoid intermittent NPE 2013-08-30 17:16:14 +02:00
Thomas Becker
b54538793b 416251 ProxyHTTPToSPDYConnection now sends a 502 to the client if it receives a rst frame from the upstream spdy server 2013-08-30 17:15:15 +02:00
Thomas Becker
1ad4f89638 416251 ProxyHTTPToSPDYConnection now sends a 502 to the client if it receives a rst frame from the upstream spdy server 2013-08-30 17:15:15 +02:00
Thomas Becker
f12afb2888 415548 migrate ProxyHTTPToSPDYTest to use HttpClient to avoid intermittent NPE part 2 2013-08-30 17:15:14 +02:00
Thomas Becker
fcdea1d4b4 416242 respect persistence headers in ProxyHTTPSPDYConnection 2013-08-30 17:15:14 +02:00
Thomas Becker
9565d2647e 415548 migrate ProxyHTTPToSPDYTest to use HttpClient to avoid intermittent NPE part 2 2013-08-30 17:15:14 +02:00
Thomas Becker
936343a3e5 415548 migrate ProxyHTTPToSPDYTest to use HttpClient to avoid intermittent NPE 2013-08-30 17:15:13 +02:00
Jesse McConnell
ac30f5c9bd update other jetty mods to new format 2013-08-29 16:39:28 -05:00
Greg Wilkins
b884fabba6 Merge branch 'jetty-9.1' of ssh://git.eclipse.org/gitroot/jetty/org.eclipse.jetty.project into jetty-9.1 2013-08-29 12:38:53 +10:00
Thomas Becker
ac156b9111 415780 fix StreamAlreadyCommittedException in spdy build 2013-08-28 17:15:48 +02:00
Greg Wilkins
c84063a5f8 415826 start.jar replace --enable with --initialize 
refactored impl to be clearer when creating ini
 2013-08-28 23:53:32 +10:00
Thomas Becker
af1abb7af6 416026 improve error handlig in SPDY parsers 2013-08-28 14:45:39 +02:00
Greg Wilkins
c1bd267c17 415826 start.jar replace --enable with --initialize 2013-08-28 15:41:27 +10:00
Joakim Erdfelt
29670845e7 jetty-start / fleshing out with spdy test case 2013-08-26 16:08:08 -07:00
Joakim Erdfelt
25ef708b48 Module fixes 2013-08-26 16:04:41 -07:00
Joakim Erdfelt
a6527a2ae0 Javadoc fixes 2013-08-26 16:04:28 -07:00