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

4866 Commits

Author SHA1 Message Date
Greg Wilkins 4ae547b988 Merge remote-tracking branch 'origin/jetty-7' into jetty-8 2013-09-16 23:31:09 +10:00
Greg Wilkins 30bab30d9b Revert "Merge branch 'release-8' into jetty-8" 
This reverts commit 463ef68dc3, reversing
changes made to de544ddfbf.
 2013-09-16 23:28:59 +10:00
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
Thomas Becker 463ef68dc3 Merge branch 'release-8' into jetty-8 2013-09-13 18:05:14 +02:00
Greg Wilkins de544ddfbf Merge remote-tracking branch 'origin/jetty-7' into jetty-8 2013-09-12 12:30:03 +10: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 da2bbdea3c Merge remote-tracking branch 'origin/jetty-7' into jetty-8 2013-09-12 10:40:54 +10:00
Greg Wilkins c842c5c505 416990 JMX names statically unique 2013-09-12 10:40:26 +10:00
Thomas Becker 5ab692b62e Updating VERSION.txt top section 2013-09-11 12:26:24 +02:00
Thomas Becker b95d6948a8 [maven-release-plugin] prepare for next development iteration 2013-09-10 20:44:44 +02:00
Thomas Becker 5692cff532 [maven-release-plugin] prepare release jetty-8.1.13.v20130910 2013-09-10 20:44:29 +02:00
Thomas Becker 2bffdf508c Merge branch 'release-8' of ssh://git.eclipse.org/gitroot/jetty/org.eclipse.jetty.project into release-8 2013-09-10 19:56:12 +02:00
Thomas Becker 911043b5be ProxyServletTest create test dir if it doesn't exist 2013-09-10 18:02:46 +02:00
Thomas Becker 8fd97dad0e Updating VERSION.txt top section 2013-09-10 17:42:53 +02:00
Thomas Becker 994d8baa3f Merge branch 'jetty-8' into release-8 2013-09-10 17:40:25 +02: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
Jan Bartel ab9ecd277d 416266 HttpServletResponse.encodeURL() encodes on first request when only SessionTrackingMode.COOKIE is used 2013-09-10 08:57:59 +10:00
Jan Bartel 11085742c8 416787 StringIndexOutOfBounds with a pathMap of "" 2013-09-09 12:41:28 +10: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 28f3c1ac01 Merge commit '9e0e173de813c3dd825becb9c3f67739f25e936b' into jetty-8 2013-09-05 17:34:39 +02: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 2ab4757450 Merge remote-tracking branch 'origin/jetty-7' into jetty-8 2013-09-05 12:55:19 +10: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
Greg Wilkins 2a178a29fd 413684 deprecated unsafe alias checkers 
removed debugs
 2013-08-23 17:11:57 +10:00
Greg Wilkins b33b5f2f5d 413684 deprecated unsafe alias checkers 2013-08-23 16:49:42 +10:00
Jesse McConnell b4fab3fbc5 Merge branch 'jetty-7' into jetty-8 2013-08-20 13:02:40 -05: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 1691618024 Merge remote-tracking branch 'origin/jetty-7' into jetty-8 2013-08-16 11:06:42 +10:00
Jan Bartel 54a899d55f 415192 <jsp-file> maps to JspPropertyGroupServlet instead of JspServlet 2013-08-16 11:02:29 +10:00
Jan Bartel 6a22a9f5b9 Merge remote-tracking branch 'origin/jetty-7' into jetty-8 2013-08-09 14:46:25 +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 59a070a9fe Merged branch 'jetty-7' into 'jetty-8'. 2013-08-08 12:10:19 +02: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 f22217392b Merge remote-tracking branch 'origin/jetty-7' into jetty-8 
Conflicts:
	jetty-annotations/src/main/java/org/eclipse/jetty/annotations/AnnotationParser.java
 2013-08-08 12:28:51 +10: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 432964cf5f Merge remote-tracking branch 'origin/jetty-7' into jetty-8 
Conflicts:
	jetty-servlets/src/main/java/org/eclipse/jetty/servlets/MultiPartFilter.java
 2013-08-05 18:03:11 +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 446820071b Merge remote-tracking branch 'origin/jetty-7' into jetty-8 2013-08-05 12:35:16 +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 01786aa0c2 Merge branch 'jetty-7' into jetty-8 2013-08-02 15:11:05 -07:00