added redirect locations

git-svn-id: http://svn.opengroupware.org/SOPE/trunk@1548 e4a50df8-12e2-0310-a44c-efbce7f8a7e3

diff --git a/sope-appserver/NGXmlRpc/ChangeLog b/sope-appserver/NGXmlRpc/ChangeLog
index 44120b436730b12ccea64c748b0ab9ef2656b80e..e82e1d6b492ee43d880a820ced5dd59bd09e3b02 100644 (file)
--- a/sope-appserver/NGXmlRpc/ChangeLog
+++ b/sope-appserver/NGXmlRpc/ChangeLog
@@ -1,3 +1,7 @@
+2007-11-20  Helge Hess  <helge.hess@opengroupware.org>
+
+       * NGXmlRpcClient.m: add redirect locations to error reason (v4.7.17)
+
 2007-02-12  Helge Hess  <helge.hess@opengroupware.org>
 
        * NGXmlRpcClient.m: fixed a gnustep-base compilation warning (v4.7.16)

diff --git a/sope-appserver/NGXmlRpc/NGXmlRpcClient.m b/sope-appserver/NGXmlRpc/NGXmlRpcClient.m
index 4d1fc810803ba7f398fa6cecab4147f8ebf67280..a645ea32cce26f2f5b661eaac8c38c0be0b994a6 100644 (file)
--- a/sope-appserver/NGXmlRpc/NGXmlRpcClient.m
+++ b/sope-appserver/NGXmlRpc/NGXmlRpcClient.m
@@ -274,6 +274,7 @@
   NSException  *exc;
   NSString     *r;
   NSDictionary *ui;
+  int          status;
   
 #if 0
   NSLog(@"%s: XML-RPC response status: %i", __PRETTY_FUNCTION__,
@@ -282,13 +283,19 @@
   
   /* construct exception */
   
+  status = [_response status];
   r = [NSString stringWithFormat:@"call failed with HTTP status code %i",
-                  [_response status]];
+                 status];
+  if (status == 301 || status == 302) {
+    NSString *l = [_response headerForKey:@"location"];
+    if ([l isNotEmpty])
+      r = [NSString stringWithFormat:@"%@ [location=%@]", r, l];
+  }
   
   ui = [NSDictionary dictionaryWithObjectsAndKeys:
                        self,      @"NGXmlRpcClient",
                        _response, @"WOResponse",
-                       [NSNumber numberWithInt:[_response status]],
+                       [NSNumber numberWithInt:status],
                        @"HTTPStatusCode",
                        nil];
   

diff --git a/sope-appserver/NGXmlRpc/Version b/sope-appserver/NGXmlRpc/Version
index 0a8bca08b028c66e6050ed1d0523f0c70aac5617..3c3eedfd9be9674738563e52ca04e222c558e0b0 100644 (file)
--- a/sope-appserver/NGXmlRpc/Version
+++ b/sope-appserver/NGXmlRpc/Version
@@ -1,3 +1,3 @@
 # version file
 
-SUBMINOR_VERSION:=16
+SUBMINOR_VERSION:=17