From: <wda...@us...> - 2009-03-25 19:30:04
|
Revision: 4320 http://oorexx.svn.sourceforge.net/oorexx/?rev=4320&view=rev Author: wdashley Date: 2009-03-25 19:29:58 +0000 (Wed, 25 Mar 2009) Log Message: ----------- Last of the fixes for mod_oorexx. Everything works now. Modified Paths: -------------- incubator/mod_oorexx/dirconfig.cpp incubator/mod_oorexx/handlers.cpp incubator/mod_oorexx/mod_oorexx.cpp incubator/mod_oorexx/rexscripts/Apache.cls incubator/mod_oorexx/rxfuncs.cpp Modified: incubator/mod_oorexx/dirconfig.cpp =================================================================== --- incubator/mod_oorexx/dirconfig.cpp 2009-03-25 16:04:45 UTC (rev 4319) +++ incubator/mod_oorexx/dirconfig.cpp 2009-03-25 19:29:58 UTC (rev 4320) @@ -42,14 +42,18 @@ #include "mod_oorexx.h" -/*----------------------------------------------------------------------------*/ -/* */ -/* Function: create_oorexx_dir_config */ -/* */ -/* Description: Creates the pool used by the directive processor functions. */ -/* */ -/*----------------------------------------------------------------------------*/ - +/** + * Function: create_oorexx_dir_config + * + * Creates the variables used by the directive processor + * functions. + * + * @param p The pool. + * + * @param path The path. + * + * @return Void + */ void *create_oorexx_dir_config(apr_pool_t *p, char *path) { rexx_config *c; @@ -77,15 +81,22 @@ } -/*----------------------------------------------------------------------------*/ -/* */ -/* Function: oorexx_set_var */ -/* */ -/* Description: Process a directive which sets the value of a Rexx variable */ -/* that can be used in any handler. */ -/* */ -/*----------------------------------------------------------------------------*/ - +/** + * Function: oorexx_set_var + * + * Process a directive which sets the value of a Rexx variable + * that can be used in any handler. + * + * @param parms The command parameters. + * + * @param mconfig The module config ptr. + * + * @param varname The Rexx variable name. + * + * @param value The Rexx variable value. + * + * @return Void + */ static const char *oorexx_set_var(cmd_parms *parms, void *mconfig, const char *varname, const char *value) { @@ -120,14 +131,19 @@ } -/*----------------------------------------------------------------------------*/ -/* */ -/* Function: oorexx_post_read */ -/* */ -/* Description: Process a directive which sets the Post Read Request Handler. */ -/* */ -/*----------------------------------------------------------------------------*/ - +/** + * Function: oorexx_post_read + * + * Process a directive which sets the Post Request Handler. + * + * @param parms The command parameters. + * + * @param mconfig The module config ptr. + * + * @param value The handler filename. + * + * @return Void + */ static const char *oorexx_post_read(cmd_parms *parms, void *mconfig, const char *value) { @@ -144,14 +160,19 @@ } -/*----------------------------------------------------------------------------*/ -/* */ -/* Function: oorexx_trans */ -/* */ -/* Description: Process a directive which sets the Translation Handler. */ -/* */ -/*----------------------------------------------------------------------------*/ - +/** + * Function: oorexx_trans + * + * Process a directive which sets the Translation Handler. + * + * @param parms The command parameters. + * + * @param mconfig The module config ptr. + * + * @param value The handler filename. + * + * @return Void + */ static const char *oorexx_trans(cmd_parms *parms, void *mconfig, const char *value) { @@ -168,14 +189,19 @@ } -/*----------------------------------------------------------------------------*/ -/* */ -/* Function: oorexx_header_parser */ -/* */ -/* Description: Process a directive which sets the Header Parser Handler. */ -/* */ -/*----------------------------------------------------------------------------*/ - +/** + * Function: oorexx_header_parser + * + * Process a directive which sets the Header Parser Handler. + * + * @param parms The command parameters. + * + * @param mconfig The module config ptr. + * + * @param value The handler filename. + * + * @return Void + */ static const char *oorexx_header_parser(cmd_parms *parms, void *mconfig, const char *value) { @@ -192,14 +218,19 @@ } -/*----------------------------------------------------------------------------*/ -/* */ -/* Function: oorexx_access */ -/* */ -/* Description: Process a directive which sets the Access Handler. */ -/* */ -/*----------------------------------------------------------------------------*/ - +/** + * Function: oorexx_access + * + * Process a directive which sets the Access Handler. + * + * @param parms The command parameters. + * + * @param mconfig The module config ptr. + * + * @param value The handler filename. + * + * @return Void + */ static const char *oorexx_access(cmd_parms *parms, void *mconfig, const char *value) { @@ -216,14 +247,19 @@ } -/*----------------------------------------------------------------------------*/ -/* */ -/* Function: oorexx_authen */ -/* */ -/* Description: Process a directive which sets the Authentication Handler. */ -/* */ -/*----------------------------------------------------------------------------*/ - +/** + * Function: oorexx_authen + * + * Process a directive which sets the Authentication Handler. + * + * @param parms The command parameters. + * + * @param mconfig The module config ptr. + * + * @param value The handler filename. + * + * @return Void + */ static const char *oorexx_authen(cmd_parms *parms, void *mconfig, const char *value) { @@ -240,14 +276,19 @@ } -/*----------------------------------------------------------------------------*/ -/* */ -/* Function: oorexx_authz */ -/* */ -/* Description: Process a directive which sets the Authorization Handler. */ -/* */ -/*----------------------------------------------------------------------------*/ - +/** + * Function: oorexx_authz + * + * Process a directive which sets the Authorization Handler. + * + * @param parms The command parameters. + * + * @param mconfig The module config ptr. + * + * @param value The handler filename. + * + * @return Void + */ static const char *oorexx_authz(cmd_parms *parms, void *mconfig, const char *value) { @@ -264,14 +305,19 @@ } -/*----------------------------------------------------------------------------*/ -/* */ -/* Function: oorexx_type */ -/* */ -/* Description: Process a directive which sets the Type Checking Handler. */ -/* */ -/*----------------------------------------------------------------------------*/ - +/** + * Function: oorexx_type + * + * Process a directive which sets the Type Checking Handler. + * + * @param parms The command parameters. + * + * @param mconfig The module config ptr. + * + * @param value The handler filename. + * + * @return Void + */ static const char *oorexx_type(cmd_parms *parms, void *mconfig, const char *value) { @@ -288,14 +334,19 @@ } -/*----------------------------------------------------------------------------*/ -/* */ -/* Function: oorexx_fixup */ -/* */ -/* Description: Process a directive which sets the Fixup Handler. */ -/* */ -/*----------------------------------------------------------------------------*/ - +/** + * Function: oorexx_fixup + * + * Process a directive which sets the Fixup Handler. + * + * @param parms The command parameters. + * + * @param mconfig The module config ptr. + * + * @param value The handler filename. + * + * @return Void + */ static const char *oorexx_fixup(cmd_parms *parms, void *mconfig, const char *value) { @@ -312,14 +363,19 @@ } -/*----------------------------------------------------------------------------*/ -/* */ -/* Function: oorexx_log */ -/* */ -/* Description: Process a directive which sets the Logging Handler. */ -/* */ -/*----------------------------------------------------------------------------*/ - +/** + * Function: oorexx_log + * + * Process a directive which sets the Logging Handler. + * + * @param parms The command parameters. + * + * @param mconfig The module config ptr. + * + * @param value The handler filename. + * + * @return Void + */ static const char *oorexx_log(cmd_parms *parms, void *mconfig, const char *value) { @@ -336,14 +392,19 @@ } -/*----------------------------------------------------------------------------*/ -/* */ -/* Function: oorexx_content */ -/* */ -/* Description: Process a directive which sets the Content Handler. */ -/* */ -/*----------------------------------------------------------------------------*/ - +/** + * Function: oorexx_content + * + * Process a directive which sets the Content Handler. + * + * @param parms The command parameters. + * + * @param mconfig The module config ptr. + * + * @param value The handler filename. + * + * @return Void + */ static const char *oorexx_content(cmd_parms *parms, void *mconfig, const char *value) { @@ -360,14 +421,19 @@ } -/*----------------------------------------------------------------------------*/ -/* */ -/* Function: oorexx_rsp_compiler */ -/* */ -/* Description: Process a directive which sets the RSP compier. */ -/* */ -/*----------------------------------------------------------------------------*/ - +/** + * Function: oorexx_rsp_compiler + * + * Process a directive which sets the RSP Compiler handler. + * + * @param parms The command parameters. + * + * @param mconfig The module config ptr. + * + * @param value The handler filename. + * + * @return Void + */ static const char *oorexx_rsp_compiler(cmd_parms *parms, void *mconfig, const char *value) { @@ -384,14 +450,19 @@ } -/*----------------------------------------------------------------------------*/ -/* */ -/* Function: oorexx_fnametemplate */ -/* */ -/* Description: Process a directive which sets the SysTemFileName template. */ -/* */ -/*----------------------------------------------------------------------------*/ - +/** + * Function: oorexx_fnametemplate + * + * Process a directive which sets the SysTempFileName template. + * + * @param parms The command parameters. + * + * @param mconfig The module config ptr. + * + * @param value The handler filename. + * + * @return Void + */ static const char *oorexx_fnametemplate(cmd_parms *parms, void *mconfig, const char *value) { Modified: incubator/mod_oorexx/handlers.cpp =================================================================== --- incubator/mod_oorexx/handlers.cpp 2009-03-25 16:04:45 UTC (rev 4319) +++ incubator/mod_oorexx/handlers.cpp 2009-03-25 19:29:58 UTC (rev 4320) @@ -42,14 +42,17 @@ #include "mod_oorexx.h" -/*----------------------------------------------------------------------------*/ -/* */ -/* Function: oorexx_child_init */ -/* */ -/* Description: This handler is invoked when a new server is created. */ -/* */ -/*----------------------------------------------------------------------------*/ - +/** + * Function: oorexx_child_init + * + * This handler is invoked when a new server is created. + * + * @param pchild The child pool. + * + * @param s The server record ptr. + * + * @return Void + */ static void oorexx_child_init(apr_pool_t *pchild, server_rec *s) { ooRexxSrvrConfig *cfg; @@ -91,15 +94,15 @@ } -/*----------------------------------------------------------------------------*/ -/* */ -/* Function: oorexx_handler */ -/* */ -/* Description: Main content handler. This function calls Rexx to handle the */ -/* HTTP request. */ -/* */ -/*----------------------------------------------------------------------------*/ - +/** + * Function: oorexx_handler + * + * This handler is invoked when a Rexx script is executed. + * + * @param r The request record ptr. + * + * @return Interger status. + */ static int oorexx_handler(request_rec *r) { char *rxprocpath; @@ -113,7 +116,7 @@ return DECLINED; } - modoorexx_debug(r->server, "Entering rexx_handler routine."); +// modoorexx_debug(r->server, "Entering rexx_handler routine."); /* If we're only supposed to send header information (HEAD request), */ /* then don't bother Rexx with the request. */ @@ -121,7 +124,7 @@ /* Set the content-type */ r->content_type = "text/html"; ap_send_http_header(r); - modoorexx_debug(r->server, "Exiting rexx_handler routine."); +// modoorexx_debug(r->server, "Exiting rexx_handler routine."); return OK; } @@ -154,7 +157,7 @@ // add the argument to the array. cfg->contentThrdInst->ArrayPut(args, cfg->contentThrdInst->NewPointer(r), 1); // call our program, using the provided arguments. - modoorexx_debug(r->server, "Calling Rexx."); +// modoorexx_debug(r->server, "Calling Rexx."); RexxObjectPtr result = cfg->contentThrdInst->CallProgram(rxprocpath, args); cfg->contentThrdInst->ObjectToInt32(result, &rc); // if an error occurred, get the decoded exception information @@ -163,27 +166,27 @@ // retrieve the error information and get it into a decoded form RexxDirectoryObject cond = cfg->contentThrdInst->GetConditionInfo(); cfg->contentThrdInst->DecodeConditionInfo(cond, &condition); - modoorexx_debug(r->server, "Exiting rexx_rsphandler routine."); +// modoorexx_debug(r->server, "Exiting rexx_rsphandler routine."); // display the errors oorexxstart_error_processor(r, rxprocpath, rc); rc = HTTP_INTERNAL_SERVER_ERROR; } - modoorexx_debug(r->server, "Exiting rexx_handler routine."); +// modoorexx_debug(r->server, "Exiting rexx_handler routine."); return rc; } -/*----------------------------------------------------------------------------*/ -/* */ -/* Function: oorexx_rsphandler */ -/* */ -/* Description: Handler for Rexx RSP files. This fuction calls Rexx to handle */ -/* an RSP request. */ -/* */ -/*----------------------------------------------------------------------------*/ - +/** + * Function: oorexx_rsphandler + * + * This handler is invoked when an RSP script is executed. + * + * @param r The request record ptr. + * + * @return Interger status. + */ static int oorexx_rsphandler(request_rec *r) { rexx_config *c; @@ -197,7 +200,7 @@ return DECLINED; } - modoorexx_debug(r->server, "Entering rexx_rsphandler routine."); +// modoorexx_debug(r->server, "Entering rexx_rsphandler routine."); /* If we're only supposed to send header information (HEAD request), */ /* then don't bother Rexx with the request. */ if (r->header_only) { @@ -238,9 +241,7 @@ sprintf(rxarg, "\"%s\" \"%s\"", r->filename, TempName); cfg->contentThrdInst->ArrayPut(args, cfg->contentThrdInst->String(rxarg), 1); // call our program, using the provided arguments. - modoorexx_debug(r->server, "Compiling rsp file."); RexxObjectPtr result = cfg->contentThrdInst->CallProgram(c->rspcompiler, args); - modoorexx_debug(r->server, "Finished compiling rsp file."); cfg->contentThrdInst->ObjectToInt32(result, &rc); // if an error occurred, get the decoded exception information if (cfg->contentThrdInst->CheckCondition()) { @@ -263,7 +264,6 @@ // add the argument to the array. cfg->contentThrdInst->ArrayPut(args, cfg->contentThrdInst->NewPointer(r), 1); // call our program, using the provided arguments. - modoorexx_debug(r->server, "Executing rsp file."); result = cfg->contentThrdInst->CallProgram(TempName, args); cfg->contentThrdInst->ObjectToInt32(result, &rc); // clean up the temporary file @@ -286,15 +286,15 @@ } -/*----------------------------------------------------------------------------*/ -/* */ -/* Function: oorexx_translation_handler */ -/* */ -/* Description: This handler is invoked during a request. It can translate */ -/* the URI in the request. */ -/* */ -/*----------------------------------------------------------------------------*/ - +/** + * Function: oorexx_translation_handler + * + * This handler is invoked when translating the URI in a request. + * + * @param r The request record ptr. + * + * @return Interger status. + */ int oorexx_translation_handler(request_rec *r) { rexx_config *c; @@ -349,15 +349,15 @@ } -/*----------------------------------------------------------------------------*/ -/* */ -/* Function: oorexx_authentication_handler */ -/* */ -/* Description: This handler is invoked during a request. Authentication of */ -/* the request is done here. */ -/* */ -/*----------------------------------------------------------------------------*/ - +/** + * Function: oorexx_authentication_handler + * + * This handler is invoked when authenticating a request. + * + * @param r The request record ptr. + * + * @return Interger status. + */ int oorexx_authentication_handler(request_rec *r) { rexx_config *c; @@ -412,15 +412,15 @@ } -/*----------------------------------------------------------------------------*/ -/* */ -/* Function: oorexx_authorization_handler */ -/* */ -/* Description: This handler is invoked during a request. Authorization of */ -/* the request is done here. */ -/* */ -/*----------------------------------------------------------------------------*/ - +/** + * Function: oorexx_authorization_handler + * + * This handler is invoked when authorizing a request. + * + * @param r The request record ptr. + * + * @return Interger status. + */ int oorexx_authorization_handler(request_rec *r) { rexx_config *c; @@ -475,15 +475,15 @@ } -/*----------------------------------------------------------------------------*/ -/* */ -/* Function: oorexx_access_handler */ -/* */ -/* Description: This handler is invoked during a request. Access control of */ -/* the request is done here. */ -/* */ -/*----------------------------------------------------------------------------*/ - +/** + * Function: oorexx_access_handler + * + * This handler is invoked when checking access control of a request. + * + * @param r The request record ptr. + * + * @return Interger status. + */ int oorexx_access_handler(request_rec *r) { rexx_config *c; @@ -538,15 +538,15 @@ } -/*----------------------------------------------------------------------------*/ -/* */ -/* Function: oorexx_mime_type_handler */ -/* */ -/* Description: This handler is invoked during a request. Mime checking of */ -/* the request is done here. */ -/* */ -/*----------------------------------------------------------------------------*/ - +/** + * Function: oorexx_mime_type_handler + * + * This handler is invoked when checking the mime type of a request. + * + * @param r The request record ptr. + * + * @return Interger status. + */ int oorexx_mime_type_handler(request_rec *r) { rexx_config *c; @@ -601,15 +601,15 @@ } -/*----------------------------------------------------------------------------*/ -/* */ -/* Function: oorexx_fixup_handler */ -/* */ -/* Description: This handler is invoked during a request. Fix up of */ -/* the request is done here. */ -/* */ -/*----------------------------------------------------------------------------*/ - +/** + * Function: oorexx_fixup_handler + * + * This handler is invoked when fixup of a request is needed. + * + * @param r The request record ptr. + * + * @return Interger status. + */ int oorexx_fixup_handler(request_rec *r) { rexx_config *c; @@ -664,15 +664,15 @@ } -/*----------------------------------------------------------------------------*/ -/* */ -/* Function: oorexx_logging_handler */ -/* */ -/* Description: This handler is invoked during a request. Logging of */ -/* the request is done here. */ -/* */ -/*----------------------------------------------------------------------------*/ - +/** + * Function: oorexx_logging_handler + * + * This handler is invoked for logging the request. + * + * @param r The request record ptr. + * + * @return Interger status. + */ int oorexx_logging_handler(request_rec *r) { rexx_config *c; @@ -728,15 +728,15 @@ } -/*----------------------------------------------------------------------------*/ -/* */ -/* Function: oorexx_header_parser_handler */ -/* */ -/* Description: This handler is invoked during a request. Header parsing of */ -/* the request is done here. */ -/* */ -/*----------------------------------------------------------------------------*/ - +/** + * Function: oorexx_header_parser_handler + * + * This handler is invoked for header parsing of the request. + * + * @param r The request record ptr. + * + * @return Interger status. + */ int oorexx_header_parser_handler(request_rec *r) { rexx_config *c; @@ -793,15 +793,15 @@ } -/*----------------------------------------------------------------------------*/ -/* */ -/* Function: oorexx_post_request_handler */ -/* */ -/* Description: This handler is invoked during a request. Post processing of */ -/* the request is done here. */ -/* */ -/*----------------------------------------------------------------------------*/ - +/** + * Function: oorexx_post_request_handler + * + * This handler is invoked after a request is processed. + * + * @param r The request record ptr. + * + * @return Interger status. + */ int oorexx_post_request_handler(request_rec *r) { rexx_config *c; @@ -865,7 +865,15 @@ /* hooks. */ /* */ /*----------------------------------------------------------------------------*/ - +/** + * Function: oorexx_register_hooks + * + * Register all our hooks. + * + * @param p The pool. + * + * @return Void + */ static void oorexx_register_hooks(apr_pool_t *p) { Modified: incubator/mod_oorexx/mod_oorexx.cpp =================================================================== --- incubator/mod_oorexx/mod_oorexx.cpp 2009-03-25 16:04:45 UTC (rev 4319) +++ incubator/mod_oorexx/mod_oorexx.cpp 2009-03-25 19:29:58 UTC (rev 4320) @@ -55,14 +55,17 @@ static const char *lf = "\n"; -/*----------------------------------------------------------------------------*/ -/* */ -/* Function: CreateTempFile */ -/* */ -/* Description: Create a temporary file. */ -/* */ -/*----------------------------------------------------------------------------*/ - +/** + * Function: CreateTempFile + * + * Create a temporary file to hold the translated RSP output. + * + * @param r The request record pointer. + * + * @param fntemplate The filename template. + * + * @return Temporary file name + */ char * CreateTempFile(request_rec *r, const char *fntemplate) { char * TempName; @@ -100,7 +103,19 @@ } - +/** + * Function: SetContextVariable + * + * Set a Rexx context variable. + * + * @param context The context. + * + * @param vname The Rexx variable name. + * + * @param vvalue The Rexx variable value + * + * @return Void + */ static void SetContextVariable(RexxExitContext *context, const char *vname, const char *vvalue) { if (vvalue != NULL) { @@ -112,14 +127,21 @@ } -/*----------------------------------------------------------------------------*/ -/* */ -/* Function: ooRexx_IO_Exit */ -/* */ -/* Description: I/O exit for the Rexx procedure. */ -/* */ -/*----------------------------------------------------------------------------*/ - +/** + * Function: ooRexx_IO_Exit + * + * The ooRexx RXIO exit for all scripts. + * + * @param context The context. + * + * @param ExitNumber The exit number. + * + * @param Subfunction The exit subfunction number. + * + * @param ParmBlock The exit paramater block. + * + * @return Status code + */ int REXXENTRY ooRexx_IO_Exit(RexxExitContext *context, int ExitNumber, int Subfunction, PEXIT ParmBlock) { @@ -160,17 +182,21 @@ } -/*----------------------------------------------------------------------------*/ -/* */ -/* Function: ooRexx_INI_Exit */ -/* */ -/* Description: INI exit for the Rexx procedure. */ -/* */ -/* Notes: Do NOT try to read the POST name/value pairs from the browser */ -/* client in this exit. Really bad things will happen. */ -/* */ -/*----------------------------------------------------------------------------*/ - +/** + * Function: ooRexx_INI_Exit + * + * The ooRexx RXINI exit for all scripts. + * + * @param context The context. + * + * @param ExitNumber The exit number. + * + * @param Subfunction The exit subfunction number. + * + * @param ParmBlock The exit paramater block. + * + * @return Status code + */ int REXXENTRY ooRexx_INI_Exit(RexxExitContext *context, int ExitNumber, int Subfunction, PEXIT ParmBlock) { @@ -191,7 +217,7 @@ /* Perform the exit function */ switch (Subfunction) { case RXINIEXT: - modoorexx_debug(r->server, "Entering Rexx_INI_Exit routine."); +// modoorexx_debug(r->server, "Entering Rexx_INI_Exit routine."); /* Set our standard CGI Rexx variables */ SetContextVariable(context, "WWWAUTH_TYPE", r->ap_auth_type); @@ -253,7 +279,7 @@ SetContextVariable(context, "WWWRSPCOMPILER", c->rspcompiler); SetContextVariable(context, "WWWFNAMETEMPLATE", c->fnametemplate); - modoorexx_debug(r->server, "Exiting Rexx_INI_Exit routine."); +// modoorexx_debug(r->server, "Exiting Rexx_INI_Exit routine."); return RXEXIT_HANDLED; default: @@ -264,14 +290,17 @@ } -/*----------------------------------------------------------------------------*/ -/* */ -/* Function: get_oorexx_err_str */ -/* */ -/* Description: Return the Rexx error string. */ -/* */ -/*----------------------------------------------------------------------------*/ - +/** + * Function: get_oorexx_err_status + * + * Return the ooRexx error message. + * + * @param r The request record ptr. + * + * @param rxrc The ooRexx return code. + * + * @return The error message + */ const char *get_oorexx_err_str(request_rec *r, int rxrc) { const char *errstr; @@ -439,15 +468,19 @@ } -/*----------------------------------------------------------------------------*/ -/* */ -/* Function: oorexxstart_error_processor */ -/* */ -/* Description: Output a page to the browser showing the error code and */ -/* message from the Rexx Interpreter. */ -/* */ -/*----------------------------------------------------------------------------*/ - +/** + * Function: oorexxstart_error_processor + * + * Send an HTML page to the user with the Rexx error information. + * + * @param r The request record ptr. + * + * @param rxprocpath The location of the main Rexx script that failed. + * + * @param rxrc The ooRexx return code. + * + * @return The error message + */ void oorexxstart_error_processor(request_rec *r, char *rxprocpath, int rxrc) { Modified: incubator/mod_oorexx/rexscripts/Apache.cls =================================================================== --- incubator/mod_oorexx/rexscripts/Apache.cls 2009-03-25 16:04:45 UTC (rev 4319) +++ incubator/mod_oorexx/rexscripts/Apache.cls 2009-03-25 19:29:58 UTC (rev 4320) @@ -91,7 +91,7 @@ ::METHOD server_admin EXTERNAL "LIBRARY mod_oorexx WWWSrvRecServer_admin" ::METHOD server_hostname EXTERNAL "LIBRARY mod_oorexx WWWSrvRecServer_hostname" ::METHOD port EXTERNAL "LIBRARY mod_oorexx WWWSrvRecPort" -::METHOD is_virtul EXTERNAL "LIBRARY mod_oorexx WWWSrvRecIs_virtual" +::METHOD is_virtual EXTERNAL "LIBRARY mod_oorexx WWWSrvRecIs_virtual" /*----------------------------------------------------------------------------*/ Modified: incubator/mod_oorexx/rxfuncs.cpp =================================================================== --- incubator/mod_oorexx/rxfuncs.cpp 2009-03-25 16:04:45 UTC (rev 4319) +++ incubator/mod_oorexx/rxfuncs.cpp 2009-03-25 19:29:58 UTC (rev 4320) @@ -813,14 +813,14 @@ /** - * Function: WWWReqRecThe_Request + * Function: WWWReqRecThe_request * * Give direct access to the the_Request field in the request. * * @return Pointer */ RexxMethod1(POINTER, // Return type - WWWReqRecThe_Request, // Routine name + WWWReqRecThe_request, // Routine name CSELF, self) // self { request_rec *r = (request_rec *)self; @@ -1125,6 +1125,9 @@ apr_table_set(r->subprocess_env, key, val); return context->String(""); } + if (r->subprocess_env == NULL) { + return context->String(""); + } return context->String((char *)apr_table_get(r->subprocess_env, key)); } @@ -1152,6 +1155,9 @@ apr_table_set(r->notes, key, val); return context->String(""); } + if (r->notes == NULL) { + return context->String(""); + } return context->String((char *)apr_table_get(r->notes, key)); } @@ -1176,6 +1182,9 @@ r->content_type = apr_pstrdup(r->pool, type); return context->String(""); } + if (r->content_type == NULL) { + return context->String(""); + } return context->String(r->content_type); } @@ -1200,6 +1209,9 @@ r->content_encoding = apr_pstrdup(r->pool, type); return context->String(""); } + if (r->content_encoding == NULL) { + return context->String(""); + } return context->String(r->content_encoding); } @@ -1375,6 +1387,9 @@ { request_rec *r = (request_rec *)self; + if (r->args == NULL) { + return context->String(""); + } return context->String(r->args); } @@ -1411,6 +1426,9 @@ { request_rec *r = (request_rec *)self; + if (r->user == NULL) { + return context->String(""); + } return context->String(r->user); } @@ -1428,6 +1446,9 @@ { request_rec *r = (request_rec *)self; + if (r->ap_auth_type == NULL) { + return context->String(""); + } return context->String(r->ap_auth_type); } @@ -1476,6 +1497,9 @@ { server_rec *s = (server_rec *)self; + if (s->server_admin == NULL) { + return context->String(""); + } return context->String(s->server_admin); } @@ -1493,6 +1517,9 @@ { server_rec *s = (server_rec *)self; + if (s->server_hostname == NULL) { + return context->String(""); + } return context->String(s->server_hostname); } @@ -1521,13 +1548,16 @@ * * @return 0 or 1 */ -RexxMethod1(int, // Return type +RexxMethod1(RexxObjectPtr, // Return type WWWSrvRecIs_virtual, // Routine name CSELF, self) // self { server_rec *s = (server_rec *)self; - return s->is_virtual; + if (s->is_virtual) { + return context->True(); + } + return context->False(); } @@ -1585,13 +1615,14 @@ // build the actual entry list RexxMethodEntry mod_oorexx_methods[] = { + REXX_METHOD(WWWNewReqrec, WWWNewReqRec), REXX_METHOD(WWWReqRecConnection, WWWReqRecConnection), REXX_METHOD(WWWReqRecServer, WWWReqRecServer), REXX_METHOD(WWWReqRecNext, WWWReqRecNext), REXX_METHOD(WWWReqRecPrev, WWWReqRecPrev), REXX_METHOD(WWWReqRecMain, WWWReqRecMain), REXX_METHOD(WWWReqRecIsMain, WWWReqRecIsMain), - REXX_METHOD(WWWReqRecThe_Request, WWWReqRecThe_Request), + REXX_METHOD(WWWReqRecThe_request, WWWReqRecThe_request), REXX_METHOD(WWWReqRecProxyreq, WWWReqRecProxyreq), REXX_METHOD(WWWReqRecHeader_only, WWWReqRecHeader_only), REXX_METHOD(WWWReqRecProtocol, WWWReqRecProtocol), @@ -1603,6 +1634,7 @@ REXX_METHOD(WWWReqRecBytes_sent, WWWReqRecBytes_sent), REXX_METHOD(WWWReqRecHeader_in, WWWReqRecHeader_in), REXX_METHOD(WWWReqRecHeader_out, WWWReqRecHeader_out), + REXX_METHOD(WWWReqRecErr_header_out, WWWReqRecErr_header_out), REXX_METHOD(WWWReqRecSubprocess_env, WWWReqRecSubprocess_env), REXX_METHOD(WWWReqRecNotes, WWWReqRecNotes), REXX_METHOD(WWWReqRecContent_type, WWWReqRecContent_type), @@ -1617,10 +1649,12 @@ REXX_METHOD(WWWReqRecFinfo_stmode, WWWReqRecFinfo_stmode), REXX_METHOD(WWWReqRecUser, WWWReqRecUser), REXX_METHOD(WWWReqRecAuth_type, WWWReqRecAuth_type), + REXX_METHOD(WWWNewSrvRec, WWWNewSrvRec), REXX_METHOD(WWWSrvRecServer_admin, WWWSrvRecServer_admin), REXX_METHOD(WWWSrvRecServer_hostname, WWWSrvRecServer_hostname), REXX_METHOD(WWWSrvRecPort, WWWSrvRecPort), REXX_METHOD(WWWSrvRecIs_virtual, WWWSrvRecIs_virtual), + REXX_METHOD(WWWNewCnxRec, WWWNewCnxRec), REXX_METHOD(WWWCnxRecAborted, WWWCnxRecAborted), REXX_LAST_METHOD() }; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |