Use shibboleth-sp as package name for compatibility.

[shibboleth/cpp-sp.git] / apache / mod_shib_20.cpp

diff --git a/apache/mod_shib_20.cpp b/apache/mod_shib_20.cpp
index 247af2f..a9b38de 100644 (file)
--- a/apache/mod_shib_20.cpp
+++ b/apache/mod_shib_20.cpp
@@ -1,17 +1,21 @@
-/*
- *  Copyright 2001-2005 Internet2
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+/**
+ * Licensed to the University Corporation for Advanced Internet
+ * Development, Inc. (UCAID) under one or more contributor license
+ * agreements. See the NOTICE file distributed with this work for
+ * additional information regarding copyright ownership.
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
+ * UCAID licenses this file to you under the Apache License,
+ * Version 2.0 (the "License"); you may not use this file except
+ * in compliance with the License. You may obtain a copy of the
+ * License at
  *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND,
+ * either express or implied. See the License for the specific
+ * language governing permissions and limitations under the License.
  */
 
 /* mod_shib_20.cpp -- a wrapper around the apache module code to
@@ -31,6 +35,7 @@
 
 #define SH_AP_R(r) 0,r
 #define SH_AP_USER(r) r->user
+#define SH_AP_AUTH_TYPE(r) r->ap_auth_type
 
 #define SERVER_ERROR HTTP_INTERNAL_SERVER_ERROR
 #define REDIRECT HTTP_MOVED_TEMPORARILY
@@ -44,17 +49,20 @@
 #define ap_table_setn apr_table_setn
 #define ap_table_unset apr_table_unset
 #define ap_table_set apr_table_set
+#define ap_table_do apr_table_do
 #define ap_clear_pool apr_pool_clear
 #define ap_destroy_pool apr_pool_destroy
 #define ap_make_table apr_table_make
+#define ap_copy_table apr_table_copy
 #define ap_overlay_tables apr_table_overlay
+#define ap_overlap_tables apr_table_overlap
 #define ap_table_elts apr_table_elts
 #define ap_is_empty_table apr_is_empty_table
-
+#define AP_OVERLAP_TABLES_SET APR_OVERLAP_TABLES_SET
 
 #define ap_send_http_header(r)
 #define ap_hard_timeout(str,r)
 #define ap_reset_timeout(r)
 #define ap_kill_timeout(r)
 
-#include "mod_apache.cpp"
+#include "mod_shib.cpp"