This is an automated email from the ASF dual-hosted git repository.
mxmanghi pushed a commit to branch quattuor
in repository https://gitbox.apache.org/repos/asf/tcl-rivet.git
commit f612260dbc6a477915f71b2daf1c7ae8400a4864
Author: Massimo Manghi <mxman...@apache.org>
AuthorDate: Mon Jan 21 11:09:09 2019 +0100
error message buffer size definitions now using RIVET_MSG_BUFFER_SIZE
---
ChangeLog | 6 ++++++
src/mod_rivet_ng/rivetCore.c | 4 ++--
src/mod_rivet_ng/rivet_worker_mpm.c | 13 ++++++-------
3 files changed, 14 insertions(+), 9 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index 2bfa08b..f5dc5f0 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -15,6 +15,12 @@
2019-01-05 Massimo Manghi <mxman...@apache.org>
* doc/: merging from 3.1 fixes to various broken docbook elements
and new entities to external resources' URLs
+ * src/mod_rivet_ng/rivetCore.c,rivet_worker_mpm.c: hardcoded buffer
size into
+ their correct macro definitions
+
+2019-01-05 Massimo Manghi <mxman...@apache.org>
+ * doc/: merging from 3.1 fixes to various broken docbook elements
+ and new entities to external resources' URLs
2018-12-24 Georgios Petasis <petas...@apache.org>
* README.md: Added badges also for the GitHub fork at:
diff --git a/src/mod_rivet_ng/rivetCore.c b/src/mod_rivet_ng/rivetCore.c
index 223a3a3..4ef8de0 100644
--- a/src/mod_rivet_ng/rivetCore.c
+++ b/src/mod_rivet_ng/rivetCore.c
@@ -278,9 +278,9 @@ TCL_CMD_HEADER( Rivet_Parse )
stat_s = apr_stat(&finfo_b,filename,APR_FINFO_NORM,private->r->pool);
if (stat_s != APR_SUCCESS)
{
- char apr_error_message[256];
+ char apr_error_message[RIVET_MSG_BUFFER_SIZE];
- Tcl_AddErrorInfo(interp,apr_strerror(stat_s,apr_error_message,256));
+
Tcl_AddErrorInfo(interp,apr_strerror(stat_s,apr_error_message,RIVET_MSG_BUFFER_SIZE));
return TCL_ERROR;
}
diff --git a/src/mod_rivet_ng/rivet_worker_mpm.c
b/src/mod_rivet_ng/rivet_worker_mpm.c
index 5992d20..45b3850 100644
--- a/src/mod_rivet_ng/rivet_worker_mpm.c
+++ b/src/mod_rivet_ng/rivet_worker_mpm.c
@@ -321,9 +321,9 @@ static void start_thread_pool (int nthreads)
if (rv != APR_SUCCESS)
{
- char errorbuf[512];
+ char errorbuf[RIVET_MSG_BUFFER_SIZE];
- apr_strerror(rv, errorbuf,200);
+ apr_strerror(rv, errorbuf,RIVET_MSG_BUFFER_SIZE);
ap_log_error(APLOG_MARK, APLOG_ERR, APR_EGENERAL,
module_globals->server,
"Error starting request_processor thread (%d)
rv=%d:%s\n",i,rv,errorbuf);
exit(1);
@@ -417,18 +417,17 @@ static void* APR_THREAD_FUNC threaded_bridge_supervisor
(apr_thread_t *thd, void
rv = create_worker_thread (&((apr_thread_t
**)mpm->workers)[i]);
if (rv != APR_SUCCESS) {
- char errorbuf[512];
+ char errorbuf[RIVET_MSG_BUFFER_SIZE];
/* we shouldn't ever be in the condition of not being
able to start a new thread
* Whatever is the reason we log a message and
terminate the whole process
*/
- apr_strerror(rv,errorbuf,200);
+ apr_strerror(rv,errorbuf,RIVET_MSG_BUFFER_SIZE);
ap_log_error(APLOG_MARK, APLOG_ERR, APR_EGENERAL, s,
"Error starting request_processor thread (%d)
rv=%d:%s",i,rv,errorbuf);
exit(1);
-
}
break;
@@ -553,9 +552,9 @@ void Worker_MPM_ChildInit (apr_pool_t* pool, server_rec*
server)
threaded_bridge_supervisor, server,
module_globals->pool);
if (rv != APR_SUCCESS) {
- char errorbuf[512];
+ char errorbuf[RIVET_MSG_BUFFER_SIZE];
- apr_strerror(rv, errorbuf,200);
+ apr_strerror(rv, errorbuf,RIVET_MSG_BUFFER_SIZE);
ap_log_error(APLOG_MARK, APLOG_ERR, rv, server,
MODNAME "Error starting supervisor thread
rv=%d:%s\n",rv,errorbuf);
exit(1);
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@tcl.apache.org
For additional commands, e-mail: commits-h...@tcl.apache.org
