Small fix to bool warning, plus a missing variable change in the 1.3 code.

git-svn-id: https://svn.middleware.georgetown.edu/cpp-sp/trunk@1329 cb58f699-b61c-0410-a6fe-9272a202ed29

diff --git a/apache/mod_apache.cpp b/apache/mod_apache.cpp
index 4488ee0..bdd0df4 100644 (file)
--- a/apache/mod_apache.cpp
+++ b/apache/mod_apache.cpp
@@ -215,7 +215,7 @@ public:
       throw ShibTargetException(SHIBRPC_OK, "EEP");
   }
   ~HTGroupTableApache() {}
-  bool lookup(const char *entry) { return (ap_table_get(groups, entry)); }
+  bool lookup(const char *entry) { return (ap_table_get(groups, entry)!=NULL); }
   SH_AP_TABLE* groups;
 };
 
@@ -267,7 +267,7 @@ public:
 
     string cgistr;
     char buff[HUGE_STRING_LEN];
-    ap_hard_timeout("[mod_shib] getPostData", r);
+    ap_hard_timeout("[mod_shib] getPostData", m_req);
     memset(buff, 0, sizeof(buff));
     while (ap_get_client_block(m_req, buff, sizeof(buff)-1) > 0) {
       ap_reset_timeout(m_req);