You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@httpd.apache.org by rp...@apache.org on 2007/11/04 12:20:13 UTC

svn commit: r591760 - in /httpd/httpd/trunk: CHANGES server/scoreboard.c

Author: rpluem
Date: Sun Nov  4 03:20:11 2007
New Revision: 591760

URL: http://svn.apache.org/viewvc?rev=591760&view=rev
Log:
* Use the same declaration for ap_time_process_request as in the header file.

PR: 43789
Submitted by: Tom Donovan <Tom.Donovan acm.org>
Reviewed by: rpluem

Modified:
    httpd/httpd/trunk/CHANGES
    httpd/httpd/trunk/server/scoreboard.c

Modified: httpd/httpd/trunk/CHANGES
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/CHANGES?rev=591760&r1=591759&r2=591760&view=diff
==============================================================================
--- httpd/httpd/trunk/CHANGES [utf-8] (original)
+++ httpd/httpd/trunk/CHANGES [utf-8] Sun Nov  4 03:20:11 2007
@@ -2,10 +2,13 @@
 Changes with Apache 2.3.0
 [ When backported to 2.2.x, remove entry from this file ]
 
+  *) scoreboard: Correctly declare ap_time_process_request.
+     PR 43789 [Tom Donovan <Tom.Donovan acm.org>]
+
   *) mod_ldap: Give callers a reference to data copied into the request
      pool instead of references directly into the cache
      PR 43786 [Eric Covener]
-    
+
   *) mod_ldap: Stop passing a reference to pconf around for
      (limited) use during request processing, avoiding possible 
      memory corruption and crashes.  [Eric Covener]

Modified: httpd/httpd/trunk/server/scoreboard.c
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/server/scoreboard.c?rev=591760&r1=591759&r2=591760&view=diff
==============================================================================
--- httpd/httpd/trunk/server/scoreboard.c (original)
+++ httpd/httpd/trunk/server/scoreboard.c Sun Nov  4 03:20:11 2007
@@ -483,7 +483,7 @@
                                                status, r);
 }
 
-void ap_time_process_request(ap_sb_handle_t *sbh, int status)
+AP_DECLARE(void) ap_time_process_request(ap_sb_handle_t *sbh, int status)
 {
     worker_score *ws;
 



Re: svn commit: r591760 - in /httpd/httpd/trunk: CHANGES server/scoreboard.c

Posted by "William A. Rowe, Jr." <wr...@rowe-clan.net>.
rpluem@apache.org wrote:
> Author: rpluem
> Date: Sun Nov  4 03:20:11 2007
> New Revision: 591760
> 
> URL: http://svn.apache.org/viewvc?rev=591760&view=rev
> Log:
> * Use the same declaration for ap_time_process_request as in the header file.
> 
> PR: 43789
> Submitted by: Tom Donovan <Tom.Donovan acm.org>
> Reviewed by: rpluem
> 
> Modified:
>     httpd/httpd/trunk/CHANGES
>     httpd/httpd/trunk/server/scoreboard.c
> 
> Modified: httpd/httpd/trunk/CHANGES
> URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/CHANGES?rev=591760&r1=591759&r2=591760&view=diff
> ==============================================================================
> --- httpd/httpd/trunk/CHANGES [utf-8] (original)
> +++ httpd/httpd/trunk/CHANGES [utf-8] Sun Nov  4 03:20:11 2007
> @@ -2,10 +2,13 @@
>  Changes with Apache 2.3.0
>  [ When backported to 2.2.x, remove entry from this file ]
>  
> +  *) scoreboard: Correctly declare ap_time_process_request.
> +     PR 43789 [Tom Donovan <Tom.Donovan acm.org>]
> +
>    *) mod_ldap: Give callers a reference to data copied into the request
>       pool instead of references directly into the cache
>       PR 43786 [Eric Covener]
> -    
> +
>    *) mod_ldap: Stop passing a reference to pconf around for
>       (limited) use during request processing, avoiding possible 
>       memory corruption and crashes.  [Eric Covener]
> 
> Modified: httpd/httpd/trunk/server/scoreboard.c
> URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/server/scoreboard.c?rev=591760&r1=591759&r2=591760&view=diff
> ==============================================================================
> --- httpd/httpd/trunk/server/scoreboard.c (original)
> +++ httpd/httpd/trunk/server/scoreboard.c Sun Nov  4 03:20:11 2007
> @@ -483,7 +483,7 @@
>                                                 status, r);
>  }
>  
> -void ap_time_process_request(ap_sb_handle_t *sbh, int status)
> +AP_DECLARE(void) ap_time_process_request(ap_sb_handle_t *sbh, int status)
>  {
>      worker_score *ws;

This changes ABI; you'll need a minor MMN bump, particularly when applied to 2.2
branch, but +1 for that to happen.

Bill

Re: svn commit: r591760 - in /httpd/httpd/trunk: CHANGES server/scoreboard.c

Posted by "William A. Rowe, Jr." <wr...@rowe-clan.net>.
rpluem@apache.org wrote:
> Author: rpluem
> Date: Sun Nov  4 03:20:11 2007
> New Revision: 591760
> 
> URL: http://svn.apache.org/viewvc?rev=591760&view=rev
> Log:
> * Use the same declaration for ap_time_process_request as in the header file.
> 
> PR: 43789
> Submitted by: Tom Donovan <Tom.Donovan acm.org>
> Reviewed by: rpluem
> 
> Modified:
>     httpd/httpd/trunk/CHANGES
>     httpd/httpd/trunk/server/scoreboard.c
> 
> Modified: httpd/httpd/trunk/CHANGES
> URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/CHANGES?rev=591760&r1=591759&r2=591760&view=diff
> ==============================================================================
> --- httpd/httpd/trunk/CHANGES [utf-8] (original)
> +++ httpd/httpd/trunk/CHANGES [utf-8] Sun Nov  4 03:20:11 2007
> @@ -2,10 +2,13 @@
>  Changes with Apache 2.3.0
>  [ When backported to 2.2.x, remove entry from this file ]
>  
> +  *) scoreboard: Correctly declare ap_time_process_request.
> +     PR 43789 [Tom Donovan <Tom.Donovan acm.org>]
> +
>    *) mod_ldap: Give callers a reference to data copied into the request
>       pool instead of references directly into the cache
>       PR 43786 [Eric Covener]
> -    
> +
>    *) mod_ldap: Stop passing a reference to pconf around for
>       (limited) use during request processing, avoiding possible 
>       memory corruption and crashes.  [Eric Covener]
> 
> Modified: httpd/httpd/trunk/server/scoreboard.c
> URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/server/scoreboard.c?rev=591760&r1=591759&r2=591760&view=diff
> ==============================================================================
> --- httpd/httpd/trunk/server/scoreboard.c (original)
> +++ httpd/httpd/trunk/server/scoreboard.c Sun Nov  4 03:20:11 2007
> @@ -483,7 +483,7 @@
>                                                 status, r);
>  }
>  
> -void ap_time_process_request(ap_sb_handle_t *sbh, int status)
> +AP_DECLARE(void) ap_time_process_request(ap_sb_handle_t *sbh, int status)
>  {
>      worker_score *ws;

This changes ABI; you'll need a minor MMN bump, particularly when applied to 2.2
branch, but +1 for that to happen.

Bill