Commit Graph

308 Commits

Author SHA1 Message Date
Greg Wilkins 085c79d7d6 637638 limit number of form parameters to avoid DOS 2011-12-30 12:00:18 +11:00
Greg Wilkins de005c68fd Revert "Merge branch 'release-8'"
This reverts commit 9e72457941, reversing
changes made to df12605f0e.
2011-11-30 16:27:30 +11:00
Greg Wilkins 55d5020980 Merge remote-tracking branch 'origin/master' into jetty-8
Conflicts:
	VERSION.txt
	jetty-server/src/main/java/org/eclipse/jetty/server/AbstractHttpConnection.java
	jetty-server/src/main/java/org/eclipse/jetty/server/Response.java
	jetty-servlet/src/main/java/org/eclipse/jetty/servlet/ServletHandler.java
2011-11-29 09:06:25 +11:00
Greg Wilkins b969de1788 organized imports 2011-11-28 15:32:14 +11:00
Greg Wilkins c229a55ad9 362742 improved UTF8 exception reason 2011-11-28 14:00:35 +11:00
Simone Bordet c6103f2d53 Removed usages of ThreadDeath. 2011-11-24 20:39:04 +01:00
Jan Bartel 0e9449ac85 Merge remote-tracking branch 'origin/master' into jetty-8 2011-11-21 18:18:09 +11:00
Jan Bartel 722444506a 362626 IllegalStateException thrown when SslContextFactory preconfigured with SSLContext 2011-11-21 12:30:29 +11:00
Jan Bartel b8b5df27d6 Merge remote-tracking branch 'origin/master' into jetty-8 2011-11-17 11:03:07 +11:00
Jan Bartel 127a5af8d7 Merge remote-tracking branch 'origin/master' into jetty-8 2011-11-17 10:59:54 +11:00
Greg Wilkins ec4dfc211f Simpler windows resource test 2011-11-16 17:08:16 +11:00
Simone Bordet 46aad20248 363785 - StdErrLog must use system-dependent EOL. 2011-11-15 10:19:10 +01:00
Greg Wilkins 722f390800 numerous findbugs inspired cleanups 2011-11-15 11:22:35 +11:00
Greg Wilkins 7a9b8f1e9d reverted last changes due to instability 2011-11-10 12:11:58 +11:00
Greg Wilkins d61258ec4e clean ups from review from sbordet.
Removed isBufferred
fixed instanceof ThreadDeath
avoid race with onInputShutdown
2011-11-10 10:12:37 +11:00
Greg Wilkins a36342438c cleaned up some unit tests 2011-11-09 17:03:11 +11:00
Jesse McConnell 2a6b8696d7 Merge branch 'master' into jetty-8 2011-11-08 15:59:55 -06:00
Greg Wilkins 5f2323418b cleanups after the merge 2011-11-08 12:47:28 +11:00
Greg Wilkins 7a082280f1 Merge remote-tracking branch 'origin/master' into jetty-7.6
Conflicts:
	example-jetty-embedded/pom.xml
	jetty-aggregate/jetty-all-server/pom.xml
	jetty-aggregate/jetty-all/pom.xml
	jetty-aggregate/jetty-client/pom.xml
	jetty-aggregate/jetty-plus/pom.xml
	jetty-aggregate/jetty-server/pom.xml
	jetty-aggregate/jetty-servlet/pom.xml
	jetty-aggregate/jetty-webapp/pom.xml
	jetty-aggregate/pom.xml
	jetty-ajp/pom.xml
	jetty-annotations/pom.xml
	jetty-client/pom.xml
	jetty-client/src/main/java/org/eclipse/jetty/client/HttpConnection.java
	jetty-client/src/main/java/org/eclipse/jetty/client/SelectConnector.java
	jetty-continuation/pom.xml
	jetty-deploy/pom.xml
	jetty-distribution/pom.xml
	jetty-http-spi/pom.xml
	jetty-http/pom.xml
	jetty-http/src/main/java/org/eclipse/jetty/http/ssl/SslContextFactory.java
	jetty-io/pom.xml
	jetty-io/src/main/java/org/eclipse/jetty/io/nio/ChannelEndPoint.java
	jetty-io/src/main/java/org/eclipse/jetty/io/nio/SelectChannelEndPoint.java
	jetty-jaspi/pom.xml
	jetty-jmx/pom.xml
	jetty-jndi/pom.xml
	jetty-jsp-2.1/pom.xml
	jetty-monitor/pom.xml
	jetty-nested/pom.xml
	jetty-nosql/pom.xml
	jetty-osgi/jetty-osgi-boot-jsp/pom.xml
	jetty-osgi/jetty-osgi-boot-logback/pom.xml
	jetty-osgi/jetty-osgi-boot-warurl/pom.xml
	jetty-osgi/jetty-osgi-boot/pom.xml
	jetty-osgi/jetty-osgi-equinoxtools/pom.xml
	jetty-osgi/jetty-osgi-httpservice/pom.xml
	jetty-osgi/pom.xml
	jetty-osgi/test-jetty-osgi/pom.xml
	jetty-overlay-deployer/pom.xml
	jetty-plus/pom.xml
	jetty-policy/pom.xml
	jetty-rewrite/pom.xml
	jetty-security/pom.xml
	jetty-server/pom.xml
	jetty-servlet/pom.xml
	jetty-servlets/pom.xml
	jetty-start/pom.xml
	jetty-util/pom.xml
	jetty-util/src/test/java/org/eclipse/jetty/util/log/LogTest.java
	jetty-util/src/test/java/org/eclipse/jetty/util/log/NamedLogTest.java
	jetty-webapp/pom.xml
	jetty-websocket/pom.xml
	jetty-websocket/src/main/java/org/eclipse/jetty/websocket/WebSocketConnectionD13.java
	jetty-xml/pom.xml
	pom.xml
	test-continuation-jetty6/pom.xml
	test-continuation/pom.xml
	test-jetty-nested/pom.xml
	test-jetty-servlet/pom.xml
	test-jetty-webapp/pom.xml
	tests/pom.xml
	tests/test-integration/pom.xml
	tests/test-loginservice/pom.xml
	tests/test-sessions/pom.xml
	tests/test-sessions/test-hash-sessions/pom.xml
	tests/test-sessions/test-jdbc-sessions/pom.xml
	tests/test-sessions/test-sessions-common/pom.xml
	tests/test-webapps/pom.xml
	tests/test-webapps/test-webapp-rfc2616/pom.xml
