You are viewing a plain text version of this content. The canonical link for it is here.
Posted to modperl-cvs@perl.apache.org by ge...@apache.org on 2003/12/02 16:49:22 UTC
cvs commit: modperl-2.0/xs/tables/current/Apache ConstantsTable.pm FunctionTable.pm
geoff 2003/12/02 07:49:22
Modified: t/filter/TestFilter both_str_req_proxy.pm
t/response/TestAPI rutil.pm
xs/maps apr_functions.map
xs/tables/current/Apache ConstantsTable.pm FunctionTable.pm
Log:
remove deprecated APR features: apr_uri_default_port_for_scheme(),
apr_socket_opt_get(), apr_socket_opt_set(), and APR_NO_TIMEOUT.
Revision Changes Path
1.3 +20 -1 modperl-2.0/t/filter/TestFilter/both_str_req_proxy.pm
Index: both_str_req_proxy.pm
===================================================================
RCS file: /home/cvs/modperl-2.0/t/filter/TestFilter/both_str_req_proxy.pm,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- both_str_req_proxy.pm 25 Nov 2003 00:11:52 -0000 1.2
+++ both_str_req_proxy.pm 2 Dec 2003 15:49:22 -0000 1.3
@@ -58,6 +58,8 @@
__DATA__
<NoAutoConfig>
<IfModule mod_proxy.c>
+
+ # 2.0
<IfModule mod_access.c>
<Proxy http://@servername@:@port@/*>
Order Deny,Allow
@@ -71,7 +73,24 @@
http://@servername@:@port@/TestFilter__both_str_req_proxy_content/
ProxyPassReverse /TestFilter__both_str_req_proxy/ \
http://@servername@:@port@/TestFilter__both_str_req_proxy_content/
- </IfModule>
+ </IfModule>
+
+ # 2.1
+ <IfModule mod_authz_host.c>
+ <Proxy http://@servername@:@port@/*>
+ Order Deny,Allow
+ Deny from all
+ Allow from @servername@
+ </Proxy>
+ ProxyRequests Off
+ RewriteEngine On
+
+ ProxyPass /TestFilter__both_str_req_proxy/ \
+ http://@servername@:@port@/TestFilter__both_str_req_proxy_content/
+ ProxyPassReverse /TestFilter__both_str_req_proxy/ \
+ http://@servername@:@port@/TestFilter__both_str_req_proxy_content/
+ </IfModule>
+
</IfModule>
PerlModule TestFilter::both_str_req_proxy
1.10 +1 -1 modperl-2.0/t/response/TestAPI/rutil.pm
Index: rutil.pm
===================================================================
RCS file: /home/cvs/modperl-2.0/t/response/TestAPI/rutil.pm,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- rutil.pm 22 Aug 2003 19:15:08 -0000 1.9
+++ rutil.pm 2 Dec 2003 15:49:22 -0000 1.10
@@ -44,7 +44,7 @@
ok $r->get_limit_req_body || 1;
while(my($scheme, $port) = each %default_ports) {
- my $apr_port = APR::URI::default_port_for_scheme($scheme);
+ my $apr_port = APR::URI::port_of_scheme($scheme);
#$r->puts("$scheme => expect: $port, got: $apr_port\n");
ok $apr_port == $port;
}
1.61 +1 -3 modperl-2.0/xs/maps/apr_functions.map
Index: apr_functions.map
===================================================================
RCS file: /home/cvs/modperl-2.0/xs/maps/apr_functions.map,v
retrieving revision 1.60
retrieving revision 1.61
diff -u -r1.60 -r1.61
--- apr_functions.map 17 Nov 2003 23:27:11 -0000 1.60
+++ apr_functions.map 2 Dec 2003 15:49:22 -0000 1.61
@@ -58,8 +58,6 @@
!apr_socket_addr_get
!apr_socket_data_get
!apr_socket_data_set
- apr_socket_opt_get
- apr_socket_opt_set
apr_socket_timeout_get | mpxs_ | ...
apr_socket_timeout_set
-apr_socket_sendfile
@@ -569,7 +567,7 @@
uptr, flags=APR_URI_UNP_OMITPASSWORD | unparse
#special case to set both uri->port and uri->port_str
mpxs_APR__URI_port | | uri, portsv=Nullsv
- apr_uri_default_port_for_scheme
+ apr_uri_port_of_scheme
!MODULE=Apache::XML
apr_text_append
1.32 +0 -1 modperl-2.0/xs/tables/current/Apache/ConstantsTable.pm
Index: ConstantsTable.pm
===================================================================
RCS file: /home/cvs/modperl-2.0/xs/tables/current/Apache/ConstantsTable.pm,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- ConstantsTable.pm 25 Nov 2003 18:41:47 -0000 1.31
+++ ConstantsTable.pm 2 Dec 2003 15:49:22 -0000 1.32
@@ -242,7 +242,6 @@
'APR_SO_DEBUG',
'APR_SO_NONBLOCK',
'APR_SO_REUSEADDR',
- 'APR_SO_TIMEOUT',
'APR_SO_SNDBUF',
'APR_SO_RCVBUF',
'APR_SO_DISCONNECTED'
1.49 +0 -10 modperl-2.0/xs/tables/current/Apache/FunctionTable.pm
Index: FunctionTable.pm
===================================================================
RCS file: /home/cvs/modperl-2.0/xs/tables/current/Apache/FunctionTable.pm,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -r1.48 -r1.49
--- FunctionTable.pm 1 Dec 2003 17:14:16 -0000 1.48
+++ FunctionTable.pm 2 Dec 2003 15:49:22 -0000 1.49
@@ -12903,16 +12903,6 @@
]
},
{
- 'return_type' => 'apr_port_t',
- 'name' => 'apr_uri_default_port_for_scheme',
- 'args' => [
- {
- 'type' => 'const char *',
- 'name' => 'scheme_str'
- }
- ]
- },
- {
'return_type' => 'int',
'name' => 'apr_uri_parse',
'args' => [
Re: cvs commit: modperl-2.0/xs/tables/current/Apache ConstantsTable.pm
FunctionTable.pm
Posted by Stas Bekman <st...@stason.org>.
Geoffrey Young wrote:
>>It'd be better to commit this separately, as it has nothing to do with
>>the rest of the commit.
>
>
> well, the goal for me was to get things working with 2.1. before commit was
> not working, after commit was.
it's ok if it was committed by mistake, but if you simply don't care to keep
commits clean than :(
>>I don't like the duplication that this auth thing creates. May be we
>>should consider adding some magic to Apache-Test to use the right
>>IfModule depending on the used httpd version used.
>
>
> I guess. magic makes things wierd, though - magically turning mod_access.c
> to mod_authz_host might just be confusing.
But it avoids an error-prone duplications.
>>> - apr_uri_default_port_for_scheme
>>> + apr_uri_port_of_scheme
>>
>>
>>You replaced apr_uri_default_port_for_scheme with
>>apr_uri_port_of_scheme, but logged only that the former was deleted.
>
>
> actually, I'm not sure exactly what the above bit of magic does. when I
> inadvertnetly added apr_uri_port_of_scheme to the function table it was
> generated twice (because it was in the function table twice). so it may
> have always been there. I didn't check.
it was in the table, but wasn't in the map. It wasn't enabled until now.
__________________________________________________________________
Stas Bekman JAm_pH ------> Just Another mod_perl Hacker
http://stason.org/ mod_perl Guide ---> http://perl.apache.org
mailto:stas@stason.org http://use.perl.org http://apacheweek.com
http://modperlbook.org http://apache.org http://ticketmaster.com
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@perl.apache.org
For additional commands, e-mail: dev-help@perl.apache.org
Re: cvs commit: modperl-2.0/xs/tables/current/Apache ConstantsTable.pm
FunctionTable.pm
Posted by Geoffrey Young <ge...@modperlcookbook.org>.
>> + </IfModule>
>> +
>> + # 2.1
>> + <IfModule mod_authz_host.c>
>> + <Proxy http://@servername@:@port@/*>
>> + Order Deny,Allow
>> + Deny from all
>> + Allow from @servername@
>> + </Proxy>
>> + ProxyRequests Off
>> + RewriteEngine On
>> +
>> + ProxyPass /TestFilter__both_str_req_proxy/ \
>> +
>> http://@servername@:@port@/TestFilter__both_str_req_proxy_content/
>> + ProxyPassReverse /TestFilter__both_str_req_proxy/ \
>> +
>> http://@servername@:@port@/TestFilter__both_str_req_proxy_content/
>> + </IfModule>
>> +
>> </IfModule>
>> PerlModule TestFilter::both_str_req_proxy
>
>
> It'd be better to commit this separately, as it has nothing to do with
> the rest of the commit.
well, the goal for me was to get things working with 2.1. before commit was
not working, after commit was.
but yeah, I suppose some of it could have been separated out.
>
> I don't like the duplication that this auth thing creates. May be we
> should consider adding some magic to Apache-Test to use the right
> IfModule depending on the used httpd version used.
I guess. magic makes things wierd, though - magically turning mod_access.c
to mod_authz_host might just be confusing.
>> - apr_uri_default_port_for_scheme
>> + apr_uri_port_of_scheme
>
>
> You replaced apr_uri_default_port_for_scheme with
> apr_uri_port_of_scheme, but logged only that the former was deleted.
actually, I'm not sure exactly what the above bit of magic does. when I
inadvertnetly added apr_uri_port_of_scheme to the function table it was
generated twice (because it was in the function table twice). so it may
have always been there. I didn't check.
>
> Also most users have no idea what APR_NO_TIMEOUT is (Changes is a user
> log, right?) so I think it's better to s/APR_NO_TIMEOUT/APR::NO_TIMEOUT/
ok
>
>
> What about these two:
>
> xs/tables/current/Apache/FunctionTable.pm: 'name' =>
> 'apr_socket_opt_get',
> xs/tables/current/Apache/FunctionTable.pm: 'name' =>
> 'apr_socket_opt_set',
>
> shouldn't these be removed as well?
yes, good catch.
--Geoff
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@perl.apache.org
For additional commands, e-mail: dev-help@perl.apache.org
Re: cvs commit: modperl-2.0/xs/tables/current/Apache ConstantsTable.pm
FunctionTable.pm
Posted by Stas Bekman <st...@stason.org>.
geoff@apache.org wrote:
> geoff 2003/12/02 07:49:22
>
> Modified: t/filter/TestFilter both_str_req_proxy.pm
> t/response/TestAPI rutil.pm
> xs/maps apr_functions.map
> xs/tables/current/Apache ConstantsTable.pm FunctionTable.pm
> Log:
> remove deprecated APR features: apr_uri_default_port_for_scheme(),
> apr_socket_opt_get(), apr_socket_opt_set(), and APR_NO_TIMEOUT.
geoff++
> Revision Changes Path
> 1.3 +20 -1 modperl-2.0/t/filter/TestFilter/both_str_req_proxy.pm
>
> Index: both_str_req_proxy.pm
> ===================================================================
> RCS file: /home/cvs/modperl-2.0/t/filter/TestFilter/both_str_req_proxy.pm,v
> retrieving revision 1.2
> retrieving revision 1.3
> diff -u -r1.2 -r1.3
> --- both_str_req_proxy.pm 25 Nov 2003 00:11:52 -0000 1.2
> +++ both_str_req_proxy.pm 2 Dec 2003 15:49:22 -0000 1.3
> @@ -58,6 +58,8 @@
> __DATA__
> <NoAutoConfig>
> <IfModule mod_proxy.c>
> +
> + # 2.0
> <IfModule mod_access.c>
> <Proxy http://@servername@:@port@/*>
> Order Deny,Allow
> @@ -71,7 +73,24 @@
> http://@servername@:@port@/TestFilter__both_str_req_proxy_content/
> ProxyPassReverse /TestFilter__both_str_req_proxy/ \
> http://@servername@:@port@/TestFilter__both_str_req_proxy_content/
> - </IfModule>
> + </IfModule>
> +
> + # 2.1
> + <IfModule mod_authz_host.c>
> + <Proxy http://@servername@:@port@/*>
> + Order Deny,Allow
> + Deny from all
> + Allow from @servername@
> + </Proxy>
> + ProxyRequests Off
> + RewriteEngine On
> +
> + ProxyPass /TestFilter__both_str_req_proxy/ \
> + http://@servername@:@port@/TestFilter__both_str_req_proxy_content/
> + ProxyPassReverse /TestFilter__both_str_req_proxy/ \
> + http://@servername@:@port@/TestFilter__both_str_req_proxy_content/
> + </IfModule>
> +
> </IfModule>
>
> PerlModule TestFilter::both_str_req_proxy
It'd be better to commit this separately, as it has nothing to do with the
rest of the commit.
I don't like the duplication that this auth thing creates. May be we should
consider adding some magic to Apache-Test to use the right IfModule depending
on the used httpd version used.
> 1.61 +1 -3 modperl-2.0/xs/maps/apr_functions.map
>
> Index: apr_functions.map
> ===================================================================
> RCS file: /home/cvs/modperl-2.0/xs/maps/apr_functions.map,v
> retrieving revision 1.60
> retrieving revision 1.61
> diff -u -r1.60 -r1.61
> --- apr_functions.map 17 Nov 2003 23:27:11 -0000 1.60
> +++ apr_functions.map 2 Dec 2003 15:49:22 -0000 1.61
> @@ -58,8 +58,6 @@
> !apr_socket_addr_get
> !apr_socket_data_get
> !apr_socket_data_set
> - apr_socket_opt_get
> - apr_socket_opt_set
> apr_socket_timeout_get | mpxs_ | ...
> apr_socket_timeout_set
> -apr_socket_sendfile
> @@ -569,7 +567,7 @@
> uptr, flags=APR_URI_UNP_OMITPASSWORD | unparse
> #special case to set both uri->port and uri->port_str
> mpxs_APR__URI_port | | uri, portsv=Nullsv
> - apr_uri_default_port_for_scheme
> + apr_uri_port_of_scheme
You replaced apr_uri_default_port_for_scheme with apr_uri_port_of_scheme, but
logged only that the former was deleted.
Also most users have no idea what APR_NO_TIMEOUT is (Changes is a user log,
right?) so I think it's better to s/APR_NO_TIMEOUT/APR::NO_TIMEOUT/
> 1.49 +0 -10 modperl-2.0/xs/tables/current/Apache/FunctionTable.pm
>
> Index: FunctionTable.pm
> ===================================================================
> RCS file: /home/cvs/modperl-2.0/xs/tables/current/Apache/FunctionTable.pm,v
> retrieving revision 1.48
> retrieving revision 1.49
> diff -u -r1.48 -r1.49
> --- FunctionTable.pm 1 Dec 2003 17:14:16 -0000 1.48
> +++ FunctionTable.pm 2 Dec 2003 15:49:22 -0000 1.49
> @@ -12903,16 +12903,6 @@
> ]
> },
> {
> - 'return_type' => 'apr_port_t',
> - 'name' => 'apr_uri_default_port_for_scheme',
> - 'args' => [
> - {
> - 'type' => 'const char *',
> - 'name' => 'scheme_str'
> - }
> - ]
> - },
> - {
What about these two:
xs/tables/current/Apache/FunctionTable.pm: 'name' => 'apr_socket_opt_get',
xs/tables/current/Apache/FunctionTable.pm: 'name' => 'apr_socket_opt_set',
shouldn't these be removed as well?
__________________________________________________________________
Stas Bekman JAm_pH ------> Just Another mod_perl Hacker
http://stason.org/ mod_perl Guide ---> http://perl.apache.org
mailto:stas@stason.org http://use.perl.org http://apacheweek.com
http://modperlbook.org http://apache.org http://ticketmaster.com
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@perl.apache.org
For additional commands, e-mail: dev-help@perl.apache.org