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

Remove httpuv_decodeURIComponent workaround #378

Merged
merged 2 commits into from
Jul 21, 2023
Merged

Remove httpuv_decodeURIComponent workaround #378

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
baa1291
Remove httpuv_decodeURIComponent workaround
nealrichardson Jul 21, 2023
be533b2
Fix reference to PR
wch Jul 21, 2023
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
4 changes: 4 additions & 0 deletions NEWS.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
# httpuv 1.6.11.9000

* Remove a workaround to support `shiny` older than version 1.0.6 (#378)

# httpuv 1.6.11

* Fix race condition introduced in 1.6.10. (#363)
Expand Down
5 changes: 0 additions & 5 deletions R/httpuv.R
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -763,8 +763,3 @@ rawToBase64 <- function(x) {
#' @export
startDaemonizedServer <- startServer


# Needed so that Rcpp registers the 'httpuv_decodeURIComponent' symbol
legacy_dummy <- function(value){
.Call('httpuv_decodeURIComponent', PACKAGE = "httpuv", value)
}
36 changes: 0 additions & 36 deletions src/RcppExports-legacy.cpp
View file
Open in desktop

This file was deleted.

3 changes: 0 additions & 3 deletions src/RcppExports.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -253,8 +253,6 @@ BEGIN_RCPP
END_RCPP
}

RcppExport SEXP httpuv_decodeURIComponent(SEXP);

static const R_CallMethodDef CallEntries[] = {
{"_httpuv_sendWSMessage", (DL_FUNC) &_httpuv_sendWSMessage, 3},
{"_httpuv_closeWS", (DL_FUNC) &_httpuv_closeWS, 3},
Expand All @@ -276,7 +274,6 @@ static const R_CallMethodDef CallEntries[] = {
{"_httpuv_getRNGState", (DL_FUNC) &_httpuv_getRNGState, 0},
{"_httpuv_wsconn_address", (DL_FUNC) &_httpuv_wsconn_address, 1},
{"_httpuv_log_level", (DL_FUNC) &_httpuv_log_level, 1},
{"httpuv_decodeURIComponent", (DL_FUNC) &httpuv_decodeURIComponent, 1},
{NULL, NULL, 0}
};

Expand Down