aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/linden/indra/llmessage/llhttpclient.h
diff options
context:
space:
mode:
Diffstat (limited to 'linden/indra/llmessage/llhttpclient.h')
-rw-r--r--linden/indra/llmessage/llhttpclient.h36
1 files changed, 30 insertions, 6 deletions
diff --git a/linden/indra/llmessage/llhttpclient.h b/linden/indra/llmessage/llhttpclient.h
index df31b44..50c6f7a 100644
--- a/linden/indra/llmessage/llhttpclient.h
+++ b/linden/indra/llmessage/llhttpclient.h
@@ -60,7 +60,8 @@ public:
60 typedef LLCurl::Responder Responder; 60 typedef LLCurl::Responder Responder;
61 typedef LLCurl::ResponderPtr ResponderPtr; 61 typedef LLCurl::ResponderPtr ResponderPtr;
62 62
63 // non-blocking 63 /** @name non-blocking API */
64 //@{
64 static void head(const std::string& url, ResponderPtr, const F32 timeout=HTTP_REQUEST_EXPIRY_SECS); 65 static void head(const std::string& url, ResponderPtr, const F32 timeout=HTTP_REQUEST_EXPIRY_SECS);
65 static void getByteRange(const std::string& url, S32 offset, S32 bytes, ResponderPtr, const LLSD& headers=LLSD(), const F32 timeout=HTTP_REQUEST_EXPIRY_SECS); 66 static void getByteRange(const std::string& url, S32 offset, S32 bytes, ResponderPtr, const LLSD& headers=LLSD(), const F32 timeout=HTTP_REQUEST_EXPIRY_SECS);
66 static void get(const std::string& url, ResponderPtr, const LLSD& headers = LLSD(), const F32 timeout=HTTP_REQUEST_EXPIRY_SECS); 67 static void get(const std::string& url, ResponderPtr, const LLSD& headers = LLSD(), const F32 timeout=HTTP_REQUEST_EXPIRY_SECS);
@@ -70,13 +71,38 @@ public:
70 static void getHeaderOnly(const std::string& url, ResponderPtr, const F32 timeout=HTTP_REQUEST_EXPIRY_SECS); 71 static void getHeaderOnly(const std::string& url, ResponderPtr, const F32 timeout=HTTP_REQUEST_EXPIRY_SECS);
71 static void getHeaderOnly(const std::string& url, ResponderPtr, const LLSD& headers, const F32 timeout=HTTP_REQUEST_EXPIRY_SECS); 72 static void getHeaderOnly(const std::string& url, ResponderPtr, const LLSD& headers, const F32 timeout=HTTP_REQUEST_EXPIRY_SECS);
72 73
73 ///< non-blocking
74 static void post(const std::string& url, const LLSD& body, ResponderPtr, const F32 timeout=HTTP_REQUEST_EXPIRY_SECS); 74 static void post(const std::string& url, const LLSD& body, ResponderPtr, const F32 timeout=HTTP_REQUEST_EXPIRY_SECS);
75 static void post(const std::string& url, const U8* data, S32 size, ResponderPtr responder, const F32 timeout=HTTP_REQUEST_EXPIRY_SECS); 75
76 /** Takes ownership of data and deletes it when sent */
77 static void postRaw(const std::string& url, const U8* data, S32 size, ResponderPtr responder, const F32 timeout=HTTP_REQUEST_EXPIRY_SECS);
78
76 static void postFile(const std::string& url, const std::string& filename, ResponderPtr, const F32 timeout=HTTP_REQUEST_EXPIRY_SECS); 79 static void postFile(const std::string& url, const std::string& filename, ResponderPtr, const F32 timeout=HTTP_REQUEST_EXPIRY_SECS);
80 #
77 static void postFile(const std::string& url, const LLUUID& uuid, 81 static void postFile(const std::string& url, const LLUUID& uuid,
78 LLAssetType::EType asset_type, ResponderPtr responder, const F32 timeout=HTTP_REQUEST_EXPIRY_SECS); 82 LLAssetType::EType asset_type, ResponderPtr responder, const F32 timeout=HTTP_REQUEST_EXPIRY_SECS);
79 83
84 static void del(
85 const std::string& url,
86 ResponderPtr responder,
87 const F32 timeout=HTTP_REQUEST_EXPIRY_SECS);
88 ///< sends a DELETE method, but we can't call it delete in c++
89
90 /**
91 * @brief Send a MOVE webdav method
92 *
93 * @param url The complete serialized (and escaped) url to get.
94 * @param destination The complete serialized destination url.
95 * @param responder The responder that will handle the result.
96 * @param timeout The number of seconds to give the server to respond.
97 */
98 static void move(
99 const std::string& url,
100 const std::string& destination,
101 ResponderPtr responder,
102 const F32 timeout=HTTP_REQUEST_EXPIRY_SECS);
103
104 //@}
105
80 /** 106 /**
81 * @brief Blocking HTTP get that returns an LLSD map of status and body. 107 * @brief Blocking HTTP get that returns an LLSD map of status and body.
82 * 108 *
@@ -85,9 +111,7 @@ public:
85 */ 111 */
86 static LLSD blockingGet(const std::string& url); 112 static LLSD blockingGet(const std::string& url);
87 113
88 static void del(const std::string& url, ResponderPtr, const F32 timeout=HTTP_REQUEST_EXPIRY_SECS); 114
89 ///< sends a DELETE method, but we can't call it delete in c++
90
91 115
92 static void setPump(LLPumpIO& pump); 116 static void setPump(LLPumpIO& pump);
93 ///< must be called before any of the above calls are made 117 ///< must be called before any of the above calls are made