[prev in list] [next in list] [prev in thread] [next in thread] 

List:       apreq-cvs
Subject:    svn commit: r215984 - in /httpd/apreq/trunk: ./ module/apache/
From:       joes () apache ! org
Date:       2005-07-12 17:39:23
Message-ID: 20050712173925.71735.qmail () minotaur ! apache ! org
[Download RAW message or body]

Author: joes
Date: Tue Jul 12 10:39:22 2005
New Revision: 215984

URL: http://svn.apache.org/viewcvs?rev=215984&view=rev
Log:
Add mod_apreq to server tokens.

Submitted by: Philip M. Gollucci
Message-ID: <42D3F889.1060901@p6m7g8.com>
Tweaked by: joes

Modified:
    httpd/apreq/trunk/CHANGES
    httpd/apreq/trunk/module/apache/apreq_module_apache.h
    httpd/apreq/trunk/module/apache/command.c
    httpd/apreq/trunk/module/apache/handle.c
    httpd/apreq/trunk/module/apache2/apreq_module_apache2.h
    httpd/apreq/trunk/module/apache2/apreq_private_apache2.h
    httpd/apreq/trunk/module/apache2/filter.c
    httpd/apreq/trunk/module/apache2/handle.c

Modified: httpd/apreq/trunk/CHANGES
URL: http://svn.apache.org/viewcvs/httpd/apreq/trunk/CHANGES?rev=215984&r1=215983&r2=215984&view=diff
 ==============================================================================
--- httpd/apreq/trunk/CHANGES (original)
+++ httpd/apreq/trunk/CHANGES Tue Jul 12 10:39:22 2005
@@ -4,6 +4,8 @@
 
 @section v2_06 Changes with libapreq2-2.06
 
+- C API [Philip M. Gollucci]
+  Add mod_apreq2 to httpd's server tokens.
 
 - Perl API [joes]
   Drop support for $req->env(), which also died with 2.05-dev.

Modified: httpd/apreq/trunk/module/apache/apreq_module_apache.h
URL: http://svn.apache.org/viewcvs/httpd/apreq/trunk/module/apache/apreq_module_apache.h?rev=215984&r1=215983&r2=215984&view=diff
 ==============================================================================
--- httpd/apreq/trunk/module/apache/apreq_module_apache.h (original)
+++ httpd/apreq/trunk/module/apache/apreq_module_apache.h Tue Jul 12 10:39:22 2005
@@ -36,6 +36,8 @@
 APREQ_DECLARE(apr_bucket_alloc_t *)
     apreq_handle_apache_bucket_alloc(apreq_handle_t *req);
 
+#define APREQ_APACHE_MMN 20050712
+
 #ifdef __cplusplus
  }
 #endif

Modified: httpd/apreq/trunk/module/apache/command.c
URL: http://svn.apache.org/viewcvs/httpd/apreq/trunk/module/apache/command.c?rev=215984&r1=215983&r2=215984&view=diff
 ==============================================================================
--- httpd/apreq/trunk/module/apache/command.c (original)
+++ httpd/apreq/trunk/module/apache/command.c Tue Jul 12 10:39:22 2005
@@ -18,6 +18,7 @@
 
 #include "apreq_util.h"
 #include "apreq_module_apache.h"
+#include "apreq_version.h"
 
 #include "httpd.h"
 #include "http_log.h"
@@ -152,6 +153,10 @@
     apr_initialize();
     apr_pool_create(&p, NULL);
     apreq_initialize(p);
+    ap_add_version_component(p, apr_psprintf(p, 
+                                             "mod_apreq-%d/%s", 
+                                             APREQ_APACHE_MMN,
+                                             APREQ_VERSION_STRING));
     ap_register_cleanup(sp, p, apreq_cleanup, apreq_cleanup);
 }
 

Modified: httpd/apreq/trunk/module/apache/handle.c
URL: http://svn.apache.org/viewcvs/httpd/apreq/trunk/module/apache/handle.c?rev=215984&r1=215983&r2=215984&view=diff
 ==============================================================================
