Eclipse
/
jetty.project
mirror of https://github.com/jetty/jetty.project.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
12,018 Commits 68 Branches 465 Tags 359 MiB
Commit Graph

2941 Commits

Author SHA1 Message Date
Simone Bordet ce41b7124f 482506 - HTTP/2 load test with h2load fails. 
Returning true if the upgrade succeeds to signal to the HttpParser to
stop parsing, leaving all the work and the buffer to the new connection.
 2015-11-18 19:25:34 +01:00
Joakim Erdfelt 4e773c16e2 Merge branch 'release-9.3.6' into jetty-9.3.x 2015-11-18 11:24:04 -07:00
Greg Wilkins 0d647fc95a Merge remote-tracking branch 'origin/jetty-9.3.x' 2015-11-18 15:11:17 +11:00
Greg Wilkins 12ec44894b 482272 Fixed relative symlink checking 2015-11-18 11:13:35 +11:00
Jan Bartel 070284643b Port infinispan sessions to new session model. 2015-11-13 14:43:15 +11:00
Jan Bartel 98558faffd Move newSessionData method to AbstractSessionDataStore. Organize imports. 2015-11-12 15:50:09 +11:00
Jan Bartel b1113940e6 Remove getSessions/getSessionsMax/getSessionsTotal from SessionManager. These stats can only exist on SessionStore implementations. 2015-11-12 15:21:55 +11:00
Jan Bartel b18769c1f9 Make setting of last saved time less fragile. 2015-11-12 11:17:20 +11:00
Greg Wilkins ff0d1b4c14 481903 Module Descriptions 2015-11-12 10:48:04 +11:00
Jan Bartel b0748c5865 Make jdbc session tests work 2015-11-11 18:31:38 +11:00
Joakim Erdfelt edf686fe0a Updating to version 9.3.7-SNAPSHOT 2015-11-06 12:13:00 -07:00
Joakim Erdfelt d737e1c638 Updating to version 9.3.6.v20151106 2015-11-06 11:09:32 -07:00
Joakim Erdfelt ec8f8d3e4f Updating to version 9.2.15-SNAPSHOT 2015-11-06 11:06:48 -07:00
Joakim Erdfelt ecba378f5c Updating to version 9.2.14.v20151106 2015-11-06 10:32:14 -07:00
Greg Wilkins 4bb63b9e03 481355 Nested Symlinks 2015-11-06 13:54:47 +11:00
Greg Wilkins 7843b7348e 480827 Implemented Unix Domain Socket Connector 
Squashed commit of the following:

commit fbb680ba7cdb73495524ea9e5b0f49caee7f68d8
Merge: ed2550b 64ea0db
Author: Greg Wilkins <gregw@webtide.com>
Date:   Fri Nov 6 10:44:00 2015 +1100

    Merge branch 'master' into unix-socket

commit ed2550b50f978e1984e19fbda642baf450dbe6a1
Merge: 88d7b35 de137ab
Author: Greg Wilkins <gregw@webtide.com>
Date:   Thu Nov 5 18:41:25 2015 +1100

    Merge branch 'master' into unix-socket

commit 88d7b35f885de2da7dec836e6e4ae2b522d517f0
Merge: 7d4155f 3e2658a
Author: Greg Wilkins <gregw@webtide.com>
Date:   Thu Nov 5 17:38:27 2015 +1100

    Merge branch 'master' into unix-socket

commit 7d4155fe4a407d493683b66709bc638879b0b422
Author: Greg Wilkins <gregw@webtide.com>
Date:   Thu Nov 5 17:24:48 2015 +1100

    Unix socket configuration

commit 2737b19f73ad153c20e1762874558a5d62849f90
Merge: cd0cc2e 92cc44c
Author: Greg Wilkins <gregw@webtide.com>
Date:   Wed Nov 4 15:13:40 2015 +1100

    Merge branch 'master' into unix-socket

    Conflicts:
    	jetty-server/src/main/java/org/eclipse/jetty/server/SecureRequestCustomizer.java

commit cd0cc2ef36a558d948bf26aff4f9e3519da2f823
Merge: 639753b 303f98e
Author: Greg Wilkins <gregw@webtide.com>
Date:   Mon Nov 2 12:21:19 2015 +1100

    Merge branch 'master' into unix-socket

commit 639753b5ed37778d7231acfe9d52039aed66351e
Author: Greg Wilkins <gregw@webtide.com>
Date:   Fri Oct 30 15:42:58 2015 +1100

    local connectors report NOIP address

commit 6d38c4195f145b99f775a06d546960b119094b0c
Author: Greg Wilkins <gregw@webtide.com>
Date:   Fri Oct 30 12:11:13 2015 +1100

    Gentler ssl close test

commit 40b46b66a738c9187f859d522a0165bb09b113c8
Merge: b7eb082 fa53b11
Author: Greg Wilkins <gregw@webtide.com>
Date:   Fri Oct 30 11:09:42 2015 +1100

    Merge branch 'master' into unix-socket

commit b7eb082be44864c058b6f01b10364013596d3650
Author: Greg Wilkins <gregw@webtide.com>
Date:   Fri Oct 30 08:34:30 2015 +1100

    SecureRequestCustomizer for UnixSockets

commit edbb3c080200b4c6aa2836eff6c81bf31a73a8c1
Merge: 90e8cc0 de7ac72
Author: Greg Wilkins <gregw@webtide.com>
Date:   Thu Oct 29 19:47:05 2015 +1100

    Merge branch 'master' into unix-socket

commit 90e8cc060ff6dc4b249818db38334ffa543f002f
Author: Greg Wilkins <gregw@webtide.com>
Date:   Thu Oct 29 19:31:50 2015 +1100

    use proxy connection

commit b1772ef5dcac9ddf9bb5ecda1cda6d038ca21755
Merge: e95a932 9fe7332
Author: Greg Wilkins <gregw@webtide.com>
Date:   Thu Oct 29 16:46:29 2015 +1100

    Merge branch 'master' into unix-socket

commit e95a932bda5a96bf98ada4fb47664790af2aa0a2
Author: Greg Wilkins <gregw@webtide.com>
Date:   Wed Oct 28 15:58:25 2015 +1100

    fixed config

commit f8963b2ed6b6b4b96f1d9403194c9d50ab1f12fd
Merge: 9c56b53 8b27484
Author: Greg Wilkins <gregw@webtide.com>
Date:   Wed Oct 28 15:34:28 2015 +1100

    Merge branch 'master' into unix-socket

commit 9c56b53cbec20d98e5cb05cf8d1f668fe84b95e0
Merge: 298a311 39768f8
Author: Greg Wilkins <gregw@webtide.com>
Date:   Mon Oct 26 13:04:34 2015 +1100

    Merge branch 'master' into unix-socket

commit 298a311af952ad3ef5d1c7635deabf47bddaa1c6
Author: Greg Wilkins <gregw@webtide.com>
Date:   Fri Oct 23 15:24:19 2015 +1100

    Async accepting

commit 8266753d124c04ec8bca8aa02be1ef3d826d6769
Author: Greg Wilkins <gregw@webtide.com>
Date:   Fri Oct 23 14:45:35 2015 +1100

    set acceptors

commit 6a56c5b9e19063fcb95cdc1228adf723c0d41362
Author: Greg Wilkins <gregw@webtide.com>
Date:   Fri Oct 23 11:44:54 2015 +1100

    licence

commit d80e5748e6c4327bae57de2af01983990dd2afe0
Author: Greg Wilkins <gregw@webtide.com>
Date:   Fri Oct 23 11:24:14 2015 +1100

    unixsocket work in progress adding modules

commit cf0c1153d9966cc7182ba29411527b4341c34da6
Merge: 645b671 c39bfa2
Author: Greg Wilkins <gregw@webtide.com>
Date:   Fri Oct 23 08:52:01 2015 +1100

    Merge branch 'master' into unix-socket

commit 645b6712d37282c26011a95c8c98e45c249b2e5f
Author: Greg Wilkins <gregw@webtide.com>
Date:   Fri Oct 23 08:49:52 2015 +1100

    IP headers

commit 67b210b9ea81af68ce3848a114bbbd1b80a8ca52
Author: Greg Wilkins <gregw@webtide.com>
Date:   Thu Oct 22 23:48:57 2015 +1100

    working with haproxy

commit e4fce9cf5d896a9a29a7c6280fcaa0336dfcc0f2
Author: Greg Wilkins <gregw@webtide.com>
Date:   Thu Oct 22 18:25:09 2015 +1100

    unixsocket working

commit 6f013788cad44e6641cd89720c5e7f3652cdc257
Author: Greg Wilkins <gregw@webtide.com>
Date:   Thu Oct 22 15:39:55 2015 +1100

    work in progress
 2015-11-06 11:17:46 +11:00
Greg Wilkins 56afc2b0e5 481554 DispatcherType reset race 
Cherry pick of fa53b11850

Conflicts:
	jetty-server/src/main/java/org/eclipse/jetty/server/HttpChannel.java
 2015-11-06 10:38:08 +11:00
Greg Wilkins 11b5e0edf4 format 2015-11-06 09:12:57 +11:00
Joakim Erdfelt eae38b4c28 Merge branch 'jetty-9.3.x' 2015-11-05 10:34:53 -07:00
Joakim Erdfelt c8ec399af2 Merge branch 'jetty-9.2.x' into jetty-9.3.x 2015-11-05 10:34:30 -07:00
Joakim Erdfelt 486e890d5d 481236 - Make ShutdownMonitor java security manager friendly 
+ Limit access to specific System properties
 2015-11-05 10:33:25 -07:00
Greg Wilkins fc9f42e11a Merge remote-tracking branch 'origin/jetty-9.3.x' 2015-11-05 18:39:04 +11:00
Greg Wilkins bd8f0b2dba 481418 ResourceHandler sets last modified 2015-11-05 08:52:03 +11:00
Greg Wilkins 8caef29126 481418 ResourceHandler sets last modified 2015-11-05 08:31:36 +11:00
Jan Bartel d5649e1d1b 481075 Session statistics are not accurate 2015-11-04 18:15:43 +11:00
Jan Bartel c63ef3e08b 481373 Corner cases where session may remain in JDBCSessionManager memory 2015-11-04 17:24:38 +11:00
Jan Bartel 06f3486b8d 481373 Corner cases where session may remain in JDBCSessionManager memory 2015-11-04 17:23:42 +11:00
Joakim Erdfelt 92cc44c1a3 Javadoc fix: HttpServletRequest#getPushBuilder() does not exist 
+ Fixing bad order (@throws, @param, @return) to correct order @param, @return, @throws
 2015-11-02 13:34:49 -07:00
