Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ PR reviewers will take into account the following aspects when reviewing your PR
- code style: keep your code style consistent with the classes you are editing, such as variable names, ordering of methods, etc
- scope of the fix: this is a very important factor. Sometimes, the fix should be applied to a broader range of classes, such as a bug that repeats itself in other parts of the code. Other times, the PR solves a bug only partially, because the bug has a broader impact than initially evaluated.
- is the proposed fix the best approach for the Jira at hand?
- backwards compatibility: we must prevent any PR that breaks compatibility with previous versions. If the PR| does so, it could still be okay, but this should be clearly documented it will probably be discussed by the project maintainers before being merged
- backwards compatibility: we must prevent any PR that breaks compatibility with previous versions. If the PR does so, it could still be okay, but this should be clearly documented it will probably be discussed by the project maintainers before being merged
- security impact: it is critical to evaluate if the PR has any sort of security impact, preventing the addition of exploitable flaws.

Your PR will be classified by the reviewer with one or more of the following labels: **bug fix**, **enhancement**, **new feature/API change**, and **dependency upgrade**.
Expand Down Expand Up @@ -82,7 +82,7 @@ Fork https://github.com/undertow-io/undertow into your GitHub account.

```bash
git clone [email protected]:[your username]/undertow.git
cd console
cd undertow
```

### Add a remote reference to upstream
Expand Down Expand Up @@ -209,7 +209,7 @@ It is a good practice to create a backup of your original branch in case you end
reload your original fix (the GitHub remote origin account containing the PR can serve this purpose, as long as you don't
overwrite it with a broken branch).

Once you are satisfied if your commits, run the tests again with `mvn clean verify`. Finally, check the changes your are going
Once you are satisfied with your commits, run the tests again with `mvn clean verify`. Finally, check the changes you are going
to push to origin are really okay with:

