From 7bf992d050fd93f5bd0b4c79b466faac25527e9f Mon Sep 17 00:00:00 2001
From: Mike Rylander <mrylander@gmail.com>
Date: Thu, 4 Aug 2016 08:51:51 -0400
Subject: [PATCH] Stash the current requestrec for opensrf to test

Signed-off-by: Mike Rylander <mrylander@gmail.com>
---
 Open-ILS/src/perlmods/lib/OpenILS/WWW/AccessHandler.pm          | 2 +-
 Open-ILS/src/perlmods/lib/OpenILS/WWW/AddedContent.pm           | 2 +-
 Open-ILS/src/perlmods/lib/OpenILS/WWW/AutoSuggest.pm            | 2 +-
 Open-ILS/src/perlmods/lib/OpenILS/WWW/BadDebt.pm                | 2 +-
 Open-ILS/src/perlmods/lib/OpenILS/WWW/EGWeb.pm                  | 2 +-
 Open-ILS/src/perlmods/lib/OpenILS/WWW/Exporter.pm               | 2 +-
 Open-ILS/src/perlmods/lib/OpenILS/WWW/FlatFielder.pm            | 2 +-
 Open-ILS/src/perlmods/lib/OpenILS/WWW/IDL2js.pm                 | 2 +-
 Open-ILS/src/perlmods/lib/OpenILS/WWW/PhoneList.pm              | 2 +-
 Open-ILS/src/perlmods/lib/OpenILS/WWW/Proxy.pm                  | 2 +-
 Open-ILS/src/perlmods/lib/OpenILS/WWW/Proxy/Authen.pm           | 2 +-
 Open-ILS/src/perlmods/lib/OpenILS/WWW/Redirect.pm               | 2 +-
 Open-ILS/src/perlmods/lib/OpenILS/WWW/Reporter.pm               | 2 +-
 Open-ILS/src/perlmods/lib/OpenILS/WWW/TemplateBatchBibUpdate.pm | 2 +-
 Open-ILS/src/perlmods/lib/OpenILS/WWW/XMLRPCGateway.pm          | 2 +-
 15 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/Open-ILS/src/perlmods/lib/OpenILS/WWW/AccessHandler.pm b/Open-ILS/src/perlmods/lib/OpenILS/WWW/AccessHandler.pm
