Merge pull request #131 from rstudio/fix-null-list

Replace NULL with empty list
rstudio · May 4, 2018 · 4a44b53 · 4a44b53
2 parents 70da68d + f4565b5
commit 4a44b53
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 2 deletions.
diff --git a/DESCRIPTION b/DESCRIPTION
@@ -1,7 +1,7 @@
 Package: httpuv
 Type: Package
 Title: HTTP and WebSocket Server Library
-Version: 1.4.2
+Version: 1.4.2.9000
 Author: Joe Cheng, Hector Corrada Bravo [ctb], Jeroen Ooms [ctb],
     Winston Chang [ctb]
 Copyright: RStudio, Inc.; Joyent, Inc.; Nginx Inc.; Igor Sysoev; Niels Provos;

diff --git a/NEWS.md b/NEWS.md
@@ -1,3 +1,8 @@
+httpuv 1.4.2.9000
+=================
+
+* Fixed [#127](https://github.com/rstudio/httpuv/issues/127): Compilation failed on some platforms because `NULL` was used instead of an `Rcpp::List`. ([#131](https://github.com/rstudio/httpuv/pulls/131))
+
 httpuv 1.4.2
 ============
 

diff --git a/src/webapplication.cpp b/src/webapplication.cpp
@@ -280,7 +280,7 @@ void RWebApplication::getResponse(boost::shared_ptr<HttpRequest> pRequest,
   // the R call/_onRequest() function. We need to signal the HttpRequest
   // object to let it know that we had an error.
   if (pRequest->isResponseScheduled()) {
-    invokeCppCallback(NULL, callback_xptr);
+    invokeCppCallback(Rcpp::List(), callback_xptr);
   }
   else {