54fab80d01
Merging from jetty-8 to master
2013-01-29 16:24:51 -06:00
f0c6b9bc82
Merge branch 'jetty-7' into jetty-8
2013-01-29 15:51:56 -06:00
c87cc4d4f0
resolve compilation issues with statistics servlet post patch application
2013-01-29 15:48:33 -06:00
cd38a7999e
399397 - websocket-client needs better upgrade failure checks
...
+ Adding checks on response status code and Connection header (along
with unit tests)
2013-01-29 14:44:56 -07:00
dd4a80288b
[Bug 391249] fix for invalid XML node dispatchedTimeMean in statistics servlet
...
Signed-off-by: Jesse McConnell <jesse.mcconnell@gmail.com>
2013-01-29 15:43:02 -06:00
840f147019
[Bug 391248] fixing localhost checking in statistics servlet
...
Signed-off-by: Jesse McConnell <jesse.mcconnell@gmail.com>
2013-01-29 15:41:39 -06:00
1910fb8ce4
[Bug 391345] fix missing br tag in statistics servlet
2013-01-29 14:55:22 -06:00
ddce31a323
[Bug 396574] add JETTY_HOME as a location for pid to be found
2013-01-29 14:48:25 -06:00
4f48bc7e7b
399343 - OnWebSocketConnect should use api.Session parameter instead.
...
+ Changed method signature for WebSocketListener and the various
@OnWebSocket* annotations
2013-01-29 13:22:38 -07:00
871b64cf38
Bug 399344 - Add missing @OnWebSocketError annotation
2013-01-29 13:22:38 -07:00
54c6928f58
Merge branch 'jetty-8'
2013-01-29 14:09:22 -06:00
01f7bc1e12
Merge branch 'jetty-7' into jetty-8
2013-01-29 14:08:25 -06:00
b9b7e76b7c
[Bug 396574] add /Users/jesse/installs/jetty as a location for pid to be found
2013-01-29 14:07:27 -06:00
e26c60e073
Merge jetty-8 to master
2013-01-29 14:06:47 -06:00
3b6cab63e2
Merge branch 'jetty-7' into jetty-8
2013-01-29 13:42:29 -06:00
35ebe6cea3
[Bug 394541] remove continuation jar from distro, add as dep to test-jetty-webapp
2013-01-29 13:34:45 -06:00
cd30ac104d
interims
2013-01-29 09:17:32 +01:00
335611815c
399173: UpgradeRequest.getParameterMap() should never return null
...
+ Making api.UpgradeRequest never return null, but also have no logic on
how to populate the parameter map
+ Using MultiMap in websocket-client for parameter map parsing
+ Using HttpServletRequest.getParameterMap() as-is in websocket-server
+ Adding unit testing for both sides
2013-01-28 17:11:51 -07:00
ec254cd165
399324 - HttpClient does not handle correctly UnresolvedAddressException.
2013-01-28 23:45:44 +01:00
40621f0300
Added test that connects to an external website that exposes a non-HTTP protocol such as SSH.
2013-01-28 23:45:44 +01:00
9ba1069383
399319 - Request.getURI() may return negative ports.
2013-01-28 23:45:44 +01:00
1f35b72d54
[Bug 381351] defaults for keymanager and trustmanager come from their factories and not hardcoded
2013-01-28 16:25:21 -06:00
a086451bc7
[Bug 393933] remove deprecated classes/methods and consolidate some static methods to SslContextFactory
2013-01-28 16:15:34 -06:00
06563d01b3
[Bug 393933] remove http's ssl context factory, it is in util
2013-01-28 15:04:21 -06:00
13fd8bc184
[Bug 370384] jetty-aggregate not used in jetty-distribution
2013-01-28 12:45:12 -06:00
a84f52d037
update jetty-maven-plugin to 1.7 compiler plugin (remove 1.5 actually)
2013-01-28 12:17:14 -06:00
7c53c317ae
Fixed DeferredContentProvider race condition.
...
HttpSender was setting the listener for asynchronous content before its own state was properly setup.
This was causing race conditions, where a thread could notify HttpSender and find null data members causing later NPEs.
Now the listener is set after the state is setup, removing the race condition.
2013-01-28 17:32:22 +01:00
988206c36a
393968 fix typo in javadoc
2013-01-28 16:11:33 +01:00
80b44f9940
interims
2013-01-28 15:27:03 +01:00
1737669df4
399242 - Reduce/eliminate false sharing in BlockingArrayQueue.
...
Now head and tail are stored in an array, spaced by empty elements to avoid false sharing.
2013-01-28 12:32:03 +01:00
1f6d058b20
intermittent commit
2013-01-28 12:18:30 +01:00
497acc8555
399132 check parent dir of session store against file to be removed
2013-01-27 10:18:27 +11:00
9b383c5780
381521 Only set Vary header when content could be compressed
2013-01-26 11:03:46 +11:00
2cbb630f8e
Merge branch 'jetty-8'
2013-01-25 16:53:46 -06:00
f16fc7e7b7
Merge branch 'jetty-7' into jetty-8
2013-01-25 16:53:18 -06:00
1a31067369
Add note about getCanonicalFile check and fix IdleSession test in test hash sessions
2013-01-25 16:25:59 -06:00
b3043276bc
add corresponding correct file removal check
2013-01-25 16:12:08 -06:00
a7c074a86c
merge from jetty-8
2013-01-25 15:32:08 -06:00
4bed164462
Merge branch 'jetty-7' into jetty-8
2013-01-25 15:31:13 -06:00
111bd19634
doh, header
2013-01-25 15:30:59 -06:00
d8a3b76862
Merge branch 'jetty-7' into jetty-8
2013-01-25 15:24:41 -06:00
d4568feba6
[Bug 399132] check parent dir of session store against file to be removed
2013-01-25 15:22:16 -06:00
7adc77a5d5
Adding -tests classifier artifacts to deploy/release to aide in quickstart documentation
2013-01-25 12:19:17 -07:00
3975ae74cb
Moving test from jetty-parent to jetty-client module
2013-01-25 12:06:17 -07:00
a82ed7a954
re-enabling jetty-all aggregate for release process
2013-01-25 11:36:45 -07:00
fe33b53f0d
Merge branch 'jetty-8'
2013-01-25 11:38:37 -06:00
368d7bbb72
Merge branch 'jetty-7' into jetty-8
2013-01-25 11:35:11 -06:00
c00e8d0283
Add analystics to aggregate javadoc profile (so it only targeted on actual release deployment.)
2013-01-25 11:26:25 -06:00
4454a83bb4
Merge branch 'master' of ssh://git.eclipse.org/gitroot/jetty/org.eclipse.jetty.project
2013-01-25 14:33:56 +11:00
ae644581dd
Port jetty-client IdleTimeoutTest to jetty-9
2013-01-25 14:33:09 +11:00
Jesse McConnell
Joakim Erdfelt
KARASZI István
Thomas Becker
Simone Bordet
Jan Bartel
Greg Wilkins