1 files changed, 8 insertions, 3 deletions
diff --git a/library/cpp/http/server/http_ex.cpp b/library/cpp/http/server/http_ex.cpp
index c742eecb3bb..fc43d2defc7 100644
--- a/library/cpp/http/server/http_ex.cpp
+++ b/library/cpp/http/server/http_ex.cpp
@@ -103,9 +103,14 @@ bool THttpClientRequestExtension::ProcessHeaders(TBaseServerRequestData& rd, TBl
             break;
 
         case Options:
-            Output() << "HTTP/1.1 405 Method Not Allowed\r\n\r\n";
-            return false;
-            
+            if (!OptionsAllowed()) {
+                Output() << "HTTP/1.1 405 Method Not Allowed\r\n\r\n";
+                return false;
+            } else if (!Parse(urlStart, rd)) {
+                return false;
+            }
+            break;
+
         case NotImplemented:
             Output() << "HTTP/1.1 501 Not Implemented\r\n\r\n";
             return false;