cvs commit: apache-1.3/src/support httpd.exp
stoddard99/08/10 07:50:44 Modified:src/support httpd.exp Log: Add a couple of missed exports. Revision ChangesPath 1.25 +3 -0 apache-1.3/src/support/httpd.exp Index: httpd.exp === RCS file: /export/home/cvs/apache-1.3/src/support/httpd.exp,v retrieving revision 1.24 retrieving revision 1.25 diff -u -r1.24 -r1.25 --- httpd.exp 1999/08/02 17:29:13 1.24 +++ httpd.exp 1999/08/10 14:50:43 1.25 @@ -245,6 +245,8 @@ ap_pstrdup ap_pstrndup ap_push_array +ap_puudecode +ap_puuencode ap_pvsprintf ap_rationalize_mtime ap_read_config @@ -308,6 +310,7 @@ ap_set_sub_req_protocol ap_setup_client_block ap_setup_prelinked_modules +ap_sha1_base64 ap_should_client_block ap_show_directives ap_show_modules
cvs commit: apache-1.3/src/support httpd.exp
rasmus 99/08/02 10:29:14 Modified:src/support httpd.exp Log: In order for DSO modules to be able to use the bundled XML functions on AIX they need to be listed here. Revision ChangesPath 1.24 +34 -0 apache-1.3/src/support/httpd.exp Index: httpd.exp === RCS file: /home/cvs/apache-1.3/src/support/httpd.exp,v retrieving revision 1.23 retrieving revision 1.24 diff -u -r1.23 -r1.24 --- httpd.exp 1999/07/29 17:54:14 1.23 +++ httpd.exp 1999/08/02 17:29:13 1.24 @@ -363,3 +363,37 @@ ap_vsnprintf core_module top_module +XML_DefaultCurrent +XML_ErrorString +XML_ExternalEntityParserCreate +XML_GetBase +XML_GetBuffer +XML_GetCurrentByteCount +XML_GetCurrentByteIndex +XML_GetCurrentColumnNumber +XML_GetCurrentLineNumber +XML_GetErrorCode +XML_GetSpecifiedAttributeCount +XML_Parse +XML_ParseBuffer +XML_ParserCreate +XML_ParserCreateNS +XML_ParserFree +XML_SetBase +XML_SetCdataSectionHandler +XML_SetCharacterDataHandler +XML_SetCommentHandler +XML_SetDefaultHandler +XML_SetDefaultHandlerExpand +XML_SetElementHandler +XML_SetEncoding +XML_SetExternalEntityRefHandler +XML_SetExternalEntityRefHandlerArg +XML_SetNamespaceDeclHandler +XML_SetNotStandaloneHandler +XML_SetNotationDeclHandler +XML_SetProcessingInstructionHandler +XML_SetUnknownEncodingHandler +XML_SetUnparsedEntityDeclHandler +XML_SetUserData +XML_UseParserAsHandlerArg
Re: cvs commit: apache-1.3/src/support httpd.exp
+API_EXPORT(void) ap_table_merge_unique_token(table *t, const char *key, +const char *val); +API_EXPORT(void) ap_table_mergen_unique_token(table *t, const char *key, + const char *val); Well, n functions were made because i could not change semantics of existing old ones. There is no need to clutter api with dual variants of new functions. -Dima
Re: cvs commit: apache-1.3/src/support httpd.exp
Good stuff. And a usefull extra function in the API as well. Dw On 28 Jul 1999 [EMAIL PROTECTED] wrote: coar99/07/28 10:37:22 Modified:.STATUS src CHANGES src/include alloc.h src/main alloc.c src/modules/standard mod_headers.c mod_negotiation.c mod_rewrite.c src/support httpd.exp Log: Treat the Vary response header field specially; change the modules that touch it to use a new routine that only adds a token if it isn't already present. O(n^2) behaviour as Dean points out, but absent set/atom operations it seems a reasonable stopgap for 1.3.7. PR: 4118 (previously closed with 'use force-no-vary') Reviewed by:Ken Coar Revision ChangesPath 1.727 +1 -8 apache-1.3/STATUS Index: STATUS === RCS file: /home/cvs/apache-1.3/STATUS,v retrieving revision 1.726 retrieving revision 1.727 diff -u -r1.726 -r1.727 --- STATUS 1999/07/28 14:06:20 1.726 +++ STATUS 1999/07/28 17:37:05 1.727 @@ -1,5 +1,5 @@ 1.3 STATUS: - Last modified at [$Date: 1999/07/28 14:06:20 $] + Last modified at [$Date: 1999/07/28 17:37:05 $] Release: @@ -67,13 +67,6 @@ RELEASE SHOWSTOPPERS: -* The Vary header field stuff is still broken (multiple - entries occur, etc.). The result is that some browsers (AFAIK at least - MSIE) are horribly confused by the responses. - Status: It should be fixed before 1.3.7 went out. For details - how it should be done, please look at new-httpd mailing list - archive: Ken, Ralf and Roy have already found consensus in the - past there. RELEASE NON-SHOWSTOPPERS BUT WOULD BE REAL NICE TO WRAP THESE UP: 1.1400+7 -0 apache-1.3/src/CHANGES Index: CHANGES === RCS file: /home/cvs/apache-1.3/src/CHANGES,v retrieving revision 1.1399 retrieving revision 1.1400 diff -u -r1.1399 -r1.1400 --- CHANGES 1999/07/24 18:48:20 1.1399 +++ CHANGES 1999/07/28 17:37:09 1.1400 @@ -1,5 +1,12 @@ Changes with Apache 1.3.7 + *) Sanitise Vary values by not adding duplicate keywords. A + separate routine needs to be used to do this, so any module + that frobs Vary needs to be changed. The standard modules + have all been modified. This solution is somewhat inelegant, + but it does the job for now. PR#4118 (better fix than before) + [Ken Coar, Roy Fielding] + *) Link DSO's with gcc -shared instead of ld -Bshareable at least on Linux and FreeBSD for now. [Rasmus Lerdorf] 1.69 +4 -0 apache-1.3/src/include/alloc.h Index: alloc.h === RCS file: /home/cvs/apache-1.3/src/include/alloc.h,v retrieving revision 1.68 retrieving revision 1.69 diff -u -r1.68 -r1.69 --- alloc.h 1999/05/13 19:44:14 1.68 +++ alloc.h 1999/07/28 17:37:14 1.69 @@ -225,6 +225,10 @@ API_EXPORT(const char *) ap_table_get(const table *, const char *); API_EXPORT(void) ap_table_set(table *, const char *name, const char *val); API_EXPORT(void) ap_table_setn(table *, const char *name, const char *val); +API_EXPORT(void) ap_table_merge_unique_token(table *t, const char *key, +const char *val); +API_EXPORT(void) ap_table_mergen_unique_token(table *t, const char *key, + const char *val); API_EXPORT(void) ap_table_merge(table *, const char *name, const char *more_val); API_EXPORT(void) ap_table_mergen(table *, const char *name, const char *more_val); API_EXPORT(void) ap_table_unset(table *, const char *key); 1.114 +26 -0 apache-1.3/src/main/alloc.c Index: alloc.c === RCS file: /home/cvs/apache-1.3/src/main/alloc.c,v retrieving revision 1.113 retrieving revision 1.114 diff -u -r1.113 -r1.114 --- alloc.c 1999/05/25 15:32:54 1.113 +++ alloc.c 1999/07/28 17:37:16 1.114 @@ -1346,6 +1346,32 @@ } } +/* + * Merge an HTTP token into a table entry IFF it isn't already in there. + * (Intended primarily to avoid Vary: host, host.) + */ +API_EXPORT(void) ap_table_merge_unique_token(table *t, const char *key, +const char *val) +{ +const char *curval; + +curval = ap_table_get(t, key); +if ((curval == NULL) || (!ap_find_token(t-a.pool, curval, val))) { +
cvs commit: apache-1.3/src/support httpd.exp
coar99/07/28 10:37:22 Modified:.STATUS src CHANGES src/include alloc.h src/main alloc.c src/modules/standard mod_headers.c mod_negotiation.c mod_rewrite.c src/support httpd.exp Log: Treat the Vary response header field specially; change the modules that touch it to use a new routine that only adds a token if it isn't already present. O(n^2) behaviour as Dean points out, but absent set/atom operations it seems a reasonable stopgap for 1.3.7. PR: 4118 (previously closed with 'use force-no-vary') Reviewed by: Ken Coar Revision ChangesPath 1.727 +1 -8 apache-1.3/STATUS Index: STATUS === RCS file: /home/cvs/apache-1.3/STATUS,v retrieving revision 1.726 retrieving revision 1.727 diff -u -r1.726 -r1.727 --- STATUS1999/07/28 14:06:20 1.726 +++ STATUS1999/07/28 17:37:05 1.727 @@ -1,5 +1,5 @@ 1.3 STATUS: - Last modified at [$Date: 1999/07/28 14:06:20 $] + Last modified at [$Date: 1999/07/28 17:37:05 $] Release: @@ -67,13 +67,6 @@ RELEASE SHOWSTOPPERS: -* The Vary header field stuff is still broken (multiple - entries occur, etc.). The result is that some browsers (AFAIK at least - MSIE) are horribly confused by the responses. - Status: It should be fixed before 1.3.7 went out. For details - how it should be done, please look at new-httpd mailing list - archive: Ken, Ralf and Roy have already found consensus in the - past there. RELEASE NON-SHOWSTOPPERS BUT WOULD BE REAL NICE TO WRAP THESE UP: 1.1400+7 -0 apache-1.3/src/CHANGES Index: CHANGES === RCS file: /home/cvs/apache-1.3/src/CHANGES,v retrieving revision 1.1399 retrieving revision 1.1400 diff -u -r1.1399 -r1.1400 --- CHANGES 1999/07/24 18:48:20 1.1399 +++ CHANGES 1999/07/28 17:37:09 1.1400 @@ -1,5 +1,12 @@ Changes with Apache 1.3.7 + *) Sanitise Vary values by not adding duplicate keywords. A + separate routine needs to be used to do this, so any module + that frobs Vary needs to be changed. The standard modules + have all been modified. This solution is somewhat inelegant, + but it does the job for now. PR#4118 (better fix than before) + [Ken Coar, Roy Fielding] + *) Link DSO's with gcc -shared instead of ld -Bshareable at least on Linux and FreeBSD for now. [Rasmus Lerdorf] 1.69 +4 -0 apache-1.3/src/include/alloc.h Index: alloc.h === RCS file: /home/cvs/apache-1.3/src/include/alloc.h,v retrieving revision 1.68 retrieving revision 1.69 diff -u -r1.68 -r1.69 --- alloc.h 1999/05/13 19:44:14 1.68 +++ alloc.h 1999/07/28 17:37:14 1.69 @@ -225,6 +225,10 @@ API_EXPORT(const char *) ap_table_get(const table *, const char *); API_EXPORT(void) ap_table_set(table *, const char *name, const char *val); API_EXPORT(void) ap_table_setn(table *, const char *name, const char *val); +API_EXPORT(void) ap_table_merge_unique_token(table *t, const char *key, + const char *val); +API_EXPORT(void) ap_table_mergen_unique_token(table *t, const char *key, + const char *val); API_EXPORT(void) ap_table_merge(table *, const char *name, const char *more_val); API_EXPORT(void) ap_table_mergen(table *, const char *name, const char *more_val); API_EXPORT(void) ap_table_unset(table *, const char *key); 1.114 +26 -0 apache-1.3/src/main/alloc.c Index: alloc.c === RCS file: /home/cvs/apache-1.3/src/main/alloc.c,v retrieving revision 1.113 retrieving revision 1.114 diff -u -r1.113 -r1.114 --- alloc.c 1999/05/25 15:32:54 1.113 +++ alloc.c 1999/07/28 17:37:16 1.114 @@ -1346,6 +1346,32 @@ } } +/* + * Merge an HTTP token into a table entry IFF it isn't already in there. + * (Intended primarily to avoid Vary: host, host.) + */ +API_EXPORT(void) ap_table_merge_unique_token(table *t, const char *key, + const char *val) +{ +const char *curval; + +curval = ap_table_get(t, key); +if ((curval == NULL) || (!ap_find_token(t-a.pool, curval, val))) { + ap_table_merge(t, key, val); +} +} + +API_EXPORT(void) ap_table_mergen_unique_token(table *t, const char *key, + const char *val) +{ +const char *curval; + +
cvs commit: apache-1.3/src/support httpd.exp
rasmus 99/06/16 14:27:22 Modified:.Makefile.tmpl src/support httpd.exp Log: Fix broken AIX shared module build. The httpd.exp file was not up to date. Also install the httpd.exp file on a 'make install' to allow apxs builds against it on AIX. apxs is still completely broken on AIX. It generates bogus -bI and -bE stuff. Working on fix for that. Revision ChangesPath 1.84 +2 -0 apache-1.3/Makefile.tmpl Index: Makefile.tmpl === RCS file: /home/cvs/apache-1.3/Makefile.tmpl,v retrieving revision 1.83 retrieving revision 1.84 diff -u -r1.83 -r1.84 --- Makefile.tmpl 1999/06/02 20:01:43 1.83 +++ Makefile.tmpl 1999/06/16 21:27:15 1.84 @@ -277,6 +277,8 @@ [EMAIL PROTECTED] [ .`grep '^[ ]*AddModule.*mod_so\.o' $(TOP)/$(SRC)/Configuration.apaci` != . ]; then \ echo $(INSTALL_CORE) $(TOP)/$(SRC)/$(TARGET) $(root)$(sbindir)/$(TARGET); \ $(INSTALL_CORE) $(TOP)/$(SRC)/$(TARGET) $(root)$(sbindir)/$(TARGET); \ + $(CP) $(TOP)/$(SRC)/support/httpd.exp $(root)$(libexecdir)/; \ + chmod 644 $(root)$(libexecdir)/httpd.exp; \ else \ echo $(INSTALL_PROGRAM) $(TOP)/$(SRC)/$(TARGET) $(root)$(sbindir)/$(TARGET); \ $(INSTALL_PROGRAM) $(TOP)/$(SRC)/$(TARGET) $(root)$(sbindir)/$(TARGET); \ 1.21 +1 -2 apache-1.3/src/support/httpd.exp Index: httpd.exp === RCS file: /home/cvs/apache-1.3/src/support/httpd.exp,v retrieving revision 1.20 retrieving revision 1.21 diff -u -r1.20 -r1.21 --- httpd.exp 1999/05/25 15:24:02 1.20 +++ httpd.exp 1999/06/16 21:27:20 1.21 @@ -100,6 +100,7 @@ ap_exists_config_define ap_exists_scoreboard_image ap_extended_status +ap_field_noparam ap_finalize_request_protocol ap_finalize_sub_req_protocol ap_find_command @@ -206,7 +207,6 @@ ap_open_logs ap_open_piped_log ap_os_escape_path -ap_os_is_filename_valid ap_os_is_path_absolute ap_overlay_tables ap_overlap_tables @@ -313,7 +313,6 @@ ap_show_modules ap_signal ap_single_module_configure -ap_single_module_init ap_size_list_item ap_slack ap_snprintf
cvs commit: apache-1.3/src/support httpd.exp
bjh 99/05/25 08:24:02 Modified:src ApacheCoreOS2.def src/include ap_compat.h src/main util.c src/support httpd.exp Log: Force regerror() to be linked into the core so DSOs can use the core's regex library. regerror() is needed by PHP3. Revision ChangesPath 1.2 +2 -1 apache-1.3/src/ApacheCoreOS2.def Index: ApacheCoreOS2.def === RCS file: /home/cvs/apache-1.3/src/ApacheCoreOS2.def,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- ApacheCoreOS2.def 1999/05/04 11:21:07 1.1 +++ ApacheCoreOS2.def 1999/05/25 15:23:55 1.2 @@ -268,7 +268,7 @@ ;os_stat @261 ;readdir @262 regcomp @263 - regexec @264 + ap_regexec @264 regfree @265 ;access_module @266 ;alias_module @267 @@ -348,3 +348,4 @@ ap_my_generation @342 ap_dummy_mutex @343 ap_signal @344 + ap_regerror @345 1.19 +1 -0 apache-1.3/src/include/ap_compat.h Index: ap_compat.h === RCS file: /home/cvs/apache-1.3/src/include/ap_compat.h,v retrieving revision 1.18 retrieving revision 1.19 diff -u -r1.18 -r1.19 --- ap_compat.h 1999/05/21 12:16:18 1.18 +++ ap_compat.h 1999/05/25 15:23:56 1.19 @@ -306,6 +306,7 @@ #define read_configap_read_config #define read_request ap_read_request #define regexecap_regexec +#define regerror ap_regerror #define register_cleanup ap_register_cleanup #define register_other_child ap_register_other_child #define release_mutex ap_release_mutex 1.162 +6 -0 apache-1.3/src/main/util.c Index: util.c === RCS file: /home/cvs/apache-1.3/src/main/util.c,v retrieving revision 1.161 retrieving revision 1.162 diff -u -r1.161 -r1.162 --- util.c1999/05/21 12:16:21 1.161 +++ util.c1999/05/25 15:24:01 1.162 @@ -293,6 +293,12 @@ return regexec(preg, string, nmatch, pmatch, eflags); } +API_EXPORT(size_t) ap_regerror(int errcode, const regex_t *preg, char *errbuf, size_t errbuf_size) +{ +return regerror(errcode, preg, errbuf, errbuf_size); +} + + /* This function substitutes for $0-$9, filling in regular expression * submatches. Pass it the same nmatch and pmatch arguments that you * passed ap_regexec(). pmatch should not be greater than the maximum number 1.20 +1 -0 apache-1.3/src/support/httpd.exp Index: httpd.exp === RCS file: /home/cvs/apache-1.3/src/support/httpd.exp,v retrieving revision 1.19 retrieving revision 1.20 diff -u -r1.19 -r1.20 --- httpd.exp 1999/05/21 12:16:23 1.19 +++ httpd.exp 1999/05/25 15:24:02 1.20 @@ -249,6 +249,7 @@ ap_rationalize_mtime ap_read_config ap_read_request +ap_regerror ap_regexec ap_register_cleanup ap_register_other_child
cvs commit: apache-1.3/src/support httpd.exp
coar99/05/04 12:02:10 Modified:src/support httpd.exp Log: Add a definition so that mod_perl can be built/linked as a DSO on AIX. Submitted by: Paul Reder [EMAIL PROTECTED] Reviewed by: Ken Coar Revision ChangesPath 1.18 +1 -0 apache-1.3/src/support/httpd.exp Index: httpd.exp === RCS file: /home/cvs/apache-1.3/src/support/httpd.exp,v retrieving revision 1.17 retrieving revision 1.18 diff -u -r1.17 -r1.18 --- httpd.exp 1999/03/07 15:05:37 1.17 +++ httpd.exp 1999/05/04 19:02:09 1.18 @@ -286,6 +286,7 @@ ap_send_mmap ap_send_size ap_server_argv0 +ap_server_config_defines ap_server_confname ap_server_post_read_config ap_server_pre_read_config
cvs commit: apache-1.3/src/support httpd.exp
fielding99/03/07 07:05:37 Modified:.STATUS htdocs/manual/misc API.html src ApacheCore.def CHANGES src/include ap_mmn.h http_request.h httpd.h src/main http_request.c src/support httpd.exp Log: Added ap_sub_req_method_uri() for doing a subrequest with a method other than GET, and const'd the definition of method in request_rec. Submitted by: Greg Stein [EMAIL PROTECTED] Reviewed by: Roy Fielding, Dean Gaudet, Doug MacEachern Revision ChangesPath 1.637 +1 -5 apache-1.3/STATUS Index: STATUS === RCS file: /home/cvs/apache-1.3/STATUS,v retrieving revision 1.636 retrieving revision 1.637 diff -u -r1.636 -r1.637 --- STATUS1999/03/06 19:25:12 1.636 +++ STATUS1999/03/07 15:05:29 1.637 @@ -1,5 +1,5 @@ 1.3 STATUS: - Last modified at [$Date: 1999/03/06 19:25:12 $] + Last modified at [$Date: 1999/03/07 15:05:29 $] Release: @@ -136,10 +136,6 @@ * Ronald Tschalär's major update of mod_digest Message-ID: [EMAIL PROTECTED] Status: Big change -- needs review. - -* Greg Stein's ap_sub_req_method_uri() - Message-ID: [EMAIL PROTECTED] - Status: Doug +1, Lars +1 (concept) In progress: 1.18 +8 -6 apache-1.3/htdocs/manual/misc/API.html Index: API.html === RCS file: /home/cvs/apache-1.3/htdocs/manual/misc/API.html,v retrieving revision 1.17 retrieving revision 1.18 diff -u -r1.17 -r1.18 --- API.html 1998/09/17 14:14:52 1.17 +++ API.html 1999/03/07 15:05:32 1.18 @@ -360,8 +360,9 @@ order to figure out what icon to use.P Such handlers can construct a EMsub-request/EM, using the - functions CODEap_sub_req_lookup_file/CODE and - CODEap_sub_req_lookup_uri/CODE; this constructs a new + functions CODEap_sub_req_lookup_file/CODE, + CODEap_sub_req_lookup_uri/CODE, and + CODEap_sub_req_method_uri/CODE; these construct a new CODErequest_rec/CODE structure and processes it as you would expect, up to but not including the point of actually sending a response. (These functions skip over the access @@ -370,7 +371,7 @@ (Server-side includes work by building sub-requests and then actually invoking the response handler for them, via the - function CODErun_sub_request/CODE). + function CODEap_run_sub_req/CODE). /UL H3A NAME=req_returnHandling requests, declining, and returning error @@ -704,7 +705,8 @@ LIfor the main request this is a subpool of connection-gt;pool; for subrequests it is a subpool of the parent request's pool. /LI - LIexists until the end of the request (EMi.e./EM, destroy_sub_req, or + LIexists until the end of the request (EMi.e./EM, +ap_destroy_sub_req, or in child_main after process_request has finished) /LI LInote that r itself is allocated from r-gt;pool; EMi.e./EM, @@ -818,7 +820,7 @@ One final note --- sub-requests have their own resource pools, which are sub-pools of the resource pool for the main request. The polite way to reclaim the resources associated with a sub request which you -have allocated (using the CODEap_sub_req_lookup_.../CODE functions) +have allocated (using the CODEap_sub_req_.../CODE functions) is CODEap_destroy_sub_req/CODE, which frees the resource pool. Before calling this function, be sure to copy anything that you care about which might be allocated in the sub-request's resource pool into @@ -830,7 +832,7 @@ request, and it will be freed anyway when the main request pool is cleared. It is only when you are allocating many, many sub-requests for a single main request that you should seriously consider the -CODEap_destroy.../CODE functions). +CODEap_destroy_.../CODE functions). H2A NAME=configConfiguration, commands and the like/A/H2 1.13 +1 -0 apache-1.3/src/ApacheCore.def Index: ApacheCore.def === RCS file: /home/cvs/apache-1.3/src/ApacheCore.def,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- ApacheCore.def1999/02/09 17:17:04 1.12 +++ ApacheCore.def1999/03/07 15:05:33 1.13 @@ -343,4 +343,5 @@ ap_group_id @336 ap_standalone @337 ap_server_confname @338 + ap_sub_req_method_uri @339 1.1262+4 -0 apache-1.3/src/CHANGES Index: CHANGES === RCS file: /home/cvs/apache-1.3/src/CHANGES,v retrieving revision 1.1261 retrieving revision 1.1262 diff
cvs commit: apache-1.3/src/support httpd.exp
coar99/01/29 06:28:57 Modified:src ApacheCore.def src/include ap_mmn.h src/support httpd.exp Log: Whoops; forgot to add the new ap_MD5Encode() function.. Revision ChangesPath 1.8 +1 -0 apache-1.3/src/ApacheCore.def Index: ApacheCore.def === RCS file: /home/cvs/apache-1.3/src/ApacheCore.def,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- ApacheCore.def1999/01/28 16:12:30 1.7 +++ ApacheCore.def1999/01/29 14:28:53 1.8 @@ -325,4 +325,5 @@ ap_array_pstrcat @318 ap_os_is_filename_valid @319 ap_find_opaque_token @320 + ap_MD5Encode @321 1.24 +2 -1 apache-1.3/src/include/ap_mmn.h Index: ap_mmn.h === RCS file: /home/cvs/apache-1.3/src/include/ap_mmn.h,v retrieving revision 1.23 retrieving revision 1.24 diff -u -r1.23 -r1.24 --- ap_mmn.h 1999/01/27 12:16:00 1.23 +++ ap_mmn.h 1999/01/29 14:28:55 1.24 @@ -204,7 +204,8 @@ * - reordered entries in request_rec that were waiting *for a non-binary-compatible release. * 19990108-1 - add ap_find_opaque_token() for things like ETags - * (1.3.5-dev) which can contain opaque quoted strings + * (1.3.5-dev) which can contain opaque quoted strings, and + *ap_MD5Encode() for MD5 password handling. */ #define MODULE_MAGIC_COOKIE 0x41503133UL /* AP13 */ 1.12 +1 -0 apache-1.3/src/support/httpd.exp Index: httpd.exp === RCS file: /home/cvs/apache-1.3/src/support/httpd.exp,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- httpd.exp 1999/01/28 16:12:32 1.11 +++ httpd.exp 1999/01/29 14:28:56 1.12 @@ -1,4 +1,5 @@ #! +ap_MD5Encode ap_MD5Final ap_MD5Init ap_MD5Update
cvs commit: apache-1.3/src/support httpd.exp
coar99/01/28 08:12:34 Modified:src ApacheCore.def src/support httpd.exp Log: Add the new ap_find_opaque_token() function to the export lists. (Oops.) Revision ChangesPath 1.7 +1 -0 apache-1.3/src/ApacheCore.def Index: ApacheCore.def === RCS file: /home/cvs/apache-1.3/src/ApacheCore.def,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- ApacheCore.def1999/01/05 08:17:25 1.6 +++ ApacheCore.def1999/01/28 16:12:30 1.7 @@ -324,4 +324,5 @@ ap_make_etag @317 ap_array_pstrcat @318 ap_os_is_filename_valid @319 + ap_find_opaque_token @320 1.11 +1 -0 apache-1.3/src/support/httpd.exp Index: httpd.exp === RCS file: /home/cvs/apache-1.3/src/support/httpd.exp,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- httpd.exp 1999/01/05 08:17:36 1.10 +++ httpd.exp 1999/01/28 16:12:32 1.11 @@ -106,6 +106,7 @@ ap_find_last_token ap_find_linked_module ap_find_module_name +ap_find_opaque_token ap_find_path_info ap_find_token ap_find_types
cvs commit: apache-1.3/src/support httpd.exp
fielding99/01/05 00:17:38 Modified:.STATUS src ApacheCore.def CHANGES src/include ap_mmn.h httpd.h src/main http_request.c util.c src/os/win32 util_win32.c src/support httpd.exp Log: ap_os_is_filename_valid() has been added to Win32 to detect and prevent access to special DOS device file names. Submitted by: Paul Sutton, Ken Parzygnat Reviewed by: Roy Fielding Revision ChangesPath 1.592 +1 -7 apache-1.3/STATUS Index: STATUS === RCS file: /home/cvs/apache-1.3/STATUS,v retrieving revision 1.591 retrieving revision 1.592 diff -u -r1.591 -r1.592 --- STATUS1999/01/05 07:08:59 1.591 +++ STATUS1999/01/05 08:17:24 1.592 @@ -1,5 +1,5 @@ 1.3 STATUS: - Last modified at [$Date: 1999/01/05 07:08:59 $] + Last modified at [$Date: 1999/01/05 08:17:24 $] Release: @@ -16,12 +16,6 @@ RELEASE SHOWSTOPPERS: -* Paul's [PATCH] Win32 device files -Message-ID: [EMAIL PROTECTED] -and [EMAIL PROTECTED] -Status: Someone who knows the current status of this thing should -apply it now, since the rest of us can't test it otherwise. - * long pathnames with many components and no AllowOverride None Status: Marc is looking at it 1.6 +1 -0 apache-1.3/src/ApacheCore.def Index: ApacheCore.def === RCS file: /home/cvs/apache-1.3/src/ApacheCore.def,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- ApacheCore.def1999/01/03 12:04:34 1.5 +++ ApacheCore.def1999/01/05 08:17:25 1.6 @@ -323,4 +323,5 @@ ap_single_module_init @316 ap_make_etag @317 ap_array_pstrcat @318 + ap_os_is_filename_valid @319 1.1204+4 -0 apache-1.3/src/CHANGES Index: CHANGES === RCS file: /home/cvs/apache-1.3/src/CHANGES,v retrieving revision 1.1203 retrieving revision 1.1204 diff -u -r1.1203 -r1.1204 --- CHANGES 1999/01/05 07:09:01 1.1203 +++ CHANGES 1999/01/05 08:17:25 1.1204 @@ -1,5 +1,9 @@ Changes with Apache 1.3.4 + *) SECURITY: ap_os_is_filename_valid() has been added to Win32 + to detect and prevent access to special DOS device file names. + [Paul Sutton, Ken Parzygnat] + *) WIN32: Created new makefiles Makefile_win32.txt (normal build) and Makefile_win32_debug.txt (debug build) that work on Win95. Run each of the following from the src directory: 1.19 +2 -1 apache-1.3/src/include/ap_mmn.h Index: ap_mmn.h === RCS file: /home/cvs/apache-1.3/src/include/ap_mmn.h,v retrieving revision 1.18 retrieving revision 1.19 diff -u -r1.18 -r1.19 --- ap_mmn.h 1999/01/03 12:04:36 1.18 +++ ap_mmn.h 1999/01/05 08:17:27 1.19 @@ -195,12 +195,13 @@ * 19990101 - renamed macro escape_uri() to ap_escape_uri() * - added MODULE_MAGIC_COOKIE to identify module structs * 19990103 (1.3.4-dev) - added ap_array_pstrcat() + * 19990105 (1.3.4-dev) - added ap_os_is_filename_valid() to Win32 */ #define MODULE_MAGIC_COOKIE 0x41503133UL /* AP13 */ #ifndef MODULE_MAGIC_NUMBER_MAJOR -#define MODULE_MAGIC_NUMBER_MAJOR 19990103 +#define MODULE_MAGIC_NUMBER_MAJOR 19990105 #endif #define MODULE_MAGIC_NUMBER_MINOR 0 /* 0...n */ #define MODULE_MAGIC_NUMBER MODULE_MAGIC_NUMBER_MAJOR/* backward compat */ 1.258 +1 -0 apache-1.3/src/include/httpd.h Index: httpd.h === RCS file: /home/cvs/apache-1.3/src/include/httpd.h,v retrieving revision 1.257 retrieving revision 1.258 diff -u -r1.257 -r1.258 --- httpd.h 1999/01/03 13:35:32 1.257 +++ httpd.h 1999/01/05 08:17:27 1.258 @@ -1025,6 +1025,7 @@ #ifdef WIN32 API_EXPORT(char *) ap_os_case_canonical_filename(pool *pPool, const char *szFile); API_EXPORT(char *) ap_os_systemcase_filename(pool *pPool, const char *szFile); +API_EXPORT(int) ap_os_is_filename_valid(const char *file); #else #define ap_os_case_canonical_filename(p,f) ap_os_canonical_filename(p,f) #define ap_os_systemcase_filename(p,f) ap_os_canonical_filename(p,f) 1.141 +42 -13apache-1.3/src/main/http_request.c Index: http_request.c === RCS file: /home/cvs/apache-1.3/src/main/http_request.c,v retrieving revision 1.140 retrieving revision 1.141 diff -u -r1.140
cvs commit: apache-1.3/src/support httpd.exp
fielding99/01/03 04:04:41 Modified:src ApacheCore.def CHANGES src/include alloc.h ap_mmn.h src/main alloc.c src/modules/standard mod_negotiation.c src/support httpd.exp Log: Major overhaul of mod_negotiation.c, part 2. - properly handle identity within Accept-Encoding. - allow encoded variants in RVSA negotiation and let them appear in the Alternates field using the non-standard encoding tag-list. - fixed both negotiation algorithms so that an explicitly accepted encoding is preferred over no encoding if identity is not included within Accept-Encoding. - added ap_array_pstrcat() to alloc.c for efficient concatenation of large substring sequences. Bumped MMN. - replaced O(n^2) memory hogs in mod_negotiation with ap_array_pstrcat. Revision ChangesPath 1.5 +1 -0 apache-1.3/src/ApacheCore.def Index: ApacheCore.def === RCS file: /home/cvs/apache-1.3/src/ApacheCore.def,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- ApacheCore.def1998/12/29 09:46:12 1.4 +++ ApacheCore.def1999/01/03 12:04:34 1.5 @@ -322,4 +322,5 @@ ap_single_module_configure @315 ap_single_module_init @316 ap_make_etag @317 + ap_array_pstrcat @318 1.1196+13 -1 apache-1.3/src/CHANGES Index: CHANGES === RCS file: /home/cvs/apache-1.3/src/CHANGES,v retrieving revision 1.1195 retrieving revision 1.1196 diff -u -r1.1195 -r1.1196 --- CHANGES 1999/01/02 14:12:18 1.1195 +++ CHANGES 1999/01/03 12:04:34 1.1196 @@ -50,7 +50,19 @@ module's token was being added first before the Apache token. This has been fixed. [Jim Jagielski] - *) Major overhaul of mod_negotiation.c. + *) Major overhaul of mod_negotiation.c, part 2. + - properly handle identity within Accept-Encoding. + - allow encoded variants in RVSA negotiation and let them appear in + the Alternates field using the non-standard encoding tag-list. + - fixed both negotiation algorithms so that an explicitly accepted + encoding is preferred over no encoding if identity is not + included within Accept-Encoding. + - added ap_array_pstrcat() to alloc.c for efficient concatenation + of large substring sequences. + - replaced O(n^2) memory hogs in mod_negotiation with ap_array_pstrcat. + [Roy Fielding] + + *) Major overhaul of mod_negotiation.c, part 1. - cleanups to mod_negotiation comments and code structure - made compliant with HTTP/1.1 proposed standard (rfc2068) and added support for everything in the upcoming HTTP/1.1 1.66 +9 -0 apache-1.3/src/include/alloc.h Index: alloc.h === RCS file: /home/cvs/apache-1.3/src/include/alloc.h,v retrieving revision 1.65 retrieving revision 1.66 diff -u -r1.65 -r1.66 --- alloc.h 1999/01/01 19:04:38 1.65 +++ alloc.h 1999/01/03 12:04:36 1.66 @@ -149,6 +149,15 @@ API_EXPORT(array_header *) ap_append_arrays(pool *, const array_header *, const array_header *); +/* ap_array_pstrcat generates a new string from the pool containing + * the concatenated sequence of substrings referenced as elements within + * the array. The string will be empty if all substrings are empty or null, + * or if there are no elements in the array. + * If sep is non-NUL, it will be inserted between elements as a separator. + */ +API_EXPORT(char *) ap_array_pstrcat(pool *p, const array_header *arr, +const char sep); + /* copy_array copies the *entire* array. copy_array_hdr just copies * the header, and arranges for the elements to be copied if (and only * if) the code subsequently does a push or arraycat. 1.18 +3 -2 apache-1.3/src/include/ap_mmn.h Index: ap_mmn.h === RCS file: /home/cvs/apache-1.3/src/include/ap_mmn.h,v retrieving revision 1.17 retrieving revision 1.18 diff -u -r1.17 -r1.18 --- ap_mmn.h 1999/01/01 20:27:47 1.17 +++ ap_mmn.h 1999/01/03 12:04:36 1.18 @@ -193,13 +193,14 @@ * 19981229 - mod_negotiation overhaul -- added ap_make_etag() *and added vlist_validator to request_rec. * 19990101 - renamed macro escape_uri() to ap_escape_uri() - * - Added MODULE_MAGIC_COOKIE to identify module structures + * - added MODULE_MAGIC_COOKIE to identify module structs + * 19990103 (1.3.4-dev) - added
cvs commit: apache-1.3/src/support httpd.exp
fielding98/12/29 01:46:19 Modified:.STATUS src ApacheCore.def CHANGES src/include ap_mmn.h http_protocol.h httpd.h src/main http_protocol.c http_request.c src/modules/standard mod_negotiation.c src/support httpd.exp Log: Major overhaul of mod_negotiation.c. - cleanups to mod_negotiation comments and code structure - made compliant with HTTP/1.1 proposed standard (rfc2068) and added support for everything in the upcoming HTTP/1.1 revision (draft-ietf-http-v11-spec-rev-06.txt). - language tag matching also handles tags with more than 2 levels like x-y-z - empty Accept, Accept-Language, Accept-Charset headers are processed correctly; previously an empty header would make all values acceptable instead of unacceptable. - allowed for q values in Accept-Encoding - added support for transparent content negotiation (rfc2295 and rfc2296) (though we do not implement all features in these drafts, e.g. no feature negotiation). Removed old experimental version. - implemented 'structured entity tags' for better cache correctness (structured entity tags ensure that caches which can deal with Vary will (eventually) be updated if the set of variants on the server is changed) - this involved adding a vlist_validator element to request_rec - this involved adding the ap_make_etag() function to the global API - modified guessing of charsets used by Apache negotiation algorithm to guess 'no charset' if the variant is not a text/* type - added code to sort multiviews variants into a canonical order so that negotiation results are consistent across backup/restores and mirrors - removed possibility of a type map file resolving to another type map file as its best variant What is being committed is a substantially modified version of what Koen submitted, with changes necessary to deal with the coding style, account for the bug fixes previously committed to 1.3.4-dev, answer some of the questions that Koen had left as comments, and reject some changes that would degrade HTTP performance. The result should be considered unstable and is in dire need of testing, but the changes are too extensive for another round of patch-and-pray. Please test me. PR: 3451, 1987 Submitted by: Koen Holtman, Roy Fielding, Lars Eilebrecht Revision ChangesPath 1.572 +1 -6 apache-1.3/STATUS Index: STATUS === RCS file: /home/cvs/apache-1.3/STATUS,v retrieving revision 1.571 retrieving revision 1.572 diff -u -r1.571 -r1.572 --- STATUS1998/12/28 15:49:12 1.571 +++ STATUS1998/12/29 09:46:11 1.572 @@ -1,5 +1,5 @@ 1.3 STATUS: - Last modified at [$Date: 1998/12/28 15:49:12 $] + Last modified at [$Date: 1998/12/29 09:46:11 $] Release: @@ -125,11 +125,6 @@ * Ronald Tschalär's ap_uuencode() bugfix Message-ID: PR#3411 Status: Lars +1 (on concept) - -* Koen Holtman's cleanup of negotiation - Message-ID: [EMAIL PROTECTED] - Status: Lars +1, Martin +1 (untested as yet) -Roy is working on this -- do not commit. * PR#2575 problem with ap_assert macro Message-ID: [EMAIL PROTECTED] 1.4 +1 -0 apache-1.3/src/ApacheCore.def Index: ApacheCore.def === RCS file: /home/cvs/apache-1.3/src/ApacheCore.def,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- ApacheCore.def1998/12/12 05:26:00 1.3 +++ ApacheCore.def1998/12/29 09:46:12 1.4 @@ -321,4 +321,5 @@ ap_exists_config_define @314 ap_single_module_configure @315 ap_single_module_init @316 + ap_make_etag @317 1.1182+28 -0 apache-1.3/src/CHANGES Index: CHANGES === RCS file: /home/cvs/apache-1.3/src/CHANGES,v retrieving revision 1.1181 retrieving revision 1.1182 diff -u -r1.1181 -r1.1182 --- CHANGES 1998/12/28 12:59:28 1.1181 +++ CHANGES 1998/12/29 09:46:13 1.1182 @@ -1,5 +1,33 @@ Changes with Apache 1.3.4 + *) Major overhaul of mod_negotiation.c. + - cleanups to mod_negotiation comments and code structure + - made compliant with HTTP/1.1 proposed standard (rfc2068) and added + support for everything in the upcoming HTTP/1.1 + revision (draft-ietf-http-v11-spec-rev-06.txt). + - language tag matching also handles tags with more than 2 + levels like x-y-z + - empty Accept, Accept-Language, Accept-Charset headers are + processed
cvs commit: apache-1.3/src/support httpd.exp
coar98/12/15 13:57:29 Modified:src/support httpd.exp Log: Add an item needed for AIX.. Submitted by: Shane Owenby [EMAIL PROTECTED] Reviewed by: Ken Coar Revision ChangesPath 1.7 +1 -0 apache-1.3/src/support/httpd.exp Index: httpd.exp === RCS file: /home/cvs/apache-1.3/src/support/httpd.exp,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- httpd.exp 1998/12/12 05:26:05 1.6 +++ httpd.exp 1998/12/15 21:57:27 1.7 @@ -188,6 +188,7 @@ ap_merge_per_dir_configs ap_method_number_of ap_month_snames +ap_my_generation ap_no2slash ap_note_auth_failure ap_note_basic_auth_failure
cvs commit: apache-1.3/src/support httpd.exp
stoddard98/09/01 13:21:15 Modified:src/support httpd.exp Log: Add symbols to symbol export list. Revision ChangesPath 1.5 +3 -0 apache-1.3/src/support/httpd.exp Index: httpd.exp === RCS file: /export/home/cvs/apache-1.3/src/support/httpd.exp,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- httpd.exp 1998/06/10 12:40:26 1.4 +++ httpd.exp 1998/09/01 20:21:14 1.5 @@ -96,6 +96,7 @@ ap_escape_shell_cmd ap_excess_requests_per_child ap_exists_scoreboard_image +ap_extended_status ap_finalize_request_protocol ap_finalize_sub_req_protocol ap_find_command @@ -167,6 +168,7 @@ ap_log_pid ap_log_printf ap_log_reason +ap_log_rerror ap_log_transaction ap_log_unixerr ap_make_array @@ -198,6 +200,7 @@ ap_os_escape_path ap_os_is_path_absolute ap_overlay_tables +ap_overlap_tables ap_palloc ap_parseHTTPdate ap_parse_hostinfo_components
cvs commit: apache-1.3/src/support httpd.exp
rse 98/06/10 05:40:27 Modified:src/support httpd.exp Log: Make sure the AIX build doesn't fail for 1.3.1 because of Dean's recent changes to the function set. Revision ChangesPath 1.4 +1 -0 apache-1.3/src/support/httpd.exp Index: httpd.exp === RCS file: /export/home/cvs/apache-1.3/src/support/httpd.exp,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- httpd.exp 1998/06/05 17:33:49 1.3 +++ httpd.exp 1998/06/10 12:40:26 1.4 @@ -63,6 +63,7 @@ ap_close_piped_log ap_construct_server ap_construct_url +ap_content_type_tolower ap_copy_array ap_copy_array_hdr ap_copy_table
cvs commit: apache-1.3/src/support httpd.exp
rse 98/06/05 10:33:50 Modified:src CHANGES src/support httpd.exp Log: Fix symbol export list (src/support/httpd.exp) after recent API changes in the child spawning area. Submitted by: Jens-Uwe Mager [EMAIL PROTECTED] Reviewed by: Ralf S. Engelschall Revision ChangesPath 1.888 +4 -0 apache-1.3/src/CHANGES Index: CHANGES === RCS file: /export/home/cvs/apache-1.3/src/CHANGES,v retrieving revision 1.887 retrieving revision 1.888 diff -u -r1.887 -r1.888 --- CHANGES 1998/06/05 07:15:17 1.887 +++ CHANGES 1998/06/05 17:33:47 1.888 @@ -1,5 +1,9 @@ Changes with Apache 1.3.1 + *) Fix symbol export list (src/support/httpd.exp) after recent + API changes in the child spawning area. + [Jens-Uwe Mager [EMAIL PROTECTED]] + *) Workaround for configure script and old `test' commands which do not support the -x flag (for instance under platforms like Ultrix). This is solved by another helper script findprg.sh which searches for Perl and 1.3 +2 -2 apache-1.3/src/support/httpd.exp Index: httpd.exp === RCS file: /export/home/cvs/apache-1.3/src/support/httpd.exp,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- httpd.exp 1998/05/22 06:58:28 1.2 +++ httpd.exp 1998/06/05 17:33:49 1.3 @@ -37,6 +37,7 @@ ap_bsetflag ap_bsetopt ap_bskiplf +ap_bspawn_child ap_bvputs ap_bwrite ap_bytes_in_free_blocks @@ -299,8 +300,7 @@ ap_snprintf ap_soft_timeout ap_some_auth_required -ap_spawn_child_err -ap_spawn_child_err_buff +ap_spawn_child ap_srm_command_loop ap_standalone ap_start_restart
cvs commit: apache-1.3/src/support httpd.exp
rse 98/05/21 23:58:28 Modified:src CHANGES src/support httpd.exp Log: Fix src/support/httpd.exp because of recent changes. AIX still worked fine, but better to have this list in a correct state. Revision ChangesPath 1.860 +6 -0 apache-1.3/src/CHANGES Index: CHANGES === RCS file: /export/home/cvs/apache-1.3/src/CHANGES,v retrieving revision 1.859 retrieving revision 1.860 diff -u -r1.859 -r1.860 --- CHANGES 1998/05/21 10:48:33 1.859 +++ CHANGES 1998/05/22 06:58:26 1.860 @@ -1,3 +1,9 @@ +Changes with Apache 1.3b8 + + *) Fix src/support/httpd.exp (DSO export file which is currently only + used under AIX) because of recent changes to function names. + [Ralf S. Engelschall] + Changes with Apache 1.3b7 *) Make sure a MIME-type can be forced via a RewriteRule even when no 1.2 +1 -2 apache-1.3/src/support/httpd.exp Index: httpd.exp === RCS file: /export/home/cvs/apache-1.3/src/support/httpd.exp,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- httpd.exp 1998/04/28 08:42:12 1.1 +++ httpd.exp 1998/05/22 06:58:28 1.2 @@ -8,6 +8,7 @@ ap_add_named_module ap_add_per_dir_conf ap_add_per_url_conf +ap_add_version_component ap_allow_options ap_allow_overrides ap_append_arrays @@ -110,7 +111,6 @@ ap_get_client_block ap_get_gmtoff ap_get_local_host -ap_get_module_config ap_get_remote_host ap_get_remote_logname ap_get_server_built @@ -285,7 +285,6 @@ ap_set_flag_slot ap_set_keepalive ap_set_last_modified -ap_set_module_config ap_set_name_virtual_host ap_set_string_slot ap_set_string_slot_lower
cvs commit: apache-1.3/src/support httpd.exp
rse 98/04/28 01:42:13 Modified:.STATUS INSTALL src CHANGES Configure README.DSO src/modules/standard mod_so.c src/os/unix os.c Added: src/os/unix os-aix-dso.c src/support httpd.exp Log: After the third interaction now we have it: Dynamic Shared Object (DSO) support for IBM's AIX. This is accomplished by using DSO emulation code because AIX = 4.2 don't have dlopen() and AIX 4.2 has a broken one. But with the emulation code it works great. Revision ChangesPath 1.341 +1 -0 apache-1.3/STATUS Index: STATUS === RCS file: /export/home/cvs/apache-1.3/STATUS,v retrieving revision 1.340 retrieving revision 1.341 diff -u -r1.340 -r1.341 --- STATUS1998/04/28 08:19:47 1.340 +++ STATUS1998/04/28 08:42:06 1.341 @@ -75,6 +75,7 @@ * Roy's bugfixes for select() handling * Martin's suppress error(0) messages for ap_log_error() * Ralf's fixes for compiler warnings under AIX 4.2 (NET_SIZE_T is size_t) +* Ralf's DSO support for AIX Available Patches: 1.22 +5 -4 apache-1.3/INSTALL Index: INSTALL === RCS file: /export/home/cvs/apache-1.3/INSTALL,v retrieving revision 1.21 retrieving revision 1.22 diff -u -r1.21 -r1.22 --- INSTALL 1998/04/27 16:11:40 1.21 +++ INSTALL 1998/04/28 08:42:06 1.22 @@ -75,13 +75,14 @@ platform-dependend. The current state is this: o Out-of-the-box supported platforms are: - - Linux - SunOS- IRIX - - FreeBSD - Solaris - HPUX - - OpenBSD - OSF1 - UnixWare + - Linux - IRIX + - FreeBSD - HPUX + - OpenBSD - OSF1 + - SunOS - UnixWare + - Solaris - AIX o Entirely unsupported platforms are: - Ultrix (because no dlopen-style interface) - - AIX(although it has dlopen it is a braindead one) If your system is not on these lists but has the dlopen-style interface, you either have to provide the appropriate compiler and 1.803 +6 -0 apache-1.3/src/CHANGES Index: CHANGES === RCS file: /export/home/cvs/apache-1.3/src/CHANGES,v retrieving revision 1.802 retrieving revision 1.803 diff -u -r1.802 -r1.803 --- CHANGES 1998/04/28 08:19:47 1.802 +++ CHANGES 1998/04/28 08:42:07 1.803 @@ -1,4 +1,10 @@ Changes with Apache 1.3b7 + + *) Add Dynamic Shared Object (DSO) support for AIX (at least 4.2 but older + AIX variants should work fine, too. Even AIX 3.x should work). This is + accomplished by using the free DSO emulation code from Jens-Uwe Mager + which we put into a os/unix/os-dso-aix.c file. + [Ralf S. Engelschall] *) PORT: Fix compiler warnings under AIX = 4.2 where the manual pages imply that we should use NET_SIZE_T == int but the include files force size_t. 1.249 +24 -0 apache-1.3/src/Configure Index: Configure === RCS file: /export/home/cvs/apache-1.3/src/Configure,v retrieving revision 1.248 retrieving revision 1.249 diff -u -r1.248 -r1.249 --- Configure 1998/04/28 08:19:48 1.248 +++ Configure 1998/04/28 08:42:08 1.249 @@ -763,6 +763,7 @@ if [ x$using_shlib = x1 ] ; then DEF_SHARED_CORE=no SHLIB_SUFFIX_DEPTH=all +SHLIB_EXPORT_FILES=no case $PLAT in *-linux1) CFLAGS_SHLIB=-fpic @@ -899,6 +900,25 @@ LDFLAGS_SHLIB=-b LDFLAGS_SHLIB_EXPORT=-Wl,-E -Wl,-B,deferred ;; +*-ibm-aix*) +case $CC in +*/gcc|gcc ) CFLAGS_SHLIB=-fpic ;; +*/cc|cc ) CFLAGS_SHLIB= ;; +esac +case $PLAT in +*-ibm-aix4*) +LDFLAGS_SHLIB=-H512 -T512 -bhalt:4 -bM:SRE -bnoentry +;; +*-ibm-aix*) +LDFLAGS_SHLIB=-H512 -T512 -bhalt:4 -bM:SRE -e _nostart +;; +esac +LDFLAGS_SHLIB=$LDFLAGS_SHLIB -bI:\$(SRCDIR)/support/httpd.exp +LDFLAGS_SHLIB=$LDFLAGS_SHLIB -bE:\`echo \$@|sed -e 's:\.so\$\$:.exp:'\` +LDFLAGS_SHLIB=$LDFLAGS_SHLIB -lc +LDFLAGS_SHLIB_EXPORT=-Wl,-bE:\$(SRCDIR)/support/httpd.exp +SHLIB_EXPORT_FILES=yes +;; *) ## ok, no known explict support for shared objects ## on this platform, but we give not up immediately. @@ -1248,6