Eclipse
/
jetty.project
mirror of https://github.com/jetty/jetty.project.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
6,629 Commits 69 Branches 462 Tags 354 MiB
Commit Graph

6629 Commits

Author SHA1 Message Date
Jesse McConnell f16fc7e7b7 Merge branch 'jetty-7' into jetty-8 2013-01-25 16:53:18 -06:00
Jesse McConnell 1a31067369 Add note about getCanonicalFile check and fix IdleSession test in test hash sessions 2013-01-25 16:25:59 -06:00
Jesse McConnell b3043276bc add corresponding correct file removal check 2013-01-25 16:12:08 -06:00
Jesse McConnell a7c074a86c merge from jetty-8 2013-01-25 15:32:08 -06:00
Jesse McConnell 4bed164462 Merge branch 'jetty-7' into jetty-8 2013-01-25 15:31:13 -06:00
Jesse McConnell 111bd19634 doh, header 2013-01-25 15:30:59 -06:00
Jesse McConnell d8a3b76862 Merge branch 'jetty-7' into jetty-8 2013-01-25 15:24:41 -06:00
Jesse McConnell d4568feba6 [Bug 399132] check parent dir of session store against file to be removed 2013-01-25 15:22:16 -06:00
Joakim Erdfelt 7adc77a5d5 Adding -tests classifier artifacts to deploy/release to aide in quickstart documentation 2013-01-25 12:19:17 -07:00
Joakim Erdfelt 3975ae74cb Moving test from jetty-parent to jetty-client module 2013-01-25 12:06:17 -07:00
Joakim Erdfelt a82ed7a954 re-enabling jetty-all aggregate for release process 2013-01-25 11:36:45 -07:00
Jesse McConnell fe33b53f0d Merge branch 'jetty-8' 2013-01-25 11:38:37 -06:00
Jesse McConnell 368d7bbb72 Merge branch 'jetty-7' into jetty-8 2013-01-25 11:35:11 -06:00
Jesse McConnell c00e8d0283 Add analystics to aggregate javadoc profile (so it only targeted on actual release deployment.) 2013-01-25 11:26:25 -06:00
Jan Bartel 4454a83bb4 Merge branch 'master' of ssh://git.eclipse.org/gitroot/jetty/org.eclipse.jetty.project 2013-01-25 14:33:56 +11:00
Jan Bartel ae644581dd Port jetty-client IdleTimeoutTest to jetty-9 2013-01-25 14:33:09 +11:00
Greg Wilkins 58cb925baf Merge branch 'master' of ssh://git.eclipse.org/gitroot/jetty/org.eclipse.jetty.project 2013-01-25 13:54:58 +11:00
Greg Wilkins 5435cd3365 385306 added getURI method 2013-01-25 13:52:32 +11:00
Jan Bartel 1843976b30 Merge branch 'master' of ssh://git.eclipse.org/gitroot/jetty/org.eclipse.jetty.project 2013-01-25 13:22:40 +11:00
Jan Bartel efd19398f3 381689 Allow jetty-runner to specify listen host along with listen port 2013-01-25 13:21:56 +11:00
Greg Wilkins 4a1a4700c3 382237 support non java JSON classes 2013-01-25 12:28:54 +11:00
Greg Wilkins 7fd04a186f cleanup after merge 2013-01-25 11:47:47 +11:00
Greg Wilkins eb5bc1c0a7 Merge branch 'master' of ssh://git.eclipse.org/gitroot/jetty/org.eclipse.jetty.project 2013-01-25 11:46:16 +11:00
Greg Wilkins ff350c3740 Merge remote-tracking branch 'origin/jetty-8' 
Conflicts:
	jetty-client/src/main/java/org/eclipse/jetty/client/BlockingHttpConnection.java
	jetty-servlets/src/main/java/org/eclipse/jetty/servlets/GzipFilter.java
	jetty-servlets/src/main/java/org/eclipse/jetty/servlets/gzip/AbstractCompressedStream.java
	jetty-servlets/src/test/java/org/eclipse/jetty/servlets/gzip/GzipTester.java
 2013-01-25 11:46:03 +11:00