Joakim Erdfelt 30888e134b Set what you test 2015-11-02 13:28:45 -07:00
Simone Bordet 5062756135 Merged branch 'jetty-9.3.x' into 'master'. 2015-11-02 12:17:00 +01:00
Simone Bordet 58027a3421 481225 - Secondary resources with query parameters are not properly pushed. 
Fixed by making PushCacheFilter remember the query parameters for
secondary resources, so that the PUSH_PROMISE frame can be correctly
generated with the query parameters.
 2015-11-02 11:37:17 +01:00
Greg Wilkins fa53b11850 fixed reset of DispatcherType 2015-10-30 10:35:37 +11:00
Greg Wilkins de7ac72cf4 Proxy TLS version 2015-10-29 19:32:38 +11:00
Greg Wilkins 9fe7332413 Implemented v2 of the ProxyConnection protocol 2015-10-29 16:45:50 +11:00
Greg Wilkins 5093aa3d40 Updated PushBuilder to draft for servlet 4.0 2015-10-28 17:33:38 +11:00
Greg Wilkins 36de309e9f 480162 - Continuations behavior differences due to HttpURI behavior 
Cleaned up handling of original URI
 2015-10-28 17:33:05 +11:00
Greg Wilkins 4ffe0d375e 480162 - Continuations behavior differences due to HttpURI behavior 
Only set scheme in SecureRequestCustomizer if not already set
 2015-10-28 16:04:34 +11:00
Jan Bartel 84239bc7f2 Start making unit tests work. 2015-10-23 16:52:05 +11:00
Jan Bartel c5489bd7b2 Renaming from temporary session.x package 2015-10-23 14:10:42 +11:00
Jan Bartel 305b7bb776 Hook up scavenging; implement HashSessionManager; add delete unrestorable sessions to session data stores 2015-10-23 11:43:12 +11:00
Greg Wilkins 7415163f59 Merge remote-tracking branch 'origin/jetty-9.3.x' 2015-10-21 17:47:58 +11:00
Greg Wilkins c156f6593c 480162 - Continuations behavior differences due to HttpURI behavior 
reverted 3e460dd219
added test clarifications
 2015-10-21 15:18:12 +11:00
Simone Bordet 5c8c590398 Merged branch 'jetty-9.3.x' into 'master'. 2015-10-20 23:23:25 +02:00
Joakim Erdfelt a01565fbc4 478757 - DebugHandler thread name is mangled 
+ Removing scheme check, now that HttpURI is sane
 2015-10-20 11:56:43 -07:00
Joakim Erdfelt 3e460dd219 480162 - Continuations behavior differences due to HttpURI behavior 
+ When fixing URI.absolute with authority, default to scheme 'http'
  (allowing things like SecureRequestCustomizer to change it again
   to 'https')
 2015-10-20 11:55:45 -07:00
Joakim Erdfelt 22573be353 Fixing format error on toString() 2015-10-20 11:28:19 -07:00
Joakim Erdfelt fae4f5d43f Merge branch 'jetty-9.3.x' 2015-10-19 11:59:44 -07:00
Joakim Erdfelt 8eda037de0 Merge branch 'jetty-9.3.x' of ssh://git.eclipse.org/gitroot/jetty/org.eclipse.jetty.project into jetty-9.3.x 2015-10-19 11:59:21 -07:00
Joakim Erdfelt 435ce8c3ab 478757 - DebugHandler thread name is mangled 
+ Replicating reopened bug with double-scheme https
  in testcase
+ Adding safety check for https in thread name determination
 2015-10-19 11:58:04 -07:00
