Eclipse/jetty.project
1
0
Fork 0
mirror of https://github.com/jetty/jetty.project.git synced 2025-02-21 22:46:04 +00:00
Code Issues Packages Projects Releases Wiki Activity
12,850 Commits 55 Branches 466 Tags
Commit Graph

371 Commits

Author SHA1 Message Date
Joakim Erdfelt
2cfc5b1665 Merge branch 'jetty-9.4.x' 2016-07-08 08:40:28 -07:00
Greg Wilkins
16c43727bf Merge remote-tracking branch 'origin/jetty-9.3.x' into jetty-9.4.x 2016-07-08 21:19:53 +10:00
WalkerWatch
db9a8dc962 Updates to Intro, Chapter 5 and ResourceHandler example for #687. 
Signed-off-by: WalkerWatch <ctwalker@gmail.com>
 2016-07-07 16:34:58 -04:00
Greg Wilkins
81f78bf16f Merge remote-tracking branch 'origin/jetty-9.4.x' 2016-06-24 18:40:32 +10:00
Greg Wilkins
d0d11244b3 Issue #644 Modules for logging 
Added module for logback-access
 2016-06-24 18:40:00 +10:00
Jesse McConnell
2dd4843e44 merge from 9.4.x 2016-06-22 15:28:17 -05:00
Jesse McConnell
399c5beb04 merge from 9.3.x 2016-06-22 15:23:51 -05:00
Jesse McConnell
ae931538ab [maven-release-plugin] prepare for next development iteration 2016-06-22 13:59:10 -05:00
Jesse McConnell
df1ed4fb03 [maven-release-plugin] prepare release jetty-9.3.11.M0 2016-06-22 13:59:06 -05:00
Jesse McConnell
030ec61837 [maven-release-plugin] prepare for next development iteration 2016-06-22 09:14:25 -05:00
Jesse McConnell
9a4cb41122 [maven-release-plugin] prepare release jetty-9.3.11.M0 2016-06-22 09:14:21 -05:00
Jesse McConnell
e7034117ea [maven-release-plugin] prepare for next development iteration 2016-06-21 08:50:13 -05:00
Jesse McConnell
16c435c69d [maven-release-plugin] prepare release jetty-9.3.10.v20160621 2016-06-21 08:50:09 -05:00
Simone Bordet
7008a96225 Merged branch 'jetty-9.4.x' into 'master'. 2016-06-13 12:17:31 +02:00
Simone Bordet
3d8242ef82 Merged branch 'jetty-9.3.x' into 'jetty-9.4.x'. 2016-06-13 12:16:33 +02:00
Joakim Erdfelt
19e52ab9c4 Removing HttpCompliance from example 2016-06-10 13:19:51 -07:00
Simone Bordet
2d1d3fe6e9 Merged branch 'jetty-9.4.x' into 'master'. 2016-06-06 21:39:31 +02:00
Simone Bordet
a8f25b550f Fixes #487 - JDK 9 build compatibility. 
Fixes #306 - Merge jetty-parent into jetty-project.

- Removed jetty.parent dependency, moving all relevant sections to
jetty.project's pom.xml.
- Introduced profiles for JDK 8 only modules and configuration, and
for JDK 9 only modules and configurations.
- Major cleanup of pom.xml files.
- All Maven Plugin now declared in alphabetical order in
pluginManagement section of jetty.project's pom.xml.
 2016-06-06 21:28:51 +02:00
