Eclipse
/
jetty.project
mirror of https://github.com/jetty/jetty.project.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
16,272 Commits 69 Branches 465 Tags 360 MiB
Commit Graph

148 Commits

Author SHA1 Message Date
Joakim Erdfelt 0476d4d28d Supplementing redirect rules with RedirectUtil 
+ Redirect rules should produce full URI for "Location" header
+ Redirect rules should produce no response body content
 2015-07-23 13:27:43 -07:00
Simone Bordet 3323a4e88d Updated property names: sslConfig -> sslContext. 2015-05-26 18:03:55 +02:00
Greg Wilkins 5d041ad54f 466645 Allow XmlConfiguration Properties to use Elements or Attributes 2015-05-07 16:24:11 +10:00
Greg Wilkins ad16f0c334 fixed test integration to use example-keystore 2015-05-01 19:32:16 +10:00
Jan Bartel e30c05cc2b Merge remote-tracking branch 'origin/jetty-9.2.x' 
Conflicts:
	tests/test-integration/src/test/java/org/eclipse/jetty/test/support/TestableJettyServer.java
	tests/test-integration/src/test/resources/BIOHttp.xml
	tests/test-integration/src/test/resources/BIOHttps.xml
	tests/test-integration/src/test/resources/NIOHttp.xml
	tests/test-integration/src/test/resources/NIOHttps.xml
 2015-04-30 10:44:44 +10:00
Greg Wilkins d5c95a1302 465747 - Jetty is failing to process all HTTP OPTIONS requests. 
The Server handleOptions method was handling all OPTIONS * requests with a blank 200 response.
This has been fixed so that this method only checks that * URI is only applied to OPTIONS method.
 2015-04-29 14:01:20 +10:00
Simone Bordet 599ab9bb1b 460671 - Rationalize property names. 
Property format is now "jetty.<module|component>.<propertyName>".

Updated all references with new properties.
 2015-04-13 16:21:48 +02:00
Greg Wilkins 1cb0449be3 Organised imports 2015-03-26 12:32:15 +11:00
Greg Wilkins 8ec5cab568 fixed LocalClient issue with integration tests 2015-02-27 11:18:45 +11:00
Greg Wilkins 165ae8f238 Improved LocalConnector 2015-02-26 20:13:45 +11:00
Greg Wilkins af70c4bd48 protect event schedule race 2015-02-26 15:37:51 +11:00
Greg Wilkins 752973931e Improved request buffer recycling 
Added a reference count that is incremented for each content reference passed and decremented as each content is consumed.
The request buffer is only filled or recycled if the reference count is 0
 2015-02-26 13:04:50 +11:00
Greg Wilkins 2d096b677f removed ALPN from test 2015-02-25 18:23:54 +11:00
Greg Wilkins 551b339f67 Added a HttpInput integration test 2015-02-25 16:20:00 +11:00
Greg Wilkins 9b40f6e0dd Added a HttpInput integration test 2015-02-25 15:35:51 +11:00
Greg Wilkins 0ee278902d Added a HttpInput integration test 2015-02-25 15:26:51 +11:00
Joakim Erdfelt 4b6d024c85 Using webdefault.xml from jetty-distribution in test cases 2015-02-18 12:39:06 -07:00
Joakim Erdfelt a3201a3c81 Happy New Year 2015 2015-01-07 17:06:59 -07:00
Joakim Erdfelt 6a0668b7a1 Happy New Year 2015 2015-01-07 17:03:30 -07:00
Greg Wilkins 738c47bc55 447515 Remove GzipFilter 
Moved all usages of GzipFilter to GzipHandler
added support to ServerContextHandler to create a GzipHandler
 2014-10-24 08:17:05 +11:00
Greg Wilkins bec34b460f optimised HttpFields 2014-08-05 17:26:27 +10:00
Greg Wilkins 22e57ef7b7 refactored Request to use new HttpURI 2014-07-25 15:03:51 +10:00
Greg Wilkins 3a6879d3e8 expanded tabs in indents 2014-07-23 16:49:05 +10:00
Simone Bordet 6fc645514e Fixed tests that broke due to changes in handling of white spaces 
between HTTP messages introduced by commit
95c6bad654.
 2014-05-03 10:29:20 +02:00
