Merge pull request #534 in ZP/z-push from...

Merge pull request #534 in ZP/z-push from bugfix/ZP-1221-unable-to-create-ol2013-profile-when to develop

* commit 'df7b6b94':
  ZP-1221 Make sure authentication during OPTIONS request is done after processing all headers and converting charset encodings.

src/index.php

@@ -55,17 +55,17 @@ include_once(ZPUSH_CONFIG);
         if (! Request::HasAuthenticationInfo() || !Request::GetGETUser())
             throw new AuthenticationRequiredException("Access denied. Please send authorisation information");
 
+        ZPush::CheckAdvancedConfig();
+
+        // Process request headers and look for AS headers
+        Request::ProcessHeaders();
+
         // Stop here if this is an OPTIONS request
         if (Request::IsMethodOPTIONS()) {
             RequestProcessor::Authenticate();
             throw new NoPostRequestException("Options request", NoPostRequestException::OPTIONS_REQUEST);
         }
 
-        ZPush::CheckAdvancedConfig();
-
-        // Process request headers and look for AS headers
-        Request::ProcessHeaders();
-
         // Check required GET parameters
         if(Request::IsMethodPOST() && (Request::GetCommandCode() === false || !Request::GetDeviceID() || !Request::GetDeviceType()))
             throw new FatalException("Requested the Z-Push URL without the required GET parameters");