Author: gavincornwell
Date: Wed Aug 20 07:35:27 2014
New Revision: 1619041
URL: http://svn.apache.org/r1619041
Log:
Applied patch for CMIS-831: MacOS target incompatibility issues
Modified:
chemistry/objectivecmis/trunk/ObjectiveCMIS/Bindings/AtomPub/AtomPubParser/CMISAtomPubPrincipalParser.h
chemistry/objectivecmis/trunk/ObjectiveCMIS/Common/CMISPrincipal.h
chemistry/objectivecmis/trunk/ObjectiveCMIS/Utils/CMISHttpUploadRequest.m
Modified:
chemistry/objectivecmis/trunk/ObjectiveCMIS/Bindings/AtomPub/AtomPubParser/CMISAtomPubPrincipalParser.h
URL:
http://svn.apache.org/viewvc/chemistry/objectivecmis/trunk/ObjectiveCMIS/Bindings/AtomPub/AtomPubParser/CMISAtomPubPrincipalParser.h?rev=1619041&r1=1619040&r2=1619041&view=diff
==============================================================================
---
chemistry/objectivecmis/trunk/ObjectiveCMIS/Bindings/AtomPub/AtomPubParser/CMISAtomPubPrincipalParser.h
(original)
+++
chemistry/objectivecmis/trunk/ObjectiveCMIS/Bindings/AtomPub/AtomPubParser/CMISAtomPubPrincipalParser.h
Wed Aug 20 07:35:27 2014
@@ -17,7 +17,6 @@
under the License.
*/
-#import <UIKit/UIKit.h>
#import "CMISAtomPubExtensionDataParserBase.h"
#import "CMISPrincipal.h"
Modified: chemistry/objectivecmis/trunk/ObjectiveCMIS/Common/CMISPrincipal.h
URL:
http://svn.apache.org/viewvc/chemistry/objectivecmis/trunk/ObjectiveCMIS/Common/CMISPrincipal.h?rev=1619041&r1=1619040&r2=1619041&view=diff
==============================================================================
--- chemistry/objectivecmis/trunk/ObjectiveCMIS/Common/CMISPrincipal.h
(original)
+++ chemistry/objectivecmis/trunk/ObjectiveCMIS/Common/CMISPrincipal.h Wed Aug
20 07:35:27 2014
@@ -17,7 +17,6 @@
under the License.
*/
-#import <UIKit/UIKit.h>
#import "CMISExtensionData.h"
@interface CMISPrincipal : CMISExtensionData
Modified:
chemistry/objectivecmis/trunk/ObjectiveCMIS/Utils/CMISHttpUploadRequest.m
URL:
http://svn.apache.org/viewvc/chemistry/objectivecmis/trunk/ObjectiveCMIS/Utils/CMISHttpUploadRequest.m?rev=1619041&r1=1619040&r2=1619041&view=diff
==============================================================================
--- chemistry/objectivecmis/trunk/ObjectiveCMIS/Utils/CMISHttpUploadRequest.m
(original)
+++ chemistry/objectivecmis/trunk/ObjectiveCMIS/Utils/CMISHttpUploadRequest.m
Wed Aug 20 07:35:27 2014
@@ -308,12 +308,12 @@ totalBytesExpectedToWrite:(NSInteger)tot
{
switch (eventCode){
case NSStreamEventOpenCompleted:{
+#ifndef TARGET_OS_MAC
+ // this fix breaks POST requests on MacOS targets
if (self.combinedInputStream.streamStatus != NSStreamStatusOpen) {
[self.combinedInputStream open]; // this seems to work around
the 'Stream ... is sending an event before being opened' Apple bug
}
- if (self.inputStream.streamStatus != NSStreamStatusOpen) {
- [self.inputStream open];
- }
+#endif
}
break;
@@ -452,6 +452,7 @@ totalBytesExpectedToWrite:(NSInteger)tot
self.encoderStream = outputStream;
self.encoderStream.delegate = self;
[self.encoderStream scheduleInRunLoop:[NSRunLoop currentRunLoop]
forMode:NSDefaultRunLoopMode];
+ [self.encoderStream open];
}