Greg Wilkins 84fa579ec7 429616 Use UTF-8 encoding for XML 2014-03-10 15:23:08 +11:00
Joakim Erdfelt a12fd9ea03 Happy New Year - 2014! 2014-01-02 14:50:14 -07:00
Greg Wilkins f1fc661a2c reenabled integration and RFC2616 tests 2013-11-29 17:33:05 +11:00
Mikhail Mazursky 6b0269a16d [Bug 420930] Use Charset to specify character encoding 
Signed-off-by: Mikhail Mazursky <mikhail.mazursky@gmail.com>
 2013-11-02 14:44:36 +06:00
Joakim Erdfelt e2d872fcc7 Merge branch 'jetty-8' 
Conflicts:
	jetty-server/src/main/java/org/eclipse/jetty/server/handler/RequestLogHandler.java
	jetty-servlets/src/test/java/org/eclipse/jetty/servlets/MultipartFilterTest.java
	jetty-spdy/spdy-client/pom.xml
	jetty-spdy/spdy-core/pom.xml
	jetty-util/src/main/java/org/eclipse/jetty/util/MultiPartInputStreamParser.java
	jetty-util/src/test/java/org/eclipse/jetty/util/MultiPartInputStreamTest.java
	pom.xml
	tests/test-integration/src/test/java/org/eclipse/jetty/test/monitor/JmxServiceTest.java
	tests/test-integration/src/test/java/org/eclipse/jetty/test/monitor/ProgramConfigTest.java
	tests/test-integration/src/test/java/org/eclipse/jetty/test/monitor/XmlConfigTest.java
 2013-08-05 08:47:24 -07:00
Joakim Erdfelt 79ac8ad22d Fixing License Header to conform with standard with rest of project 2013-08-02 14:34:03 -07:00
Joakim Erdfelt 2057c4c17b Upgrading Junit + Hamcrest 2013-08-02 14:25:53 -07:00
Jan Bartel e6974dadab Harmonize with jetty-9 apis 2013-07-26 18:01:37 +10:00
Jan Bartel 50a67eac6a Merge remote-tracking branch 'origin/jetty-8' 
Conflicts:
	jetty-client/src/main/java/org/eclipse/jetty/client/HttpExchange.java
	jetty-client/src/test/java/org/eclipse/jetty/client/IdleTimeoutTest.java
	jetty-http/src/main/java/org/eclipse/jetty/http/HttpGenerator.java
 2013-07-25 13:22:14 +10:00
Joakim Erdfelt ab7268e516 413684 - Trailing slash shows JSP source 
+ Adding testcase to replicate issue.
 2013-07-24 16:43:02 -07:00
Jan Bartel 246088c2ee Merge remote-tracking branch 'origin/jetty-8' 
Conflicts:
	jetty-http/src/main/java/org/eclipse/jetty/http/HttpGenerator.java
	jetty-jndi/src/main/java/org/eclipse/jetty/jndi/ContextFactory.java
	jetty-jndi/src/test/java/org/eclipse/jetty/jndi/java/TestJNDI.java
	jetty-osgi/jetty-osgi-boot/src/main/java/org/eclipse/jetty/osgi/boot/internal/webapp/JettyContextHandlerServiceTracker.java
	jetty-osgi/test-jetty-osgi-context/pom.xml
	jetty-osgi/test-jetty-osgi-context/src/main/java/com/acme/osgi/Activator.java
	jetty-osgi/test-jetty-osgi/src/test/java/org/eclipse/jetty/osgi/boot/JettyOSGiBootContextAsService.java
	jetty-osgi/test-jetty-osgi/src/test/java/org/eclipse/jetty/osgi/boot/TestJettyOSGiBootWebAppAsService.java
	jetty-osgi/test-jetty-osgi/src/test/java/org/eclipse/jetty/osgi/boot/TestJettyOSGiBootWithJsp.java
 2013-02-14 20:08:37 +11:00
Joakim Erdfelt 65c2112964 Making Jsp tests work on JDK's less than 7 2013-02-05 18:00:58 -07:00
Simone Bordet 209d5bc12f 399721 - Change <Ref id= ...> to <Ref refid= ...> 2013-02-01 13:03:11 +01:00
Greg Wilkins 46e13b305b Merge remote-tracking branch 'origin/jetty-8' 
Conflicts:
	jetty-util/src/test/java/org/eclipse/jetty/util/URLEncodedTest.java
 2013-01-17 11:00:20 +11:00
Greg Wilkins c4e77feefa unit test uses fake JSP 2013-01-15 15:53:54 +11:00
Jesse McConnell e1c516c7d1 merge from jetty-8 and update license blocks. 2013-01-11 17:04:53 -06:00
Jesse McConnell a4dbb5823c update license blocks for 2013 2013-01-11 14:57:51 -06:00
Greg Wilkins 3efcc2af41 Merge remote-tracking branch 'origin/jetty-8' 
Conflicts:
	jetty-server/src/main/java/org/eclipse/jetty/server/Request.java
	jetty-server/src/main/java/org/eclipse/jetty/server/handler/ContextHandler.java
	jetty-servlet/src/main/java/org/eclipse/jetty/servlet/DefaultServlet.java
	jetty-servlets/src/main/java/org/eclipse/jetty/servlets/GzipFilter.java
 2013-01-10 16:24:41 +11:00
Greg Wilkins 1add18a57b 397535 Support pluggable alias checking to support symbolic links 2013-01-10 13:23:11 +11:00
Greg Wilkins 8deb1222db Making change to reintroduce this test to merged 8 2013-01-10 13:03:27 +11:00
Joakim Erdfelt 7a3b440a62 Refactoring Jsp + DefaultServlet + Resource Aliasing test cases 2013-01-09 15:22:32 -07:00
Greg Wilkins ccda9bb10b 397535 Support pluggable alias checking to support symbolic links 2013-01-07 19:57:52 +11:00
Jan Bartel a4c547d61f Make JspMatchingTest work with jsp 2.1 using maven command line build 2013-01-07 19:18:53 +11:00
Jan Bartel 39cae560d8 Merge remote-tracking branch 'origin/jetty-8' 
Conflicts:
	tests/test-integration/pom.xml
 2013-01-07 16:12:04 +11:00
Jan Bartel 8d0e776b2a Merge remote-tracking branch 'origin/jetty-8' 
Conflicts:
	jetty-start/src/main/resources/org/eclipse/jetty/start/start.config
	jetty-util/src/main/java/org/eclipse/jetty/util/MultiPartInputStream.java
	test-jetty-webapp/pom.xml
	tests/test-integration/pom.xml
 2013-01-07 12:47:32 +11:00
Jan Bartel 64df770b42 Make new JspMatchingTest work with jsp2.2 for jetty-8 2013-01-07 12:34:57 +11:00
Joakim Erdfelt c23f722286 Reverting validation changes to FileResource and disabling tests 2013-01-02 10:32:16 -07:00
Joakim Erdfelt 1da584003a Moving new tests from test-jetty-webapp as a webapp to test-integration as embedded 2012-12-27 13:53:38 -07:00
Greg Wilkins 6f098dd69c jetty-9 use DateCache timer to set Date header once per second 2012-12-10 12:58:14 +11:00
Jan Bartel 3642de3b8a 392237 - Port test-integration to jetty-9 2012-11-19 18:48:03 +11:00
Greg Wilkins f21b74dcb1 jetty-9 relocated test webapp 2012-11-19 15:57:38 +11:00
Greg Wilkins 3683653052 393303 use jetty-web.xml to explicitly add the jetty packages that need visability. This commit also sucked in some changes made to help with the documentation process (improving deployer configuration management 2012-11-01 20:20:45 +11:00
Greg Wilkins 129583679a jetty-9 javadoc improvements and renamed SelectChannelConnector to ServerConnector 2012-09-17 17:37:56 +10:00
Joakim Erdfelt 3d1d76d214 Merge from jetty-8 to jetty-9 (license header standarization) 2012-08-17 13:44:22 -07:00
Jesse McConnell 00ed549898 standardize license header blocks 2012-08-16 19:11:27 -05:00
Simone Bordet 136f7924fd Jetty9 - Refactored usage of components that were using custom stop timeout to use the get/setStopTimeout() methods inherited from AbstractLifeCycle. 2012-08-10 19:02:16 +02:00
Simone Bordet 822abe514e Jetty9 - Improved idle timeout handling. 
Idle timeouts are not enforced anymore by polling the AsyncEndPoints from the SelectorManager,
but instead the AsyncEndPoints now take a SchedulerExecutorService as parameter and perform
their own enforcing of the idle timeout.

Also removed a few Timer usages (replaced by SchedulerExecutorService) and fixed XML files
referencing old APIs.
 2012-07-24 10:38:28 +02:00
Simone Bordet d2a0cb5c50 Jetty9 - Fixed compilation problems. 2012-07-23 15:38:27 +02:00
Jesse McConnell aa941f5711 quick pass through to clean up missing or incorrect license blocks 2012-07-11 12:29:46 -05:00
Thomas Becker 40963a884e Revert "Making --dry-run work with paths that have spaces" 
This reverts commit 3df95d45c2.

Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
 2012-01-30 09:17:53 -07:00
Greg Wilkins 067e3f17cb avoid NPE with jdk 7u4ea8 changed behaviour of SslContext init 2012-01-23 16:58:29 +11:00
Joakim Erdfelt 3df95d45c2 Making --dry-run work with paths that have spaces 2012-01-20 11:27:38 -07:00
Joakim Erdfelt fc3d2f0599 Setting TRACE tests to @Ignore pending review of changes for realmless security constraints that have rendered the TRACE tests invalid for integration testing of the default configuration 2012-01-17 12:16:55 -07:00
Greg Wilkins d4a23c2a65 368633 fixed configure.dtd resource mappings 2012-01-16 13:58:44 +11:00
Greg Wilkins 202475aad9 clean build 2011-11-07 15:34:33 +11:00
Greg Wilkins 61664d3c0f Added concept of SslConnection 2011-10-26 01:15:59 +11:00
Greg Wilkins 5140a95144 refactored HttpConnection name 2011-10-20 15:12:19 +11:00
Greg Wilkins 75645cef0e 358674 Added include/exclude protocols to SslContextFactory 2011-09-23 08:02:42 +10:00
Michael Gorovoy 4bab65040d 356128 Removed integration tests from jetty-monitor module 2011-08-29 19:36:40 -04:00
Joakim Erdfelt f6d45d5650 293739 - Deprecate static Jetty Log usage in favor of named logs 
+ Finished conversion of the rest of jetty 7.x
 2011-08-24 13:14:28 -07:00
Greg Wilkins a775708997 341692 Fixed deadlock if stopped while starting 
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@2961 7e9141cc-0065-0410-87d8-b60c137991c4
 2011-04-04 06:58:50 +00:00
Joakim Erdfelt acc4f230fc Merging back /branches/jetty-bug-296978 revs 2674:HEAD 
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@2709 7e9141cc-0065-0410-87d8-b60c137991c4
 2011-01-28 18:58:47 +00:00
Greg Wilkins 543118f837 329410 Enforce XmlConfiguration properties as Map<String,String> 
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@2469 7e9141cc-0065-0410-87d8-b60c137991c4
 2010-11-04 02:08:49 +00:00
Greg Wilkins 72e6f5ee40 328199 ensure SSL closes connections when shutdownoutput is attempted 
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@2388 7e9141cc-0065-0410-87d8-b60c137991c4
 2010-10-22 23:12:22 +00:00
Greg Wilkins f16dcd8cad reduced verbosity of tests reporting errors 
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@2064 7e9141cc-0065-0410-87d8-b60c137991c4
 2010-07-02 15:53:01 +00:00
Greg Wilkins 517130e909 317759 Allow roles and constraints to be added after init 
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@2043 7e9141cc-0065-0410-87d8-b60c137991c4
 2010-06-24 00:39:13 +00:00
Greg Wilkins 21f0c161d2 JETTY-547 delay close after shutdown 
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@1948 7e9141cc-0065-0410-87d8-b60c137991c4
 2010-06-09 06:11:12 +00:00
Joakim Erdfelt 685b799c37 309185 - Fix the over 300 Javadoc warnings 
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@1634 7e9141cc-0065-0410-87d8-b60c137991c4
 2010-04-30 16:27:12 +00:00
Joakim Erdfelt 500f91bbce 310703 - Update test suite to JUnit4 - Module tests/test-integration 
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@1617 7e9141cc-0065-0410-87d8-b60c137991c4
 2010-04-27 20:07:00 +00:00
Joakim Erdfelt 1755a8c069 310703 - Update test suite to JUnit4 - Module tests/test-integration 
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@1616 7e9141cc-0065-0410-87d8-b60c137991c4
 2010-04-27 20:06:51 +00:00
Greg Wilkins b12bdbc06e 306782 Do not skip content if 100 not sent, but content available 
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@1416 7e9141cc-0065-0410-87d8-b60c137991c4
 2010-03-27 19:56:53 +00:00
Greg Wilkins a4b09b44da JETTY-1192 Fixed Digested POST 
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@1384 7e9141cc-0065-0410-87d8-b60c137991c4
 2010-03-16 14:33:47 +00:00
Greg Wilkins 0207f90d5b JETTY-1192 Fixed Digested POST 
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@1383 7e9141cc-0065-0410-87d8-b60c137991c4
 2010-03-16 12:41:11 +00:00
Greg Wilkins 37fe212f35 JETTY-983 range handling cleanup 
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@1267 7e9141cc-0065-0410-87d8-b60c137991c4
 2010-02-15 05:14:07 +00:00
Greg Wilkins 227fb5abec numerous code cleanups 
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@1014 7e9141cc-0065-0410-87d8-b60c137991c4
 2009-10-26 07:48:39 +00:00
Joakim Erdfelt 37059788f3 Fixing test failures in RFC2616 section 9.4 
* A timing issue was discovered in the test case (not a bug in jetty),
  added some code to filter out the "Date: " header as there can be a
  difference in that header between the GET and HEAD calls.

git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@645 7e9141cc-0065-0410-87d8-b60c137991c4
 2009-08-05 23:56:31 +00:00
Joakim Erdfelt 0e10f592d8 [BUG 283172] fix build on windows 
* Undoing misplaced .toSystemLN() hack in favor of using Subversion svn:eol-style property correctly.


git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@552 7e9141cc-0065-0410-87d8-b60c137991c4
 2009-07-11 00:56:03 +00:00
Joakim Erdfelt 1c11416ad4 [BUG 283172] fix build on windows 
* Ensure tmpdir exists
* Ensure tmpdir is not reused between tests


git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@549 7e9141cc-0065-0410-87d8-b60c137991c4
 2009-07-11 00:01:29 +00:00
Joakim Erdfelt b3c82d1bbf [BUG 283172] fix build on windows 
* Using /target/work/${testname}/ as temp dir for webapp deployment (so as to play nice in windows, and not fill up the ${java.io.tmpdir} with webapp deployments)


git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@548 7e9141cc-0065-0410-87d8-b60c137991c4
 2009-07-10 23:56:08 +00:00
Joakim Erdfelt d8006aaafd [BUG 283172] fix build on windows 
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@547 7e9141cc-0065-0410-87d8-b60c137991c4
 2009-07-10 23:36:35 +00:00
Joakim Erdfelt 90105841ab * Correcting System LN issue. 
* Fixing test name typo.


git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@546 7e9141cc-0065-0410-87d8-b60c137991c4
 2009-07-10 23:04:02 +00:00
Joakim Erdfelt ebb3c4966c [BUG 283172] fix build on windows 
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@543 7e9141cc-0065-0410-87d8-b60c137991c4
 2009-07-10 21:50:22 +00:00
Greg Wilkins 42a33c32fc slighly quicker tests 
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@534 7e9141cc-0065-0410-87d8-b60c137991c4
 2009-07-09 23:26:36 +00:00
Joakim Erdfelt 3a7cc3809f 271535 Adding integration tests, and enabling RFC2616 tests. 
Adding /tests/test-integration/ tree, along with new RedirectRegexRule.



git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@496 7e9141cc-0065-0410-87d8-b60c137991c4
 2009-07-08 19:28:16 +00:00