cvs commit: apachen/src/modules/proxy proxy_ftp.c
dgaudet 98/01/21 14:02:40
Modified:src/modules/proxy proxy_ftp.c
Log:
clean up some warnings. An unused function, and an extra parm to
ap_snprintf().
Revision ChangesPath
1.46 +1 -21 apachen/src/modules/proxy/proxy_ftp.c
Index: proxy_ftp.c
===
RCS file: /export/home/cvs/apachen/src/modules/proxy/proxy_ftp.c,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -r1.45 -r1.46
--- proxy_ftp.c 1998/01/07 16:46:37 1.45
+++ proxy_ftp.c 1998/01/21 22:02:39 1.46
@@ -214,26 +214,6 @@
return status;
}
-static char *
- encode_space(request_rec *r, char *path)
-{
-char *newpath;
-int i, j, len;
-
-len = strlen(path);
-newpath = palloc(r-pool, 3 * len + 1);
-for (i = 0, j = 0; i len; i++, j++) {
- if (path[i] != ' ')
- newpath[j] = path[i];
- else {
- proxy_c2hex(' ', newpath[j]);
- j += 2;
- }
-}
-newpath[j] = '\0';
-return newpath;
-}
-
static long int send_dir(BUFF *f, request_rec *r, BUFF *f2, struct cache_req
*c, char *url)
{
char buf[IOBUFSIZE];
@@ -287,7 +267,7 @@
BASE HREF=\%s%s\/HEAD\n
BODYH2Directory of
A HREF=\/\%s/A/,
- tempurl, psite, path, site, site);
+ tempurl, psite, path, site);
bputs(buf, con-client);
if (f2 != NULL)
bputs(buf, f2);
cvs commit: apachen/src/modules/proxy proxy_ftp.c proxy_util.c
jim 97/12/30 07:10:54 Modified:.STATUS src CHANGES src/ap Makefile.tmpl src/main alloc.c http_config.c http_config.h http_core.c http_main.c httpd.h util.c src/modules/proxy proxy_ftp.c proxy_util.c Added: src/ap ap_cpystrn.c Log: Submitted by: Jim Jagielski Reviewed by: Dean Gaudet, Dirk-Willem van Gulik, Ken Coar Idea by:Martin Kraemer The move from strncpy() to ap_cpystrn(), which is home-brewed and is located in ./src/ap Revision ChangesPath 1.40 +1 -4 apachen/STATUS Index: STATUS === RCS file: /export/home/cvs/apachen/STATUS,v retrieving revision 1.39 retrieving revision 1.40 diff -u -r1.39 -r1.40 --- STATUS1997/12/29 15:09:47 1.39 +++ STATUS1997/12/30 15:10:39 1.40 @@ -60,12 +60,9 @@ * Ben Hyde's [PATCH] Serialize the update to pool.sub_* in destroy_pool (take 2) * Ken's [PATCH] for PR#1195 ( in realm names) +* Jim's [PATCH] ap_cpystrn() function (replace strncpy) Take II Available Patches: - -* Jim's [PATCH] ap_cpystrn() function (replace strncpy) Take II - [EMAIL PROTECTED] - Status: Jim +1, Dirk +1, Marc wants to think about the name, Dean +1 * [PATCH] mod_digest/1599: proxy authentication using the digest auth scheme never succeeds (fwd) 1.552 +4 -0 apachen/src/CHANGES Index: CHANGES === RCS file: /export/home/cvs/apachen/src/CHANGES,v retrieving revision 1.551 retrieving revision 1.552 diff -u -r1.551 -r1.552 --- CHANGES 1997/12/29 17:51:51 1.551 +++ CHANGES 1997/12/30 15:10:41 1.552 @@ -1,5 +1,9 @@ Changes with Apache 1.3b4 + *) migration from strncpy() to our enhanced version called + ap_cpystrn() for performance and functionality reasons. + Located in libap.a. [Jim Jagielski] + *) table_set() and table_unset() did not deal correctly with multiple occurrences of the same key. [Stephen Scheck [EMAIL PROTECTED], Ben Laurie] PR#1604 1.6 +2 -1 apachen/src/ap/Makefile.tmpl Index: Makefile.tmpl === RCS file: /export/home/cvs/apachen/src/ap/Makefile.tmpl,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- Makefile.tmpl 1997/12/28 04:51:01 1.5 +++ Makefile.tmpl 1997/12/30 15:10:42 1.6 @@ -6,7 +6,7 @@ LIB=libap.a -OBJS=ap_signal.o ap_slack.o ap_snprintf.o ap_strings.o +OBJS=ap_signal.o ap_slack.o ap_snprintf.o ap_strings.o ap_cpystrn.o .c.o: $(CC) -c $(INCLUDES) $(CFLAGS) $(SPACER) $ @@ -28,3 +28,4 @@ ap_slack.o: $(INCDIR)/httpd.h $(INCDIR)/http_log.h ap_snprintf.o: $(INCDIR)/conf.h ap_strings.o: $(INCDIR)/httpd.h +ap_cpystrn.o: $(INCDIR)/httpd.h 1.1 apachen/src/ap/ap_cpystrn.c Index: ap_cpystrn.c === /* * Copyright (c) 1995-1997 The Apache Group. 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. All advertising materials mentioning features or use of this *software must display the following acknowledgment: *This product includes software developed by the Apache Group *for use in the Apache HTTP server project (http://www.apache.org/). * * 4. The names Apache Server and Apache Group must not be used to *endorse or promote products derived from this software without *prior written permission. For written permission, please contact *[EMAIL PROTECTED] * * 5. Redistributions of any form whatsoever must retain the following *acknowledgment: *This product includes software developed by the Apache Group *for use in the Apache HTTP server project (http://www.apache.org/). * * THIS SOFTWARE IS PROVIDED BY THE APACHE GROUP ``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 GROUP OR *
cvs commit: apachen/src/modules/proxy proxy_ftp.c
fielding97/09/30 14:02:16 Modified:src CHANGES src/modules/proxy proxy_ftp.c Log: mod_proxy was sending HTTP/1.1 responses to ftp requests by mistake. Also removed the auto-generated link to www.apache.org that was the source of so many misdirected bug reports. Submitted by: Roy Fielding, Marc Slemko Revision ChangesPath 1.452 +4 -0 apachen/src/CHANGES Index: CHANGES === RCS file: /export/home/cvs/apachen/src/CHANGES,v retrieving revision 1.451 retrieving revision 1.452 diff -u -r1.451 -r1.452 --- CHANGES 1997/09/26 03:52:08 1.451 +++ CHANGES 1997/09/30 21:02:10 1.452 @@ -1,5 +1,9 @@ Changes with Apache 1.3b1 + *) mod_proxy was sending HTTP/1.1 responses to ftp requests by mistake. + Also removed the auto-generated link to www.apache.org that was the + source of so many misdirected bug reports. [Roy Fielding, Marc Slemko] + *) Change to CGI permission test to allow User/Group tests to do the right thing for suexec. [Randy Terbush] PR#918 1.40 +4 -5 apachen/src/modules/proxy/proxy_ftp.c Index: proxy_ftp.c === RCS file: /export/home/cvs/apachen/src/modules/proxy/proxy_ftp.c,v retrieving revision 1.39 retrieving revision 1.40 diff -u -r1.39 -r1.40 --- proxy_ftp.c 1997/09/18 00:20:19 1.39 +++ proxy_ftp.c 1997/09/30 21:02:14 1.40 @@ -375,10 +375,9 @@ o += w; } } -ap_snprintf(buf, sizeof(buf), /PREHRIA HREF=\http://www.apache.org\;%s/A/I/BODY/HTML, SERVER_VERSION); -bwrite(con-client, buf, strlen(buf)); +bputs(/PREHR/BODY/HTML\015\012, con-client); if (f2 != NULL) - bwrite(f2, buf, strlen(buf)); + bputs(/PREHR/BODY/HTML\015\012, f2); total_bytes_sent += strlen(buf); bflush(con-client); @@ -964,9 +963,9 @@ /* send response */ /* write status line */ if (!r-assbackwards) - rvputs(r, SERVER_PROTOCOL, , r-status_line, \015\012, NULL); + rvputs(r, HTTP/1.0 , r-status_line, \015\012, NULL); if (cache != NULL) - if (bvputs(cache, SERVER_PROTOCOL, , r-status_line, \015\012, + if (bvputs(cache, HTTP/1.0 , r-status_line, \015\012, NULL) == -1) cache = proxy_cache_error(c);
cvs commit: apachen/src/modules/proxy proxy_ftp.c
ben 97/08/16 07:38:25 Modified:src/modules/proxy proxy_ftp.c Log: Life is easier if we don't have to have a pile of include paths used for a single include. Plus, then it compiles on NT. Revision ChangesPath 1.34 +1 -1 apachen/src/modules/proxy/proxy_ftp.c Index: proxy_ftp.c === RCS file: /export/home/cvs/apachen/src/modules/proxy/proxy_ftp.c,v retrieving revision 1.33 retrieving revision 1.34 diff -u -r1.33 -r1.34 --- proxy_ftp.c 1997/08/15 18:30:10 1.33 +++ proxy_ftp.c 1997/08/16 14:38:25 1.34 @@ -54,7 +54,7 @@ #include mod_proxy.h #include http_main.h -#include mod_mime.h +#include ../standard/mod_mime.h /* * Decodes a '%' escaped string, and returns the number of characters