index 24f1d9e085..a8d0c52ca0 100644
--- a/Open-ILS/src/perlmods/lib/OpenILS/WWW/AccessHandler.pm
+++ b/Open-ILS/src/perlmods/lib/OpenILS/WWW/AccessHandler.pm
@@ -14,7 +14,7 @@ use URI::Escape;
 
 # Auth Handler
 sub handler {
-    my ($r) = @_;
+    my $r = $ENV{OSRF_APACHE_REQUEST_OBJ} = shift;
 
     # Configuration options
 
diff --git a/Open-ILS/src/perlmods/lib/OpenILS/WWW/AddedContent.pm b/Open-ILS/src/perlmods/lib/OpenILS/WWW/AddedContent.pm
index 254d790cf6..700b961a6a 100644
--- a/Open-ILS/src/perlmods/lib/OpenILS/WWW/AddedContent.pm
+++ b/Open-ILS/src/perlmods/lib/OpenILS/WWW/AddedContent.pm
@@ -88,7 +88,7 @@ sub child_init {
 
 sub handler {
 
-    my $r   = shift;
+    my $r   = $ENV{OSRF_APACHE_REQUEST_OBJ} = shift;
 
     # If the URL requested matches a file on the filesystem, have Apache serve that file
     # this allows for local content (most typically images) to be used for some requests
diff --git a/Open-ILS/src/perlmods/lib/OpenILS/WWW/AutoSuggest.pm b/Open-ILS/src/perlmods/lib/OpenILS/WWW/AutoSuggest.pm
index c5d9ee1abe..e7c726f0c3 100644
--- a/Open-ILS/src/perlmods/lib/OpenILS/WWW/AutoSuggest.pm
+++ b/Open-ILS/src/perlmods/lib/OpenILS/WWW/AutoSuggest.pm
@@ -203,7 +203,7 @@ sub output_handler {
 sub handler {
     child_init() unless $init_done;
 
-    my $r = shift;
+    my $r = $ENV{OSRF_APACHE_REQUEST_OBJ} = shift;
     my $cgi = new CGI;
 
     my $editor = new_editor;
diff --git a/Open-ILS/src/perlmods/lib/OpenILS/WWW/BadDebt.pm b/Open-ILS/src/perlmods/lib/OpenILS/WWW/BadDebt.pm
index 523b6d417b..7eaa6700b9 100644
--- a/Open-ILS/src/perlmods/lib/OpenILS/WWW/BadDebt.pm
+++ b/Open-ILS/src/perlmods/lib/OpenILS/WWW/BadDebt.pm
@@ -41,7 +41,7 @@ sub child_init {
 }
 
 sub handler {
-    my $r = shift;
+    my $r = $ENV{OSRF_APACHE_REQUEST_OBJ} = shift;
     my $cgi = new CGI;
     my $auth_ses = $cgi->cookie('ses') || $cgi->param('ses');
 
diff --git a/Open-ILS/src/perlmods/lib/OpenILS/WWW/EGWeb.pm b/Open-ILS/src/perlmods/lib/OpenILS/WWW/EGWeb.pm
index da18d7e56d..2d4a27e860 100644
--- a/Open-ILS/src/perlmods/lib/OpenILS/WWW/EGWeb.pm
+++ b/Open-ILS/src/perlmods/lib/OpenILS/WWW/EGWeb.pm
@@ -50,7 +50,7 @@ sub child_init {
 }
 
 sub handler {
-    my $r = shift;
+    my $r = $ENV{OSRF_APACHE_REQUEST_OBJ} = shift;
     my $stat = handler_guts($r);
 
     # other opensrf clients share this apache process,
diff --git a/Open-ILS/src/perlmods/lib/OpenILS/WWW/Exporter.pm b/Open-ILS/src/perlmods/lib/OpenILS/WWW/Exporter.pm
index bf2fa367ca..3482c58313 100644
--- a/Open-ILS/src/perlmods/lib/OpenILS/WWW/Exporter.pm
+++ b/Open-ILS/src/perlmods/lib/OpenILS/WWW/Exporter.pm
@@ -51,7 +51,7 @@ sub child_init {
 }
 
 sub handler {
-    my $r = shift;
+    my $r = $ENV{OSRF_APACHE_REQUEST_OBJ} = shift;
     my $cgi = new CGI;
 
     # find some IDs ...
diff --git a/Open-ILS/src/perlmods/lib/OpenILS/WWW/FlatFielder.pm b/Open-ILS/src/perlmods/lib/OpenILS/WWW/FlatFielder.pm
index b80c9e8966..d3dec453b1 100644
--- a/Open-ILS/src/perlmods/lib/OpenILS/WWW/FlatFielder.pm
+++ b/Open-ILS/src/perlmods/lib/OpenILS/WWW/FlatFielder.pm
@@ -214,7 +214,7 @@ sub output_handler {
 }
 
 sub handler {
-    my $r = shift;
+    my $r = $ENV{OSRF_APACHE_REQUEST_OBJ} = shift;
     my $cgi = new CGI;
 
     my %args;
diff --git a/Open-ILS/src/perlmods/lib/OpenILS/WWW/IDL2js.pm b/Open-ILS/src/perlmods/lib/OpenILS/WWW/IDL2js.pm
index 497b0dbc16..50ad13fd51 100644
--- a/Open-ILS/src/perlmods/lib/OpenILS/WWW/IDL2js.pm
+++ b/Open-ILS/src/perlmods/lib/OpenILS/WWW/IDL2js.pm
@@ -58,7 +58,7 @@ sub child_init {
 
 my %idl_cache;
 sub handler {
-    my $r = shift;
+    my $r = $ENV{OSRF_APACHE_REQUEST_OBJ} = shift;
     my $args = $r->args || '';
     child_init() unless $__initted;
 
diff --git a/Open-ILS/src/perlmods/lib/OpenILS/WWW/PhoneList.pm b/Open-ILS/src/perlmods/lib/OpenILS/WWW/PhoneList.pm
index 6e6c9fd7b1..3d42e4e57c 100644
--- a/Open-ILS/src/perlmods/lib/OpenILS/WWW/PhoneList.pm
+++ b/Open-ILS/src/perlmods/lib/OpenILS/WWW/PhoneList.pm
@@ -58,7 +58,7 @@ sub child_init {
 }
 
 sub handler {
-    my $r = shift;
+    my $r = $ENV{OSRF_APACHE_REQUEST_OBJ} = shift;
     my $cgi = new CGI;
     my $authid = $cgi->cookie('ses') || $cgi->param('ses');
     my $user = $U->simplereq('open-ils.auth', 'open-ils.auth.session.retrieve', $authid);
diff --git a/Open-ILS/src/perlmods/lib/OpenILS/WWW/Proxy.pm b/Open-ILS/src/perlmods/lib/OpenILS/WWW/Proxy.pm
index ed6cdf9c53..b74d25f046 100644
--- a/Open-ILS/src/perlmods/lib/OpenILS/WWW/Proxy.pm
+++ b/Open-ILS/src/perlmods/lib/OpenILS/WWW/Proxy.pm
@@ -59,7 +59,7 @@ sub child_init {
 }
 
 sub handler {
-    my $apache = shift;
+    my $apache = $ENV{OSRF_APACHE_REQUEST_OBJ} = shift;
 
     my $proxyhtml = $apache->dir_config('OILSProxyHTML');
     my $title = $apache->dir_config('OILSProxyTitle');
diff --git a/Open-ILS/src/perlmods/lib/OpenILS/WWW/Proxy/Authen.pm b/Open-ILS/src/perlmods/lib/OpenILS/WWW/Proxy/Authen.pm
index 5b1c64b77d..3a5b2c7008 100644
--- a/Open-ILS/src/perlmods/lib/OpenILS/WWW/Proxy/Authen.pm
+++ b/Open-ILS/src/perlmods/lib/OpenILS/WWW/Proxy/Authen.pm
@@ -31,7 +31,7 @@ sub child_init {
 }
 
 sub handler {
-    my $apache = shift;
+    my $apache = $ENV{OSRF_APACHE_REQUEST_OBJ} = shift;
 
     my $ltype = $apache->dir_config('OILSProxyLoginType');
     my $perms = [ split ' ', $apache->dir_config('OILSProxyPermissions') ];
diff --git a/Open-ILS/src/perlmods/lib/OpenILS/WWW/Redirect.pm b/Open-ILS/src/perlmods/lib/OpenILS/WWW/Redirect.pm
index d55c01f122..924edc1fc8 100644
--- a/Open-ILS/src/perlmods/lib/OpenILS/WWW/Redirect.pm
+++ b/Open-ILS/src/perlmods/lib/OpenILS/WWW/Redirect.pm
@@ -53,7 +53,7 @@ sub parse_ips_file {
 
 my %org_cache;
 sub handler {
-    my $apache = shift;
+    my $apache = $ENV{OSRF_APACHE_REQUEST_OBJ} = shift;
 
     my $cgi = CGI->new( $apache );
     my $port = $cgi->server_port();
diff --git a/Open-ILS/src/perlmods/lib/OpenILS/WWW/Reporter.pm b/Open-ILS/src/perlmods/lib/OpenILS/WWW/Reporter.pm
index 882c12d711..1d27104ce5 100644
--- a/Open-ILS/src/perlmods/lib/OpenILS/WWW/Reporter.pm
+++ b/Open-ILS/src/perlmods/lib/OpenILS/WWW/Reporter.pm
@@ -54,7 +54,7 @@ sub child_init {
 
 sub handler {
 
-    my $apache = shift;
+    my $apache = $ENV{OSRF_APACHE_REQUEST_OBJ} = shift;
     return Apache2::Const::DECLINED if (-e $apache->filename);
 
     my $cgi = CGI->new;
diff --git a/Open-ILS/src/perlmods/lib/OpenILS/WWW/TemplateBatchBibUpdate.pm b/Open-ILS/src/perlmods/lib/OpenILS/WWW/TemplateBatchBibUpdate.pm
index 6d75965f16..65b761aa1c 100644
--- a/Open-ILS/src/perlmods/lib/OpenILS/WWW/TemplateBatchBibUpdate.pm
+++ b/Open-ILS/src/perlmods/lib/OpenILS/WWW/TemplateBatchBibUpdate.pm
@@ -52,7 +52,7 @@ sub child_init {
 }
 
 sub handler {
-    my $r = shift;
+    my $r = $ENV{OSRF_APACHE_REQUEST_OBJ} = shift;
     my $cgi = new CGI;
 
     my $authid = $cgi->cookie('ses') || $cgi->param('ses');
diff --git a/Open-ILS/src/perlmods/lib/OpenILS/WWW/XMLRPCGateway.pm b/Open-ILS/src/perlmods/lib/OpenILS/WWW/XMLRPCGateway.pm
index 43e99e4a61..96f2a23ad3 100644
--- a/Open-ILS/src/perlmods/lib/OpenILS/WWW/XMLRPCGateway.pm
+++ b/Open-ILS/src/perlmods/lib/OpenILS/WWW/XMLRPCGateway.pm
@@ -54,7 +54,7 @@ sub child_init {
 
 sub handler {
 
-    my $r       = shift;
+    my $r       = $ENV{OSRF_APACHE_REQUEST_OBJ} = shift;
     my $cgi = CGI->new;
     my $service = $r->path_info;
     $service =~ s#^/##;
-- 
2.11.0