aba64046cf
Merge remote-tracking branch 'origin/jetty-7' into jetty-8
2013-01-21 12:13:10 +11:00
b36411d382
381521 Only set Vary header when content could be compressed
2013-01-21 12:09:46 +11:00
863944873d
merge from 7 and update license blocks for 2013
2013-01-11 15:01:16 -06:00
a4dbb5823c
update license blocks for 2013
2013-01-11 14:57:51 -06:00
2aab780eba
Merge remote-tracking branch 'origin/jetty-7' into jetty-8
...
Conflicts:
jetty-server/src/main/java/org/eclipse/jetty/server/handler/ContextHandler.java
tests/test-integration/src/test/java/org/eclipse/jetty/test/jsp/JspMatchingTest.java
2013-01-07 23:45:38 +11:00
ccda9bb10b
397535 Support pluggable alias checking to support symbolic links
2013-01-07 19:57:52 +11:00
1da584003a
Moving new tests from test-jetty-webapp as a webapp to test-integration as embedded
2012-12-27 13:53:38 -07:00
9009f6abbf
Adding safety checks for FileResource references with null characters.
...
* Adding testcase for Jsp + DefaultServlet w/aliasing turned on
with null characters in the request url.
* Adding validateUri() method to FileResource
2012-12-27 11:44:19 -07:00
32e1d0f29c
Merge remote-tracking branch 'origin/jetty-7' into jetty-8
...
Conflicts:
jetty-server/src/main/java/org/eclipse/jetty/server/Server.java
jetty-servlets/src/main/java/org/eclipse/jetty/servlets/MultiPartFilter.java
jetty-servlets/src/test/java/org/eclipse/jetty/servlets/MultipartFilterTest.java
2012-12-21 13:00:14 +11:00
f9e76b1620
Merge remote-tracking branch 'origin/jetty-7' into jetty-8
...
Conflicts:
jetty-servlet/src/main/java/org/eclipse/jetty/servlet/ServletHandler.java
jetty-servlets/src/main/java/org/eclipse/jetty/servlets/MultiPartFilter.java
jetty-util/src/main/java/org/eclipse/jetty/util/ReadLineInputStream.java
2012-12-14 11:48:55 +11:00
7488452e8a
Adding some debugging
2012-12-03 14:55:22 -07:00
57849a905f
Adding -Dtest.slow.destroy support to CookieDump to aid in testing of
...
start.jar -DSTOP.WAIT=360 --stop
2012-12-03 13:04:03 -07:00
94547fb4ea
Fix link to jetty @ eclipse for test webapp
2012-11-23 10:54:47 +11:00
3587350447
Fix link to jetty @ eclipse in remote.html
2012-11-23 10:51:47 +11:00
976d6e2203
394870 Make enablement of remote access to test webapp configurable in override-web.xml
2012-11-23 10:47:39 +11:00
3d3b035b22
Merge remote-tracking branch 'origin/jetty-7' into jetty-8
...
Conflicts:
jetty-servlet/src/test/java/org/eclipse/jetty/servlet/DefaultServletTest.java
2012-11-12 09:08:53 +11:00
75aedbbf45
393947 implement ETags and update gzip filter to handle them
2012-11-11 09:52:26 +11:00
8723408731
Merge remote-tracking branch 'origin/jetty-7' into jetty-8
...
Conflicts:
jetty-servlets/src/main/java/org/eclipse/jetty/servlets/MultiPartFilter.java
2012-11-02 13:17:53 +11:00
65202e9abe
393363 Use Locale.ENGLISH for all toUpperCase and toLowerCase calls
2012-11-02 11:55:00 +11:00
3920146bf0
Remove printlns
2012-10-15 16:06:07 +11:00
07327cf46d
Fix license header
2012-10-13 21:14:03 +11:00
785e06d347
390108 Servlet 3.0 API for programmatic login doesn't appear to work
2012-10-12 19:00:28 +11:00
ce3ba58887
390163 Implement ServletRegistration.Dynamic.setServletSecurity
2012-09-29 16:15:55 +10:00
5de0cee1eb
merge from master + license block standardization
2012-08-17 14:50:43 -05:00
00ed549898
standardize license header blocks
2012-08-16 19:11:27 -05:00
ce2dc33a0a
Merge branch 'master' into jetty-8
2012-07-11 14:06:11 -05:00
81d72052c8
merged master to jetty-8
2012-07-11 14:04:49 -05:00
319d4bc66c
quick pass through to clean up missing or incorrect license blocks
2012-07-11 12:41:34 -05:00
aa941f5711
quick pass through to clean up missing or incorrect license blocks
2012-07-11 12:29:46 -05:00
cf214ffeef
Merge branch 'master' into jetty-8
2012-05-24 08:35:22 -05:00
37bce89b8f
379909 FormAuthenticator Rembers only the URL of first Request before authentication
2012-05-22 13:13:10 +02:00
37a040bf6a
Merge remote-tracking branch 'origin/master' into jetty-8
2012-01-13 14:29:42 +11:00
04d703c062
365302: clean up old Logger mbeans
2012-01-13 13:59:49 +11:00
89afbdf31d
360245 OSGi: javax.servlet packages version refactored 3.0 -> 2.6
2011-12-02 17:27:26 +08:00
de005c68fd
Revert "Merge branch 'release-8'"
...
This reverts commit 9e72457941df12605f0e
2011-11-30 16:27:30 +11:00
55d5020980
Merge remote-tracking branch 'origin/master' into jetty-8
...
Conflicts:
VERSION.txt
jetty-server/src/main/java/org/eclipse/jetty/server/AbstractHttpConnection.java
jetty-server/src/main/java/org/eclipse/jetty/server/Response.java
jetty-servlet/src/main/java/org/eclipse/jetty/servlet/ServletHandler.java
2011-11-29 09:06:25 +11:00
d55477388b
more debug in tests
2011-11-22 00:12:56 +11:00
127a5af8d7
Merge remote-tracking branch 'origin/master' into jetty-8
2011-11-17 10:59:54 +11:00
af4c40d793
fixed SSL buffer pool
2011-11-09 17:39:59 +11:00
202475aad9
clean build
2011-11-07 15:34:33 +11:00
d862348b4c
Merge remote-tracking branch 'origin/master' into jetty-8
...
Conflicts:
jetty-server/src/main/java/org/eclipse/jetty/server/HttpConnection.java
2011-10-06 18:31:57 +11:00
a8f24a2b64
360066 jsps referenced in web.xml <jsp-file> elements do not compile
2011-10-06 17:32:31 +11:00
32dbb1bddb
Merge remote-tracking branch 'origin/master' 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/pom.xml
jetty-ajp/pom.xml
jetty-annotations/pom.xml
jetty-client/pom.xml
jetty-continuation/pom.xml
jetty-deploy/pom.xml
jetty-deploy/src/main/config/etc/jetty-deploy.xml
jetty-distribution/pom.xml
jetty-http/pom.xml
jetty-io/pom.xml
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-jsp/src/main/java/org/eclipse/jetty/osgi/boot/jsp/FragmentActivator.java
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/jetty-osgi-servletbridge/pom.xml
jetty-osgi/jetty-osgi-servletbridge/src/main/java/org/eclipse/jetty/osgi/servletbridge/FrameworkLauncherExtended.java
jetty-osgi/jetty-osgi-servletbridge/src/main/webapp/WEB-INF/web.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-server/src/main/java/org/eclipse/jetty/server/HttpOutput.java
jetty-servlet/pom.xml
jetty-servlets/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-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-10-04 17:45:15 +11:00
11ae5c7dd3
JETTY-1434
...
Add a jsp that exercises jstl.
2011-09-26 20:59:37 +10:00
298a623fe9
357959 - Include javadoc in distribution
...
+ Adjusting /javadoc/ proxy configuration in test-jetty-webapp to
now be /javadoc-proxy/, along with providing a link to the
distribution's /javadoc/ path as well.
2011-09-16 11:05:07 -07:00
670e8de261
352050: Fixed infinite redirect loop for /remote.html in testapp
2011-09-13 11:58:30 -07:00
246fb51cfc
357163 - jetty 8 ought to proxy jetty8 javadocs
...
+ Fixing proxy configuration to use jetty8 javadocs destination.
2011-09-13 10:43:08 -07:00
1e079f06c9
Merge remote-tracking branch 'origin/master' into jetty-8
2011-09-01 14:11:53 +10:00
4ace183764
Merging from master
2011-08-25 12:09:36 -07:00
def117775d
353073 recycle buffer
2011-08-25 12:28:49 +10:00
Greg Wilkins
Jesse McConnell
Joakim Erdfelt
Jan Bartel
Greg Wilkins
hmalphettes
Jan Bartel
Thomas Becker