Eclipse
/
jetty.project
mirror of https://github.com/jetty/jetty.project.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
10,428 Commits 65 Branches 460 Tags 355 MiB
Commit Graph

10428 Commits

Author SHA1 Message Date
Jesse McConnell aa22842c20 [maven-release-plugin] prepare for next development iteration 2015-01-16 17:48:29 -06:00
Jesse McConnell 8c58a9abc4 [maven-release-plugin] prepare release jetty-9.2.7.v20150116 2015-01-16 17:48:23 -06:00
Jesse McConnell 8748abbfa1 tweake 2015-01-16 16:34:21 -06:00
Jesse McConnell 425a14de18 set for release 2015-01-16 16:32:19 -06:00
Joakim Erdfelt 7d88ce8f27 457696 - JMX implementation should not be overridden by WebApp classes 
+ Adding integration tests for the jmx issues
 2015-01-16 15:18:01 -07:00
Joakim Erdfelt 3f08e54a23 457696 - JMX implementation should not be overridden by WebApp classes 
+ Marking org.eclipse.jetty.util.annotation. for hole punching
+ Making ContextHandler parsing of "org.eclipse.jetty.server.context.ManagedAttributes"
  more lenient to whitespace around delimitors
+ Making ObjectMBean take in account the .jmx.{name}MBean for
  annotation influences too.
 2015-01-16 15:18:01 -07:00
Joakim Erdfelt aea4713d27 Minor test class cleanup while testing some annotation scanning behavior reported 2015-01-16 15:18:01 -07:00
Jesse McConnell 81bb8411d1 [maven-release-plugin] prepare for next development iteration 2015-01-16 12:06:36 -06:00
Jesse McConnell 7865f88b81 [maven-release-plugin] prepare release jetty-9.2.7.v20150116 2015-01-16 12:06:30 -06:00
Jesse McConnell b3f4578d7d yeah, I just did that 2015-01-16 11:36:19 -06:00
Jesse McConnell db991355a2 [maven-release-plugin] prepare for next development iteration 2015-01-16 10:41:45 -06:00
Jesse McConnell 6930abb8d3 [maven-release-plugin] prepare release jetty-9.2.7.v20140116 2015-01-16 10:41:39 -06:00
Jesse McConnell c6e98e1e92 set for release 2015-01-16 10:11:07 -06:00
Jesse McConnell 9225b124a4 [maven-release-plugin] prepare for next development iteration 2015-01-16 08:21:35 -06:00
Jesse McConnell ebd563e64d [maven-release-plugin] prepare release 9.2.7.v20140116 2015-01-16 08:21:29 -06:00
Joakim Erdfelt 2178824b17 457696 - JMX implementation should not be overridden by WebApp classes 2015-01-16 06:42:28 -07:00
Greg Wilkins 82870deef9 Removed incorrect LICENSE file (CREATIVE COMMONS) 
This license file was committed to a private repository at github.com:intalio/jetty-fcgi
when we were considering if FCGI was to be a part of Jetty or not. When FCGI was merged into
jetty master (e00f5c4056) the file was not removed.

As per the NOTICE.txt file, Jetty is dual licensed under
http://www.apache.org/licenses/LICENSE-2.0.html
and http://www.eclipse.org/legal/epl-v10.html

It was not and is not the intention of the copyright holders or contributors to use the
creative commons license for any part of the jetty release.
 2015-01-15 17:04:46 +01:00
Joakim Erdfelt 73110f5ba0 Merge branch 'jetty-9.2.x' 2015-01-09 10:00:57 -07:00
Joakim Erdfelt d8186af7ac Bumping up maven-deploy-plugin to v2.8.2 with retry configuration 2015-01-09 10:00:39 -07:00
Simone Bordet 6861da11b9 457130 - HTTPS request with IP host and HTTP proxy throws IllegalArgumentException. 
Fixed handling of cookies in case of null URI.
 2015-01-09 16:08:41 +01:00
Jan Bartel 0aa6f1b706 420944 Hot Deployment of WAR when Context XML exists doesn't trigger redeploy 2015-01-09 16:08:41 +01:00
Simone Bordet c7d9c5c951 457130 - HTTPS request with IP host and HTTP proxy throws IllegalArgumentException. 
Fixed handling of cookies in case of null URI.
 2015-01-09 16:07:41 +01:00
