Greg Wilkins
a719418990
413568 Made AJP worker name generic
2013-08-08 12:05:24 +10:00
Greg Wilkins
95416bce76
413568 Made AJP worker name generic
2013-08-08 10:51:43 +10:00
Jan Bartel
a900010f81
414235 RequestLogHandler configured on a context fails to handle forwarded requests
2013-08-06 09:14:28 +10:00
Joakim Erdfelt
74991f90d6
Cleanup from merge
2013-08-05 09:13:32 -07:00
Joakim Erdfelt
e2d872fcc7
Merge branch 'jetty-8'
...
Conflicts:
jetty-server/src/main/java/org/eclipse/jetty/server/handler/RequestLogHandler.java
jetty-servlets/src/test/java/org/eclipse/jetty/servlets/MultipartFilterTest.java
jetty-spdy/spdy-client/pom.xml
jetty-spdy/spdy-core/pom.xml
jetty-util/src/main/java/org/eclipse/jetty/util/MultiPartInputStreamParser.java
jetty-util/src/test/java/org/eclipse/jetty/util/MultiPartInputStreamTest.java
pom.xml
tests/test-integration/src/test/java/org/eclipse/jetty/test/monitor/JmxServiceTest.java
tests/test-integration/src/test/java/org/eclipse/jetty/test/monitor/ProgramConfigTest.java
tests/test-integration/src/test/java/org/eclipse/jetty/test/monitor/XmlConfigTest.java
2013-08-05 08:47:24 -07:00
Jan Bartel
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
Jan Bartel
f3f2bce36c
414393 StringIndexOutofBoundsException with > 8k multipart content without CR or LF
2013-08-05 17:18:44 +10:00
Jan Bartel
446820071b
Merge remote-tracking branch 'origin/jetty-7' into jetty-8
2013-08-05 12:35:16 +10:00
Jan Bartel
f5fb412eba
414235 - RequestLogHandler configured on a context fails to handle forwarded requests
2013-08-05 12:32:21 +10:00
Joakim Erdfelt
01786aa0c2
Merge branch 'jetty-7' into jetty-8
2013-08-02 15:11:05 -07:00
Joakim Erdfelt
79ac8ad22d
Fixing License Header to conform with standard with rest of project
2013-08-02 14:34:03 -07:00
Joakim Erdfelt
2057c4c17b
Upgrading Junit + Hamcrest
2013-08-02 14:25:53 -07:00
Jan Bartel
e15d83e061
Merge remote-tracking branch 'origin/jetty-8'
...
Conflicts:
VERSION.txt
aggregates/jetty-all/pom.xml
examples/async-rest/async-rest-jar/pom.xml
examples/async-rest/async-rest-webapp/pom.xml
examples/async-rest/pom.xml
examples/embedded/pom.xml
jetty-aggregate/jetty-all-server/pom.xml
jetty-aggregate/jetty-client/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-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-jaas/src/main/java/org/eclipse/jetty/jaas/spi/PropertyFileLoginModule.java
jetty-jaspi/pom.xml
jetty-jmx/pom.xml
jetty-jndi/pom.xml
jetty-jsp/pom.xml
jetty-monitor/pom.xml
jetty-nosql/pom.xml
jetty-osgi/jetty-osgi-boot-jsp/pom.xml
jetty-osgi/jetty-osgi-boot-warurl/pom.xml
jetty-osgi/jetty-osgi-boot/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-proxy/pom.xml
jetty-rewrite/pom.xml
jetty-runner/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-client/pom.xml
jetty-spdy/spdy-core/pom.xml
jetty-spdy/spdy-example-webapp/pom.xml
jetty-spdy/spdy-server/pom.xml
jetty-start/pom.xml
jetty-util-ajax/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
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-jetty-webapp/pom.xml
tests/test-webapps/test-webapp-rfc2616/pom.xml
2013-08-01 13:21:32 +10:00
Jan Bartel
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
Jan Bartel
e87eee1b46
412629 PropertyFileLoginModule doesn't cache user configuration file even for refreshInterval=0
2013-08-01 11:56:13 +10:00
Jan Bartel
1dbab40863
412629 PropertyFileLoginModule doesn't cache user configuration file even for refreshInterval=0
2013-08-01 10:55:10 +10:00
Jan Bartel
7dea4f85f9
414085 - Add jetty-continuations to plugin dependencies
2013-08-01 09:59:19 +10:00
Jesse McConnell
223c8ad7b4
Merge branch 'release-8' into jetty-8
2013-07-31 12:12:59 -05:00
Jesse McConnell
2380d748f8
set for dev
2013-07-31 12:12:38 -05:00
Jesse McConnell
b706f541ec
Merge branch 'release-7' into jetty-7
2013-07-31 12:09:53 -05:00
Jesse McConnell
9db05ac2fa
set for dev
2013-07-31 12:09:17 -05:00
Simone Bordet
61ea4d6705
Fixed method parseResponse() that should never return null.
...
The response is "filled" by parser events even if at the end of
the parsing the parser returns false.
2013-07-26 19:07:39 +02:00
Jesse McConnell
20bd1e0f96
[maven-release-plugin] prepare for next development iteration
2013-07-26 11:50:17 -05:00
Jesse McConnell
49c3b2c32a
[maven-release-plugin] prepare release jetty-8.1.12.v20130726
2013-07-26 11:49:58 -05:00
Jesse McConnell
6ed360c480
reset for release
2013-07-26 11:23:57 -05:00
Jesse McConnell
8de5fbbac7
Merge branch 'release-8' of ssh://git.eclipse.org/gitroot/jetty/org.eclipse.jetty.project into release-8
2013-07-26 11:18:52 -05:00
Jesse McConnell
1a5117e9ab
[maven-release-plugin] prepare release jetty-8.1.12.v20130726
2013-07-26 11:18:24 -05:00
Jesse McConnell
650e8e93ae
[maven-release-plugin] prepare for next development iteration
2013-07-26 10:57:33 -05:00
Jesse McConnell
e7e2fce56e
[maven-release-plugin] prepare release jetty-7.6.12.v20130726
2013-07-26 10:57:26 -05:00
Jesse McConnell
ed660fffd7
set for release
2013-07-26 10:51:28 -05:00
Jesse McConnell
98249488d4
set for release
2013-07-26 10:49:24 -05:00
Jesse McConnell
869389e857
set for release
2013-07-26 10:48:53 -05:00
Jesse McConnell
d87a3884ad
Merge branch 'jetty-8' into release-8
2013-07-26 10:38:24 -05:00
Jesse McConnell
e59f1d2191
set for release
2013-07-26 10:30:55 -05:00
Jesse McConnell
ef7ea3cbbf
Merge branch 'jetty-7' into release-7
2013-07-26 10:28:27 -05:00
Jesse McConnell
7a5401e506
Merge branch 'jetty-8'
2013-07-26 10:27:43 -05:00
Jesse McConnell
5a0278fc3f
Merge branch 'jetty-7' into jetty-8
2013-07-26 10:26:46 -05:00
David Harrigan
192f2d7002
BUG-413812
...
Mark RateTracker as Serializable to allow it to be stored in a Session that is
eventually persisted in a distributed memory platform.
Signed-off-by: David Harrigan <dharrigan@gmail.com>
2013-07-26 10:24:03 -05:00
Jesse McConnell
6622e06841
set for release
2013-07-26 09:13:52 -05:00
Jesse McConnell
e1db76563a
Merge branch 'jetty-7' into release-7
2013-07-26 09:12:45 -05:00
Simone Bordet
bc096cace4
Moved new JSON classes to the right module.
2013-07-26 14:17:42 +02:00
Simone Bordet
cea4ac5fe3
Merged branch 'jetty-8' into 'master'.
2013-07-26 13:51:26 +02:00
Simone Bordet
b7b3ced092
Merged branch 'jetty-7' into 'jetty-8'.
2013-07-26 13:46:08 +02:00
Simone Bordet
2be4ca5921
Reverted VERSION.txt.
2013-07-26 13:45:41 +02:00
Simone Bordet
5c7eb9e265
Reverted version to 7.6.12-SNAPSHOT.
2013-07-26 13:36:35 +02:00
Simone Bordet
a0519a9693
413371 - Default JSON.Converters for List and Set.
...
Introduced a JSONCollectionConvertor that is able to convert
Collections, and hence both List and Set.
Code cleanups.
2013-07-26 13:09:11 +02:00
Jan Bartel
2a2eb9cd38
Merge branch 'master' of ssh://git.eclipse.org/gitroot/jetty/org.eclipse.jetty.project
2013-07-26 18:02:10 +10:00
Jan Bartel
e6974dadab
Harmonize with jetty-9 apis
2013-07-26 18:01:37 +10:00
Greg Wilkins
ea7854eccf
removed delicate external test
2013-07-26 16:09:50 +10:00
Greg Wilkins
4a5567433c
413372 JSON Enum uses name rather than toString()
2013-07-26 16:06:32 +10:00