Simone Bordet 964afc3020 Merged branch 'jetty-9.3.x' into 'master'. 2015-10-19 12:35:26 +02:00
Greg Wilkins 570c751ec8 479179 Fixed NPE from debug 2015-10-17 09:37:43 +11:00
Greg Wilkins cfeee5cec7 479903 - improve async onError handling 2015-10-16 14:51:57 +11:00
Joakim Erdfelt 28daeb912d Merge branch 'release-9.3.5' into jetty-9.3.x 2015-10-13 09:07:50 -07:00
Joakim Erdfelt 4dfd68b315 Merge branch 'jetty-9.3.x' 
Conflicts:
	aggregates/jetty-all-compact3/pom.xml
	aggregates/jetty-all/pom.xml
	apache-jsp/pom.xml
	apache-jstl/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
	examples/pom.xml
	jetty-alpn/jetty-alpn-client/pom.xml
	jetty-alpn/jetty-alpn-server/pom.xml
	jetty-alpn/pom.xml
	jetty-annotations/pom.xml
	jetty-ant/pom.xml
	jetty-cdi/cdi-core/pom.xml
	jetty-cdi/cdi-full-servlet/pom.xml
	jetty-cdi/cdi-servlet/pom.xml
	jetty-cdi/cdi-websocket/pom.xml
	jetty-cdi/pom.xml
	jetty-cdi/test-cdi-webapp/pom.xml
	jetty-client/pom.xml
	jetty-continuation/pom.xml
	jetty-deploy/pom.xml
	jetty-distribution/pom.xml
	jetty-fcgi/fcgi-client/pom.xml
	jetty-fcgi/fcgi-server/pom.xml
	jetty-fcgi/pom.xml
	jetty-http-spi/pom.xml
	jetty-http/pom.xml
	jetty-http2/http2-alpn-tests/pom.xml
	jetty-http2/http2-client/pom.xml
	jetty-http2/http2-common/pom.xml
	jetty-http2/http2-hpack/pom.xml
	jetty-http2/http2-http-client-transport/pom.xml
	jetty-http2/http2-server/pom.xml
	jetty-http2/pom.xml
	jetty-infinispan/pom.xml
	jetty-io/pom.xml
	jetty-jaas/pom.xml
	jetty-jaspi/pom.xml
	jetty-jmx/pom.xml
	jetty-jndi/pom.xml
	jetty-jspc-maven-plugin/pom.xml
	jetty-maven-plugin/pom.xml
	jetty-monitor/pom.xml
	jetty-nosql/pom.xml
	jetty-osgi/jetty-osgi-alpn/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-plus/pom.xml
	jetty-proxy/pom.xml
	jetty-quickstart/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-spring/pom.xml
	jetty-start/pom.xml
	jetty-util-ajax/pom.xml
	jetty-util/pom.xml
	jetty-webapp/pom.xml
	jetty-websocket/javax-websocket-client-impl/pom.xml
	jetty-websocket/javax-websocket-server-impl/pom.xml
	jetty-websocket/pom.xml
	jetty-websocket/websocket-api/pom.xml
	jetty-websocket/websocket-client/pom.xml
	jetty-websocket/websocket-common/pom.xml
	jetty-websocket/websocket-server/pom.xml
	jetty-websocket/websocket-servlet/pom.xml
	jetty-xml/pom.xml
	pom.xml
	tests/pom.xml
	tests/test-continuation/pom.xml
	tests/test-http-client-transport/pom.xml
	tests/test-integration/pom.xml
	tests/test-jmx/jmx-webapp-it/pom.xml
	tests/test-jmx/jmx-webapp/pom.xml
	tests/test-jmx/pom.xml
	tests/test-loginservice/pom.xml
	tests/test-quickstart/pom.xml
	tests/test-sessions/pom.xml
	tests/test-sessions/test-hash-sessions/pom.xml
	tests/test-sessions/test-infinispan-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-jaas-webapp/pom.xml
	tests/test-webapps/test-jetty-webapp/pom.xml
	tests/test-webapps/test-jndi-webapp/pom.xml
	tests/test-webapps/test-mock-resources/pom.xml
	tests/test-webapps/test-proxy-webapp/pom.xml
	tests/test-webapps/test-servlet-spec/pom.xml
	tests/test-webapps/test-servlet-spec/test-container-initializer/pom.xml
	tests/test-webapps/test-servlet-spec/test-spec-webapp/pom.xml
	tests/test-webapps/test-servlet-spec/test-web-fragment/pom.xml
	tests/test-webapps/test-webapp-rfc2616/pom.xml
 2015-10-13 08:53:35 -07:00
Joakim Erdfelt 29d63b41b1 Merge branch 'jetty-9.2.x' into jetty-9.3.x 
Conflicts:
	jetty-server/src/test/java/org/eclipse/jetty/server/ServerConnectorHttpServerTest.java
 2015-10-13 08:39:45 -07:00
Joakim Erdfelt b02783220e Renaming old 'SelectChannel*' test for new naming scheme 2015-10-13 08:10:16 -07:00
Joakim Erdfelt dde32787c4 Updating to version 9.3.6-SNAPSHOT 2015-10-12 15:47:37 -07:00
Joakim Erdfelt 29722bd880 Updating to version 9.3.5.v20151012 2015-10-12 15:10:39 -07:00
Jan Bartel d91fe48edc Finish scavenging impl for Hash and JDBC session mgmt. 2015-10-09 18:53:17 +11:00
Joakim Erdfelt 2cce7510e1 Updating to 9.3.5-SNAPSHOT 2015-10-08 17:49:09 -07:00
Greg Wilkins b1f963ae59 ForwardedFor module 2015-10-09 10:21:15 +11:00
Joakim Erdfelt 9cf0e34a1d Updating to version 9.4.0-SNAPSHOT 2015-10-07 15:41:32 -07:00
Joakim Erdfelt 37296bec3c Updating to version 9.3.4.v20151007 2015-10-07 14:58:38 -07:00
Joakim Erdfelt f2e0a46058 478752 - Clarify support for HttpServletRequest.upgrade() 
+ Indicating lack of upgrade() support with ServletException
 2015-10-07 14:40:01 -07:00
Jan Bartel e2ecf7ca14 More implementation. 2015-10-08 08:05:52 +11:00
Greg Wilkins 4d4ed7bbe2 478923 Add XML property for blockingTimeout 2015-10-06 09:14:19 +11:00
Joakim Erdfelt 5300f0c7f7 478757 - DebugHandler thread name is mangled 
+ Added testcase, and fixed handler for threadname output.
 2015-09-30 12:47:31 -07:00
Simone Bordet 90743d301a Improved toString(). 
Changes imported manually from branch 9.2.x.
 2015-09-29 12:06:01 +02:00
Simone Bordet 1f2f62cff4 Revert "Merged branch 'jetty-9.2.x' into 'master'." 
This reverts commit 701ca1aa26, reversing
changes made to 64ba5a6ef8.
 2015-09-29 11:31:56 +02:00
Simone Bordet 9549b32ea6 Revert "Merged branch 'jetty-9.2.x' into 'master'." 
This reverts commit db61fc2a47.
 2015-09-29 11:31:03 +02:00
Simone Bordet db61fc2a47 Merged branch 'jetty-9.2.x' into 'master'. 2015-09-29 09:43:12 +02:00
Simone Bordet 701ca1aa26 Merged branch 'jetty-9.2.x' into 'master'. 2015-09-29 09:42:28 +02:00
Simone Bordet fd5c5b5779 Improved toString(). 2015-09-28 19:23:50 +02:00
Joakim Erdfelt 58203893b6 Fixing javadoc 2015-09-25 09:49:29 -07:00
Greg Wilkins 007ac4a9dd 478372 - JavaUtilLog setSourceClass and setSourceMethod 
Added some additional features to configure the java.util.logging mechansim
 2015-09-25 14:08:31 +10:00
