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

4327 Commits

Author SHA1 Message Date
Greg Wilkins 2629f93397 Revert "Merge branch 'release-7' into jetty-7" 
This reverts commit 624a0d7e45, reversing
changes made to 3eb84f99a4.

Conflicts:
	VERSION.txt
 2013-09-16 23:23:59 +10:00
Greg Wilkins 0e2f3990b1 reset VERSION.txt 2013-09-16 20:12:50 +10:00
Greg Wilkins 05d039b426 413684 deprecated unsafe alias checkers 
removed debugs
 2013-09-16 19:30:59 +10:00
Greg Wilkins a731ec13c8 413684 deprecated unsafe alias checkers 2013-09-16 19:30:45 +10:00
Thomas Becker 624a0d7e45 Merge branch 'release-7' into jetty-7 2013-09-13 18:06:06 +02:00
Greg Wilkins 3eb84f99a4 416990 JMX names statically unique 
Fixed monitor test to reset uniqueness
 2013-09-12 12:29:24 +10:00
Greg Wilkins c842c5c505 416990 JMX names statically unique 2013-09-12 10:40:26 +10:00
Thomas Becker d6d6b53ee8 Updating VERSION.txt top section 2013-09-10 17:33:51 +02:00
Thomas Becker ed0bbaa166 [maven-release-plugin] prepare for next development iteration 2013-09-10 16:19:10 +02:00
Thomas Becker 3d78c02add [maven-release-plugin] prepare release jetty-7.6.13.v20130910 2013-09-10 16:18:55 +02:00
Thomas Becker 0e3e02f6f9 Updating VERSION.txt top section 2013-09-10 15:34:12 +02:00
Thomas Becker 262019a5e1 Merge branch 'jetty-7' into release-7 2013-09-10 15:33:19 +02:00
Thomas Becker 9db0101d69 ProxyServletTest create test dir if it doesn't exist 2013-09-10 12:03:03 +02:00
Greg Wilkins fefab2af96 Merge branch 'jetty-7' of ssh://git.eclipse.org/gitroot/jetty/org.eclipse.jetty.project into jetty-7 2013-09-06 07:04:44 +10:00
Thomas Becker 9e0e173de8 415401 Add XmlConfiguration.initializeDefaults that allows to set default values for any XmlConfiguration that may be overridden in the config file 2013-09-05 17:30:59 +02:00
Jan Bartel e764a0f2e7 416585 WebInfConfiguration examines webapp classloader first instead of its parent when looking for container jars 2013-09-05 12:47:39 +10:00
Greg Wilkins 236f5d57bf 414431 Avoid debug NPE race 2013-09-05 12:24:28 +10:00
Jesse McConnell 3d6711b4ab [Bug 413484] setAttribute in nosql session management better handles _dirty status 2013-08-20 13:01:52 -05:00
Jan Bartel 54a899d55f 415192 <jsp-file> maps to JspPropertyGroupServlet instead of JspServlet 2013-08-16 11:02:29 +10:00
Jan Bartel 66620b77b8 414507 Ensure AnnotationParser ignores parent dir hierarchy when checking for hidden dirnames 2013-08-09 14:19:04 +10:00
Simone Bordet 4ce4615597 414652 - WebSocket's sendMessage() may hang on congested connections. 
Fixed by using Locks instead of the synchronized keyword, and by using tryLock()
in flushBuffer() and flush(), that are called by WebSocketConnection.handle().

It is quite a hack, but the real fix is in Jetty 9 where the architecture is different
and there are two different paths for reading and writing, so that this problem
could not even happen.
 2013-08-08 12:09:11 +02:00
Jan Bartel f983629434 414507 AnnotationParser should skip classes in hidden dirs or with . name prefix 2013-08-08 12:09:29 +10:00
Jan Bartel f3f2bce36c 414393 StringIndexOutofBoundsException with > 8k multipart content without CR or LF 2013-08-05 17:18:44 +10:00
Jan Bartel f5fb412eba 414235 - RequestLogHandler configured on a context fails to handle forwarded requests 2013-08-05 12:32:21 +10: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 e87eee1b46 412629 PropertyFileLoginModule doesn't cache user configuration file even for refreshInterval=0 2013-08-01 11:56:13 +10:00
Jesse McConnell b706f541ec Merge branch 'release-7' into jetty-7 2013-07-31 12:09:53 -05:00
Jesse McConnell 9db05ac2fa set for dev 2013-07-31 12:09:17 -05:00
Jesse McConnell 650e8e93ae [maven-release-plugin] prepare for next development iteration 2013-07-26 10:57:33 -05:00
Jesse McConnell e7e2fce56e [maven-release-plugin] prepare release jetty-7.6.12.v20130726 2013-07-26 10:57:26 -05:00
Jesse McConnell e59f1d2191 set for release 2013-07-26 10:30:55 -05:00
Jesse McConnell ef7ea3cbbf Merge branch 'jetty-7' into release-7 2013-07-26 10:28:27 -05:00
David Harrigan 192f2d7002 BUG-413812 
Mark RateTracker as Serializable to allow it to be stored in a Session that is
eventually persisted in a distributed memory platform.

Signed-off-by: David Harrigan <dharrigan@gmail.com>
 2013-07-26 10:24:03 -05:00
Jesse McConnell 6622e06841 set for release 2013-07-26 09:13:52 -05:00
Jesse McConnell e1db76563a Merge branch 'jetty-7' into release-7 2013-07-26 09:12:45 -05:00
Simone Bordet 2be4ca5921 Reverted VERSION.txt. 2013-07-26 13:45:41 +02:00
Simone Bordet 5c7eb9e265 Reverted version to 7.6.12-SNAPSHOT. 2013-07-26 13:36:35 +02:00
Simone Bordet a0519a9693 413371 - Default JSON.Converters for List and Set. 
Introduced a JSONCollectionConvertor that is able to convert
Collections, and hence both List and Set.

Code cleanups.
 2013-07-26 13:09:11 +02:00
Greg Wilkins 4a5567433c 413372 JSON Enum uses name rather than toString() 2013-07-26 16:06:32 +10:00
Jesse McConnell 9137644595 Merge branch 'release-7' into jetty-7 2013-07-25 15:10:09 -05:00
Jesse McConnell e810727b55 set for dev 2013-07-25 15:09:03 -05:00
Jesse McConnell 49045558ef [maven-release-plugin] prepare for next development iteration 2013-07-25 14:07:12 -05:00
Jesse McConnell 9b888d5c22 [maven-release-plugin] prepare release jetty-7.6.12.v20130725 2013-07-25 14:06:53 -05:00
Jesse McConnell 6b8f29bb88 add import 2013-07-25 12:27:36 -05:00
Jesse McConnell 3813b2da76 remove for release 2013-07-25 12:05:33 -05:00
Jesse McConnell bc679809f8 [maven-release-plugin] prepare for next development iteration 2013-07-25 11:25:58 -05:00
Jesse McConnell 39ec9b8051 [maven-release-plugin] prepare release jetty-7.6.12.v20130725 2013-07-25 11:25:51 -05:00
Jesse McConnell 3c9bcd3ece set for release 2013-07-25 10:59:36 -05:00
Jesse McConnell f93e83ad3c Merge branch 'jetty-7' into release-7 2013-07-25 10:56:33 -05:00