30bab30d9b
Revert "Merge branch 'release-8' into jetty-8"
...
This reverts commit 463ef68dc3de544ddfbf
2013-09-16 23:28:59 +10:00
463ef68dc3
Merge branch 'release-8' into jetty-8
2013-09-13 18:05:14 +02:00
de544ddfbf
Merge remote-tracking branch 'origin/jetty-7' into jetty-8
2013-09-12 12:30:03 +10:00
3eb84f99a4
416990 JMX names statically unique
...
Fixed monitor test to reset uniqueness
2013-09-12 12:29:24 +10:00
da2bbdea3c
Merge remote-tracking branch 'origin/jetty-7' into jetty-8
2013-09-12 10:40:54 +10:00
c842c5c505
416990 JMX names statically unique
2013-09-12 10:40:26 +10:00
5ab692b62e
Updating VERSION.txt top section
2013-09-11 12:26:24 +02:00
b95d6948a8
[maven-release-plugin] prepare for next development iteration
2013-09-10 20:44:44 +02:00
5692cff532
[maven-release-plugin] prepare release jetty-8.1.13.v20130910
2013-09-10 20:44:29 +02:00
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
911043b5be
ProxyServletTest create test dir if it doesn't exist
2013-09-10 18:02:46 +02:00
8fd97dad0e
Updating VERSION.txt top section
2013-09-10 17:42:53 +02:00
994d8baa3f
Merge branch 'jetty-8' into release-8
2013-09-10 17:40:25 +02:00
9db0101d69
ProxyServletTest create test dir if it doesn't exist
2013-09-10 12:03:03 +02:00
ab9ecd277d
416266 HttpServletResponse.encodeURL() encodes on first request when only SessionTrackingMode.COOKIE is used
2013-09-10 08:57:59 +10:00
11085742c8
416787 StringIndexOutOfBounds with a pathMap of ""
2013-09-09 12:41:28 +10:00
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
28f3c1ac01
Merge commit '9e0e173de813c3dd825becb9c3f67739f25e936b' into jetty-8
2013-09-05 17:34:39 +02:00
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
2ab4757450
Merge remote-tracking branch 'origin/jetty-7' into jetty-8
2013-09-05 12:55:19 +10:00
e764a0f2e7
416585 WebInfConfiguration examines webapp classloader first instead of its parent when looking for container jars
2013-09-05 12:47:39 +10:00
236f5d57bf
414431 Avoid debug NPE race
2013-09-05 12:24:28 +10:00
2a178a29fd
413684 deprecated unsafe alias checkers
...
removed debugs
2013-08-23 17:11:57 +10:00
b33b5f2f5d
413684 deprecated unsafe alias checkers
2013-08-23 16:49:42 +10:00
b4fab3fbc5
Merge branch 'jetty-7' into jetty-8
2013-08-20 13:02:40 -05:00
3d6711b4ab
[Bug 413484] setAttribute in nosql session management better handles _dirty status
2013-08-20 13:01:52 -05:00
1691618024
Merge remote-tracking branch 'origin/jetty-7' into jetty-8
2013-08-16 11:06:42 +10:00
54a899d55f
415192 <jsp-file> maps to JspPropertyGroupServlet instead of JspServlet
2013-08-16 11:02:29 +10:00
6a22a9f5b9
Merge remote-tracking branch 'origin/jetty-7' into jetty-8
2013-08-09 14:46:25 +10:00
66620b77b8
414507 Ensure AnnotationParser ignores parent dir hierarchy when checking for hidden dirnames
2013-08-09 14:19:04 +10:00
59a070a9fe
Merged branch 'jetty-7' into 'jetty-8'.
2013-08-08 12:10:19 +02:00
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
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
f983629434
414507 AnnotationParser should skip classes in hidden dirs or with . name prefix
2013-08-08 12:09:29 +10:00
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
f3f2bce36c
414393 StringIndexOutofBoundsException with > 8k multipart content without CR or LF
2013-08-05 17:18:44 +10:00
446820071b
Merge remote-tracking branch 'origin/jetty-7' into jetty-8
2013-08-05 12:35:16 +10:00
f5fb412eba
414235 - RequestLogHandler configured on a context fails to handle forwarded requests
2013-08-05 12:32:21 +10:00
01786aa0c2
Merge branch 'jetty-7' into jetty-8
2013-08-02 15:11:05 -07:00
79ac8ad22d
Fixing License Header to conform with standard with rest of project
2013-08-02 14:34:03 -07:00
2057c4c17b
Upgrading Junit + Hamcrest
2013-08-02 14:25:53 -07:00
5094dc059d
Merge remote-tracking branch 'origin/jetty-7' into jetty-8
...
Conflicts:
VERSION.txt
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/jetty-websocket/pom.xml
jetty-aggregate/pom.xml
jetty-ajp/pom.xml
jetty-annotations/pom.xml
jetty-client/pom.xml
jetty-continuation/pom.xml
jetty-deploy/pom.xml
jetty-distribution/pom.xml
jetty-http-spi/pom.xml
jetty-http/pom.xml
jetty-io/pom.xml
jetty-jaspi/pom.xml
jetty-jmx/pom.xml
jetty-jndi/pom.xml
jetty-jsp/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-context/pom.xml
jetty-osgi/test-jetty-osgi-webapp/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-spdy/pom.xml
jetty-spdy/spdy-core/pom.xml
jetty-spdy/spdy-jetty-http-webapp/pom.xml
jetty-spdy/spdy-jetty-http/pom.xml
jetty-spdy/spdy-jetty/pom.xml
jetty-start/pom.xml
jetty-util/pom.xml
jetty-webapp/pom.xml
jetty-websocket/pom.xml
jetty-xml/pom.xml
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-mongodb-sessions/pom.xml
tests/test-sessions/test-sessions-common/pom.xml
tests/test-webapps/pom.xml
tests/test-webapps/test-webapp-rfc2616/pom.xml
2013-08-01 12:40:23 +10:00
e87eee1b46
412629 PropertyFileLoginModule doesn't cache user configuration file even for refreshInterval=0
2013-08-01 11:56:13 +10:00
223c8ad7b4
Merge branch 'release-8' into jetty-8
2013-07-31 12:12:59 -05:00
2380d748f8
set for dev
2013-07-31 12:12:38 -05:00
b706f541ec
Merge branch 'release-7' into jetty-7
2013-07-31 12:09:53 -05:00
9db05ac2fa
set for dev
2013-07-31 12:09:17 -05:00
20bd1e0f96
[maven-release-plugin] prepare for next development iteration
2013-07-26 11:50:17 -05:00
49c3b2c32a
[maven-release-plugin] prepare release jetty-8.1.12.v20130726
2013-07-26 11:49:58 -05:00
6ed360c480
reset for release
2013-07-26 11:23:57 -05:00
Greg Wilkins
Thomas Becker
Jan Bartel
Jesse McConnell
Simone Bordet
Joakim Erdfelt