serf-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From rhuij...@apache.org
Subject svn commit: r1720339 - in /serf/trunk: ./ src/
Date Wed, 16 Dec 2015 11:36:27 GMT
Author: rhuijben
Date: Wed Dec 16 11:36:27 2015
New Revision: 1720339

URL: http://svn.apache.org/viewvc?rev=1720339&view=rev
Log:
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/outgoing_request.c
* src/pump.c
* src/ssltunnel.c
  Move files here.

Added:
    serf/trunk/src/   (with props)
    serf/trunk/src/config_store.c
      - copied unchanged from r1720338, serf/trunk/config_store.c
    serf/trunk/src/context.c
      - copied unchanged from r1720338, serf/trunk/context.c
    serf/trunk/src/deprecated.c
      - copied unchanged from r1720338, serf/trunk/deprecated.c
    serf/trunk/src/incoming.c
      - copied unchanged from r1720338, serf/trunk/incoming.c
    serf/trunk/src/logging.c
      - copied unchanged from r1720338, serf/trunk/logging.c
    serf/trunk/src/outgoing.c
      - copied unchanged from r1720338, serf/trunk/outgoing.c
    serf/trunk/src/outgoing_request.c
      - copied, changed from r1720338, serf/trunk/outgoing_request.c
    serf/trunk/src/pump.c
      - copied unchanged from r1720338, serf/trunk/pump.c
    serf/trunk/src/ssltunnel.c
      - copied unchanged from r1720338, serf/trunk/ssltunnel.c
Removed:
    serf/trunk/config_store.c
    serf/trunk/context.c
    serf/trunk/deprecated.c
    serf/trunk/incoming.c
    serf/trunk/logging.c
    serf/trunk/outgoing.c
    serf/trunk/outgoing_request.c
    serf/trunk/pump.c
    serf/trunk/ssltunnel.c
Modified:
    serf/trunk/   (props changed)
    serf/trunk/SConstruct

Propchange: serf/trunk/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Wed Dec 16 11:36:27 2015
@@ -12,5 +12,6 @@ serf-2.pc
 libserf-2.dylib
 *.sln
 *.vcxproj
+*.vcxproj.*
 *.vcproj
 .vs

Propchange: serf/trunk/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Dec 16 11:36:27 2015
@@ -3,3 +3,4 @@
 /serf/branches/get-remaining:1701859-1708111
 /serf/branches/multiple_ssl_impls:1699382
 /serf/branches/windows-sspi:1698866-1698877
+/serf/trunk:1715006-1715870

Modified: serf/trunk/SConstruct
URL: http://svn.apache.org/viewvc/serf/trunk/SConstruct?rev=1720339&r1=1720338&r2=1720339&view=diff
==============================================================================
--- serf/trunk/SConstruct (original)
+++ serf/trunk/SConstruct Wed Dec 16 11:36:27 2015
@@ -301,7 +301,7 @@ if sys.platform == 'win32':
   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)

Propchange: serf/trunk/src/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Wed Dec 16 11:36:27 2015
@@ -0,0 +1 @@
+*.os

Copied: serf/trunk/src/outgoing_request.c (from r1720338, serf/trunk/outgoing_request.c)
URL: http://svn.apache.org/viewvc/serf/trunk/src/outgoing_request.c?p2=serf/trunk/src/outgoing_request.c&p1=serf/trunk/outgoing_request.c&r1=1720338&r2=1720339&rev=1720339&view=diff
==============================================================================
--- serf/trunk/outgoing_request.c (original)
+++ serf/trunk/src/outgoing_request.c Wed Dec 16 11:36:27 2015
@@ -292,10 +292,15 @@ apr_status_t serf__handle_response(serf_
     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)) {
 



Mime
View raw message