You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@httpd.apache.org by co...@apache.org on 2005/10/03 13:50:50 UTC
svn commit: r293318 -
/httpd/httpd/branches/2.2.x/modules/generators/mod_cgid.c
Author: colm
Date: Mon Oct 3 04:50:47 2005
New Revision: 293318
URL: http://svn.apache.org/viewcvs?rev=293318&view=rev
Log:
Sync with trunk; minor comment and camelcase consistency changes.
Modified:
httpd/httpd/branches/2.2.x/modules/generators/mod_cgid.c
Modified: httpd/httpd/branches/2.2.x/modules/generators/mod_cgid.c
URL: http://svn.apache.org/viewcvs/httpd/httpd/branches/2.2.x/modules/generators/mod_cgid.c?rev=293318&r1=293317&r2=293318&view=diff
==============================================================================
--- httpd/httpd/branches/2.2.x/modules/generators/mod_cgid.c (original)
+++ httpd/httpd/branches/2.2.x/modules/generators/mod_cgid.c Mon Oct 3 04:50:47 2005
@@ -277,7 +277,7 @@
kill(proc->pid, SIGHUP); /* send signal to daemon telling it to die */
/* Remove the cgi socket, we must do it here in order to try and
- * guarantee the same permissions as when the socket was created
+ * guarantee the same permissions as when the socket was created.
*/
if (unlink(sockname) < 0 && errno != ENOENT) {
ap_log_error(APLOG_MARK, APLOG_ERR, errno, NULL,
@@ -927,11 +927,12 @@
return err;
}
+ /* Make sure the pid is appended to the sockname */
sockname = ap_append_pid(cmd->pool, arg, ".");
sockname = ap_server_root_relative(cmd->pool, sockname);
if (!sockname) {
- return apr_pstrcat(cmd->pool, "Invalid Scriptsock path",
+ return apr_pstrcat(cmd->pool, "Invalid ScriptSock path",
arg, NULL);
}
@@ -946,7 +947,7 @@
"the maximum length (in bytes) of the script debug log"),
AP_INIT_TAKE1("ScriptLogBuffer", set_scriptlog_buffer, NULL, RSRC_CONF,
"the maximum size (in bytes) to record of a POST request"),
- AP_INIT_TAKE1("Scriptsock", set_script_socket, NULL, RSRC_CONF,
+ AP_INIT_TAKE1("ScriptSock", set_script_socket, NULL, RSRC_CONF,
"the name of the socket to use for communication with "
"the cgi daemon."),
{NULL}