You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@httpd.apache.org by wr...@apache.org on 2001/09/18 00:12:50 UTC
cvs commit: httpd-2.0/modules/generators mod_cgi.h mod_cgi.c
wrowe 01/09/17 15:12:50
Modified: modules/generators mod_cgi.c
Added: modules/generators mod_cgi.h
Log:
Here's the declaration for all to share. Don't expect many to use it.
Revision Changes Path
1.105 +1 -17 httpd-2.0/modules/generators/mod_cgi.c
Index: mod_cgi.c
===================================================================
RCS file: /home/cvs/httpd-2.0/modules/generators/mod_cgi.c,v
retrieving revision 1.104
retrieving revision 1.105
diff -u -r1.104 -r1.105
--- mod_cgi.c 2001/09/17 21:07:35 1.104
+++ mod_cgi.c 2001/09/17 22:12:49 1.105
@@ -94,25 +94,9 @@
#include "ap_mpm.h"
#include "mod_core.h"
#include "../filters/mod_include.h"
+#include "mod_cgi.h"
-
module AP_MODULE_DECLARE_DATA cgi_module;
-
-/* There has to be a better place to put this - uhm... where exactly? */
-/**
- * Reprocess the command and arguments to execute the given CGI script.
- * @param cmd Pointer to the command to execute (may be overridden)
- * @param argv Pointer to the arguments to pass (may be overridden)
- * @param r The current request
- * @param p The pool to allocate correct cmd/argv elements within.
- * @deffunc apr_status_t ap_cgi_build_command(const char **cmd, const char ***argv, request_rec *r, apr_pool_t *p)
- * @tip This callback may be registered by the os-specific module
- * to correct the command and arguments for apr_proc_create invocation
- * on a given os. mod_cgi will call the function if registered.
- */
-APR_DECLARE_OPTIONAL_FN(apr_status_t, ap_cgi_build_command,
- (const char **cmd, const char ***argv,
- request_rec *r, apr_pool_t *p));
static APR_OPTIONAL_FN_TYPE(ap_register_include_handler) *cgi_pfn_reg_with_ssi;
static APR_OPTIONAL_FN_TYPE(ap_ssi_get_tag_and_value) *cgi_pfn_gtv;
1.1 httpd-2.0/modules/generators/mod_cgi.h
Index: mod_cgi.h
===================================================================
/* ====================================================================
* The Apache Software License, Version 1.1
*
* Copyright (c) 2000-2001 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
* are met:
*
* 1. Redistributions of source code must retain the above copyright
* notice, this list of conditions and the following disclaimer.
*
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in
* the documentation and/or other materials provided with the
* distribution.
*
* 3. The end-user documentation included with the redistribution,
* if any, must include the following acknowledgment:
* "This product includes software developed by the
* Apache Software Foundation (http://www.apache.org/)."
* Alternately, this acknowledgment may appear in the software itself,
* if and wherever such third-party acknowledgments normally appear.
*
* 4. The names "Apache" and "Apache Software Foundation" must
* not be used to endorse or promote products derived from this
* software without prior written permission. For written
* permission, please contact apache@apache.org.
*
* 5. Products derived from this software may not be called "Apache",
* nor may "Apache" appear in their name, without prior written
* permission of the Apache Software Foundation.
*
* THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
* WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
* OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
* DISCLAIMED. IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR
* ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
* SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
* LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
* USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
* OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
* OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
* ====================================================================
*
* This software consists of voluntary contributions made by many
* individuals on behalf of the Apache Software Foundation. For more
* information on the Apache Software Foundation, please see
* <http://www.apache.org/>.
*
* Portions of this software are based upon public domain software
* originally written at the National Center for Supercomputing Applications,
* University of Illinois, Urbana-Champaign.
*/
#ifndef _MOD_CGI_H
#define _MOD_CGI_H 1
/**
* Registerable optional function to override CGI behavior;
* Reprocess the command and arguments to execute the given CGI script.
* @param cmd Pointer to the command to execute (may be overridden)
* @param argv Pointer to the arguments to pass (may be overridden)
* @param r The current request
* @param p The pool to allocate correct cmd/argv elements within.
* @deffunc apr_status_t ap_cgi_build_command(const char **cmd, const char ***argv, request_rec *r, apr_pool_t *p)
* @tip This callback may be registered by the os-specific module
* to correct the command and arguments for apr_proc_create invocation
* on a given os. mod_cgi will call the function if registered.
*/
APR_DECLARE_OPTIONAL_FN(apr_status_t, ap_cgi_build_command,
(const char **cmd, const char ***argv,
request_rec *r, apr_pool_t *p));
#endif /* _MOD_CGI_H */
Re: cvs commit: httpd-2.0/modules/generators mod_cgi.h mod_cgi.c
Posted by Ian Holsman <ia...@cnet.com>.
Hi Bill.
just a little nit.
Doxygen doesn't use @tip (replace with either @warning/@remark) or
@deffunc (not required).
On Mon, 2001-09-17 at 15:12, wrowe@apache.org wrote:
> wrowe 01/09/17 15:12:50
>
> Modified: modules/generators mod_cgi.c
> Added: modules/generators mod_cgi.h
> Log:
> Here's the declaration for all to share. Don't expect many to use it.
>
> Revision Changes Path
> 1.105 +1 -17 httpd-2.0/modules/generators/mod_cgi.c
>
> Index: mod_cgi.c
> ===================================================================
> RCS file: /home/cvs/httpd-2.0/modules/generators/mod_cgi.c,v
> retrieving revision 1.104
> retrieving revision 1.105
> diff -u -r1.104 -r1.105
> --- mod_cgi.c 2001/09/17 21:07:35 1.104
> +++ mod_cgi.c 2001/09/17 22:12:49 1.105
> @@ -94,25 +94,9 @@
> #include "ap_mpm.h"
> #include "mod_core.h"
> #include "../filters/mod_include.h"
> +#include "mod_cgi.h"
>
> -
> module AP_MODULE_DECLARE_DATA cgi_module;
> -
> -/* There has to be a better place to put this - uhm... where exactly? */
> -/**
> - * Reprocess the command and arguments to execute the given CGI script.
> - * @param cmd Pointer to the command to execute (may be overridden)
> - * @param argv Pointer to the arguments to pass (may be overridden)
> - * @param r The current request
> - * @param p The pool to allocate correct cmd/argv elements within.
> - * @deffunc apr_status_t ap_cgi_build_command(const char **cmd, const char ***argv, request_rec *r, apr_pool_t *p)
> - * @tip This callback may be registered by the os-specific module
> - * to correct the command and arguments for apr_proc_create invocation
> - * on a given os. mod_cgi will call the function if registered.
> - */
> -APR_DECLARE_OPTIONAL_FN(apr_status_t, ap_cgi_build_command,
> - (const char **cmd, const char ***argv,
> - request_rec *r, apr_pool_t *p));
>
> static APR_OPTIONAL_FN_TYPE(ap_register_include_handler) *cgi_pfn_reg_with_ssi;
> static APR_OPTIONAL_FN_TYPE(ap_ssi_get_tag_and_value) *cgi_pfn_gtv;
>
>
>
> 1.1 httpd-2.0/modules/generators/mod_cgi.h
>
> Index: mod_cgi.h
> ===================================================================
> /* ====================================================================
> * The Apache Software License, Version 1.1
> *
> * Copyright (c) 2000-2001 The Apache Software Foundation. All rights
> * reserved.
> *
> * Redistribution and use in source and binary forms, with or without
> * modification, are permitted provided that the following conditions
> * are met:
> *
> * 1. Redistributions of source code must retain the above copyright
> * notice, this list of conditions and the following disclaimer.
> *
> * 2. Redistributions in binary form must reproduce the above copyright
> * notice, this list of conditions and the following disclaimer in
> * the documentation and/or other materials provided with the
> * distribution.
> *
> * 3. The end-user documentation included with the redistribution,
> * if any, must include the following acknowledgment:
> * "This product includes software developed by the
> * Apache Software Foundation (http://www.apache.org/)."
> * Alternately, this acknowledgment may appear in the software itself,
> * if and wherever such third-party acknowledgments normally appear.
> *
> * 4. The names "Apache" and "Apache Software Foundation" must
> * not be used to endorse or promote products derived from this
> * software without prior written permission. For written
> * permission, please contact apache@apache.org.
> *
> * 5. Products derived from this software may not be called "Apache",
> * nor may "Apache" appear in their name, without prior written
> * permission of the Apache Software Foundation.
> *
> * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
> * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
> * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
> * DISCLAIMED. IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR
> * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
> * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
> * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
> * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
> * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
> * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
> * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
> * SUCH DAMAGE.
> * ====================================================================
> *
> * This software consists of voluntary contributions made by many
> * individuals on behalf of the Apache Software Foundation. For more
> * information on the Apache Software Foundation, please see
> * <http://www.apache.org/>.
> *
> * Portions of this software are based upon public domain software
> * originally written at the National Center for Supercomputing Applications,
> * University of Illinois, Urbana-Champaign.
> */
>
> #ifndef _MOD_CGI_H
> #define _MOD_CGI_H 1
>
>
> /**
> * Registerable optional function to override CGI behavior;
> * Reprocess the command and arguments to execute the given CGI script.
> * @param cmd Pointer to the command to execute (may be overridden)
> * @param argv Pointer to the arguments to pass (may be overridden)
> * @param r The current request
> * @param p The pool to allocate correct cmd/argv elements within.
> * @deffunc apr_status_t ap_cgi_build_command(const char **cmd, const char ***argv, request_rec *r, apr_pool_t *p)
> * @tip This callback may be registered by the os-specific module
> * to correct the command and arguments for apr_proc_create invocation
> * on a given os. mod_cgi will call the function if registered.
> */
> APR_DECLARE_OPTIONAL_FN(apr_status_t, ap_cgi_build_command,
> (const char **cmd, const char ***argv,
> request_rec *r, apr_pool_t *p));
>
> #endif /* _MOD_CGI_H */
>
>
>
--
Ian Holsman IanH@cnet.com
Performance Measurement & Analysis
CNET Networks - (415) 364-8608