2011-11-07 18:09:31 +11:00
Joakim Erdfelt e207ea357e Minor update to invalid utf8 test case (expanding bad examples) 2011-11-02 17:22:32 -07:00
Jesse McConnell 2b6fec713c Merge branch 'master' into jetty-8 2011-11-02 16:47:04 -05:00
Joakim Erdfelt e088acc559 Resolving merge 2011-10-28 13:42:07 -07:00
Joakim Erdfelt a32c1186e2 362113 - Improve Test Coverage of org.eclipse.jetty.util.log classes
+ JavaUtilLog coverage improvements and bug fixes
+ More in-code comments about decisions
2011-10-28 13:29:22 -07:00
Joakim Erdfelt aa73830199 Updating java comments to make clear the purpose of this new static{} block 2011-10-28 10:57:32 -07:00
Joakim Erdfelt 4947bf099a Making Log use an optional jetty-logging.properties object for pre-loading its properties (with System.getProperty override) 2011-10-28 10:30:35 -07:00
Joakim Erdfelt c02f98b7e6 More classpath mucking about in Sfl4jTestJarsRunner 2011-10-28 09:48:59 -07:00
Joakim Erdfelt 9c9f2bd7c3 Making Sfl4jTestJarsRunner use its own classloader for loading the test 2011-10-28 09:23:11 -07:00
Joakim Erdfelt 21c43b1ab9 Making Sfl4jTestJarsRunner use its own classloader for loading the test 2011-10-28 09:21:46 -07:00
Jesse McConnell 062ccd7e70 trial classloader 2011-10-28 11:15:02 -05:00
Jesse McConnell 148459bc8f trial classloader 2011-10-28 11:14:14 -05:00
Joakim Erdfelt 5c516c9e7b Making fixes to StdErrLogTest 2011-10-28 09:12:29 -07:00
Joakim Erdfelt c174304996 Making fixes to StdErrLogTest 2011-10-28 09:11:21 -07:00
Joakim Erdfelt f510e0daf9 Making fixes to StdErrLogTest 2011-10-28 09:07:03 -07:00
Joakim Erdfelt 824e6ebc52 Merge branch 'master' into slf4j-testing 2011-10-28 08:44:44 -07:00
Greg Wilkins 84b07f359e temporary disabled log format test 2011-10-28 15:25:10 +11:00
Joakim Erdfelt 962e4afda9 Bug 362251 - Allow Log.setDebugEnabled(true) to override on configured StdErrLog levels 2011-10-27 16:44:29 -07:00
Joakim Erdfelt a87286a17c WIP: testing of Slf4jLog 2011-10-27 15:56:32 -07:00
Jesse McConnell 94124f7412 merge from master 2011-10-26 15:26:49 -05:00
Joakim Erdfelt 464c297c01 Bug 362113 - Improve Test Coverage of org.eclipse.jetty.util.log classes
+ Bringing StdErrLog testing coverage up from 73% to 92%
2011-10-26 12:57:13 -07:00
Joakim Erdfelt 1f9814a69a 362113 - Improve Test Coverage of org.eclipse.jetty.util.log classes
* Fixing bugs with bad level names, and adding tests for lowercase level
  names.
