-
Notifications
You must be signed in to change notification settings - Fork 128
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
deepcgi apache module complete. Fixed build issues, and added comments.
Fixed persistent connection bug, removed unneeded imports and renamed module to mod_deepcgi. Use pre-processor directive for replayserver binary name. Removed all references to mod_env and mod_cgi.
- Loading branch information
Showing
10 changed files
with
182 additions
and
30 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1 +1,2 @@ | ||
| ACLOCAL_AMFLAGS = -I m4 | ||
| SUBDIRS = src man traces scripts |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,136 @@ | ||
| #include <stdio.h> | ||
|
|
||
| #include "httpd.h" | ||
| #include "http_core.h" | ||
| #include "http_protocol.h" | ||
|
|
||
| extern const char* replayserver_filename; | ||
|
|
||
| static void deepcgi_hooks( apr_pool_t* inpPool ); | ||
| static int deepcgi_handler( request_rec* inpRequest ); | ||
|
|
||
| typedef struct { | ||
| const char* working_dir; | ||
| const char* recording_dir; | ||
| } deepcgi_config; | ||
|
|
||
| static deepcgi_config config; | ||
|
|
||
| // ============================================================================ | ||
| // Methods for reading configuration parameters | ||
| // ============================================================================ | ||
|
|
||
| const char* deepcgi_set_workingdir(cmd_parms* cmd, void* cfg, const char* arg) { | ||
| config.working_dir = arg; | ||
| return NULL; | ||
| } | ||
|
|
||
| const char* deepcgi_set_recordingdir(cmd_parms* cmd, void* cfg, const char* arg) { | ||
| config.recording_dir = arg; | ||
| return NULL; | ||
| } | ||
|
|
||
| // ============================================================================ | ||
| // Directives to read configuration parameters | ||
| // ============================================================================ | ||
|
|
||
| static const command_rec deepcgi_directives[] = | ||
| { | ||
| AP_INIT_TAKE1( "workingDir", deepcgi_set_workingdir, NULL, RSRC_CONF, "Working directory" ), | ||
| AP_INIT_TAKE1( "recordingDir", deepcgi_set_recordingdir, NULL, RSRC_CONF, "Recording directory" ), | ||
| { NULL } | ||
| }; | ||
|
|
||
| // ============================================================================ | ||
| // Module definition | ||
| // ============================================================================ | ||
|
|
||
| module AP_MODULE_DECLARE_DATA deepcgi_module = | ||
| { | ||
| STANDARD20_MODULE_STUFF, | ||
| NULL, | ||
| NULL, | ||
| NULL, | ||
| NULL, | ||
| deepcgi_directives, | ||
| deepcgi_hooks | ||
| }; | ||
|
|
||
| // ============================================================================ | ||
| // Module handler function | ||
| // ============================================================================ | ||
|
|
||
| int deepcgi_handler( request_rec* inpRequest ) | ||
| { | ||
| if ( !inpRequest->handler || strcmp( inpRequest->handler, "deepcgi-handler" )) | ||
| { | ||
| return DECLINED; | ||
| } | ||
|
|
||
| const char* request_method = inpRequest->method; | ||
| const char* request_uri = inpRequest->unparsed_uri; | ||
| const char* protocol = inpRequest->protocol; | ||
| const char* http_host = inpRequest->hostname; | ||
| const char* user_agent = apr_table_get( inpRequest->headers_in, "User-Agent" ); | ||
|
|
||
| setenv( "MAHIMAHI_CHDIR", config.working_dir, TRUE ); | ||
| setenv( "MAHIMAHI_RECORD_PATH", config.recording_dir, TRUE ); | ||
| setenv( "REQUEST_METHOD", request_method, TRUE ); | ||
| setenv( "REQUEST_URI", request_uri, TRUE ); | ||
| setenv( "SERVER_PROTOCOL", protocol, TRUE ); | ||
| setenv( "HTTP_HOST", http_host, TRUE ); | ||
| if ( user_agent != NULL ) { | ||
| setenv( "HTTP_USER_AGENT", user_agent, TRUE ); | ||
| } | ||
|
|
||
| FILE* fp = popen( replayserver_filename, "r" ); | ||
| if ( fp == NULL ) { | ||
| // "Error encountered while running script" | ||
| return HTTP_INTERNAL_SERVER_ERROR; | ||
| } | ||
|
|
||
| char line[HUGE_STRING_LEN]; | ||
| struct ap_filter_t *cur; | ||
|
|
||
| // Get rid of all filters up through protocol...since we | ||
| // haven't parsed off the headers, there is no way they can | ||
| // work | ||
| cur = inpRequest->proto_output_filters; | ||
| while (cur && cur->frec->ftype < AP_FTYPE_CONNECTION) { | ||
| cur = cur->next; | ||
| } | ||
| inpRequest->output_filters = inpRequest->proto_output_filters = cur; | ||
|
|
||
| // Write headers + body | ||
| int num_bytes_read; | ||
| do { | ||
| num_bytes_read = fread( line, sizeof(char), HUGE_STRING_LEN, fp ); | ||
| int num_bytes_left = num_bytes_read; | ||
| while ( num_bytes_left > 0 ) { | ||
| int offset = num_bytes_read - num_bytes_left; | ||
| int num_bytes_written = ap_rwrite( line + offset, num_bytes_left, inpRequest ); | ||
| if ( num_bytes_written == -1 ) { | ||
| // "Error encountered while writing" | ||
| return HTTP_INTERNAL_SERVER_ERROR; | ||
| } | ||
| num_bytes_left -= num_bytes_written; | ||
| } | ||
| } while ( num_bytes_read == HUGE_STRING_LEN ); | ||
|
|
||
| // To ensure that connection is kept-alive | ||
| ap_set_keepalive( inpRequest ); | ||
|
|
||
| pclose( fp ); | ||
|
|
||
| return OK; | ||
| } | ||
|
|
||
| // ============================================================================ | ||
| // Definition of hook for handler | ||
| // ============================================================================ | ||
|
|
||
| void deepcgi_hooks( apr_pool_t* inpPool ) | ||
| { | ||
| ap_hook_handler( deepcgi_handler, NULL, NULL, APR_HOOK_LAST ); | ||
| } | ||
|
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,3 @@ | ||
| #include "config.h" | ||
|
|
||
| const char *replayserver_filename = REPLAYSERVER; |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters