db48bce49d
Merge remote-tracking branch 'origin/jetty-7' into jetty-8
2013-04-22 14:15:51 +10:00
3c498f0a2c
405281 allow filemappedbuffers to not be used
2013-04-22 14:15:14 +10:00
fbb53c2d23
added encodeRedirectURL to Dump servlet
2013-04-19 13:53:48 +10:00
3812622365
Merge remote-tracking branch 'origin/jetty-7' into jetty-8
2013-04-18 14:37:38 +10:00
2e5a233cd3
405537 NPE in rendering JSP using SPDY and wrapped ServletRequest
2013-04-18 14:26:18 +10:00
e1fa106c19
Fix SslBytesServerTest failing on MacOS
2013-04-12 14:13:41 +02:00
e6fb9adeda
Merge branch 'jetty-7' into jetty-8
2013-04-08 16:42:58 +02:00
87b1003641
Removed module jetty-npn, it now lives in its own repository at http://git.eclipse.org/c/jetty/org.eclipse.jetty.npn.git .
2013-04-08 16:41:50 +02:00
abcb4f163b
Merge remote-tracking branch 'origin/jetty-7' into jetty-8
...
Conflicts:
jetty-security/src/main/java/org/eclipse/jetty/security/ConstraintSecurityHandler.java
2013-04-05 16:35:37 +11:00
cada28e8cf
404325 data constraint redirection does send default port
2013-04-05 16:32:51 +11:00
6b3cb20720
Merge remote-tracking branch 'origin/jetty-7' into jetty-8
2013-04-05 09:58:33 +11:00
b58066451e
404958 Fixed Resource.newSystemResource striped / handling
2013-04-05 09:58:05 +11:00
c7b671d49d
Merge remote-tracking branch 'origin/jetty-7' into jetty-8
2013-04-05 09:49:56 +11:00
7d068ddb01
removed debug println - DOH!
2013-04-05 09:41:58 +11:00
e9185aa062
Merge remote-tracking branch 'origin/jetty-7' into jetty-8
2013-04-04 16:09:19 +11:00
060389147b
404128 Add Vary headers rather than set them
2013-04-04 16:05:27 +11:00
df6e18cc00
404517 Close connection if request received after half close
2013-04-04 15:38:15 +11:00
3cd6d90e9f
removed verbose output
2013-04-04 15:38:15 +11:00
6f80105d74
merge
2013-04-03 09:10:32 -05:00
05b2d988b0
add travis ci linkage
2013-04-03 09:07:13 -05:00
ce7629c663
Merge branch 'jetty-7' into jetty-8
2013-04-03 11:24:02 +02:00
5df26a6a57
404789 - Support IPv6 addresses in DoSFilter white list.
2013-04-03 11:21:33 +02:00
1f9e4f3e5c
Merge remote-tracking branch 'origin/jetty-7' into jetty-8
2013-03-28 14:05:24 +11:00
72162c0342
404517 Close connection if request received after half close
2013-03-28 14:04:24 +11:00
28bb68a8ae
Merge remote-tracking branch 'origin/jetty-7' into jetty-8
2013-03-26 10:57:16 +11:00
af53d94b8b
404283 org.eclipse.jetty.util.Scanner.scanFile() dies with an NPE if listFiles() returns null
2013-03-26 10:55:37 +11:00
50119acb66
Merge remote-tracking branch 'origin/jetty-7' into jetty-8
2013-03-22 12:58:55 +11:00
e553e2ec1f
403281 jetty.sh waits for started or failure before returning
2013-03-22 12:58:31 +11:00
e4fb243adf
Merge remote-tracking branch 'origin/jetty-7' into jetty-8
2013-03-22 11:54:44 +11:00
61be691a0c
403281 jetty.sh waits for started or failure before returning
2013-03-22 11:54:09 +11:00
ea5fcfd20d
Merge remote-tracking branch 'origin/jetty-7' into jetty-8
2013-03-22 11:32:53 +11:00
e083f9d95a
403281 jetty.sh waits for started or failure before returning
2013-03-22 11:31:15 +11:00
b69b52d984
Merge remote-tracking branch 'origin/jetty-7' into jetty-8
2013-03-18 15:27:10 +11:00
1eea7a2a89
Update to build with jdk1.7 which requires npn-boot jar v 1.1.5, and npn-api 1.1.0
2013-03-18 14:38:42 +11:00
25f5e38e13
403513 jetty:run goal cannot be executed twice during the maven build
2013-03-18 14:33:49 +11:00
d21c8e5ca4
Merge remote-tracking branch 'origin/jetty-7' into jetty-8
2013-03-18 10:53:14 +11:00
63f2719938
403570 Asynchronous Request Logging
2013-03-18 10:48:06 +11:00
7ba6bb92b0
403281 jetty.sh waits for started or failure before returning
2013-03-16 10:36:43 +11:00
6b9c0ac3e3
Merge branch 'jetty-7' into jetty-8
2013-03-14 23:32:19 -07:00
529c3cab9b
Fixing TestingDir does not implement MethodRule error by removing conflicting junit classes
2013-03-14 23:30:19 -07:00
b15f9340d0
Merge remote-tracking branch 'origin/jetty-7' into jetty-8
2013-03-15 14:40:19 +11:00
41feea7e01
402844 STOP.PORT & STOP.KEY behaviour has changed
2013-03-15 14:38:53 +11:00
8a96cc8c4a
Merge branch 'jetty-7' into jetty-8
2013-03-14 16:54:35 -07:00
5084a1430f
Fixing build.
...
+ Bumping jetty-test-helper to 2.0
+ Bumping jetty-version-maven-plugin to 1.0.10
+ Fixing JDK 1.5 build warts
+ Updating Stress use for new "test.stress" property introduced by upgrades
2013-03-14 16:52:52 -07:00
6448758fc0
Merge remote-tracking branch 'origin/jetty-7' into jetty-8
2013-03-15 08:33:14 +11:00
cc34bdc20a
403281 jetty.sh waits for started or failure before returning
2013-03-15 08:32:24 +11:00
1cb201ef14
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-distribution/src/main/resources/bin/jetty.sh
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-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-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-03-14 12:40:29 +11:00
38d701753c
403281 jetty.sh waits for started before OK
...
Conflicts:
jetty-distribution/src/main/resources/bin/jetty.sh
2013-03-14 11:50:06 +11:00
f85168a9ac
Merge branch 'release-8' into jetty-8
2013-03-12 14:26:52 -05:00
859c15ada3
Merge branch 'release-7' into jetty-7
2013-03-12 14:26:30 -05:00
Greg Wilkins
Jan Bartel
Thomas Becker
Simone Bordet
Jesse McConnell
Joakim Erdfelt