Jan Bartel 06fbf447fb 478247 WebappClassLoader pinned after redeploy 2015-09-24 14:03:37 +10:00
Simone Bordet 460673f04b 477890 - Overwhelmed HTTP/2 server discards data. 
HttpInput was using a bounded ArrayQueue with max capacity 64.
The queue was overflowing if there were more than 64 reads within the
flow control window capacity.

Fixed by replacing the ArrayQueue with ArrayDeque, which is unbounded.
 2015-09-21 09:34:15 +02:00
Greg Wilkins 269ac1a44e 477737 Improve handling of etags with dynamic and static gzip 
Fixed spin on --gzip etag
 2015-09-18 14:54:07 +10:00
Greg Wilkins 67aee72bdd 477680 Encode merged query parameters 2015-09-18 13:19:00 +10:00
Greg Wilkins 99f4ed7352 477737 Improve handling of etags with dynamic and static gzip 2015-09-18 12:30:02 +10:00
Simone Bordet 014d021618 Removed unnecessary test condition. 2015-09-18 01:46:46 +02:00
Greg Wilkins 2d88fdf386 477278 Refactored DefaultServlet for cached Gzip & Etags 
Refactored the DefaultServlet to better handle static gzipped files with etags in the cache.
Required a simplification of always having a HttpContent rather than the prior situation of
having either a Resource or a HttpContent.  So introduced a HttpContent.Factory, of which
the ResourceCache is the normal implementation, but there is also now a ResourceContentFactory
that creates content when there is no cache.

The Gzip resource is now associated with the normal resource, so less lookups are needed.
This also give scope for caching dynamic gzipping in the future.

The GzipHttpContent class has been introduced to send content with the headers of the
uncompress, but content of the compressed resource.
 2015-09-17 18:19:58 +10:00
Jan Bartel 03a601f2b2 477385 Make jetty osgi manifests only resolve jetty packages against a single distro version 2015-09-16 19:13:47 +10:00
Jan Bartel fa8232d3c8 More implementation 2015-09-11 19:52:05 +10:00
Greg Wilkins 02c5ea30be 477123 - AsyncListener callbacks need context scope 
Also added DebugListener and deprecated DebugHandler
 2015-09-11 12:06:23 +10:00
Jan Bartel 79ce5db312 Using SessionKey class 2015-09-10 10:46:43 +10:00
Jan Bartel bf2a1fa29e Merge remote-tracking branch 'origin/master' into session-refactor 2015-09-09 16:13:10 +10:00
Jan Bartel 3e3bfb9d6b Does not compile, draft of changes. 2015-09-04 12:07:24 +10:00
Joakim Erdfelt 49c927974b Javadoc fix 2015-09-02 09:26:12 -07:00
Jesse McConnell 6409366499 [maven-release-plugin] prepare for next development iteration 2015-08-27 10:11:29 -05:00
Jesse McConnell 3086adc965 [maven-release-plugin] prepare release jetty-9.3.3.v20150827 2015-08-27 10:11:21 -05:00
Jesse McConnell f5d1fb1058 Merge branch 'master' into release-9.3.3 2015-08-27 08:31:22 -05:00
Simone Bordet bee5437bad 475927 - SecureRequestCustomizer fails to match host. 
Cosmetic changes during review.
 2015-08-27 11:14:33 +02:00
Jan Bartel c45cd8ce03 Partial refactoring - does not yet compile. 2015-08-27 18:03:44 +10:00
Greg Wilkins 8070ce61f3 475927 - SecureRequestCustomizer fails to match host. 
Moved host and wildcard to new X509 class
 2015-08-27 12:25:52 +10:00
Simone Bordet 7057dae67b 475927 - SecureRequestCustomizer fails to match host. 
Fixed by storing in the SSLSession the SNI names correspondent to the
alias that was selected when the TLS connection was initiated.
 2015-08-26 20:36:43 +02:00
Simone Bordet 874300472e Do not hardcode the "http" scheme, but use that of the request. 2015-08-26 11:58:18 +02:00
Jesse McConnell f8734f23ce [maven-release-plugin] prepare for next development iteration 2015-08-25 14:10:01 -05:00
Jesse McConnell e9edf4c24b [maven-release-plugin] prepare release jetty-9.3.3.v20150825 2015-08-25 14:09:54 -05:00
Simone Bordet bfeb7f56a6 Closing the connection also in case the parser is in CLOSED state. 
When the request is fully read and the response is sent, the parser
may enter the CLOSE state if there were Connection: close headers.

It may happen that later the connection reads -1, then moves the
parser is CLOSED state, so the condition to close the connection must
include the CLOSED state.
 2015-08-20 18:23:55 +02:00
Greg Wilkins d44ba7e24a Improved Context pluggability 2015-08-19 16:28:36 +10:00
Greg Wilkins 2cc663685a ContextHandler.ContextScopeListener 
Added a listener that is called as any thread enters/exits a context/request scope. This is
both normal servlet dispatches and async callbacks.
 2015-08-19 15:30:52 +10:00
Greg Wilkins afda638dd9 474685 - GzipHandler configuration supports csv paths and mimetypes. 
readded for backward compatibility, but with a warning it will be removed.
 2015-08-19 09:39:38 +10:00
