Fixed XML-RPC server to work with pluggable HTTP server

stevestreza · Nov 23, 2008 · 1b716c2 · 1b716c2
1 parent b8430b5
commit 1b716c2
Show file tree

Hide file tree

Showing 4 changed files with 1,191 additions and 161 deletions.
diff --git a/Classes/Plugins/Organization/TCHTTPServerPlugin/TCHTTPConnection.h b/Classes/Plugins/Organization/TCHTTPServerPlugin/TCHTTPConnection.h
@@ -20,8 +20,12 @@
 
     CFHTTPMessageRef message;
     BOOL isMessageComplete;
+
+	NSData *messageBody;
 }
 
+@property (readonly) NSData *messageBody;
+
 - (id)initWithFileHandle:(NSFileHandle *)fh delegate:(id)dl;
 - (NSFileHandle *)fileHandle;
 - (TCHTTPServer *)server;

diff --git a/Classes/Plugins/Organization/TCHTTPServerPlugin/TCHTTPConnection.m b/Classes/Plugins/Organization/TCHTTPServerPlugin/TCHTTPConnection.m
@@ -24,6 +24,7 @@ - (id)initWithFileHandle:(NSFileHandle *)fh delegate:(id)dl
 
         isMessageComplete = YES;
         message = NULL;
+		messageBody = [[NSMutableData data] retain];
 
         // Get IP address of remote client
         CFSocketRef socket;
@@ -88,9 +89,15 @@ - (void)dataReceivedNotification:(NSNotification *)notification
         Boolean success = CFHTTPMessageAppendBytes(message,
                                                    [data bytes],
                                                    [data length]);
+
         if( success ) {
             if( CFHTTPMessageIsHeaderComplete(message) ) {
                 isMessageComplete = YES;
+
+				[messageBody release];
+				messageBody = nil;
+				[self messageBody];
+
                 CFURLRef url = CFHTTPMessageCopyRequestURL(message);
                 [delegate newRequestWithURL:(NSURL *)url connection:self];
                 CFRelease(url);
@@ -160,9 +167,11 @@ -(void)_setServer:(TCHTTPServer *)srv{
 }
 
 -(NSData *)messageBody{
-	CFDataRef messageData = CFHTTPMessageCopyBody(message);
-	NSData *messageBody = (NSData *)messageData;
-	return [messageBody autorelease];
+	if(!messageBody){
+		CFDataRef messageData = CFHTTPMessageCopyBody(message);
+		messageBody = (NSData *)messageData;
+	}
+	return messageBody;
 }
 
 @end