Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

new version

  • Loading branch information...
commit 65488baa373e18f368badec37e7323ee3de1f040 1 parent 3a6b68c
@duncantl duncantl authored
View
1  .Rbuildignore
@@ -22,3 +22,4 @@ manyConnections.R
.*\.log
.*\.aux
.*~
+.git*
View
15 Changes.html
@@ -4,6 +4,19 @@
</head>
<body>
+<h2>1.95-4</h2>
+<dl>
+ <dt>
+ <li> Important fix in a low-level bug in R_curl_easy_setopt
+ where we were assuming the logical vector isProtected
+ had the same length as values. Thanks to Bruce Hoff for
+ identifying this and providing a patch.
+ <dd>
+ <dt>
+ <li> Correction for mapping new lines in curlPercentEncode().
+ <dd>
+</dl>
+
<h2>1.95-1 &amp;2 &amp; 3</h2>
<dl>
<dt>
@@ -1012,6 +1025,6 @@
<address><a href="http://www.stat.ucdavis.edu/~duncan">Duncan Temple Lang</a>
<a href=mailto:duncan@wald.ucdavis.edu>&lt;duncan@wald.ucdavis.edu&gt;</a></address>
<!-- hhmts start -->
-Last modified: Fri Oct 19 16:33:05 PDT 2012
+Last modified: Tue Mar 5 10:55:53 PST 2013
<!-- hhmts end -->
</body> </html>
View
2  DESCRIPTION
@@ -1,5 +1,5 @@
Package: RCurl
-Version: 1.95-3
+Version: 1.95-4
Title: General network (HTTP/FTP/...) client interface for R
Author: Duncan Temple Lang
SystemRequirements: libcurl (version 7.14.0 or higher) http://curl.haxx.se.
View
4 R/curl.S
@@ -141,7 +141,7 @@ function(url, ..., .opts = list(), write = basicTextGatherer(.mapUnicode = .mapU
if(async) {
if(missing(write))
write = multiTextGatherer(url)
- return(getURIAsynchronous(url, ..., .opts = .opts, write = write, curl = curl))
+ return(getURIAsynchronous(url, ..., .opts = .opts, write = write, curl = curl, .encoding = .encoding))
}
if(length(url) > 1) {
@@ -357,7 +357,7 @@ PercentCodes = c(
'}' = "%7D",
' ' = '%20',
'\r' = '%0D',
- '\n' = '%OA')
+ '\n' = '%0A')
curlPercentEncode =
function(x, amp = TRUE, codes = PercentCodes, post.amp = FALSE)
View
2  R/form.S
@@ -22,7 +22,7 @@ function(uri, ..., .params = character(), .opts = list(), curl = getCurlHandle()
els = mapply(function(id, val) {
# turn name=c("a", "b") into
# name=a&name=b
- paste(id, curlEscape(val), sep="=", collapse="&")
+ paste(curlEscape(id), curlEscape(val), sep="=", collapse="&")
}, names(.params), .params)
args = paste(els, collapse = "&")
View
2  R/getURLContent.R
@@ -10,6 +10,8 @@ function(url, ..., curl = getCurlHandle(.opts = .opts), .encoding = NA, binary =
header = dynCurlReader(curl, binary = binary, baseURL = url, isHTTP = isHTTP, encoding = .encoding),
isHTTP = length(grep('^[[:space:]]*http', url)) > 0)
{
+ url = as(url, "character")
+
if(!missing(curl))
curlSetOpt(.opts = .opts, curl = curl)
View
14 Todo.html
@@ -9,6 +9,18 @@
<dl>
<dt>
+<li> Add check in the C code for options that we hav an appropriate
+R &amp; C data type for the option, based on the options type.
+<dd>
+
+
+
+<dt>
+<li> curlEscape the names of the parameters in getForm().
+<dd> See ~/Projects/CaseStudies/JobsWordMining/careerbuilder.R
+
+
+<dt>
potential problem with httpheader in RCurl
when only one element in the vector. name seems to disappear.
<code>
@@ -343,6 +355,6 @@
<address><a href="http://cm.bell-labs.com/stat/duncan">Duncan Temple Lang</a>
<a href=mailto:duncan@research.bell-labs.com>&lt;duncan@research.bell-labs.com&gt;</a></address>
<!-- hhmts start -->
-Last modified: Fri Aug 5 12:40:50 PDT 2011
+Last modified: Tue Dec 11 15:19:07 PST 2012
<!-- hhmts end -->
</body> </html>
View
16 Web/config.log
@@ -12,9 +12,9 @@ generated by GNU Autoconf 2.61. Invocation command line was
hostname = Duncan-Temple-Langs-MacBook-Pro.local
uname -m = x86_64
-uname -r = 11.2.0
+uname -r = 11.4.0
uname -s = Darwin
-uname -v = Darwin Kernel Version 11.2.0: Tue Aug 9 20:54:00 PDT 2011; root:xnu-1699.24.8~1/RELEASE_X86_64
+uname -v = Darwin Kernel Version 11.4.0: Mon Apr 9 19:32:15 PDT 2012; root:xnu-1699.26.8~1/RELEASE_X86_64
/usr/bin/uname -p = i386
/bin/uname -X = unknown
@@ -23,15 +23,15 @@ uname -v = Darwin Kernel Version 11.2.0: Tue Aug 9 20:54:00 PDT 2011; root:xnu-
/usr/bin/arch -k = unknown
/usr/convex/getsysinfo = unknown
/usr/bin/hostinfo = Mach kernel version:
- Darwin Kernel Version 11.2.0: Tue Aug 9 20:54:00 PDT 2011; root:xnu-1699.24.8~1/RELEASE_X86_64
+ Darwin Kernel Version 11.4.0: Mon Apr 9 19:32:15 PDT 2012; root:xnu-1699.26.8~1/RELEASE_X86_64
Kernel configured for up to 4 processors.
2 processors are physically available.
4 processors are logically available.
Processor type: i486 (Intel 80486)
Processors active: 0 1 2 3
Primary memory available: 8.00 gigabytes
-Default processor set: 230 tasks, 1053 threads, 4 processors
-Load average: 2.80, Mach factor: 1.32
+Default processor set: 84 tasks, 418 threads, 4 processors
+Load average: 0.40, Mach factor: 3.58
/bin/machine = unknown
/usr/bin/oslevel = unknown
/bin/universe = unknown
@@ -100,7 +100,7 @@ ac_cv_env_target_alias_value=
## Output variables. ##
## ----------------- ##
-DATE='31 January 2012'
+DATE='05 March 2013'
DEFS='-DPACKAGE_NAME=\"\" -DPACKAGE_TARNAME=\"\" -DPACKAGE_VERSION=\"\" -DPACKAGE_STRING=\"\" -DPACKAGE_BUGREPORT=\"\"'
ECHO_C='ECHO_N=''
ECHO_T=''
@@ -115,8 +115,8 @@ PACKAGE_VERSION=''
PATH_SEPARATOR=':'
PKG_NAME='RCurl'
SHELL='/bin/sh'
-TAR_FILE='RCurl_1.91-0.tar.gz'
-VERSION='1.91-0'
+TAR_FILE='RCurl_1.95-4.tar.gz'
+VERSION='1.95-4'
bindir='${exec_prefix}/bin'
build_alias=''
datadir='${datarootdir}'
View
8 Web/config.status
@@ -331,7 +331,7 @@ Copyright (C) 2006 Free Software Foundation, Inc.
This config.status script is free software; the Free Software Foundation
gives unlimited permission to copy, distribute and modify it."
-ac_pwd='/Users/duncan/Projects/org/omegahat/R/RCurl/Web'
+ac_pwd='/Users/duncan/GitWorkingArea/RCurl/Web'
srcdir='.'
# If no file are specified by the user, then we need to provide default
# value. By we need to know if files were specified by the user.
@@ -503,9 +503,9 @@ s,@build_alias@,|#_!!_#|,g
s,@host_alias@,|#_!!_#|,g
s,@target_alias@,|#_!!_#|,g
s,@PKG_NAME@,|#_!!_#|RCurl,g
-s,@VERSION@,|#_!!_#|1.91-0,g
-s,@TAR_FILE@,|#_!!_#|RCurl_1.91-0.tar.gz,g
-s,@DATE@,|#_!!_#|31 January 2012,g
+s,@VERSION@,|#_!!_#|1.95-4,g
+s,@TAR_FILE@,|#_!!_#|RCurl_1.95-4.tar.gz,g
+s,@DATE@,|#_!!_#|05 March 2013,g
s,@LIBOBJS@,|#_!!_#|,g
s,@LTLIBOBJS@,|#_!!_#|,g
:end
View
2  Web/index.html
@@ -6,7 +6,7 @@
<body>
<h1>The RCurl Package</h1>
-<p align=right><a href="RCurl_1.91-0.tar.gz">RCurl_1.91-0.tar.gz</a> (31 January 2012)</p>
+<p align=right><a href="RCurl_1.95-4.tar.gz">RCurl_1.95-4.tar.gz</a> (05 March 2013)</p>
<p align=right><a href="philosophy.html">Manual</a></p>
The RCurl package is an R-interface to the <a
View
7 src/curl.c
@@ -136,7 +136,7 @@ R_curl_easy_setopt(SEXP handle, SEXP values, SEXP opts, SEXP isProtected, SEXP e
CURLcode status = 0;
CURLoption opt;
- int i, n;
+ int i, n, isProtectedLength;
void *val;
SEXP el;
RWriteDataInfo *data;
@@ -147,6 +147,7 @@ R_curl_easy_setopt(SEXP handle, SEXP values, SEXP opts, SEXP isProtected, SEXP e
/* Find out how many options we are setting. */
n = GET_LENGTH(values);
+ isProtectedLength = GET_LENGTH(isProtected);
data = (RWriteDataInfo *) calloc(1, sizeof(RWriteDataInfo));
data->encoding = CE_LATIN1;
@@ -161,7 +162,7 @@ R_curl_easy_setopt(SEXP handle, SEXP values, SEXP opts, SEXP isProtected, SEXP e
opt = INTEGER(opts)[i];
el = VECTOR_ELT(values, i);
/* Turn the R value into something we can use in libcurl. */
- val = getCurlPointerForData(el, opt, LOGICAL(isProtected)[ i % n ], obj);
+ val = getCurlPointerForData(el, opt, LOGICAL(isProtected)[ i % isProtectedLength ], obj);
if(opt == CURLOPT_WRITEFUNCTION && TYPEOF(el) == CLOSXP) {
data->fun = val; useData++;
@@ -1057,7 +1058,7 @@ R_call_R_write_function(SEXP fun, void *buffer, size_t size, size_t nmemb, RWrit
void
checkEncoding(char *buffer, size_t len, RWriteDataInfo *data)
{
- SEXP e, ns_env, ns_name, fun;
+ SEXP e, ns_env, ns_name;
int ans;
PROTECT(e = allocVector(LANGSXP, 2));
#if 0
Please sign in to comment.
Something went wrong with that request. Please try again.