Simone Bordet 805ec9554c 475195 - SNI matching fails when keystore does not contain wild certificates. 
Fixed condition in SslContextFactory.getKeyManagers() that installs
the SniX509ExtendedKeyManager.

Miscellaneous code cleanups.
 2015-08-17 20:55:20 +02:00
Simone Bordet b96f2f5b24 474634 - AsyncListener.onError() handling. 
Simplified exception handling, making sure that we terminate the
handling even in case the state was COMPLETING but the container
could not write the response.
 2015-08-14 14:48:51 -07:00
Simone Bordet b819273c7b 474634 - AsyncListener.onError() handling. 
Refactored continuation tests.
 2015-08-14 14:48:51 -07:00
Greg Wilkins 946b1476f8 474634 - AsyncListener.onError() handling. 
reverted onComplete behaviour
 2015-08-14 12:24:06 +10:00
Greg Wilkins d780839bec 474634 - AsyncListener.onError() handling. 
Added HttpConfiguration.maxErrorDispatches to detect error loops
Fixed ManyWays... unit test to handle error dispatch.
 2015-08-14 10:06:57 +10:00
Greg Wilkins 9b9b9524dc 474634 - AsyncListener.onError() handling. 
Allow IOException from complete flush to goto an onError call.
 2015-08-13 19:09:57 +10:00
Greg Wilkins 8c0e4f53d3 474634 - AsyncListener.onError() handling. 
Fixed AsyncContextTests
 2015-08-13 18:12:38 +10:00
Greg Wilkins f21ea15725 474634 - AsyncListener.onError() handling. 
Handle errors thrown from dispatch when async is started with onError
 2015-08-13 18:06:14 +10:00
Greg Wilkins d1aa9ce993 474634 - AsyncListener.onError() handling. 
Removed special termination case handling. Unhandle can be avoided with a break loop.
Replaced actions COMPLETING and COMPLETED with COMPLETE (which is an action)

Refactored test harness to use a static history array rather than headers
 2015-08-13 16:22:02 +10:00
Simone Bordet 79086f3fe3 474634 - AsyncListener.onError() handling. 
Interim work on getting the right behavior for onError().
 2015-08-13 01:33:28 +02:00
Joakim Erdfelt 791896339d Fixing javadoc 2015-08-12 14:22:53 -07:00
Simone Bordet 4c7d5f661e Fixed import error. 2015-08-11 12:32:27 +02:00
Simone Bordet aa684a5dcc 470311 - Introduce a proxy-protocol module. 
Support for the PROXY protocol is now enabled via 2 new modules:
proxy-protocol and proxy-protocol-ssl, respectively for the HTTP
connector and the SSL connector.
 2015-08-11 12:17:24 +02:00
Joakim Erdfelt 9ca235beca Revert "474618 - AsyncListener.onComplete not called when error occurs" 
This reverts commit 60f409e4ff.
 2015-08-10 09:38:40 -07:00
Joakim Erdfelt 60f409e4ff 474618 - AsyncListener.onComplete not called when error occurs 2015-08-10 07:56:14 -07:00
Joakim Erdfelt b522dd7fe2 474617 - AsyncListener.onError not called for errors 
+ Making onError call correctly
 2015-08-10 07:53:56 -07:00
Greg Wilkins 98f8852b51 more robust testharness for graceful stop 2015-08-05 15:44:46 +10:00
Greg Wilkins 4939854893 473321 - Overriding SSL context KeyStoreType requires explicit override of TrustStoreType 2015-08-05 14:58:08 +10:00
Joakim Erdfelt a3684f7fb8 [maven-release-plugin] prepare for next development iteration 2015-07-30 09:47:57 -07:00
Joakim Erdfelt 798fc8118b [maven-release-plugin] prepare release jetty-9.2.13.v20150730 2015-07-30 09:47:48 -07:00
Joakim Erdfelt 4b3879845d [maven-release-plugin] prepare for next development iteration 2015-07-30 07:02:10 -07:00
Joakim Erdfelt 6b7e9ac4b0 [maven-release-plugin] prepare release jetty-9.3.2.v20150730 2015-07-30 07:02:02 -07:00
Greg Wilkins 5aa5a4e525 fixed accidental NPE on Context logger 2015-07-30 18:50:04 +10:00
Greg Wilkins a568ee6f17 473832 SslConnection flips back buffers on handshake exception 2015-07-30 11:52:31 +10:00
Greg Wilkins 4a727a7f08 472974 Improved StatisticsHandler 503 generation 2015-07-30 11:24:30 +10:00
Greg Wilkins df6b935b94 470351 Fixed SNI matching of wildcard certificates 2015-07-23 19:49:06 +10:00
Greg Wilkins e1827f659e Ignore read/write timeout tests 2015-07-23 19:47:40 +10:00
Greg Wilkins ea7c0fed30 implemented ServletContext.getVersionServerName 2015-07-23 19:46:51 +10:00
Greg Wilkins 830b126e43 Fixed javadoc errors 2015-07-23 09:35:38 +10:00
Joakim Erdfelt fa92938243 Fixing javadoc errors 2015-07-22 10:22:39 -07:00
Greg Wilkins 607239028c 470727 - Thread Starvation of selector wakeups. 
Changed the CallBack.NonBlocking to a default Callback.isNonBlocking, so that wrapping callbacks can determine if they are NonBlocking or not.
 2015-07-22 17:31:54 +10:00
