Преглед на файлове

Merge remote-tracking branch 'origin/dev' into dev

dmuratshin преди 8 години
родител
ревизия
03e48154c6
променени са 1 файла, в които са добавени 7 реда и са изтрити 7 реда
  1. 7 7
      oxygine/src/core/ios/HttpRequestCocoaTask.mm

+ 7 - 7
oxygine/src/core/ios/HttpRequestCocoaTask.mm

@@ -102,7 +102,7 @@ static HttpRequestTask *createTask()
         }
         }
         else
         else
         {
         {
-            httpRequestTask->complete_(/* data */ nil, /* error */ true);
+            httpRequestTask->complete_(/* data */ nil, /* error */ true, 0);
         }
         }
     }
     }
     
     
@@ -251,16 +251,15 @@ namespace oxygine
                                                   NSError *error) {
                                                   NSError *error) {
                                   // handle response
                                   // handle response
                                   
                                   
-                                  bool httpError = false;
                                   
                                   
                                   if ([response isKindOfClass:[NSHTTPURLResponse class]]) {
                                   if ([response isKindOfClass:[NSHTTPURLResponse class]]) {
                                       NSHTTPURLResponse *httpResponse = ((NSHTTPURLResponse *)response);
                                       NSHTTPURLResponse *httpResponse = ((NSHTTPURLResponse *)response);
-                                      NSInteger statusCode = httpResponse.statusCode;
-                                      if (statusCode != 200)
-                                          httpError = true;
+                                      _responseCode = httpResponse.statusCode;
+                                      //if (statusCode != 200)
+                                       //   httpError = true;
                                   }
                                   }
                                   
                                   
-                                  if (error || httpError)
+                                  if (error)
                                   {
                                   {
                                       onError();
                                       onError();
                                   }
                                   }
@@ -272,6 +271,7 @@ namespace oxygine
                                           size_t len = data.length;
                                           size_t len = data.length;
                                           _response.assign((const char*)ptr, (const char*)ptr + len);
                                           _response.assign((const char*)ptr, (const char*)ptr + len);
                                       }
                                       }
+                                      
                                       onComplete();
                                       onComplete();
                                   }
                                   }
                                   releaseRef();
                                   releaseRef();
@@ -289,4 +289,4 @@ namespace oxygine
         
         
         [task resume];
         [task resume];
     }
     }
-}
+}