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

Throw an informative warning if a subdirectory of www clashes with another static path #2434

Merged
merged 5 commits into from Aug 22, 2019
Merged

Throw an informative warning if a subdirectory of www clashes with another static path #2434

merged 5 commits into from Aug 22, 2019

Conversation

cpsievert
Copy link
Collaborator

See #2433

wch
wch reviewed May 28, 2019
View reviewed changes
R/app.R Outdated Show resolved Hide resolved
@wch
Copy link
Collaborator

wch commented May 28, 2019 •
edited

In the line above

shiny/R/server.R

Line 461 in 547edd7

httpuvApp$staticPathOptions <- httpuv::staticPathOptions(
, it would be good to do a pairwise check for conflicts on all the paths that are in httpuvApp$staticPaths. That way, we don't need to special case anything, and we'll also detect conflicts among resourcePaths, and between resourcePaths and session and shared.

cpsievert added a commit to rstudio/shiny-examples that referenced this pull request Jul 15, 2019
@cpsievert
Add a test for rstudio/shiny#2434
6ee53f8
@cpsievert cpsievert mentioned this pull request Jul 15, 2019
Merged
wch
wch approved these changes Jul 15, 2019
View reviewed changes
Copy link
Collaborator

@wch wch left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks good - just a few comments.

R/server.R Outdated Show resolved Hide resolved
R/server.R Outdated Show resolved Hide resolved
R/server.R Show resolved Hide resolved
@wch wch merged commit 33cdc75 into master Aug 22, 2019
@wch wch deleted the wwwSubDir branch August 22, 2019 21:58
cpsievert added a commit to rstudio/shiny-examples that referenced this pull request Aug 26, 2019
@cpsievert
Add a test for rstudio/shiny#2434
133f10f
cpsievert added a commit to rstudio/shiny-examples that referenced this pull request Aug 26, 2019
@cpsievert
Merge pull request #148 from rstudio/resource-warnings
782962b 
Add a test for rstudio/shiny#2434
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@wch wch wch approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
2 participants
@cpsievert @wch