Skip to content
Projects
Groups
Snippets
Help
Loading...
Sign in / Register
Toggle navigation
M
mongoose
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Packages
Packages
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
submodule
mongoose
Commits
4680573a
Commit
4680573a
authored
May 22, 2020
by
Deomid "rojer" Ryabkov
Committed by
Cesanta Bot
May 23, 2020
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fixes for -pedantic build mode
PUBLISHED_FROM=d0a15356cf047e579c74869ce3e8fe813752e8c7
parent
95fcb261
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
16 additions
and
10 deletions
+16
-10
mongoose.c
mongoose.c
+8
-5
mg_http_ssi.c
src/mg_http_ssi.c
+4
-2
mg_ssl_if_openssl.c
src/mg_ssl_if_openssl.c
+4
-3
No files found.
mongoose.c
View file @
4680573a
...
...
@@ -4537,9 +4537,10 @@ enum mg_ssl_if_result mg_ssl_if_conn_init(
SSL_CTX_set_options
(
ctx
->
ssl_ctx
,
SSL_OP_NO_SSLv2
);
SSL_CTX_set_options
(
ctx
->
ssl_ctx
,
SSL_OP_NO_SSLv3
);
SSL_CTX_set_options
(
ctx
->
ssl_ctx
,
SSL_OP_NO_TLSv1
);
SSL_CTX_set_session_id_context
(
ctx
->
ssl_ctx
,
(
void
*
)
mg_default_session_id_context
,
strlen
(
mg_default_session_id_context
));
SSL_CTX_set_session_id_context
(
ctx
->
ssl_ctx
,
(
const
unsigned
char
*
)
mg_default_session_id_context
,
strlen
(
mg_default_session_id_context
));
#ifdef MG_SSL_OPENSSL_NO_COMPRESSION
SSL_CTX_set_options
(
ctx
->
ssl_ctx
,
SSL_OP_NO_COMPRESSION
);
#endif
...
...
@@ -9376,13 +9377,15 @@ static void mg_do_ssi_include(struct mg_connection *nc, struct http_message *hm,
*/
if
(
sscanf
(
tag
,
" virtual=
\"
%[^
\"
]
\"
"
,
file_name
)
==
1
)
{
/* File name is relative to the webserver root */
snprintf
(
path
,
sizeof
(
path
),
"%s/%s"
,
opts
->
document_root
,
file_name
);
if
(
snprintf
(
path
,
sizeof
(
path
),
"%s/%s"
,
opts
->
document_root
,
file_name
)
<
0
)
{
return
;
}
}
else
if
(
sscanf
(
tag
,
" abspath=
\"
%[^
\"
]
\"
"
,
file_name
)
==
1
)
{
/*
* File name is relative to the webserver working directory
* or it is absolute system path
*/
snprintf
(
path
,
sizeof
(
path
),
"%s"
,
file_name
)
;
if
(
snprintf
(
path
,
sizeof
(
path
),
"%s"
,
file_name
)
<
0
)
return
;
}
else
if
(
sscanf
(
tag
,
" file=
\"
%[^
\"
]
\"
"
,
file_name
)
==
1
||
sscanf
(
tag
,
"
\"
%[^
\"
]
\"
"
,
file_name
)
==
1
)
{
/* File name is relative to the currect document */
...
...
src/mg_http_ssi.c
View file @
4680573a
...
...
@@ -29,13 +29,15 @@ static void mg_do_ssi_include(struct mg_connection *nc, struct http_message *hm,
*/
if
(
sscanf
(
tag
,
" virtual=
\"
%[^
\"
]
\"
"
,
file_name
)
==
1
)
{
/* File name is relative to the webserver root */
snprintf
(
path
,
sizeof
(
path
),
"%s/%s"
,
opts
->
document_root
,
file_name
);
if
(
snprintf
(
path
,
sizeof
(
path
),
"%s/%s"
,
opts
->
document_root
,
file_name
)
<
0
)
{
return
;
}
}
else
if
(
sscanf
(
tag
,
" abspath=
\"
%[^
\"
]
\"
"
,
file_name
)
==
1
)
{
/*
* File name is relative to the webserver working directory
* or it is absolute system path
*/
snprintf
(
path
,
sizeof
(
path
),
"%s"
,
file_name
)
;
if
(
snprintf
(
path
,
sizeof
(
path
),
"%s"
,
file_name
)
<
0
)
return
;
}
else
if
(
sscanf
(
tag
,
" file=
\"
%[^
\"
]
\"
"
,
file_name
)
==
1
||
sscanf
(
tag
,
"
\"
%[^
\"
]
\"
"
,
file_name
)
==
1
)
{
/* File name is relative to the currect document */
...
...
src/mg_ssl_if_openssl.c
View file @
4680573a
...
...
@@ -78,9 +78,10 @@ enum mg_ssl_if_result mg_ssl_if_conn_init(
SSL_CTX_set_options
(
ctx
->
ssl_ctx
,
SSL_OP_NO_SSLv2
);
SSL_CTX_set_options
(
ctx
->
ssl_ctx
,
SSL_OP_NO_SSLv3
);
SSL_CTX_set_options
(
ctx
->
ssl_ctx
,
SSL_OP_NO_TLSv1
);
SSL_CTX_set_session_id_context
(
ctx
->
ssl_ctx
,
(
void
*
)
mg_default_session_id_context
,
strlen
(
mg_default_session_id_context
));
SSL_CTX_set_session_id_context
(
ctx
->
ssl_ctx
,
(
const
unsigned
char
*
)
mg_default_session_id_context
,
strlen
(
mg_default_session_id_context
));
#ifdef MG_SSL_OPENSSL_NO_COMPRESSION
SSL_CTX_set_options
(
ctx
->
ssl_ctx
,
SSL_OP_NO_COMPRESSION
);
#endif
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment