Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
Alchemy Viewer
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Iterations
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Locked files
Deploy
Releases
Package registry
Operate
Terraform modules
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Terms and privacy
Keyboard shortcuts
?
Snippets
Groups
Projects
Silent mode is enabled
All outbound communications are blocked.
Learn more
.
Show more breadcrumbs
Alchemy Viewer
Alchemy Viewer
Commits
a6c638d8
Commit
a6c638d8
authored
13 years ago
by
Xiaohong Bao
Browse files
Options
Downloads
Patches
Plain Diff
more exception handlings for llcurl fixes.
parent
11bd5cb8
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
indra/llmessage/llpumpio.h
+1
-0
1 addition, 0 deletions
indra/llmessage/llpumpio.h
indra/llmessage/llsdrpcclient.h
+18
-7
18 additions, 7 deletions
indra/llmessage/llsdrpcclient.h
with
19 additions
and
7 deletions
indra/llmessage/llpumpio.h
+
1
−
0
View file @
a6c638d8
...
@@ -111,6 +111,7 @@ class LLPumpIO
...
@@ -111,6 +111,7 @@ class LLPumpIO
* @param chain The pipes for the chain
* @param chain The pipes for the chain
* @param timeout The number of seconds in the future to
* @param timeout The number of seconds in the future to
* expire. Pass in 0.0f to never expire.
* expire. Pass in 0.0f to never expire.
* @param has_curl_request The chain contains LLURLRequest if true.
* @return Returns true if anything was added to the pump.
* @return Returns true if anything was added to the pump.
*/
*/
bool
addChain
(
const
chain_t
&
chain
,
F32
timeout
,
bool
has_curl_request
=
false
);
bool
addChain
(
const
chain_t
&
chain
,
F32
timeout
,
bool
has_curl_request
=
false
);
...
...
This diff is collapsed.
Click to expand it.
indra/llmessage/llsdrpcclient.h
+
18
−
7
View file @
a6c638d8
...
@@ -239,12 +239,17 @@ class LLSDRPCClientFactory : public LLChainIOFactory
...
@@ -239,12 +239,17 @@ class LLSDRPCClientFactory : public LLChainIOFactory
LLSDRPCClientFactory
(
const
std
::
string
&
fixed_url
)
:
mURL
(
fixed_url
)
{}
LLSDRPCClientFactory
(
const
std
::
string
&
fixed_url
)
:
mURL
(
fixed_url
)
{}
virtual
bool
build
(
LLPumpIO
::
chain_t
&
chain
,
LLSD
context
)
const
virtual
bool
build
(
LLPumpIO
::
chain_t
&
chain
,
LLSD
context
)
const
{
{
llerrs
<<
"Can not call this."
<<
llendl
;
lldebugs
<<
"LLSDRPCClientFactory::build"
<<
llendl
;
lldebugs
<<
"LLSDRPCClientFactory::build"
<<
llendl
;
LLIOPipe
::
ptr_t
service
(
new
Client
);
chain
.
push_back
(
service
);
LLURLRequest
*
http
(
new
LLURLRequest
(
LLURLRequest
::
HTTP_POST
));
LLURLRequest
*
http
(
new
LLURLRequest
(
LLURLRequest
::
HTTP_POST
));
if
(
!
http
->
isValid
())
{
llwarns
<<
"Creating LLURLRequest failed."
<<
llendl
;
delete
http
;
return
false
;
}
LLIOPipe
::
ptr_t
service
(
new
Client
);
chain
.
push_back
(
service
);
LLIOPipe
::
ptr_t
http_pipe
(
http
);
LLIOPipe
::
ptr_t
http_pipe
(
http
);
http
->
addHeader
(
"Content-Type: text/llsd"
);
http
->
addHeader
(
"Content-Type: text/llsd"
);
if
(
mURL
.
empty
())
if
(
mURL
.
empty
())
...
@@ -284,11 +289,17 @@ class LLXMLSDRPCClientFactory : public LLChainIOFactory
...
@@ -284,11 +289,17 @@ class LLXMLSDRPCClientFactory : public LLChainIOFactory
LLXMLSDRPCClientFactory
(
const
std
::
string
&
fixed_url
)
:
mURL
(
fixed_url
)
{}
LLXMLSDRPCClientFactory
(
const
std
::
string
&
fixed_url
)
:
mURL
(
fixed_url
)
{}
virtual
bool
build
(
LLPumpIO
::
chain_t
&
chain
,
LLSD
context
)
const
virtual
bool
build
(
LLPumpIO
::
chain_t
&
chain
,
LLSD
context
)
const
{
{
llerrs
<<
"who calls this?"
<<
llendl
;
lldebugs
<<
"LLXMLSDRPCClientFactory::build"
<<
llendl
;
lldebugs
<<
"LLXMLSDRPCClientFactory::build"
<<
llendl
;
LLIOPipe
::
ptr_t
service
(
new
Client
);
chain
.
push_back
(
service
);
LLURLRequest
*
http
(
new
LLURLRequest
(
LLURLRequest
::
HTTP_POST
));
LLURLRequest
*
http
(
new
LLURLRequest
(
LLURLRequest
::
HTTP_POST
));
if
(
!
http
->
isValid
())
{
llwarns
<<
"Creating LLURLRequest failed."
<<
llendl
;
delete
http
;
return
false
;
}
LLIOPipe
::
ptr_t
service
(
new
Client
);
chain
.
push_back
(
service
);
LLIOPipe
::
ptr_t
http_pipe
(
http
);
LLIOPipe
::
ptr_t
http_pipe
(
http
);
http
->
addHeader
(
"Content-Type: text/xml"
);
http
->
addHeader
(
"Content-Type: text/xml"
);
if
(
mURL
.
empty
())
if
(
mURL
.
empty
())
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment