[svn:mod_parrot] r254 - in mod_parrot/trunk: build/lib/Generator lib/Apache t/lib
[email protected] Mon, 17 Sep 2007 08:27:30 -0700 (PDT)
Newsgroups
perl.cvs.mod_parrot
Message-ID
<[email protected] >
Author: jhorwitz
Date: Mon Sep 17 08:27:29 2007
New Revision: 254
Modified:
mod_parrot/trunk/build/lib/Generator/ApacheConstants.pm
mod_parrot/trunk/lib/Apache/Constants.pir
mod_parrot/trunk/t/lib/handlers.pir
Log:
migrate constants from Apache::Constants to [ 'Apache; 'Constants' ]
Modified: mod_parrot/trunk/build/lib/Generator/ApacheConstants.pm
==============================================================================
--- mod_parrot/trunk/build/lib/Generator/ApacheConstants.pm (original)
+++ mod_parrot/trunk/build/lib/Generator/ApacheConstants.pm Mon Sep 17 08:27:29 2007
@@ -118,6 +118,6 @@
# Log Severities
%%LOG%%
- set_root_global [ 'Apache::Constants' ], 'ap_constants', ap_constants
+ set_root_global [ 'Apache'; 'Constants' ], 'ap_constants', ap_constants
.end
Modified: mod_parrot/trunk/lib/Apache/Constants.pir
==============================================================================
--- mod_parrot/trunk/lib/Apache/Constants.pir (original)
+++ mod_parrot/trunk/lib/Apache/Constants.pir Mon Sep 17 08:27:29 2007
@@ -26,7 +26,7 @@
This IMC code returns C<OK> from a handler:
- find_global $P0, 'Apache::Constants', 'ap_const'
+ $P0 = get_root_global [ 'Apache'; 'Constants'], 'ap_const'
$I0 = ap_const['OK']
.return($I0)
@@ -36,7 +36,7 @@
=cut
-.namespace [ 'Apache::Constants' ]
+.namespace [ 'Apache'; 'Constants' ]
.include 'build/src/pir/ap_constants.pir'
Modified: mod_parrot/trunk/t/lib/handlers.pir
==============================================================================
--- mod_parrot/trunk/t/lib/handlers.pir (original)
+++ mod_parrot/trunk/t/lib/handlers.pir Mon Sep 17 08:27:29 2007
@@ -9,7 +9,7 @@
r.'content_type'('text/plain')
r.'puts'("testing\n")
- ap_const = get_root_global [ 'Apache::Constants' ], 'ap_constants'
+ ap_const = get_root_global [ 'Apache'; 'Constants' ], 'ap_constants'
$I0 = ap_const['OK']
.return($I0)
@@ -23,7 +23,7 @@
r.'puts'("Testing 123\n")
- ap_const = get_root_global [ 'Apache::Constants' ], 'ap_constants'
+ ap_const = get_root_global [ 'Apache'; 'Constants' ], 'ap_constants'
$I0 = ap_const['OK']
.return($I0)
@@ -39,7 +39,7 @@
$P0 = "Testing 123\n"
r.'write'($P0, 12)
- ap_const = get_root_global [ 'Apache::Constants' ], 'ap_constants'
+ ap_const = get_root_global [ 'Apache'; 'Constants' ], 'ap_constants'
$I0 = ap_const['OK']
.return($I0)
@@ -55,7 +55,7 @@
args = r.'args'( )
r.'puts'(args)
- ap_const = get_root_global [ 'Apache::Constants' ], 'ap_constants'
+ ap_const = get_root_global [ 'Apache'; 'Constants' ], 'ap_constants'
$I0 = ap_const['OK']
.return($I0)
@@ -71,7 +71,7 @@
hostname = r.'hostname'( )
r.'puts'(hostname)
- ap_const = get_root_global [ 'Apache::Constants' ], 'ap_constants'
+ ap_const = get_root_global [ 'Apache'; 'Constants' ], 'ap_constants'
$I0 = ap_const['OK']
.return($I0)
@@ -85,7 +85,7 @@
.local int level
# use EMERG to make sure the log gets through
- ap_const = get_root_global [ 'Apache::Constants' ], 'ap_constants'
+ ap_const = get_root_global [ 'Apache'; 'Constants' ], 'ap_constants'
level = ap_const['APLOG_EMERG']
r.'log_rerror'('test', 0, level, 'testing')
@@ -103,7 +103,7 @@
r.'puts'("Access granted.")
- ap_const = get_root_global [ 'Apache::Constants' ], 'ap_constants'
+ ap_const = get_root_global [ 'Apache'; 'Constants' ], 'ap_constants'
$I0 = ap_const['OK']
.return($I0)
@@ -115,7 +115,7 @@
.param pmc r
.local pmc ap_const
- ap_const = get_root_global [ 'Apache::Constants' ], 'ap_constants'
+ ap_const = get_root_global [ 'Apache'; 'Constants' ], 'ap_constants'
$I0 = ap_const['OK']
$S0 = r.'args'( )
@@ -138,7 +138,7 @@
($I0, $S1) = r.'get_basic_auth_pw'( )
$S0 = r.'user'( )
- ap_const = get_root_global [ 'Apache::Constants' ], 'ap_constants'
+ ap_const = get_root_global [ 'Apache'; 'Constants' ], 'ap_constants'
if $S0 != 'joeuser' goto auth_failed
if $S1 != 'password' goto auth_failed
@@ -159,7 +159,7 @@
.param pmc r
.local pmc ap_const
- ap_const = get_root_global [ 'Apache::Constants' ], 'ap_constants'
+ ap_const = get_root_global [ 'Apache'; 'Constants' ], 'ap_constants'
$I0 = ap_const['OK']
$S0 = r.'args'( )
@@ -179,7 +179,7 @@
.param pmc r
.local pmc ap_const
- ap_const = get_root_global [ 'Apache::Constants' ], 'ap_constants'
+ ap_const = get_root_global [ 'Apache'; 'Constants' ], 'ap_constants'
$I0 = ap_const['OK']
r.'puts'('Hello World')
@@ -196,7 +196,7 @@
$S0 = r.'auth_type'( )
r.'puts'($S0)
- ap_const = get_root_global [ 'Apache::Constants' ], 'ap_constants'
+ ap_const = get_root_global [ 'Apache'; 'Constants' ], 'ap_constants'
$I0 = ap_const['OK']
.return($I0)
@@ -211,7 +211,7 @@
$S0 = r.'auth_name'( )
r.'puts'($S0)
- ap_const = get_root_global [ 'Apache::Constants' ], 'ap_constants'
+ ap_const = get_root_global [ 'Apache'; 'Constants' ], 'ap_constants'
$I0 = ap_const['OK']
.return($I0)
@@ -226,7 +226,7 @@
$S0 = r.'the_request'( )
r.'puts'($S0)
- ap_const = get_root_global [ 'Apache::Constants' ], 'ap_constants'
+ ap_const = get_root_global [ 'Apache'; 'Constants' ], 'ap_constants'
$I0 = ap_const['OK']
.return($I0)
@@ -241,7 +241,7 @@
$S0 = r.'protocol'( )
r.'puts'($S0)
- ap_const = get_root_global [ 'Apache::Constants' ], 'ap_constants'
+ ap_const = get_root_global [ 'Apache'; 'Constants' ], 'ap_constants'
$I0 = ap_const['OK']
.return($I0)
@@ -256,7 +256,7 @@
$S0 = r.'status_line'( )
r.'puts'($S0)
- ap_const = get_root_global [ 'Apache::Constants' ], 'ap_constants'
+ ap_const = get_root_global [ 'Apache'; 'Constants' ], 'ap_constants'
$I0 = ap_const['OK']
.return($I0)
@@ -271,7 +271,7 @@
$S0 = r.'range'( )
r.'puts'($S0)
- ap_const = get_root_global [ 'Apache::Constants' ], 'ap_constants'
+ ap_const = get_root_global [ 'Apache'; 'Constants' ], 'ap_constants'
$I0 = ap_const['OK']
.return($I0)
@@ -286,7 +286,7 @@
$S0 = r.'handler'( )
r.'puts'($S0)
- ap_const = get_root_global [ 'Apache::Constants' ], 'ap_constants'
+ ap_const = get_root_global [ 'Apache'; 'Constants' ], 'ap_constants'
$I0 = ap_const['OK']
.return($I0)
@@ -301,7 +301,7 @@
$S0 = r.'content_encoding'( )
r.'puts'($S0)
- ap_const = get_root_global [ 'Apache::Constants' ], 'ap_constants'
+ ap_const = get_root_global [ 'Apache'; 'Constants' ], 'ap_constants'
$I0 = ap_const['OK']
.return($I0)
@@ -316,7 +316,7 @@
$S0 = r.'vlist_validator'( )
r.'puts'($S0)
- ap_const = get_root_global [ 'Apache::Constants' ], 'ap_constants'
+ ap_const = get_root_global [ 'Apache'; 'Constants' ], 'ap_constants'
$I0 = ap_const['OK']
.return($I0)
@@ -331,7 +331,7 @@
$S0 = r.'unparsed_uri'( )
r.'puts'($S0)
- ap_const = get_root_global [ 'Apache::Constants' ], 'ap_constants'
+ ap_const = get_root_global [ 'Apache'; 'Constants' ], 'ap_constants'
$I0 = ap_const['OK']
.return($I0)
@@ -346,7 +346,7 @@
$S0 = r.'uri'( )
r.'puts'($S0)
- ap_const = get_root_global [ 'Apache::Constants' ], 'ap_constants'
+ ap_const = get_root_global [ 'Apache'; 'Constants' ], 'ap_constants'
$I0 = ap_const['OK']
.return($I0)
@@ -361,7 +361,7 @@
$S0 = r.'path_info'( )
r.'puts'($S0)
- ap_const = get_root_global [ 'Apache::Constants' ], 'ap_constants'
+ ap_const = get_root_global [ 'Apache'; 'Constants' ], 'ap_constants'
$I0 = ap_const['OK']
.return($I0)
@@ -376,7 +376,7 @@
$I0 = r.'assbackwards'( )
r.'putc'($I0)
- ap_const = get_root_global [ 'Apache::Constants' ], 'ap_constants'
+ ap_const = get_root_global [ 'Apache'; 'Constants' ], 'ap_constants'
$I0 = ap_const['OK']
.return($I0)
@@ -391,7 +391,7 @@
$I0 = r.'proxyreq'( )
r.'putc'($I0)
- ap_const = get_root_global [ 'Apache::Constants' ], 'ap_constants'
+ ap_const = get_root_global [ 'Apache'; 'Constants' ], 'ap_constants'
$I0 = ap_const['OK']
.return($I0)
@@ -406,7 +406,7 @@
$I0 = r.'header_only'( )
r.'putc'($I0)
- ap_const = get_root_global [ 'Apache::Constants' ], 'ap_constants'
+ ap_const = get_root_global [ 'Apache'; 'Constants' ], 'ap_constants'
$I0 = ap_const['OK']
.return($I0)
@@ -421,7 +421,7 @@
$I0 = r.'proto_num'( )
r.'putc'($I0)
- ap_const = get_root_global [ 'Apache::Constants' ], 'ap_constants'
+ ap_const = get_root_global [ 'Apache'; 'Constants' ], 'ap_constants'
$I0 = ap_const['OK']
.return($I0)
@@ -436,7 +436,7 @@
$I0 = r.'method_number'( )
r.'putc'($I0)
- ap_const = get_root_global [ 'Apache::Constants' ], 'ap_constants'
+ ap_const = get_root_global [ 'Apache'; 'Constants' ], 'ap_constants'
$I0 = ap_const['OK']
.return($I0)
@@ -451,7 +451,7 @@
$I0 = r.'chunked'( )
r.'putc'($I0)
- ap_const = get_root_global [ 'Apache::Constants' ], 'ap_constants'
+ ap_const = get_root_global [ 'Apache'; 'Constants' ], 'ap_constants'
$I0 = ap_const['OK']
.return($I0)
@@ -466,7 +466,7 @@
$I0 = r.'read_body'( )
r.'putc'($I0)
- ap_const = get_root_global [ 'Apache::Constants' ], 'ap_constants'
+ ap_const = get_root_global [ 'Apache'; 'Constants' ], 'ap_constants'
$I0 = ap_const['OK']
.return($I0)
@@ -481,7 +481,7 @@
$I0 = r.'read_chunked'( )
r.'putc'($I0)
- ap_const = get_root_global [ 'Apache::Constants' ], 'ap_constants'
+ ap_const = get_root_global [ 'Apache'; 'Constants' ], 'ap_constants'
$I0 = ap_const['OK']
.return($I0)
@@ -496,7 +496,7 @@
$I0 = r.'no_cache'( )
r.'putc'($I0)
- ap_const = get_root_global [ 'Apache::Constants' ], 'ap_constants'
+ ap_const = get_root_global [ 'Apache'; 'Constants' ], 'ap_constants'
$I0 = ap_const['OK']
.return($I0)
@@ -511,7 +511,7 @@
$I0 = r.'no_local_copy'( )
r.'putc'($I0)
- ap_const = get_root_global [ 'Apache::Constants' ], 'ap_constants'
+ ap_const = get_root_global [ 'Apache'; 'Constants' ], 'ap_constants'
$I0 = ap_const['OK']
.return($I0)
@@ -526,7 +526,7 @@
$I0 = r.'used_path_info'( )
r.'putc'($I0)
- ap_const = get_root_global [ 'Apache::Constants' ], 'ap_constants'
+ ap_const = get_root_global [ 'Apache'; 'Constants' ], 'ap_constants'
$I0 = ap_const['OK']
.return($I0)
@@ -541,7 +541,7 @@
$I0 = r.'eos_sent'( )
r.'putc'($I0)
- ap_const = get_root_global [ 'Apache::Constants' ], 'ap_constants'
+ ap_const = get_root_global [ 'Apache'; 'Constants' ], 'ap_constants'
$I0 = ap_const['OK']
.return($I0)
@@ -558,7 +558,7 @@
$S0 = $P0.'get'('foo')
r.'puts'($S0)
- ap_const = get_root_global [ 'Apache::Constants' ], 'ap_constants'
+ ap_const = get_root_global [ 'Apache'; 'Constants' ], 'ap_constants'
$I0 = ap_const['OK']
.return($I0)
@@ -572,7 +572,7 @@
r.'status'(201)
- ap_const = get_root_global [ 'Apache::Constants' ], 'ap_constants'
+ ap_const = get_root_global [ 'Apache'; 'Constants' ], 'ap_constants'
$I0 = ap_const['OK']
.return($I0)