```bash
Expand Down
4 changes: 2 additions & 2 deletions core/src/main/java/io/undertow/UndertowOptions.java
Original file line number Diff line number Diff line change
Expand Up @@ -474,13 +474,13 @@ public class UndertowOptions {


/**
* Configure a read timeout for a web socket, in milliseconds. If its present it will override {@link org.xnio.Options#READ_TIMEOUT}. If the given amount of time elapses without
* Configure a read timeout for a web socket, in milliseconds. If it's present it will override {@link org.xnio.Options#READ_TIMEOUT}. If the given amount of time elapses without
* a successful read taking place, the socket's next read will throw a {@link ReadTimeoutException}.
*/
public static final Option<Integer> WEB_SOCKETS_READ_TIMEOUT = Option.simple(Options.class, "WEB_SOCKETS_READ_TIMEOUT", Integer.class);

/**
* Configure a write timeout for a web socket, in milliseconds. If its present it will override {@link org.xnio.Options#WRITE_TIMEOUT}. If the given amount of time elapses without
* Configure a write timeout for a web socket, in milliseconds. If it's present it will override {@link org.xnio.Options#WRITE_TIMEOUT}. If the given amount of time elapses without
* a successful write taking place, the socket's next write will throw a {@link WriteTimeoutException}.
*/
public static final Option<Integer> WEB_SOCKETS_WRITE_TIMEOUT = Option.simple(Options.class, "WEB_SOCKETS_WRITE_TIMEOUT", Integer.class);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ public Http2PriorityTree() {
}

/**
* Resisters a stream, with its dependency and dependent information
* Registers a stream, with its dependency and dependent information
* @param streamId The stream id
* @param dependency The stream this stream depends on, if no stream is specified this should be zero
* @param weighting The weighting. If no weighting is specified this should be 16
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@
* {@link HttpHandler} responsible for setting up the {@link AuthenticatedSessionManager} for cached authentications and
* registering a {@link NotificationReceiver} to receive the security notifications.
* <p>
* This handler also forces the session to change its session ID on sucessful authentication.
* This handler also forces the session to change its session ID on successful authentication.
*
* @author <a href="mailto:[email protected]">Darran Lofthouse</a>
*/
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -361,7 +361,7 @@ static Node parse(final String string, Deque<Token> tokens, boolean topLevel) {
break;
} else if(token.getToken().equals("\n") || token.getToken().equals(";")) {
if(token.getToken().equals(";") && tokens.peek()!=null && tokens.peek().getToken().equals(ELSE)) {
// something() -> predicate; ELSE predicate; - dont end processing since its followed by ELSE and its singular block
// something() -> predicate; ELSE predicate; - don't end processing since it's followed by ELSE and it's singular block
continue;
} else if (token.getToken().equals("\n") && tokens.peek() != null && isOperator(tokens.peek().getToken())) {
// predicate
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ public class DirectBufferCache {
*/
public static final int MAX_AGE_NO_CACHING = 0;
/**
* Mage age -1, entries dont expire
* Max age -1, entries don't expire
*/
public static final int MAX_AGE_NO_EXPIRY = -1;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ public class LRUCache<K, V> {
*/
public static final int MAX_AGE_NO_CACHING = 0;
/**
* Mage age -1, entries dont expire
* Max age -1, entries don't expire
*/
public static final int MAX_AGE_NO_EXPIRY = -1;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ public class CachingResourceManager implements ResourceManager {
*/
public static final int MAX_AGE_NO_CACHING = LRUCache.MAX_AGE_NO_CACHING;
/**
* Mage age -1, this force manager to retain entries until underlying resource manager indicate that entries expired/changed
* Max age -1, this forces manager to retain entries until underlying resource manager indicates that entries expired/changed
*/
public static final int MAX_AGE_NO_EXPIRY = LRUCache.MAX_AGE_NO_EXPIRY;
/**
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -494,7 +494,7 @@ public <T> void addToAttachmentList(AttachmentKey<AttachmentList<T>> key, T valu
public interface EventCallback {

/**
* Notification that is called when a message is sucessfully sent
* Notification that is called when a message is successfully sent
*
* @param connection The connection
* @param data The message data
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@
import static java.nio.charset.StandardCharsets.ISO_8859_1;

/**
* The recieve listener for a Http2 connection.
* The receive listener for a Http2 connection.
* <p>
* A new instance is created per connection.
*
Expand Down
2 changes: 1 addition & 1 deletion core/src/main/java/io/undertow/util/Cookies.java
Original file line number Diff line number Diff line change
Expand Up @@ -470,7 +470,7 @@ public static void assembleCrumbs(final HeaderMap headerMap) {
public static void disperseCrumbs(final HeaderMap headerMap) {
final HeaderValues cookieValues = headerMap.get(Headers.COOKIE);
// NOTE: If cookies are up2standard, thats the only case
// otherwise something is up, dont touch it
// otherwise something is up, don't touch it
if (cookieValues != null && cookieValues.size() == 1) {
if (cookieValues.getFirst().contains(CRUMB_SEPARATOR)) {
final String[] cookieJar = cookieValues.getFirst().split(CRUMB_SEPARATOR);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -429,7 +429,7 @@ private static byte[] encode3to4(byte[] b4, byte[] threeBytes, int numSigBytes,
* Encodes up to three bytes of the array <var>source</var> and writes the resulting four Base64 bytes to
* <var>destination</var>. The source and destination arrays can be manipulated anywhere along their length by specifying
* <var>srcOffset</var> and <var>destOffset</var>. This method does not check to make sure your arrays are large enough to
* accomodate <var>srcOffset</var> + 3 for the <var>source</var> array or <var>destOffset</var> + 4 for the
* accommodate <var>srcOffset</var> + 3 for the <var>source</var> array or <var>destOffset</var> + 4 for the
* <var>destination</var> array. The actual number of significant bytes in your array is given by <var>numSigBytes</var>.
* </p>
* <p>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -102,7 +102,7 @@ public interface Deployment {
/**
* Attempts to add a servlet mapping using {@link jakarta.servlet.ServletRegistration#addMapping(String...)}
*
* @return true if the addition was sucessful
* @return true if the addition was successful
*/
Set<String> tryAddServletMappings(ServletInfo servletInfo, String... urlPatterns);

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@
* {@link HttpHandler} responsible for setting up the {@link AuthenticatedSessionManager} for cached authentications and
* registering a {@link NotificationReceiver} to receive the security notifications.
*
* This handler also forces the session to change its session ID on sucessful authentication.
* This handler also forces the session to change its session ID on successful authentication.
*
* @author <a href="mailto:[email protected]">Darran Lofthouse</a>
*/
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@

/**
*
* Test that separate servlet deployments use seperate session managers, even if one is broken.
* Test that separate servlet deployments use separate session managers, even if one is broken.
*
* @author Stuart Douglas
*/
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@

/**
*
* Test that separate servlet deployments use seperate session managers, even in the presence of forwards,
* Test that separate servlet deployments use separate session managers, even in the presence of forwards,
* and that sessions created in a forwarded context are accessible to later direct requests
*
* @author Stuart Douglas
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@

/**
*
* Test that separate servlet deployments use seperate session managers, even in the presence of forwards,
* Test that separate servlet deployments use separate session managers, even in the presence of forwards,
* and that sessions created in a forwarded context are accessible to later direct requests
*
* @author Stuart Douglas
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -590,7 +590,7 @@ public Set<Extension> getInstalledExtensions() {
* Runs a web socket invocation, setting up the threads and dispatching a thread pool
* <p>
* Unfortunately we need to dispatch to a thread pool, because there is a good chance that the endpoint
* will use blocking IO methods. We suspend recieves while this is in progress, to make sure that we do not have multiple
* will use blocking IO methods. We suspend receives while this is in progress, to make sure that we do not have multiple
* methods invoked at once.
* <p>
*
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -141,7 +141,7 @@ public synchronized void removeMessageHandler(MessageHandler messageHandler) {
}

/**
* sets the recieve listener This should only be used for annotated endpoints.
* sets the receive listener This should only be used for annotated endpoints.
*
* @param handler The handler
*/
Expand Down Expand Up @@ -204,7 +204,7 @@ public void closeInternal(CloseReason closeReason) throws IOException {
try {
try {
if (!webSocketChannel.isCloseFrameReceived() && !webSocketChannel.isCloseFrameSent()) {
//if we have already recieved a close frame then the close frame handler
//if we have already received a close frame then the close frame handler
//will deal with sending back the reason message
if (closeReason == null || closeReason.getCloseCode().getCode() == CloseReason.CloseCodes.NO_STATUS_CODE.getCode()) {
webSocketChannel.sendClose();
Expand Down