Jan Bartel a36c55d7a0 Update instructions for test-spec webapp 2013-01-25 11:28:40 +11:00
Jan Bartel 0306d9b532 Make jetty-annotations.xml include plus config 2013-01-25 11:26:29 +11:00
Jan Bartel 16ef1cbd74 Update deployment instructions for test-jndi webapp 2013-01-25 11:09:19 +11:00
Jan Bartel 10ae37566f Remove unneeded TagLibConfiguration, fix args to WebAppProvider in jetty-plus.xml 2013-01-25 11:06:01 +11:00
Jan Bartel 503f292172 Fix typo in start.ini comments and switch ordering of jetty-plus.xml and jetty-annotations.xml 2013-01-25 10:54:25 +11:00
Greg Wilkins 3c6deaf83c Merge remote-tracking branch 'origin/jetty-7' into jetty-8 2013-01-25 09:43:57 +11:00
Greg Wilkins c9d026703f removed System.outs 2013-01-25 09:42:51 +11:00
Simone Bordet 29d2854027 397769 - TimerScheduler does not relinquish cancelled tasks. 
Now the scheduler submits itself as a task that runs every second to purge the task queue.
 2013-01-24 16:06:20 +01:00
Simone Bordet 6980a8d9d2 398872 - SslConnection should not be notified of idle timeouts. First solution. Merge branch 'ssl_idle_timeout_ignored'. 2013-01-24 10:32:31 +01:00
Simone Bordet 2ba64a59e6 Made the test more reliable. 2013-01-24 10:32:05 +01:00
Simone Bordet b2f3852fb3 398872 - SslConnection should not be notified of idle timeouts. First solution. 2013-01-24 10:29:27 +01:00
Greg Wilkins fd25e3a742 Merge remote-tracking branch 'origin/jetty-7' into jetty-8 
Conflicts:
	jetty-servlets/src/test/java/org/eclipse/jetty/servlets/gzip/GzipTester.java
 2013-01-24 14:30:45 +11:00
Greg Wilkins 161a14d9d0 381521 Only set Vary header when content could be compressed 2013-01-24 14:07:25 +11:00
Joakim Erdfelt de0d5acdb9 Bumping up jetty-version-maven-plugin to 1.0.9 2013-01-23 13:59:21 -07:00
Joakim Erdfelt b6d551675b Merge branch 'jetty-7' into jetty-8 2013-01-23 13:58:34 -07:00
Joakim Erdfelt a7aab0b6c6 Bumping up jetty-version-maven-plugin to 1.0.9 2013-01-23 13:56:05 -07:00
Joakim Erdfelt 7211ce230e Removing unused websocket-core files, detrius from old merge 2013-01-23 10:50:37 -07:00
Joakim Erdfelt bfba20565a Removing out of date mux diagrams 2013-01-23 10:49:07 -07:00
Joakim Erdfelt f9cb26b5a7 Removing jsr diagrams from common, should only exist in jsr branch (for now) 2013-01-23 10:48:51 -07:00
Joakim Erdfelt c31f3a5501 Updating diagrams 2013-01-23 10:47:59 -07:00
Simone Bordet b5df3a6b76 Made the test more reliable. 2013-01-23 12:18:01 +01:00
Jesse McConnell 9bc937a676 add line back into pom 2013-01-22 08:32:32 -06:00
Jan Bartel 92af54c3fc Make IdleTimeoutTest jdk1.5 compliant 2013-01-22 08:58:35 +11:00
Greg Wilkins dc4e525622 Merge remote-tracking branch 'origin/jetty-8' 
Conflicts:
	jetty-servlets/src/main/java/org/eclipse/jetty/servlets/GzipFilter.java
 2013-01-21 17:04:22 +11:00
Jan Bartel fe48239b34 Merge remote-tracking branch 'origin/jetty-7' into jetty-8 2013-01-21 16:54:06 +11:00
Jan Bartel 91a94f8213 362226 HttpConnection "wait" call causes thread resource exhaustion 2013-01-21 16:43:57 +11:00