Jan Bartel b195e7ee20 420944 Hot Deployment of WAR when Context XML exists doesn't trigger redeploy 2015-01-09 13:23:37 +01:00
Simone Bordet 86c2d01e80 Merged branch 'jetty-9.2.x' into 'master'. 2015-01-09 12:59:17 +01:00
Simone Bordet fd13361132 Fixed test assumption. 2015-01-09 12:58:14 +01:00
Simone Bordet 8a27385bc3 Merged branch 'jetty-9.2.x' into 'master'. 2015-01-09 12:51:13 +01:00
Simone Bordet bb2872b789 Fixed test assumption. 2015-01-09 12:46:56 +01:00
Simone Bordet adae3193d8 457130 - HTTPS request with IP host and HTTP proxy throws IllegalArgumentException. 
Fixed by handling the case of non-URI request target.
 2015-01-09 11:49:13 +01:00
Joakim Erdfelt 3456c78d54 457017 - Reflective call to websocket methods that fail have ambiguous exceptions 
+ Ensuring that the Jetty WebSocket API behaves in the same way
 2015-01-08 14:38:12 -07:00
Joakim Erdfelt 0984796282 Cleanup of .gitignore 2015-01-08 12:13:45 -07:00
Joakim Erdfelt f7b382064f 457017 - Reflective call to websocket methods that fail have ambiguous 
exceptions 

+ Making JSR onOpen close and use onError properly, as well we
unwrapping the InvocationTargetException cause as to WHY the call to
onOpen failed.
 2015-01-08 12:06:53 -07:00
Greg Wilkins 978a7e8f15 Merge branch 'jetty-9.3-ewyk' of ssh://git.eclipse.org/gitroot/jetty/org.eclipse.jetty.project into jetty-9.3-ewyk 2015-01-08 17:44:09 +01:00
Greg Wilkins 55bcd32448 fixed merge 2015-01-08 17:43:55 +01:00
Joakim Erdfelt 7e7dd40f0a Happy New Year 2015 (merge from master) 2015-01-08 09:14:13 -07:00
Simone Bordet 0c21d7c78b Merged branch 'jetty-9.2.x' into 'master'. 2015-01-08 16:57:45 +01:00
Simone Bordet 51aafc78a4 457032 - Request sent from a failed CompleteListener due to connect timeout is failed immediately. 
Fixed by copying the exchange queue and failing only the exchanges
that are present in the copy.
 2015-01-08 16:56:59 +01:00
Greg Wilkins e1cc5fb487 Merge remote-tracking branch 'origin/master' into jetty-9.3-ewyk 
Conflicts:
	jetty-server/src/main/java/org/eclipse/jetty/server/HttpChannel.java
	jetty-server/src/main/java/org/eclipse/jetty/server/QueuedHttpInput.java
	jetty-util/src/main/java/org/eclipse/jetty/util/thread/NonBlockingThread.java
 2015-01-08 15:21:01 +01:00
Greg Wilkins c23f21c761 456956 Reduce ThreadLocal.remove() weak reference garbage 
removed getCurrentChannel thread local
 2015-01-08 15:03:05 +01:00
Greg Wilkins 12f84c9592 Merge remote-tracking branch 'origin/jetty-9.2.x' 
Conflicts:
	jetty-servlets/src/main/java/org/eclipse/jetty/servlets/GzipFilter.java
 2015-01-08 12:03:55 +01:00
Greg Wilkins 9618f45ead Merge branch 'jetty-9.2.x' of ssh://git.eclipse.org/gitroot/jetty/org.eclipse.jetty.project into jetty-9.2.x 2015-01-08 11:40:02 +01:00
Greg Wilkins 3fed24127f 456956 Reduce ThreadLocal.remove() weak reference garbage 2015-01-08 11:39:40 +01: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 629035ba7a Merge remote-tracking branch 'origin/jetty-9.2.x' 
Conflicts:
	jetty-server/src/main/java/org/eclipse/jetty/server/HttpChannel.java
	jetty-servlets/src/main/java/org/eclipse/jetty/servlets/GzipFilter.java
 2015-01-07 23:42:10 +01:00
Greg Wilkins 2b530939a7 456956 Reduce ThreadLocal.remove() weak reference garbage 
reduced calls to getCurrentConnection
 2015-01-07 20:56:06 +01:00
Greg Wilkins 3270af81e8 456956 Reduce ThreadLocal.remove() weak reference garbage 2015-01-07 19:53:30 +01:00
Simone Bordet 337d638422 Merged branch 'master' into 'jetty-9.3-ewyk'. 2015-01-06 17:32:12 +01:00
Simone Bordet 379f9f6c43 Merged branch 'jetty-9.2.x' into 'master'. 2015-01-06 17:30:43 +01:00
Simone Bordet 3abfbe26b3 Using the provider string when creating the SSLContext in case of no 
keystore.
 2015-01-06 17:30:03 +01:00
Simone Bordet bb3f296626 Fixed byte arithmetic: byte is signed and can't be used as array 
index without proper conversion to int.
 2015-01-05 16:57:19 +01:00