Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix: Only map websockets to servlet path and not any sub paths #14638

Merged
merged 5 commits into from
Sep 28, 2022
Merged

fix: Only map websockets to servlet path and not any sub paths #14638

merged 5 commits into from
Sep 28, 2022

Conversation

Artur-
Copy link
Member

@Artur- Artur- commented Sep 26, 2022

Allows other websockets to work, especially when Vaadin is root mapped

@Artur-
fix: Only map websockets to servlet path and not any sub paths
c189977 
Allows other websockets to work, especially when Vaadin is root mapped
@Artur- Artur- mentioned this pull request Sep 26, 2022
Closed
@vaadin-bot vaadin-bot added +0.1.0 and removed +0.0.1 labels Sep 26, 2022
@MarcinVaadin MarcinVaadin mentioned this pull request Sep 26, 2022
Closed
@github-actions
Copy link

github-actions bot commented Sep 26, 2022 •
edited
Loading

Unit Test Results

   948 files  +5     948 suites  +5   52m 2s ⏱️ -1s
6 051 tests +1  5 998 ✔️ +1  53 💤 ±0  0 ❌ ±0 
6 308 runs  +9  6 247 ✔️ +9  61 💤 ±0  0 ❌ ±0 

Results for commit cf2e0ce. ± Comparison against base commit dac96ba.

♻️ This comment has been updated with latest results.

@Artur- Artur- marked this pull request as ready for review September 26, 2022 10:08
@HawkSK
Copy link

HawkSK commented Sep 27, 2022

Is this fix going to be released also in +0.0.1 (the label was removed)? Because it should be, the problem did not happen in 23.1.1, so this is a fix for 23.2.x. Also, it's a blocker in using 23.2.0.

@vaadin-bot vaadin-bot added +0.0.1 and removed +0.1.0 labels Sep 27, 2022
MarcinVaadin
MarcinVaadin previously approved these changes Sep 27, 2022
View reviewed changes
@vaadin-bot vaadin-bot added +0.1.0 and removed +0.0.1 labels Sep 27, 2022
@vaadin-bot vaadin-bot added +0.0.1 and removed +0.1.0 labels Sep 28, 2022
@sonarcloud
Copy link

sonarcloud bot commented Sep 28, 2022

Kudos, SonarCloud Quality Gate passed!    Quality Gate passed

Bug A 0 Bugs
Vulnerability A 0 Vulnerabilities
Security Hotspot A 0 Security Hotspots
Code Smell A 0 Code Smells

No Coverage information No Coverage information
0.0% 0.0% Duplication

@MarcinVaadin
Copy link
Member

MarcinVaadin commented Sep 28, 2022 •
edited
Loading

I'm merging this PR although please have in mind that is not the final solution - see #14641

@MarcinVaadin MarcinVaadin merged commit f4c7497 into master Sep 28, 2022
@MarcinVaadin MarcinVaadin deleted the websocket-servlet-path-only branch September 28, 2022 11:16
@vaadin-bot
Copy link
Collaborator

Hi @Artur- and @MarcinVaadin, when i performed cherry-pick to this commit to 23.2, i have encountered the following issue. Can you take a look and pick it manually?
Error Message:
Error: Command failed: git cherry-pick f4c7497
error: could not apply f4c7497... fix: Only map websockets to servlet path and not any sub paths (#14638)
hint: After resolving the conflicts, mark them with
hint: "git add/rm ", then run
hint: "git cherry-pick --continue".
hint: You can instead skip this commit with "git cherry-pick --skip".
hint: To abort and get back to the state before "git cherry-pick",
hint: run "git cherry-pick --abort".

MarcinVaadin pushed a commit that referenced this pull request Sep 28, 2022
@Artur- @MarcinVaadin
fix: Only map websockets to servlet path and not any sub paths (#14638)
5ea915f 
(cherry picked from commit f4c7497)
mcollovati pushed a commit that referenced this pull request Sep 29, 2022
@MarcinVaadin @Artur-
fix: Only map websockets to servlet path and not any sub paths (#14638)…
30e23a9 
… (#14676)

(cherry picked from commit f4c7497)

Co-authored-by: Artur <artur@vaadin.com>
MarcinVaadin pushed a commit that referenced this pull request Sep 29, 2022
@Artur- @MarcinVaadin
fix: Only map websockets to servlet path and not any sub paths (#14638)
1f0c797 
* fix: Only map websockets to servlet path and not any sub paths

(cherry picked from commit f4c7497)
@MarcinVaadin MarcinVaadin mentioned this pull request Oct 3, 2022
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@mcollovati mcollovati mcollovati approved these changes

@MarcinVaadin MarcinVaadin MarcinVaadin left review comments

Assignees
No one assigned
Labels
cherry-picked-23.2 +0.0.1
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
5 participants
@Artur- @HawkSK @MarcinVaadin @vaadin-bot @mcollovati