Eclipse/jetty.project
1
0
Fork 0
mirror of https://github.com/jetty/jetty.project.git synced 2025-02-24 08:28:54 +00:00
Code Issues Packages Projects Releases Wiki Activity
10,052 Commits 55 Branches 466 Tags
Commit Graph

10052 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Simone Bordet
9796457dfc 446672 - NPN Specification issue in the case no protocols are selected. 2014-10-13 21:27:11 +02:00
Simone Bordet
fb590a5fff Fixed merge conflict. 2014-10-13 17:10:03 +02:00
Simone Bordet
e7d830c26e Merged branch 'jetty-9.2.x' into 'master'. 2014-10-13 16:57:52 +02:00
Simone Bordet
abdd2e4ff0 440729 - SSL requests often fail with EOFException or IllegalStateException. 
Fixed IllegalStateException by handling NEED_UNWRAP for the CLOSED
state in fill().
The EOFException does not seem to be an issue with the client.

Also removed an unneeded catch block and an empty if statement.
 2014-10-13 16:55:59 +02:00
Simone Bordet
2dba2ea2c2 Improved exception reporting. 2014-10-13 16:55:59 +02:00
Joakim Erdfelt
8d85940077 Moving HttpTester to "tests" scoped jetty-http artifact. 
+ HttpTester, a testing class, was used by jetty-servlets,
   embedded-jetty-examples, and test-integration, all from
   those testing scopes.  Moved the HttpTester into the
   pre-existing jetty-http "tests" classified artifact.
 2014-10-13 07:35:12 -07:00
Joakim Erdfelt
1511be8c97 Committing proper testcase for bug 440823 2014-10-11 22:51:15 -07:00
Joakim Erdfelt
dec984302a Merge branch 'jetty-9.2.x' 
Conflicts:
	jetty-server/src/test/java/org/eclipse/jetty/server/handler/RequestLogHandlerTest.java
 2014-10-10 16:14:06 -07:00
Joakim Erdfelt
e7b86b99cb 445823 - RequestLogHandler at end of HandlerCollection doesn't work 
+ Adding more varieties of server side collection vs wrapper with error
  handlers
+ Adding servlet version of tests to demonstrate behavior in servlet
  context, when also using the mapped error handler
 2014-10-10 11:21:40 -07:00
Joakim Erdfelt
707b2f5ab8 Adding Decorator to serverClasses by default, for CDI use when not using cdi.mod 2014-10-10 08:24:23 -07:00
Joakim Erdfelt
b478d49062 Tweaking WeldDeploymentBinding for more accurate weld setup 2014-10-10 07:05:54 -07:00
Greg Wilkins
a94e0287b9 446559 Avoid spin consuming extra data 2014-10-10 22:30:54 +11:00
Jan Bartel
e292b572f1 446425 Oracle Sql error on JettySessions table when this table do not exist already 2014-10-10 17:36:36 +11:00
Jan Bartel
dd864f9799 443529 CrossOriginFilter does not accept wildcard for allowedHeaders 2014-10-10 15:53:13 +11:00
Greg Wilkins
bb2d77f00b Merge remote-tracking branch 'origin/jetty-9.2.x' 2014-10-10 14:20:30 +11:00
Greg Wilkins
6a0e220b9c 446506 getAsyncContext ISE before startAsync on async dispatches 2014-10-10 14:19:42 +11:00
Greg Wilkins
cd15bb187d 446559 Avoid spin consuming extra data 2014-10-10 13:16:41 +11:00
Jan Bartel
f07387c703 442942 Content sent with status 204 (No Content) 2014-10-10 12:58:45 +11:00
Joakim Erdfelt
cba0ce2b9e Adding notes about weld and container discovery 2014-10-09 16:35:35 -07:00
Joakim Erdfelt
f4a0754a76 Another attempt at the cdi / weld integration 2014-10-09 16:33:12 -07:00
Greg Wilkins
0df54fd279 fixed merge 2014-10-10 09:17:48 +11:00
Joakim Erdfelt
8e1fc56f6f CDI module now depends on JSP module 
+ weld requires javax.el + jsp to function
 2014-10-09 15:12:15 -07:00
Joakim Erdfelt
a041c01e73 Making jsp module names consistent 2014-10-09 15:11:46 -07:00
Joakim Erdfelt
17aa2eaf7a Adding note about weld requirement on .getServerInfo() 2014-10-09 15:11:07 -07:00
Greg Wilkins
984b3c491f Merge branch 'master' of ssh://git.eclipse.org/gitroot/jetty/org.eclipse.jetty.project 2014-10-10 08:54:42 +11:00
Greg Wilkins
7e68a98dcd fixes from merge 2014-10-10 08:54:11 +11:00
Greg Wilkins
758ce66c8d Merge remote-tracking branch 'origin/jetty-9.2.x' 
Conflicts:
	jetty-websocket/pom.xml
	tests/test-sessions/test-mongodb-sessions/pom.xml
 2014-10-10 08:53:43 +11:00
