diff options
| author | Don Kjer <don@lindenlab.com> | 2007-04-05 16:23:03 +0000 |
|---|---|---|
| committer | Don Kjer <don@lindenlab.com> | 2007-04-05 16:23:03 +0000 |
| commit | ae588e76f1c61bf489dfb2cdcab371f0b34118f2 (patch) | |
| tree | 77c5fd9a185659d598d08d274badd08e551ed137 /indra/llmessage/llhttpclient.h | |
| parent | 2ce0fc5f185f22be79b9be5406b76c97ed91ee01 (diff) | |
svn merge -r 58913:59058 svn+ssh://svn/svn/linden/branches/rez-content-loss-1 into release
Diffstat (limited to 'indra/llmessage/llhttpclient.h')
| -rw-r--r-- | indra/llmessage/llhttpclient.h | 16 |
1 files changed, 9 insertions, 7 deletions
diff --git a/indra/llmessage/llhttpclient.h b/indra/llmessage/llhttpclient.h index a8afea312d..060293c930 100644 --- a/indra/llmessage/llhttpclient.h +++ b/indra/llmessage/llhttpclient.h @@ -19,6 +19,8 @@ #include "llassettype.h" +extern const F32 HTTP_REQUEST_EXPIRY_SECS; + class LLUUID; class LLPumpIO; class LLSD; @@ -50,19 +52,19 @@ public: typedef boost::intrusive_ptr<Responder> ResponderPtr; - static void get(const std::string& url, ResponderPtr); - static void put(const std::string& url, const LLSD& body, ResponderPtr); + static void get(const std::string& url, ResponderPtr, const F32 timeout=HTTP_REQUEST_EXPIRY_SECS); + static void put(const std::string& url, const LLSD& body, ResponderPtr, const F32 timeout=HTTP_REQUEST_EXPIRY_SECS); ///< non-blocking - static void post(const std::string& url, const LLSD& body, ResponderPtr); - static void post(const std::string& url, const U8* data, S32 size, ResponderPtr responder); - static void postFile(const std::string& url, const std::string& filename, ResponderPtr); + static void post(const std::string& url, const LLSD& body, ResponderPtr, const F32 timeout=HTTP_REQUEST_EXPIRY_SECS); + static void post(const std::string& url, const U8* data, S32 size, ResponderPtr responder, const F32 timeout=HTTP_REQUEST_EXPIRY_SECS); + static void postFile(const std::string& url, const std::string& filename, ResponderPtr, const F32 timeout=HTTP_REQUEST_EXPIRY_SECS); static void postFile(const std::string& url, const LLUUID& uuid, - LLAssetType::EType asset_type, ResponderPtr responder); + LLAssetType::EType asset_type, ResponderPtr responder, const F32 timeout=HTTP_REQUEST_EXPIRY_SECS); // Blocking HTTP get that returns an LLSD map of status and body. static LLSD blockingGet(const std::string& url); - static void del(const std::string& url, ResponderPtr); + static void del(const std::string& url, ResponderPtr, const F32 timeout=HTTP_REQUEST_EXPIRY_SECS); ///< sends a DELETE method, but we can't call it delete in c++ |