You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@httpd.apache.org by Rüdiger Plüm <ru...@vodafone.com> on 2011/10/06 08:18:34 UTC
Fwd: svn commit: r1179448 - in /httpd/httpd/trunk: include/ap_mmn.h
include/mpm_common.h server/mpm_common.c
-------- Original-Nachricht --------
Betreff: svn commit: r1179448 - in /httpd/httpd/trunk: include/ap_mmn.h
include/mpm_common.h server/mpm_common.c
Datum: Wed, 05 Oct 2011 21:25:59 GMT
Von:
Author: sf
Date: Wed Oct 5 21:25:58 2011
New Revision: 1179448
URL: http://svn.apache.org/viewvc?rev=1179448&view=rev
Log:
Export ap_max_mem_free, needed by r1178079, as pointed out by Gregg L. Smith
Modified:
httpd/httpd/trunk/include/ap_mmn.h
httpd/httpd/trunk/include/mpm_common.h
httpd/httpd/trunk/server/mpm_common.c
Modified: httpd/httpd/trunk/include/ap_mmn.h
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/include/ap_mmn.h?rev=1179448&r1=1179447&r2=1179448&view=diff
==============================================================================
--- httpd/httpd/trunk/include/ap_mmn.h (original)
+++ httpd/httpd/trunk/include/ap_mmn.h Wed Oct 5 21:25:58 2011
@@ -355,6 +355,7 @@
* 20110724.8 (2.3.15-dev) add ap_abort_on_oom(), ap_malloc(), ap_calloc(),
* ap_realloc()
* 20110724.9 (2.3.15-dev) add ap_varbuf_pdup() and ap_varbuf_regsub()
+ * 20110724.10(2.3.15-dev) Export ap_max_mem_free
*/
#define MODULE_MAGIC_COOKIE 0x41503234UL /* "AP24" */
@@ -362,7 +363,7 @@
#ifndef MODULE_MAGIC_NUMBER_MAJOR
#define MODULE_MAGIC_NUMBER_MAJOR 20110724
#endif
-#define MODULE_MAGIC_NUMBER_MINOR 9 /* 0...n */
+#define MODULE_MAGIC_NUMBER_MINOR 10 /* 0...n */
/**
* Determine if the server's current MODULE_MAGIC_NUMBER is at least a
Modified: httpd/httpd/trunk/include/mpm_common.h
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/include/mpm_common.h?rev=1179448&r1=1179447&r2=1179448&view=diff
==============================================================================
--- httpd/httpd/trunk/include/mpm_common.h (original)
+++ httpd/httpd/trunk/include/mpm_common.h Wed Oct 5 21:25:58 2011
@@ -314,7 +314,7 @@ AP_INIT_TAKE1("GracefulShutdownTimeout",
int ap_signal_server(int *, apr_pool_t *);
void ap_mpm_rewrite_args(process_rec *);
-extern apr_uint32_t ap_max_mem_free;
+AP_DECLARE_DATA apr_uint32_t ap_max_mem_free;
Shouldn't that be
extern apr_uint32_t AP_DECLARE_DATA ap_max_mem_free;
extern const char *ap_mpm_set_max_mem_free(cmd_parms *cmd, void *dummy,
const char *arg);
Modified: httpd/httpd/trunk/server/mpm_common.c
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/server/mpm_common.c?rev=1179448&r1=1179447&r2=1179448&view=diff
==============================================================================
--- httpd/httpd/trunk/server/mpm_common.c (original)
+++ httpd/httpd/trunk/server/mpm_common.c Wed Oct 5 21:25:58 2011
@@ -142,7 +142,7 @@ int ap_max_requests_per_child;
char ap_coredump_dir[MAX_STRING_LEN];
int ap_coredumpdir_configured;
int ap_graceful_shutdown_timeout;
-apr_uint32_t ap_max_mem_free;
+AP_DECLARE_DATA apr_uint32_t ap_max_mem_free;
Shouldn't that be
apr_uint32_t AP_DECLARE_DATA ap_max_mem_free;
apr_size_t ap_thread_stacksize;
/* Set defaults for config directives implemented here. This is
Re: Fwd: svn commit: r1179448 - in /httpd/httpd/trunk: include/ap_mmn.h
include/mpm_common.h server/mpm_common.c
Posted by Stefan Fritsch <sf...@sfritsch.de>.
On Thu, 6 Oct 2011, Rüdiger Plüm wrote:
> Author: sf
> Date: Wed Oct 5 21:25:58 2011
> New Revision: 1179448
>
> URL: http://svn.apache.org/viewvc?rev=1179448&view=rev
> Log:
> Export ap_max_mem_free, needed by r1178079, as pointed out by Gregg L. Smith
>
> Modified:
> httpd/httpd/trunk/include/ap_mmn.h
> httpd/httpd/trunk/include/mpm_common.h
> httpd/httpd/trunk/server/mpm_common.c
>
> Modified: httpd/httpd/trunk/include/mpm_common.h
> URL:
> http://svn.apache.org/viewvc/httpd/httpd/trunk/include/mpm_common.h?rev=1179448&r1=1179447&r2=1179448&view=diff
> ==============================================================================
> --- httpd/httpd/trunk/include/mpm_common.h (original)
> +++ httpd/httpd/trunk/include/mpm_common.h Wed Oct 5 21:25:58 2011
> @@ -314,7 +314,7 @@ AP_INIT_TAKE1("GracefulShutdownTimeout",
> int ap_signal_server(int *, apr_pool_t *);
> void ap_mpm_rewrite_args(process_rec *);
>
> -extern apr_uint32_t ap_max_mem_free;
> +AP_DECLARE_DATA apr_uint32_t ap_max_mem_free;
>
>
>
>
> Shouldn't that be
>
> extern apr_uint32_t AP_DECLARE_DATA ap_max_mem_free;
True, thanks. Fixed in r1179715.
> Modified: httpd/httpd/trunk/server/mpm_common.c
> URL:
> http://svn.apache.org/viewvc/httpd/httpd/trunk/server/mpm_common.c?rev=1179448&r1=1179447&r2=1179448&view=diff
> ==============================================================================
> --- httpd/httpd/trunk/server/mpm_common.c (original)
> +++ httpd/httpd/trunk/server/mpm_common.c Wed Oct 5 21:25:58 2011
> @@ -142,7 +142,7 @@ int ap_max_requests_per_child;
> char ap_coredump_dir[MAX_STRING_LEN];
> int ap_coredumpdir_configured;
> int ap_graceful_shutdown_timeout;
> -apr_uint32_t ap_max_mem_free;
> +AP_DECLARE_DATA apr_uint32_t ap_max_mem_free;
>
>
>
> Shouldn't that be
>
> apr_uint32_t AP_DECLARE_DATA ap_max_mem_free;
The other uses in server/*.c have the AP_DECLARE_DATA first, too. Probably
both orders work.