httpd-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From "William A. Rowe, Jr." <wr...@rowe-clan.net>
Subject Re: svn commit: r123882 - in httpd/httpd/trunk: . include modules/arch/netware modules/dav/main modules/experimental modules/generators modules/http modules/mappers modules/proxy modules/ssl server
Date Sun, 02 Jan 2005 06:55:24 GMT
Any objections to this rename?

The other question; are httpd-2.1-dev/2.2 modules different
enough from 2.0 to warrant bumping MODULE_MAGIC_COOKIE from
0x41503230UL to 0x41503231UL ("AP21")?

I almost committed that change - but stopped since we aught
to discussion implications, especially for folks willing
to attempt 2.0/2.2 module compatibility.

Bill

At 11:33 PM 1/1/2005, wrowe@apache.org wrote:
>Author: wrowe
>Date: Sat Jan  1 21:33:44 2005
>New Revision: 123882
>
>URL: http://svn.apache.org/viewcvs?view=rev&rev=123882
>Log:
>
>  FINALLY Correct ap_http_method()!  It is NOT a method, it's a SCHEME!
>
>  Bumped mmn, and ap module cookie, for this function rename.
>
>  It's not a deprecation, as ap_http_method would be a lovely function
>  name sometime in the future: to determine what the function name implies.
>
>--- httpd/httpd/trunk/include/ap_mmn.h  (original)
>+++ httpd/httpd/trunk/include/ap_mmn.h  Sat Jan  1 21:33:44 2005
>@@ -84,14 +84,15 @@
>  *                      changed ap_add_module, ap_add_loaded_module,
>  *                      ap_setup_prelinked_modules, ap_process_resource_config
>  * 20040425.1 (2.1.0-dev) Added ap_module_symbol_t and ap_prelinked_module_symbols
>+ * 20050101.0 (2.1.2-dev) Axed mixnamed http_method for http_scheme (which it was!)
>  */
> 
> #define MODULE_MAGIC_COOKIE 0x41503230UL /* "AP20" */
> 
> #ifndef MODULE_MAGIC_NUMBER_MAJOR
>-#define MODULE_MAGIC_NUMBER_MAJOR 20040425
>+#define MODULE_MAGIC_NUMBER_MAJOR 20050101
> #endif
>-#define MODULE_MAGIC_NUMBER_MINOR 1                     /* 0...n */
>+#define MODULE_MAGIC_NUMBER_MINOR 0                     /* 0...n */
> 
> /**
>  * Determine if the server's current MODULE_MAGIC_NUMBER is at least a
>
>Modified: httpd/httpd/trunk/include/http_protocol.h
>Url: http://svn.apache.org/viewcvs/httpd/httpd/trunk/include/http_protocol.h?view=diff&rev=123882&p1=httpd/httpd/trunk/include/http_protocol.h&r1=123881&p2=httpd/httpd/trunk/include/http_protocol.h&r2=123882
>==============================================================================
>--- httpd/httpd/trunk/include/http_protocol.h   (original)
>+++ httpd/httpd/trunk/include/http_protocol.h   Sat Jan  1 21:33:44 2005
>@@ -608,13 +608,13 @@
> AP_DECLARE_HOOK(int,log_transaction,(request_rec *r))
> 
> /**
>- * This hook allows modules to retrieve the http method from a request.  This
>- * allows Apache modules to easily extend the methods that Apache understands
>+ * This hook allows modules to retrieve the http scheme for a request.  This
>+ * allows Apache modules to easily extend the schemes that Apache understands
>  * @param r The current request
>- * @return The http method from the request
>- * @deffunc const char *ap_run_http_method(const request_rec *r)
>+ * @return The http scheme from the request
>+ * @deffunc const char *ap_run_http_scheme(const request_rec *r)
>  */
>-AP_DECLARE_HOOK(const char *,http_method,(const request_rec *r))
>+AP_DECLARE_HOOK(const char *,http_scheme,(const request_rec *r))
> 
> /**
>  * Return the default port from the current request
>
>Modified: httpd/httpd/trunk/include/httpd.h
>Url: http://svn.apache.org/viewcvs/httpd/httpd/trunk/include/httpd.h?view=diff&rev=123882&p1=httpd/httpd/trunk/include/httpd.h&r1=123881&p2=httpd/httpd/trunk/include/httpd.h&r2=123882
>==============================================================================
>--- httpd/httpd/trunk/include/httpd.h   (original)
>+++ httpd/httpd/trunk/include/httpd.h   Sat Jan  1 21:33:44 2005
>@@ -278,9 +278,8 @@
> /**
>  * Get the scheme for a request.
>  * @param r The request
>- * @bug This should be called ap_http_scheme!
>  */
>-#define ap_http_method(r)      ap_run_http_method(r)
>+#define ap_http_scheme(r)      ap_run_http_scheme(r)
> 
> /** The default string lengths */
> #define MAX_STRING_LEN HUGE_STRING_LEN



Mime
View raw message