You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@httpd.apache.org by Ruediger Pluem <rp...@apache.org> on 2010/09/23 07:20:11 UTC
Re: svn commit: r999690 - in /httpd/sandbox/replacelimit: ./ include/
modules/aaa/ modules/cache/ modules/dav/main/ modules/generators/ modules/http/
modules/ldap/ modules/mappers/ modules/proxy/ server/
On 09/22/2010 01:49 AM, wrowe@apache.org wrote:
> Author: wrowe
> Date: Tue Sep 21 23:49:29 2010
> New Revision: 999690
>
> URL: http://svn.apache.org/viewvc?rev=999690&view=rev
> Log:
> Eliminate the hobbled <Limit[Except]> directive and associated API noise.
>
> Replace request_rec allowed with allowed_methods
>
> ap_init_method_list replaces ap_make_method_list
>
> OR_LIMIT/limited/limited_methods/xlimited/
> ap_method_is_limited are dropped from the API.
> allowed/allowed_xmethods/allowed_methods are all
> simplified into an ap_method_list_t
>
> Modified:
> httpd/sandbox/replacelimit/ap.d
> httpd/sandbox/replacelimit/include/ap_mmn.h
> httpd/sandbox/replacelimit/include/http_config.h
> httpd/sandbox/replacelimit/include/http_core.h
> httpd/sandbox/replacelimit/include/http_protocol.h
> httpd/sandbox/replacelimit/include/httpd.h
> httpd/sandbox/replacelimit/modules/aaa/mod_access_compat.c
> httpd/sandbox/replacelimit/modules/aaa/mod_authz_core.c
> httpd/sandbox/replacelimit/modules/cache/mod_cache.c
> httpd/sandbox/replacelimit/modules/cache/mod_file_cache.c
> httpd/sandbox/replacelimit/modules/dav/main/mod_dav.c
> httpd/sandbox/replacelimit/modules/generators/mod_asis.c
> httpd/sandbox/replacelimit/modules/generators/mod_autoindex.c
> httpd/sandbox/replacelimit/modules/generators/mod_info.c
> httpd/sandbox/replacelimit/modules/generators/mod_status.c
> httpd/sandbox/replacelimit/modules/http/http_protocol.c
> httpd/sandbox/replacelimit/modules/http/http_request.c
> httpd/sandbox/replacelimit/modules/ldap/util_ldap.c
> httpd/sandbox/replacelimit/modules/mappers/mod_actions.c
> httpd/sandbox/replacelimit/modules/proxy/mod_proxy_balancer.c
> httpd/sandbox/replacelimit/server/config.c
> httpd/sandbox/replacelimit/server/core.c
> httpd/sandbox/replacelimit/server/protocol.c
> httpd/sandbox/replacelimit/server/request.c
> httpd/sandbox/replacelimit/server/util_script.c
>
> Modified: httpd/sandbox/replacelimit/server/util_script.c
> URL: http://svn.apache.org/viewvc/httpd/sandbox/replacelimit/server/util_script.c?rev=999690&r1=999689&r2=999690&view=diff
> ==============================================================================
> --- httpd/sandbox/replacelimit/server/util_script.c (original)
> +++ httpd/sandbox/replacelimit/server/util_script.c Tue Sep 21 23:49:29 2010
> @@ -124,9 +124,7 @@ AP_DECLARE(void) ap_add_common_vars(requ
> conn_rec *c = r->connection;
> const char *rem_logname;
> const char *env_path;
> -#if defined(WIN32) || defined(OS2)
> const char *env_temp;
> -#endif
> const char *host;
> const apr_array_header_t *hdrs_arr = apr_table_elts(r->headers_in);
> const apr_table_entry_t *hdrs = (const apr_table_entry_t *) hdrs_arr->elts;
> @@ -191,7 +189,7 @@ AP_DECLARE(void) ap_add_common_vars(requ
> }
> apr_table_addn(e, "PATH", apr_pstrdup(r->pool, env_path));
>
> -#ifdef WIN32
> +#if defined(WIN32)
> if (env_temp = getenv("SystemRoot")) {
> apr_table_addn(e, "SystemRoot", env_temp);
> }
> @@ -204,6 +202,43 @@ AP_DECLARE(void) ap_add_common_vars(requ
> if (env_temp = getenv("WINDIR")) {
> apr_table_addn(e, "WINDIR", env_temp);
> }
> +#elif defined(OS2)
> + if ((env_temp = getenv("COMSPEC")) != NULL) {
> + apr_table_addn(e, "COMSPEC", env_temp);
> + }
> + if ((env_temp = getenv("ETC")) != NULL) {
> + apr_table_addn(e, "ETC", env_temp);
> + }
> + if ((env_temp = getenv("DPATH")) != NULL) {
> + apr_table_addn(e, "DPATH", env_temp);
> + }
> + if ((env_temp = getenv("PERLLIB_PREFIX")) != NULL) {
> + apr_table_addn(e, "PERLLIB_PREFIX", env_temp);
> + }
> +#elif defined(BEOS)
> + if ((env_temp = getenv("LIBRARY_PATH")) != NULL) {
> + apr_table_addn(e, "LIBRARY_PATH", env_temp);
> + }
> +#elif defined(DARWIN)
> + if ((env_temp = getenv("DYLD_LIBRARY_PATH")) != NULL) {
> + apr_table_addn(e, "DYLD_LIBRARY_PATH", env_temp);
> + }
> +#elif defined(_AIX)
> + if ((env_temp = getenv("LIBPATH")) != NULL) {
> + apr_table_addn(e, "LIBPATH", env_temp);
> + }
> +#elif defined(__HPUX__)
> + /* HPUX PARISC 2.0W knows both, otherwise redundancy is harmless */
> + if ((env_temp = getenv("SHLIB_PATH")) != NULL) {
> + apr_table_addn(e, "SHLIB_PATH", env_temp);
> + }
> + if ((env_temp = getenv("LD_LIBRARY_PATH")) != NULL) {
> + apr_table_addn(e, "LD_LIBRARY_PATH", env_temp);
> + }
> +#else /* Some Unix */
> + if ((env_temp = getenv("LD_LIBRARY_PATH")) != NULL) {
> + apr_table_addn(e, "LD_LIBRARY_PATH", env_temp);
> + }
> #endif
>
> #ifdef OS2
>
Are these changes really related to <Limit?
Regards
Rüdiger
Re: svn commit: r999690 - in /httpd/sandbox/replacelimit: ./ include/
modules/aaa/ modules/cache/ modules/dav/main/ modules/generators/ modules/http/
modules/ldap/ modules/mappers/ modules/proxy/ server/
Posted by "William A. Rowe Jr." <wr...@rowe-clan.net>.
On 9/23/2010 12:20 AM, Ruediger Pluem wrote:
>
>> --- httpd/sandbox/replacelimit/server/util_script.c (original)
>> +++ httpd/sandbox/replacelimit/server/util_script.c Tue Sep 21 23:49:29 2010
>
> Are these changes really related to <Limit?
No - this was cruft in the tree I forked, I'll revert it for purposes of
considering the sandbox. This should just be proposed and committed
separately to trunk, if accepted, which I'll deal with in a day or few.
Thanks for noting this, and reviewing the proposal.