2011-10-26 11:04:53 -07:00
Joakim Erdfelt 064c93c53b 362111 - StdErrLog.isDebugEnabled() returns true too often 2011-10-26 10:34:33 -07:00
Greg Wilkins 4258b6f385 SslConnection server side mostly working 2011-10-26 22:55:02 +11:00
Greg Wilkins 61664d3c0f Added concept of SslConnection 2011-10-26 01:15:59 +11:00
Joakim Erdfelt b87cbd1181 Adding test on StdErrLog.isDebugEnabled() 2011-10-24 10:35:06 -07:00
Jan Bartel fc497fe1e8 Merge remote-tracking branch 'origin/master' into jetty-8 2011-10-24 16:30:10 +11:00
Greg Wilkins a642f7b55c Merge remote-tracking branch 'origin/master' into jetty-7.6
Conflicts:
	jetty-http/src/main/java/org/eclipse/jetty/http/HttpGenerator.java
	jetty-io/src/main/java/org/eclipse/jetty/io/nio/SslSelectChannelEndPoint.java
2011-10-24 11:27:42 +11:00
Greg Wilkins cd0628ab66 Added isDebugEnabled guards to debugging that generates garbage 2011-10-22 09:39:54 +11:00
Simone Bordet 810223e259 361655 ExecutorThreadPool.isLowOnThreads() returns wrong value.
Optimized by calling getActiveCount() last, since it locks the thread pool.
2011-10-21 22:53:20 +02:00
Simone Bordet d4603e1fdd Merge branch 'master' of ssh://git.eclipse.org/gitroot/jetty/org.eclipse.jetty.project 2011-10-21 16:26:18 +02:00
Simone Bordet 309e347d18 361655 ExecutorThreadPool.isLowOnThreads() returns wrong value.
Method isLowOnThreads() now return a value similar to what QueuedThreadPool does.
Also taken the chance to refactor constructors, and clarify that if an unbounded queue
like LinkedBlockingQueue is used, then the corePoolSize must be equal to the maxPoolSize.
2011-10-21 16:25:37 +02:00