commit 204527e6c402aa4347dad378b0dc34a49763e760
author Bert Huijben <rhuijben@apache.org> Wed Dec 16 11:36:27 2015 +0000
committer Bert Huijben <rhuijben@apache.org> Wed Dec 16 11:36:27 2015 +0000
tree ed3f3cbaeac2c720d023a88a9ab98456cfdc5317
parent 952263c327a52211009800545384952a3353b836

Move *.c to src/*.c to cleanup the build root.

Suggested by: gstein

* .
  (svn:ignore): Updated for recent VS changes.

* SConstruct
  Find src/*.c instead of ./*.c

* src/
  New directory. Set svn:ignore.

* src/config_store.c
* src/context.c
* src/deprecated.c
* src/incoming.c
* src/logging.c
* src/outgoing.c
* src/pump.c
* src/ssltunnel.c
  Move files here.

* src/outgoing_request.c
    Move file here.
  (serf__handle_response): Accidental early commit of a verification
    that we are actually calling against a response instance instead
    of some other bucket wrapping a response (which would cause a
    segfault on the further calls)

git-svn-id: https://svn.apache.org/repos/asf/serf/trunk@1720339 13f79535-47bb-0310-9956-ffa450edef68

SConstruct

diff --git a/SConstruct b/SConstruct
index 968ac1a..c7494c1 100644
--- a/SConstruct
+++ b/SConstruct
@@ -301,7 +301,7 @@
   dll_res = env.RES(['serf.rc'])
   SHARED_SOURCES.append(dll_res)
 
-SOURCES = Glob('*.c') + Glob('buckets/*.c') + Glob('auth/*.c') + \
+SOURCES = Glob('src/*.c') + Glob('buckets/*.c') + Glob('auth/*.c') + \
           Glob('protocols/*.c')
 
 lib_static = env.StaticLibrary(LIBNAME, SOURCES)

src/config_store.c

diff --git a/config_store.c b/src/config_store.c
similarity index 100%
rename from config_store.c
rename to src/config_store.c

src/context.c

diff --git a/context.c b/src/context.c
similarity index 100%
rename from context.c
rename to src/context.c

src/deprecated.c

diff --git a/deprecated.c b/src/deprecated.c
similarity index 100%
rename from deprecated.c
rename to src/deprecated.c

src/incoming.c

diff --git a/incoming.c b/src/incoming.c
similarity index 100%
rename from incoming.c
rename to src/incoming.c

src/logging.c

diff --git a/logging.c b/src/logging.c
similarity index 100%
rename from logging.c
rename to src/logging.c

src/outgoing.c

diff --git a/outgoing.c b/src/outgoing.c
similarity index 100%
rename from outgoing.c
rename to src/outgoing.c

src/outgoing_request.c

diff --git a/outgoing_request.c b/src/outgoing_request.c
similarity index 98%
rename from outgoing_request.c
rename to src/outgoing_request.c
index 1ceb2cb..17228ad 100644
--- a/outgoing_request.c
+++ b/src/outgoing_request.c
@@ -292,10 +292,15 @@
     if (!request->auth_done && request->conn->ctx->cred_cb) {
         apr_status_t status;
 
-        status = serf__handle_auth_response(&consumed_response,
-                                            request,
-                                            request->resp_bkt,
-                                            pool);
+        if (!SERF_BUCKET_IS_RESPONSE(request->resp_bkt)) {
+            request->auth_done = true;
+            status = APR_SUCCESS;
+        }
+        else
+            status = serf__handle_auth_response(&consumed_response,
+                                                request,
+                                                request->resp_bkt,
+                                                pool);
 
         if (SERF_BUCKET_READ_ERROR(status)) {
 

src/pump.c

diff --git a/pump.c b/src/pump.c
similarity index 100%
rename from pump.c
rename to src/pump.c

src/ssltunnel.c

diff --git a/ssltunnel.c b/src/ssltunnel.c
similarity index 100%
rename from ssltunnel.c
rename to src/ssltunnel.c