Grrr... I tested with a compile and it worked fine, but
I forgot to do a make distclean 1st.

Yep.

Problem is that we're leaking info in mod_proxy.h
that we shouldn't :/

I'll revert until we figure out a better way to do
this...

On Sep 7, 2007, at 4:30 AM, jean-frederic clere wrote:

That is going to break:
In mod_proxy.h:
int ap_proxy_lb_workers(void);
In server/scoreboard.c:
+++
static APR_OPTIONAL_FN_TYPE(ap_proxy_lb_workers)
                                *proxy_lb_workers;
+++

Cheers

Jean-Frederic

[EMAIL PROTECTED] wrote:
Author: jim
Date: Thu Sep  6 06:46:46 2007
New Revision: 573264

URL: http://svn.apache.org/viewvc?rev=573264&view=rev
Log:
lb_score *is* proxy_worker_stat... no need to "mask" that
or use wasted space.

Modified:
    httpd/httpd/trunk/include/scoreboard.h

Modified: httpd/httpd/trunk/include/scoreboard.h
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/include/ scoreboard.h?rev=573264&r1=573263&r2=573264&view=diff ===================================================================== =========
--- httpd/httpd/trunk/include/scoreboard.h (original)
+++ httpd/httpd/trunk/include/scoreboard.h Thu Sep  6 06:46:46 2007
@@ -40,6 +40,9 @@
 #include "apr_shm.h"
 #include "apr_optional.h"

+/* for lb_score */
+#include "../modules/proxy/mod_proxy.h"
+
 /* Scoreboard file, if there is one */
 #ifndef DEFAULT_SCOREBOARD
 #define DEFAULT_SCOREBOARD "logs/apache_runtime_status"
@@ -142,11 +145,7 @@
 };

 /* stuff which is lb specific */
-typedef struct lb_score lb_score;
-struct lb_score {
-    /* TODO: make a real stuct from this */
-    unsigned char data[1024];
-};
+typedef struct proxy_worker_stat lb_score;

/* Scoreboard is now in 'local' memory, since it isn't updated once created, * even in forked architectures. Child created-processes (non- fork) will





Reply via email to