--- httpd/apreq/trunk/module/apache/handle.c (original)
+++ httpd/apreq/trunk/module/apache/handle.c Tue Jul 12 10:39:22 2005
@@ -482,7 +482,7 @@
     return APR_SUCCESS;
 }
 
-static APREQ_MODULE(apache, 20050227);
+static APREQ_MODULE(apache, APREQ_APACHE_MMN);
 
 static void apreq_cleanup(void *data)
 {

Modified: httpd/apreq/trunk/module/apache2/apreq_module_apache2.h
URL: http://svn.apache.org/viewcvs/httpd/apreq/trunk/module/apache2/apreq_module_apache2.h?rev=215984&r1=215983&r2=215984&view=diff
 ==============================================================================
--- httpd/apreq/trunk/module/apache2/apreq_module_apache2.h (original)
+++ httpd/apreq/trunk/module/apache2/apreq_module_apache2.h Tue Jul 12 10:39:22 2005
@@ -137,7 +137,10 @@
  * Create an apreq handle which communicates with an Apache 2.X
  * request_rec.
  */
-APREQ_DECLARE(apreq_handle_t*) apreq_handle_apache2(request_rec *r);
+APREQ_DECLARE(apreq_handle_t *) apreq_handle_apache2(request_rec *r);
+
+#define APREQ_FILTER_NAME "apreq2"
+#define APREQ_APACHE2_MMN 20050712
 
 /** @} */
 

Modified: httpd/apreq/trunk/module/apache2/apreq_private_apache2.h
URL: http://svn.apache.org/viewcvs/httpd/apreq/trunk/module/apache2/apreq_private_apache2.h?rev=215984&r1=215983&r2=215984&view=diff
 ==============================================================================
--- httpd/apreq/trunk/module/apache2/apreq_private_apache2.h (original)
+++ httpd/apreq/trunk/module/apache2/apreq_private_apache2.h Tue Jul 12 10:39:22 2005
@@ -1,5 +1,4 @@
 extern module AP_MODULE_DECLARE_DATA apreq_module;
-#define APREQ_FILTER_NAME "apreq2"
 
 struct dir_config {
     const char         *temp_dir;

Modified: httpd/apreq/trunk/module/apache2/filter.c
URL: http://svn.apache.org/viewcvs/httpd/apreq/trunk/module/apache2/filter.c?rev=215984&r1=215983&r2=215984&view=diff
 ==============================================================================
--- httpd/apreq/trunk/module/apache2/filter.c (original)
+++ httpd/apreq/trunk/module/apache2/filter.c Tue Jul 12 10:39:22 2005
@@ -29,6 +29,7 @@
 #include "apreq_private_apache2.h"
 #include "apreq_error.h"
 #include "apreq_util.h"
+#include "apreq_version.h"
 
 static void *apreq_create_dir_config(apr_pool_t *p, char *d)
 {
@@ -422,6 +423,11 @@
                            apr_pool_t *ptemp, server_rec *base_server)
 {
     apr_status_t status;
+
+    ap_add_version_component(p, apr_psprintf(p,
+                                             "mod_apreq2-%d/%s",
+                                             APREQ_APACHE2_MMN,
+                                             APREQ_VERSION_STRING));
 
     status = apreq_post_initialize(p);
     if (status != APR_SUCCESS) {

Modified: httpd/apreq/trunk/module/apache2/handle.c
URL: http://svn.apache.org/viewcvs/httpd/apreq/trunk/module/apache2/handle.c?rev=215984&r1=215983&r2=215984&view=diff
 ==============================================================================
--- httpd/apreq/trunk/module/apache2/handle.c (original)
+++ httpd/apreq/trunk/module/apache2/handle.c Tue Jul 12 10:39:22 2005
@@ -407,7 +407,7 @@
     return APR_SUCCESS;
 }
 
-static APREQ_MODULE(apache2, 20050427);
+static APREQ_MODULE(apache2, APREQ_APACHE2_MMN);
 
 APREQ_DECLARE(apreq_handle_t *) apreq_handle_apache2(request_rec *r)
 {


[prev in list] [next in list] [prev in thread] [next in thread]