Simone Bordet
7241b1e95c Merged branch 'jetty-9.4.x' into 'master'. 2016-06-01 10:49:41 +02:00
Simone Bordet
8956245026 Merged branch 'jetty-9.3.x' into 'jetty-9.4.x'. 2016-06-01 10:48:57 +02:00
Hauke Wulff
8d9c086fa4 FastFileServer throws exception on any GET file due to wrong Content-… (#599) 
* FastFileServer throws exception on any GET file due to wrong Content-Length value

Any GET file request, e.g. curl http://localhost:8080/pom.xml
results in FastFileServer returning a "HTTP/1.1 500 Server Error".
The root-cause for the error is the following line in handle()
response.setDateHeader("Content-Length", file.length());
which attempts to set the content-length header using a date-function.
Explicitly setting the response Content-Length in servlet-code.

Signed-off-by: Hauke Wulff <hauk3wu1ff@gmail.com>
Reviewed-by: Simone Bordet <simone.bordet@gmail.com>
 2016-06-01 10:46:58 +02:00
Jesse McConnell
dc4574f380 [maven-release-plugin] prepare for next development iteration 2016-05-17 17:30:17 -05:00
Jesse McConnell
0bbebec1e0 [maven-release-plugin] prepare release jetty-9.3.9.v20160517 2016-05-17 17:30:13 -05:00
Greg Wilkins
9179add187 Merge remote-tracking branch 'origin/jetty-9.4.x' 2016-05-12 12:51:17 +10:00
Greg Wilkins
094de7548e Merge remote-tracking branch 'origin/jetty-9.3.x' into jetty-9.4.x 2016-05-12 12:50:21 +10:00
Greg Wilkins
fc9063eeb9 Issue #553 
Turn off path compaction as a side effect in rewrite handler.
There is an explicit rule for that!
 2016-05-12 12:49:37 +10:00
Greg Wilkins
1c292819fe Merge remote-tracking branch 'origin/jetty-9.4.x' 2016-05-04 11:45:23 +10:00
Greg Wilkins
a5d3f29f11 Merge remote-tracking branch 'origin/jetty-9.3.x' into jetty-9.4.x 2016-05-04 11:10:03 +10:00
Greg Wilkins
a32e3a2091 avoided NPE in example 2016-05-04 10:53:05 +10:00
Greg Wilkins
a5ad291add Squashed commit of the following: (#528) 
commit 4bf6b7c9519e168444b30c1b3b310bc94f8fc556
Merge: a50e882 301fc12
Author: Greg Wilkins <gregw@webtide.com>
Date:   Wed Apr 27 12:12:08 2016 +1000

    Merge branch 'master' into jetty-9.4.x-Feature

commit a50e8825a3c1f0fb9a78ae8fb5b0142f1e27289b
Author: Greg Wilkins <gregw@webtide.com>
Date:   Sat Apr 23 09:38:00 2016 +1000

    work in progress

commit 4e286266c04d266489187bb020b65ddff6992cf1
Merge: 5ae7da0 f550fcd
Author: Greg Wilkins <gregw@webtide.com>
Date:   Thu Apr 21 16:34:12 2016 +1000

    Merge branch 'master' into jetty-9.4.x-Feature

commit 5ae7da049bf8ae7067be52cb083219f4542f37d7
Author: Greg Wilkins <gregw@webtide.com>
Date:   Thu Apr 21 12:12:24 2016 +1000

    Work in progress on Features

commit adfc430ad4cfc0a5785d440db535f73570978717
Author: Jan Bartel <janb@webtide.com>
Date:   Wed Apr 20 22:05:55 2016 +1000

    Refactor Configurations.isEnabledByDefault, enable all configurations by default.

commit 70cca692cc283a2153b974e00fe589a63cef89cb
Author: Jan Bartel <janb@webtide.com>
Date:   Wed Apr 20 17:32:22 2016 +1000

    Fix features for jsp with osgi

commit 22d2b251e93e776d90160c67c0922902de740cf3
Merge: 571d503 2c4cdbe
Author: Greg Wilkins <gregw@webtide.com>
Date:   Thu Apr 14 16:19:43 2016 +1000

    Merge branch 'master' into jetty-9.4.x-Feature

commit 571d50315e83e5c1d78663fbe9347490cc3921df
Author: Greg Wilkins <gregw@webtide.com>
Date:   Wed Apr 13 15:36:36 2016 +1000

    code comment

commit d9b229f298de6a54fa0b46f51c708230981b4f83
Author: Greg Wilkins <gregw@webtide.com>
Date:   Sat Apr 9 21:24:22 2016 +1000

    fixed quickstart validation

commit 154d58bf622d48c94ab7c60fd4eda4d031416d4e
Merge: 8e54aad ef92338
Author: Greg Wilkins <gregw@webtide.com>
Date:   Fri Apr 8 18:25:17 2016 +1000

    Merge branch 'master' into jetty-9.4.x-Feature

commit 8e54aad414ed470b8b9f51175649e0c159530ab0
Author: Greg Wilkins <gregw@webtide.com>
Date:   Fri Apr 8 18:21:30 2016 +1000

    general cleanup of Configuration and ClasspathPattern usage

commit 65f8e5dbd0d17fe9c22c801d19290c50bde8cfa1
Merge: ea1deda 2fb9b55
Author: Greg Wilkins <gregw@webtide.com>
Date:   Fri Apr 8 09:15:28 2016 +1000

    Merge branch 'master' into jetty-9.4.x-Feature

commit ea1deda4f9d4c521ca86d45cabc042b24e36e685
Merge: cfe9c83 f92588c
Author: Greg Wilkins <gregw@webtide.com>
Date:   Tue Mar 15 18:21:56 2016 +1100

    Merge branch 'master' into jetty-9.4.x-Feature

commit cfe9c836910f2e86c24ee0e60a2f1070e1e3e9f0
Author: Greg Wilkins <gregw@webtide.com>
Date:   Tue Mar 15 17:57:23 2016 +1100

    work in progress

commit 725be8c051bca65feacfce60286fef0f14973816
Author: Greg Wilkins <gregw@webtide.com>
Date:   Tue Mar 15 10:11:49 2016 +1100

    work in progress

commit 61d2c07534350d701276e803b9913a851a1c3be7
Author: Greg Wilkins <gregw@webtide.com>
Date:   Fri Mar 11 14:01:00 2016 +1100

    progress on OSGi

commit a977536c7dd979c1262b3b5d57d4c877c2d64d9b
Author: Greg Wilkins <gregw@webtide.com>
Date:   Fri Mar 11 12:52:33 2016 +1100

    Fixed plugin

commit f08b84ba0e98de50114c8e9bf4a065db6f47b78a
Merge: f19bd2c 8a24798
Author: Greg Wilkins <gregw@webtide.com>
Date:   Fri Mar 11 12:21:55 2016 +1100

    Merge branch 'master' into jetty-9.4.x-Feature

commit f19bd2c65ae947905faa731e511cc103831858a4
Author: Greg Wilkins <gregw@webtide.com>
Date:   Fri Mar 11 12:21:06 2016 +1100

    work in progress... all but OSGi

commit 2f15c3e4f9a107ce531f660ad40250dffeb4fcb6
Merge: 36b5687 7b1486b
Author: Greg Wilkins <gregw@webtide.com>
Date:   Thu Mar 10 16:52:43 2016 +1100

    Merge branch 'master' into jetty-9.4.x-Feature

commit 36b56873297e299beb3df7b8a64da7d4e9a72195
Merge: 13d914a e7081d7
Author: Greg Wilkins <gregw@webtide.com>
Date:   Thu Mar 10 07:20:05 2016 +1100

    Merge branch 'master' into jetty-9.4.x-Feature

commit 13d914aa7c8ba87eb7a8176de52da59f5f756228
Author: Greg Wilkins <gregw@webtide.com>
Date:   Thu Mar 10 04:41:30 2016 +1100

    Work in progress on Features

    Moved jar discovery to META-INF

commit d41bd264ad33c45c2d4657e8a4e1b39e90399257
Author: Greg Wilkins <gregw@webtide.com>
Date:   Sat Mar 5 17:48:15 2016 +0100

    Work in progress towards new quickstart arch

commit c5c23698c455a854e241e3f9be975145188dd872
Merge: fd34007 692aae0
Author: Greg Wilkins <gregw@webtide.com>
Date:   Sat Mar 5 11:29:18 2016 +0100

    Merge branch 'master' into jetty-9.4.x-Feature

commit fd34007c3d5f92b63ec38afd92d724ecb4a8e71d
Author: Greg Wilkins <gregw@webtide.com>
Date:   Sat Mar 5 11:04:35 2016 +0100

    Work in progress on Features for QuickStart

commit c5f0c80cd2bd4f3977b9c91f5b046cfef2300b2b
Merge: 0e6d886 b61c5ff
Author: Greg Wilkins <gregw@webtide.com>
Date:   Fri Mar 4 16:05:23 2016 +0100

    Merge branch 'master' into jetty-9.4.x-Feature

commit 0e6d886b01c8a4f911bf47b13a2edc6617d38bf2
Merge: d150405 2b67e04
Author: Greg Wilkins <gregw@webtide.com>
Date:   Wed Mar 2 17:32:36 2016 +0100

    Merge branch 'master' into jetty-9.4.x-Feature

commit d1504055deb1df6f759d6aece8656c7492173964
Merge: 22a6cd0 3300d54
Author: Greg Wilkins <gregw@webtide.com>
Date:   Wed Mar 2 15:21:20 2016 +0100

    Merge branch 'master' into jetty-9.4.x-Feature

commit 22a6cd05b7135ef26205a5781783c58ba65e8927
Author: Greg Wilkins <gregw@webtide.com>
Date:   Mon Feb 29 20:53:17 2016 +0100

    Features work in progress

    convert more server/system classes to Configurations

commit 037e04bfe54a54764a9d51a769cab5a95e863fa6
Merge: add9876 bb08b65
Author: Greg Wilkins <gregw@webtide.com>
Date:   Mon Feb 29 17:11:04 2016 +0100

    Merge branch 'master' into jetty-9.4.x-Feature

commit add9876f830d9524a3019979e122dc7a9b96a857
Merge: 5263f15 eb5e25c
Author: Greg Wilkins <gregw@webtide.com>
Date:   Thu Feb 25 10:11:08 2016 +0100

    Merge branch 'master' into jetty-9.4.x-Feature

commit 5263f15acdf66a488c622e4535cbfa17fe9d97e8
Merge: 89803ae 21fdaf5
Author: Greg Wilkins <gregw@webtide.com>
Date:   Tue Feb 23 14:35:31 2016 +0100

    Merge remote-tracking branch 'origin/master' into jetty-9.4.x-Feature

commit 89803aec959d8f0eea8eef59b03e56a0b2684bf0
Merge: 5fed7c7 779317d
Author: Greg Wilkins <gregw@webtide.com>
Date:   Tue Feb 16 16:09:38 2016 +0100

    Merge branch 'master' into jetty-9.4.x-Feature

commit 5fed7c713f549175a3641659903dddba9f75760a
Author: Greg Wilkins <gregw@webtide.com>
Date:   Tue Feb 16 11:21:13 2016 +0100

    fixed merge

commit ec22a1ba0bc1bfccb1deab08af8ca575040feae7
Merge: 4c8257d d0541e5
Author: Greg Wilkins <gregw@webtide.com>
Date:   Tue Feb 16 10:53:16 2016 +0100

    Merge branch 'master' into jetty-9.4.x-Feature

commit 4c8257d23b36a9a3ecab4ca342cf453edeffa672
Author: Greg Wilkins <gregw@webtide.com>
Date:   Thu Dec 17 09:34:28 2015 +1100

    Do not default quickstart

commit 57ce87770af0774c97304996b5b6c37673e9bc18
Merge: 14bde1f 96e4d72
Author: Greg Wilkins <gregw@webtide.com>
Date:   Wed Dec 16 17:16:14 2015 +1100

    Merge branch 'master' into jetty-9.4.x-Feature

commit 14bde1f69691f979fdb3c31f6b7841208fed0157
Author: Greg Wilkins <gregw@webtide.com>
Date:   Fri Dec 4 16:26:58 2015 +1100

    work in progress on Configurations as services

commit 46ce2aef3abe68bbf6816874904c76506ccc848f
Merge: 9e82fa0 ae9dc79
Author: Greg Wilkins <gregw@webtide.com>
Date:   Fri Dec 4 10:11:09 2015 +1100

    Merge branch 'master' into jetty-9.4.x-Feature

commit 9e82fa0a22166b75aa2012ae9e9f64ca8d0a2259
Author: Greg Wilkins <gregw@webtide.com>
Date:   Fri Dec 4 08:52:37 2015 +1100

    work in progress to Configurations as ServiceLoader

commit 6e11f22de469d7ae444e13912603a5a1ba0d7137
Merge: 120e330 5afa348
Author: Greg Wilkins <gregw@webtide.com>
Date:   Thu Dec 3 18:16:14 2015 +1100

    Merge branch 'master' into jetty-9.4.x-Feature

commit 120e33034f0cd3e5f254e36025badd98cc9ae2ab
Merge: 6c5b95d 384caf0
Author: Greg Wilkins <gregw@webtide.com>
Date:   Thu Dec 3 14:20:52 2015 +1100

    Merge branch 'master' into jetty-9.4.x-Feature

commit 6c5b95d6b8abd17ae985d41486b7139c972cd4cc
Merge: 722eb60 5e40bf2
Author: Greg Wilkins <gregw@webtide.com>
Date:   Wed Dec 2 11:16:37 2015 +1100

    Merge branch 'master' into jetty-9.4.x-Feature

commit 722eb60ce5029958f58ede16aba134fb3db6c2d4
Author: Greg Wilkins <gregw@webtide.com>
Date:   Fri Nov 27 13:58:16 2015 +1100

    Configurations can add server/system classes

commit 2972354db76b03f9d86e77942db86d079ba1151e
Author: Greg Wilkins <gregw@webtide.com>
Date:   Fri Nov 27 11:47:03 2015 +1100

    Self ordering WebApp Configurations

Signed-off-by: Greg Wilkins <gregw@webtide.com>
 2016-05-02 17:55:54 +10:00
Joakim Erdfelt
c09f31a51d Bumping up master to version 10.0.0-SNAPSHOT 2016-04-29 11:47:15 -07:00
Joakim Erdfelt
6fb338e50d Updating to version 9.3.9-SNAPSHOT 2016-04-11 16:20:50 -07:00
Joakim Erdfelt
bb4f3c4882 Updating to version 9.3.9.M1 2016-04-11 15:35:22 -07:00
Greg Wilkins
92904d2b7d Merge remote-tracking branch 'origin/jetty-9.3.x' 2016-04-05 13:30:01 +10:00
Greg Wilkins
815764c279 Issue #472 Use LongAdder for statistics 
Improved JMX context names
 2016-04-05 12:53:19 +10:00
Greg Wilkins
23ad5a2bdf Merge remote-tracking branch 'origin/jetty-9.3.x' 2016-04-05 12:23:32 +10:00
Greg Wilkins
b087e6db28 Issue #467 Compact // rule 
Improved the rewrite classes and modules to make it easier to compact // withing a URL.
This can now be done with --module=rewrite,rewrite-compactpath
 2016-04-05 12:13:29 +10:00
Greg Wilkins
acfa1268bc Merge remote-tracking branch 'origin/jetty-9.3.x' 2016-03-24 12:58:06 +11:00
Greg Wilkins
9352d91d48 Issue #448 Log Compliance violations 
Added a ComplianceHandler to HttpParsere to log compliance violations for #448
Am cautious that this may have a performance impact.
 2016-03-22 13:58:50 +11:00
Joakim Erdfelt
c68d3b1d8d Updating to version 9.3.9-SNAPSHOT 2016-03-14 09:07:52 -07:00
Joakim Erdfelt
1f3b3f31f4 Updating to version 9.3.8.v20160314 2016-03-14 08:30:20 -07:00
Jesse McConnell
d8f74233a0 fix some merge issues, some example javadoc that was never right and contributing language 2016-02-26 08:13:41 -06:00
Jesse McConnell
fc73be1d31 clean javadoc 2016-02-26 08:09:15 -06:00
Jesse McConnell
ce5a3b11d6 Issue #367 Resolve remaining git.eclipse.org build references 2016-02-26 08:03:33 -06:00
Jesse McConnell
b3dc23f2c0 Update ExampleServerXml.java 2016-02-26 07:30:14 -06:00
Jesse McConnell
74f8abf8af Update FileServerXml.java 2016-02-26 07:29:22 -06:00
Joakim Erdfelt
e0ce545ad7 Updating to version 9.3.8-SNAPSHOT 2016-01-15 17:15:14 -07:00
Joakim Erdfelt
c0b191119b Updating to version 9.3.7.v20160115 2016-01-15 16:40:15 -07:00
Joakim Erdfelt
b7f9c9aca9 Updating to version 9.3.7-SNAPSHOT 2016-01-13 08:21:01 -07:00
Joakim Erdfelt
21ca3f6690 Updating to version 9.3.7.RC1 2016-01-13 07:30:24 -07:00