You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@httpd.apache.org by ji...@apache.org on 2007/11/15 22:31:17 UTC
svn commit: r595464 - /httpd/httpd/branches/1.3.x/src/main/http_main.c
Author: jim
Date: Thu Nov 15 13:31:15 2007
New Revision: 595464
URL: http://svn.apache.org/viewvc?rev=595464&view=rev
Log:
Apply Jeff's patch...
Modified:
httpd/httpd/branches/1.3.x/src/main/http_main.c
Modified: httpd/httpd/branches/1.3.x/src/main/http_main.c
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/1.3.x/src/main/http_main.c?rev=595464&r1=595463&r2=595464&view=diff
==============================================================================
--- httpd/httpd/branches/1.3.x/src/main/http_main.c (original)
+++ httpd/httpd/branches/1.3.x/src/main/http_main.c Thu Nov 15 13:31:15 2007
@@ -2661,7 +2661,6 @@
if (status == SERVER_DEAD) {
ss->my_access_count = 0L;
ss->my_bytes_served = 0L;
- ap_scoreboard_image->parent[child_num].pid = 0;
}
ss->conn_count = (unsigned short) 0;
ss->conn_bytes = (unsigned long) 0;
@@ -2689,7 +2688,10 @@
ss->vhostrec = r->server;
}
}
- if (status == SERVER_STARTING && r == NULL) {
+ if (status == SERVER_DEAD) {
+ ap_scoreboard_image->parent[child_num].pid = 0;
+ }
+ else if (status == SERVER_STARTING && r == NULL) {
/* clean up the slot's vhostrec pointer (maybe re-used)
* and mark the slot as belonging to a new generation.
*/
Re: svn commit: r595464 - /httpd/httpd/branches/1.3.x/src/main/http_main.c
Posted by Jim Jagielski <ji...@jaguNET.com>.
On Thu, Nov 15, 2007 at 09:31:17PM -0000, jim@apache.org wrote:
> Modified: httpd/httpd/branches/1.3.x/src/main/http_main.c
> URL: http://svn.apache.org/viewvc/httpd/httpd/branches/1.3.x/src/main/http_main.c?rev=595464&r1=595463&r2=595464&view=diff
> ==============================================================================
> --- httpd/httpd/branches/1.3.x/src/main/http_main.c (original)
> +++ httpd/httpd/branches/1.3.x/src/main/http_main.c Thu Nov 15 13:31:15 2007
> @@ -2661,7 +2661,6 @@
> if (status == SERVER_DEAD) {
> ss->my_access_count = 0L;
> ss->my_bytes_served = 0L;
> - ap_scoreboard_image->parent[child_num].pid = 0;
> }
> ss->conn_count = (unsigned short) 0;
> ss->conn_bytes = (unsigned long) 0;
By the by, I just noticed that we have a sh*tload of tabs in various
1.3 files... should be take the time to actually detab? Or let float...
I'm 0 either way.
--
===========================================================================
Jim Jagielski [|] jim@jaguNET.com [|] http://www.jaguNET.com/
"Great is the guilt of an unnecessary war" ~ John Adams