Jesse McConnell 4b8a6e584f Merge branch 'release-9.3.1' 2015-07-17 12:10:49 -05:00
Greg Wilkins 54995452d6 472931 - HttpConfiguration copy constructor incomplete 2015-07-17 23:50:39 +10:00
Greg Wilkins edc8bae556 472781 - GzipHandler isMimeTypeGzipable() bad logic 
Added utility classes:

  IncludeExclude  - handles standard include exclude set
  RegexSet        - A set of regular expressions that have a combined compiled pattern
  PathMap.PathSet - A set of standard path mappings
 2015-07-17 16:28:48 +10:00
Greg Wilkins 9ee4b64e89 472781, 472782 Improve GzipHandler Include/Exclude handling 
Fixed javadoc
 2015-07-17 11:54:18 +10:00
Greg Wilkins de39bf5227 472781, 472782 Improve GzipHandler Include/Exclude handling 
Made a common utility class for include/exclude handling
Use path exclusion rather than mime exclusion for svg
 2015-07-17 08:11:11 +10:00
Greg Wilkins deba2f0d6a 472621 - Unjustified timeout when serving static content 
Created HttpConfiguration.setBlockingTimeout as a new timeout to apply to the total read/write operation.
Default is -1, which is no overall timeout and only the idle timeout will apply.
 2015-07-15 17:09:18 +10:00
Jesse McConnell 9b790c38ce [maven-release-plugin] prepare for next development iteration 2015-07-14 11:42:34 -05:00
Jesse McConnell b35d32f2b8 [maven-release-plugin] prepare release jetty-9.3.1.v20150714 2015-07-14 11:42:28 -05:00
Greg Wilkins c2615d5fbd 472411 - PathResource.checkAliasPath typo 2015-07-12 21:33:15 +10:00
Greg Wilkins 2c3326e049 Improved graceful shutdown and added tests 2015-07-12 21:32:38 +10:00
Jan Bartel 325c65a6cb 464745 Remove @org.apache.xbean.XBean references 2015-07-10 18:14:02 +10:00
Jesse McConnell 7204707902 [maven-release-plugin] prepare for next development iteration 2015-07-09 12:14:38 -05:00
Jesse McConnell 3b1533673e [maven-release-plugin] prepare release jetty-9.2.12.v20150709 2015-07-09 12:14:30 -05:00
Greg Wilkins a9dd6ec676 fixed header 2015-07-02 17:24:37 +10:00
Greg Wilkins 04062a8383 Improved graceful shutdown and added tests 2015-07-02 16:57:56 +10:00
John Myers 2d0bedd9bf [Bug 470664] Handle multiple RequestLogHandler in chain 
Signed-off-by: John Myers <jgmyers@proofpoint.com>
Change-Id: Iff4d80957f43ddeafc212500cf912ae9c928b261
 2015-07-02 01:57:26 -04:00
Greg Wilkins 75f74ff76f 471251 - Improved debugging on async timeout 2015-07-02 15:53:52 +10:00
Greg Wilkins ca8ba1c080 471251 - Improved debugging on async timeout 2015-07-02 08:01:03 +10:00
Greg Wilkins 8d869bf88b 470727 - Thread Starvation with EWYK 
Implemented NonBlockingCallbacks and fallback to PEC scheduling
 2015-07-01 17:21:53 +10:00
Greg Wilkins 13ce021e5e 471464 - Parsing issues with HttpURI 
Fixed parsing of CONNECT URIs
 2015-07-01 15:50:31 +10:00
Joakim Erdfelt 7ebbe58c81 Fixing javadoc 2015-06-25 08:58:57 -07:00
Jan Bartel 3ac6a727cf 470803 If a webapp is not fully started do not fully stop it 2015-06-25 18:29:51 +10:00
Greg Wilkins 07c81d6ec7 Bug: 470790 Fixed alias checking of symlinked directories 2015-06-24 12:28:50 +10:00
Greg Wilkins 814000531f Bug: 447781 Allow additional methods to be x-www-form-encoded 
Added configuration to the HttpConfiguration class to allow additional methods to be set as
acceptable for x-www-form-encoding.
 2015-06-24 11:45:44 +10:00
Greg Wilkins 3e401a62e9 StringUtil.csvSplit(String) 2015-06-19 16:48:53 +10:00
Greg Wilkins b0a3c7c5ea Simplified ManagedAttribute mechanism 2015-06-19 15:24:06 +10:00
Greg Wilkins 1a572c3236 improved Dump 2015-06-18 17:24:06 +10:00
Jesse McConnell 60e45a940e [maven-release-plugin] prepare for next development iteration 2015-06-15 15:34:11 -05:00
Jesse McConnell d3dec8d513 [maven-release-plugin] prepare release jetty-9.2.12.M0 2015-06-15 15:34:03 -05:00
Joakim Erdfelt cf6c4a914e Updating version to 9.3.1-SNAPSHOT 2015-06-15 10:25:49 -07:00
Joakim Erdfelt 1a9da9f9e4 Updating versions to 9.3.0.v20150612 2015-06-12 09:34:24 -07:00
Joakim Erdfelt c6ac82f50b Merge branch 'master' into release-9.3 2015-06-12 09:30:46 -07:00
Joakim Erdfelt c20c5a2bed Jetty SSL distribution default port is 8443 (XML is now source of default) 2015-06-12 09:24:24 -07:00
Joakim Erdfelt 7c737a587b Removing [version] sections in modules 2015-06-12 09:14:34 -07:00
Joakim Erdfelt 496b4dfc83 [maven-release-plugin] prepare for next development iteration 2015-06-11 15:08:36 -07:00
Joakim Erdfelt f53c5d8fac [maven-release-plugin] prepare release jetty-9.3.0.v20150611 2015-06-11 15:08:29 -07:00
Joakim Erdfelt 1f24d44987 469341 - Not possible to use old/deprecated start properties 
+ Distribution default is 8080, based on the XML
 2015-06-11 12:58:48 -07:00
Joakim Erdfelt b670b9e47d Merge branch 'master' into bugs/469860 
Conflicts:
	jetty-start/src/main/java/org/eclipse/jetty/start/StartArgs.java
	jetty-start/src/test/resources/assert-home-with-http2.txt
 2015-06-11 06:57:16 -07:00
Greg Wilkins cd420d7db5 465118 Fixed GzipHandler handling of multiple closes 2015-06-11 12:39:03 +10:00
Joakim Erdfelt 916efd6aa7 469860 - Add module metadata versioning to support backwards compat 
+ Adding [version] section to all existing jetty 9.3 distro modules
+ Updating testcases in jetty-start with new [version] sections too
+ Adding extra testcases for versioned modules
 2015-06-10 10:59:18 -07:00
Greg Wilkins 8c89f141ab Revert "469341 - Not possible to use old/deprecated start properties" 
This reverts commit fcd0a3b270.

Port 80 is the HTTP default
 2015-06-10 13:42:43 +10:00
Joakim Erdfelt fcd0a3b270 469341 - Not possible to use old/deprecated start properties 
+ Using xml for defaults, not the modules/ini section
 2015-06-09 16:35:02 -07:00
Greg Wilkins 5ae9614d11 [469688] Added configuration for keystore type and provider 2015-06-10 08:46:57 +10:00
Simone Bordet b18adb525f 469633 - Make SpinLock behavior pluggable. 
Renamed SpinLock to Locker, uses ReentrantLock by default, but can be
turned into a spin lock by setting the system property
org.eclipse.jetty.util.thread.Locker.spin=true.
 2015-06-08 17:15:54 +02:00
Jesse McConnell bfe6c2638e [maven-release-plugin] prepare for next development iteration 2015-05-29 09:06:42 -05:00
Jesse McConnell 71e0f4d8ce [maven-release-plugin] prepare release jetty-9.2.11.v20150529 2015-05-29 09:06:36 -05:00
Greg Wilkins 69bf5ab46c Merge remote-tracking branch 'origin/jetty-9.2.x' 
Conflicts:
	jetty-http-spi/src/main/java/org/eclipse/jetty/http/spi/HttpSpiContextHandler.java
	jetty-server/src/main/java/org/eclipse/jetty/server/handler/ErrorHandler.java
	jetty-websocket/websocket-server/src/main/java/org/eclipse/jetty/websocket/server/WebSocketServerFactory.java
 2015-05-29 21:05:26 +10:00
Greg Wilkins 4472b614b9 468747 - XSS vulnerability in HttpSpiContextHandler 2015-05-29 20:12:57 +10:00
Jesse McConnell a7087cbfbf [maven-release-plugin] prepare for next development iteration 2015-05-28 10:06:51 -05:00
Jesse McConnell 913c63e597 [maven-release-plugin] prepare release jetty-9.2.11.v20150528 2015-05-28 10:03:44 -05:00
Simone Bordet 6cabf8452e 468347 - Fix modules/debuglog.mod. 2015-05-26 18:22:22 +02:00
Greg Wilkins b2e8d2cd04 minor optimisations 2015-05-22 22:53:01 +10:00
Greg Wilkins 4028df12ca Merge remote-tracking branch 'origin/jetty-9.2.x' 
Conflicts:
	jetty-server/src/main/java/org/eclipse/jetty/server/handler/gzip/GzipHttpOutputInterceptor.java
 2015-05-22 10:50:33 +10:00
Greg Wilkins 68412d1958 Merge remote-tracking branch 'origin/jetty-9.2.x' 2015-05-22 10:01:04 +10:00
Greg Wilkins 5bde7f34ea 467936 -w Check HttpOutput aggregateSize is < bufferSize 2015-05-22 09:56:51 +10:00
Greg Wilkins ff15aa4a5c Added optional http2 to https for ALPN ordering 2015-05-21 00:38:07 +10:00
Greg Wilkins 3f0fd550dc 467702 - SslContextFactory not backward compatible 2015-05-20 22:20:33 +10:00
Simone Bordet b844bdde0b Removed leftover configuration that was forgotten there. 2015-05-20 11:06:44 +02:00
Greg Wilkins 02a1350965 abstracted AbstractHandler setServer 2015-05-20 11:21:55 +10:00
Greg Wilkins c5e4abd792 467281 Remove Java 1.7 support from Jetty 9.3 2015-05-14 09:31:50 +10:00
Simone Bordet 61f6763a68 Removed example syntax leftovers. 2015-05-12 10:57:04 +02:00
Simone Bordet 1a2eca098a Fixed XML's <Ref> elements to use refid instead of id. 2015-05-12 08:55:17 +02:00
Jan Bartel fe0bbe8e2f Add scavenge interval property to jdbc-sessions.mod 2015-05-08 14:03:16 +10:00
Greg Wilkins f1f6c67acf fixed typo 2015-05-08 13:29:39 +10:00
Greg Wilkins 6428718962 457788 Powered By in o.e.j.util.Jetty conditional on sendServerVersion 
moved conditional to HttpConfiguration
 2015-05-08 09:44:19 +10:00
Jan Bartel 532b0019cc 466678 Make a .mod file for jdbc session management 2015-05-07 17:10:31 +10:00