Simone Bordet
96cf942b70 Fixed race condition in onSelected(). 
WebSocket and multiplexed protocols are always read interested.
It may happen that while the application is writing, the write
blocks, resulting in a call to changeInterests().
At the same time, the selector may detect data to read and call
onSelected(), so there is a possibility that onSelected() runs
concurrently with changeInterests().

The fix adds an additional state (PROCESSING) that isolates the
changes that onSelected() makes to _interestOps, spin-waiting if
changeInterests() is running concurrently.
Likewise, changeInterests() spin-waits until onSelected() is running
concurrently.
 2014-10-09 22:46:04 +02:00
Joakim Erdfelt
67db9e67de Merge branch 'jetty-9.2.x' into cdi-testing 2014-10-09 12:42:14 -07:00
Simone Bordet
76278d3563 Fixed race condition causing onSelected() to throw IllegalStateException. 
The race was happening when updateKey() lost the race with
changeInterests() to update the interests and subsequently the key.
In that case, the selector thread that called updateKey() was returning
while changeInterests() was executing the CHANGING state.
Since updateKey() lost the race, the actual key interests was still
(typically) OP_READ so the selector thread would select() and call
onSelected() while changeInterests() was still executing, causing the
IllegalStateException.
 2014-10-09 16:43:50 +02:00
Simone Bordet
649eb7f3dc Introduced factory method to create JDK's Selector instances. 2014-10-09 10:08:15 +02:00
Jan Bartel
060a26ecfe 443530 CrossOriginFilter does not set the Vary header 2014-10-09 17:23:01 +11:00
Jan Bartel
34fafcce4c 442419 CrossOriginFilter javadoc says "exposeHeaders", but should be "exposedHeaders" 2014-10-09 14:10:27 +11:00
Joakim Erdfelt
2f696e87bd 445258 - STOP.WAIT is not really respected 
Fixing stupid typo / copy / paste bug
 2014-10-08 15:01:05 -07:00
Joakim Erdfelt
eee2ab0f10 445979 - jetty.sh fails to start when start-stop-daemon does not exist and the user is not root 
+ Adding better JETTY_USER test into jetty.sh
 2014-10-08 14:54:00 -07:00
Joakim Erdfelt
ab930aae9f 446033 - org.eclipse.jetty.websocket.server.WebSocketServerFactory not available in OSGi 
+ Tweaking version identifiers in websocket
+ Adding oej.websocket.server.pathmap to Dynamic-Import of
  websocket-servlet manifest
 2014-10-08 14:46:57 -07:00
Joakim Erdfelt
0f01f7edbd 446107 - NullPointerException in ProxyServlet when extended by Servlet 
without a package 

+ Adding null check
 2014-10-08 14:38:16 -07:00
Joakim Erdfelt
1f543e9983 System.lineSeparator exists 2014-10-08 11:02:13 -07:00
Joakim Erdfelt
086bea097d Using StandardCharset where appropriate 2014-10-08 11:02:13 -07:00
Joakim Erdfelt
8e99c51d86 fixing url to jetty 2014-10-08 11:02:13 -07:00
Joakim Erdfelt
eb39d75f29 Javadoc update 2014-10-08 11:02:13 -07:00
Jan Bartel
3eb42e7183 445830 Support setting environment variables on forked jetty with jetty:run-forked 2014-10-03 14:27:35 +10:00
Joakim Erdfelt
61dd2c9620 Fixing encoding tests (that actually didn't validate results) 2014-10-02 15:12:32 -07:00
Joakim Erdfelt
43d2c59394 445821 - Error 400 should be logged with RequestLog 
+ Adding BadRequestLogHandlerTest to demonstrate error 400 not being
captured by RequestLogHandler
 2014-10-02 13:55:14 -07:00
Joakim Erdfelt
e93e024166 445823 - RequestLogHandler at end of HandlerCollection doesn't work 
+ Adding example of RequestLogHandler use in HandlerCollection
 2014-10-02 13:54:22 -07:00
Joakim Erdfelt
3636bd6894 Moving hardcoded ports to ephemeral range suitable for more environments 2014-10-02 10:31:32 -07:00
Joakim Erdfelt
7635b3cd49 Merge branch 'jetty-9.2.x' into cdi-testing 2014-10-01 14:46:05 -07:00
Jan Bartel
8bca0bbe7e Add mongo sessinon manager module tests back into build, but skipped 2014-10-01 17:51:38 +10:00
Jan Bartel
e448ea0ab1 444595 nosql/mongodb - Cleanup process/Refreshing does not respect encoding of attribute keys 2014-10-01 16:21:25 +10:00
Jan Bartel
bc265953a5 445495 Improve Exception message when no jndi resource to bind for a name in web.xml 2014-10-01 13:29:23 +10:00