cvs commit: apache/support logresolve.c
brian 96/08/07 19:32:03 Modified:support logresolve.c Log: Reviewed by: Brian Behlendorf Submitted by: Paul Richards Removed requirement for OS/2 specific #ifdef. Revision ChangesPath 1.4 +0 -6 apache/support/logresolve.c Index: logresolve.c === RCS file: /export/home/cvs/apache/support/logresolve.c,v retrieving revision 1.3 retrieving revision 1.4 diff -C3 -r1.3 -r1.4 *** logresolve.c 1996/08/06 05:21:20 1.3 --- logresolve.c 1996/08/08 02:32:00 1.4 *** *** 41,50 \*** ***/ - #ifdef __EMX__ - /* Need this include before any others under OS/2 */ #include sys/types.h - #endif #include ctype.h #include netdb.h --- 41,47 *** *** 52,60 #include stdio.h #include stdlib.h - #ifndef __EMX__ - #include sys/types.h - #endif #include sys/socket.h #include netinet/in.h --- 49,54
cvs commit: apache/src http_request.c
brian 96/08/05 22:24:49
Modified:src http_request.c
Log:
Reviewed by: Brian Behlendorf
Submitted by: Garey Smiley
The following patch fixes OS/2 drive name support ia 1.1.1.
Revision ChangesPath
1.14 +5 -0 apache/src/http_request.c
Index: http_request.c
===
RCS file: /export/home/cvs/apache/src/http_request.c,v
retrieving revision 1.13
retrieving revision 1.14
diff -C3 -r1.13 -r1.14
*** http_request.c1996/07/28 19:27:45 1.13
--- http_request.c1996/08/06 05:24:47 1.14
***
*** 224,230
--- 224,235
* for the moment, that's not worth the trouble.
*/
+ #ifdef __EMX__
+ /* Add OS/2 drive name support */
+ if ((test_filename[0] != '/') (test_filename[1] != ':'))
+ #else
if (test_filename[0] != '/')
+ #endif
{
/* fake filenames only match Directory sections */
void *this_conf, *entry_config;
cvs commit: apache/conf access.conf-dist
brian 96/07/25 12:37:17 Modified:conf access.conf-dist Log: Modified to contain a different default suggested mod_status mapping. Revision ChangesPath 1.5 +1 -1 apache/conf/access.conf-dist Index: access.conf-dist === RCS file: /export/home/cvs/apache/conf/access.conf-dist,v retrieving revision 1.4 retrieving revision 1.5 diff -C3 -r1.4 -r1.5 *** access.conf-dist 1996/07/17 09:57:33 1.4 --- access.conf-dist 1996/07/25 19:37:15 1.5 *** *** 46,52 # Allow server status reports, with the URL of http://servername/status # Change the .your_domain.com to match your domain to enable. ! #Location /status #SetHandler server-status #order deny,allow --- 46,52 # Allow server status reports, with the URL of http://servername/status # Change the .your_domain.com to match your domain to enable. ! #Location /server-status #SetHandler server-status #order deny,allow
Re: cvs commit: apache/src mod_cookies.c
On Thu, 4 Jul 1996, Paul Richards wrote: Mark J. Cox writes: ! * add cookie support. ! * 31.3.95 JimC Allow the log to be sent to a pipe. Copies the relevant ! * code from mod_log_agent.c. ! * 24.5.96 MJC Improved documentation after receiving comments from users ! * 4.7.96 MJC Bug, else missing since February caused logging twice */ Can we delete log information from inside files please? It should all go in the cvs logs and not clutter up the files themselves. The best way to do this is to cut and paste the log info into the commit message when you remove it and then it all gets added to the cvs log info so you can see it using the normal cvs commands. I like the tight binding this provides, mostly because it allows non-Apache-listmembers to see what's changed over time. Perhaps old ones can be rolled off in any place they get too numerous. Brian --=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-- [EMAIL PROTECTED] www.apache.org hyperreal.com http://www.organic.com/JOBS
cvs commit: apache/conf access.conf-dist
brian 96/07/03 10:18:13 Modified:conf access.conf-dist Log: Changes to make access.conf more secure for the newbie fresh installation. Revision ChangesPath 1.3 +16 -28apache/conf/access.conf-dist Index: access.conf-dist === RCS file: /export/home/cvs/apache/conf/access.conf-dist,v retrieving revision 1.2 retrieving revision 1.3 diff -C3 -r1.2 -r1.3 *** access.conf-dist 1996/04/11 06:05:49 1.2 --- access.conf-dist 1996/07/03 17:18:11 1.3 *** *** 10,20 # Originally by Rob McCool - # /usr/local/etc/httpd/ should be changed to whatever you set ServerRoot to. - Directory /usr/local/etc/httpd/cgi-bin - Options Indexes FollowSymLinks - /Directory - # This should be changed to whatever you set DocumentRoot to. Directory /usr/local/etc/httpd/htdocs --- 10,15 *** *** 27,70 Options Indexes FollowSymLinks - # This option allows you to turn on the XBitHack behavior, which allows you - # to make text/html server-parsed by activating the owner x bit with chmod. - # This directive may be used wherever Options may, and has three - # possible arguments: Off, On or Full. If set to full, Apache will also - # add a Last-Modified header to the document if the group x bit is set. - - # Unless the server has been compiled with -DXBITHACK, this function is - # off by default. To use, uncomment the following line: - - #XBitHack Full - # This controls which options the .htaccess files in directories can ! # override. Can also be None, or any combination of Options, FileInfo, # AuthConfig, and Limit ! AllowOverride All # Controls who can get stuff from this server. - Limit GET order allow,deny allow from all - /Limit /Directory # Allow server status reports, with the URL of http://servername/status # Change the .nowhere.com to match your domain to enable. ! Location /status ! SetHandler server-status ! Limit GET ! order deny,allow ! deny from all ! allow from .nowhere.com ! /Limit ! /Location # You may place any other directories or locations you wish to have # access information for after this one. --- 22,58 Options Indexes FollowSymLinks # This controls which options the .htaccess files in directories can ! # override. Can also be All, or any combination of Options, FileInfo, # AuthConfig, and Limit ! AllowOverride None # Controls who can get stuff from this server. order allow,deny allow from all /Directory + # /usr/local/etc/httpd/cgi-bin should be changed to whatever your ScriptAliased + # CGI directory exists, if you have that configured. + + Directory /usr/local/etc/httpd/cgi-bin + AllowOverride None + Options None + /Directory + # Allow server status reports, with the URL of http://servername/status # Change the .nowhere.com to match your domain to enable. ! #Location /status ! #SetHandler server-status ! #order deny,allow ! #deny from all ! #allow from .nowhere.com ! #/Location # You may place any other directories or locations you wish to have # access information for after this one.
cvs commit: apache/src http_log.c
brian 96/06/30 14:48:04
Modified:src http_log.c
Log:
Reviewed by: Brian Behlendorf
Submitted by: Howard Fear [EMAIL PROTECTED]
Flushes the output, important in error recovery.
Revision ChangesPath
1.5 +1 -0 apache/src/http_log.c
Index: http_log.c
===
RCS file: /export/home/cvs/apache/src/http_log.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -C3 -r1.4 -r1.5
*** http_log.c1996/04/15 11:34:52 1.4
--- http_log.c1996/06/30 21:48:02 1.5
***
*** 179,184
--- 179,185
va_end (args);
fputc('\n', s-error_log);
+ fflush(s-error_log);
}
void log_reason(char *reason, char *file, request_rec *r) {
cvs commit: apache/src mod_auth_msql.c
brian 96/06/30 15:36:59
Modified:src mod_auth_msql.c
Log:
Submitted by: Dirk.vanGulik [EMAIL PROTECTED]
Updated module from Dirk - more backwards-Vitek-compatibility issues
addressed.
Revision ChangesPath
1.9 +25 -19apache/src/mod_auth_msql.c
Index: mod_auth_msql.c
===
RCS file: /export/home/cvs/apache/src/mod_auth_msql.c,v
retrieving revision 1.8
retrieving revision 1.9
diff -C3 -r1.8 -r1.9
*** mod_auth_msql.c 1996/06/17 20:52:05 1.8
--- mod_auth_msql.c 1996/06/30 22:36:57 1.9
***
*** 284,289
--- 284,295
* Replaced some MAX_STRING_LENGTH claims.
* 1.0 removed some error check as they where already done elsehwere
* NumFields - NumRows (Thanks Vitek). More stack memory.
+ * 1.1 no logging of empty password strings.
+ * 1.2 Problem with the Backward vitek which cause it to check
+ * even if msql_auth was not configured; Also more carefull
+ * with the authorative stuff; caught by [EMAIL PROTECTED]
+ * 1.3 Even more changes to get it right; that BACKWARD thing was a bad
+ * idea.
*/
***
*** 392,400
#include http_log.h
#include http_protocol.h
#include msql.h
- #ifdef HAVE_CRYPT_H
#include crypt.h
- #endif
typedef struct {
--- 398,404
***
*** 778,788
* We do not check on dbase, group, userid or host name, as it is
* perfectly possible to only do group control with mSQL and leave
* user control to the next (dbm) guy in line.
*/
! if (
! (!sec-auth_msql_pwd_table)
! (!sec-auth_msql_pwd_field)
! ) return DECLINED;
if(!(real_pw = get_msql_pw(r, c-user, sec,msql_errstr ))) {
if ( msql_errstr[0] ) {
--- 782,791
* We do not check on dbase, group, userid or host name, as it is
* perfectly possible to only do group control with mSQL and leave
* user control to the next (dbm) guy in line.
+ * We no longer check on the user field name; to avoid problems
+ * with Backward VITEK.
*/
! if (!sec-auth_msql_pwd_table) return DECLINED;
if(!(real_pw = get_msql_pw(r, c-user, sec,msql_errstr ))) {
if ( msql_errstr[0] ) {
***
*** 809,816
--- 812,821
*/
if ((sec-auth_msql_nopasswd) (!strlen(real_pw))) {
+ /*
sprintf(msql_errstr,mSQL: user %s: Empty/'any' password
accepted,c-user);
log_reason (msql_errstr, r-uri, r);
+ */
return OK;
};
***
*** 862,867
--- 867,875
char *t, *w;
msql_errstr[0]='\0';
+ /* If we are not configured, ignore */
+ if (!sec-auth_msql_pwd_table) return DECLINED;
+
if (!reqs_arr) {
if (sec-auth_msql_authorative) {
sprintf(msql_errstr,user %s denied, no access rules specified
(MSQL-Authorative) ,user);
***
*** 929,953
};
}
! /* we do not have to check the valid-ness of the group result as
! * have not (yet) a 'valid-group' token
*/
! if ( (user_result != OK) (sec-auth_msql_authorative) ) {
! sprintf(msql_errstr,User %s denied, no access rules applied
(MSQL-Authorative) ,user);
log_reason (msql_errstr, r-uri, r);
- note_basic_auth_failure(r);
return AUTH_REQUIRED;
};
! /* if the user is DECLINED, it is up to the group_result to tip
! * the balance. But if the group result is AUTH_REQUIRED it should
! * always override. A SERVER_ERROR should not get here.
! */
! if ( (user_result == DECLINED) || (group_result == AUTH_REQUIRED))
! return group_result;
!
! return user_result;
}
--- 937,959
};
}
! /* Get serious if we are authorative, previous
! * returns are only if msql yielded a correct result.
! * This really is not needed.
*/
! if (((group_result == AUTH_REQUIRED) || (user_result == AUTH_REQUIRED))
(sec-auth_msql_authorative) ) {
! sprintf(msql_errstr,mSQL-Authorative: Access denied on %s %s
rule(s) ,
! (group_result == AUTH_REQUIRED) ? USER : ,
! (user_result == AUTH_REQUIRED) ? GROUP :
! );
log_reason (msql_errstr, r-uri, r);
return AUTH_REQUIRED;
};
+ if ( (user_result == OK) || (group_result == OK))
+ return OK;
! return DECLINED;
}
cvs commit: apache/src Configuration.tmpl
brian 96/06/27 15:35:43 Modified:src Configuration.tmpl Log: Submitted by: Dirk-Willem van Gulik [EMAIL PROTECTED] Added suggestions as to extra CFLAG possibilities if one wishes to use the msql module. Revision ChangesPath 1.19 +6 -1 apache/src/Configuration.tmpl Index: Configuration.tmpl === RCS file: /export/home/cvs/apache/src/Configuration.tmpl,v retrieving revision 1.18 retrieving revision 1.19 diff -C3 -r1.18 -r1.19 *** Configuration.tmpl1996/06/26 06:28:28 1.18 --- Configuration.tmpl1996/06/27 22:35:41 1.19 *** *** 243,249 # Module dbm_auth_module mod_auth_dbm.o ## msql_auth checks against an MSQL database. You must have MSQL installed ! ## and an msql.h available for this to even compile. # Module msql_auth_modulemod_auth_msql.o --- 243,254 # Module dbm_auth_module mod_auth_dbm.o ## msql_auth checks against an MSQL database. You must have MSQL installed ! ## and an msql.h available for this to even compile. Additionally, ! ## you may need to add a couple entries to the CFLAGS line, like ! ## ! ## -lmsql -L/usr/local/lib -L/usr/local/Minerva/lib ! ## ! ## This depends on your installation of MSQL. # Module msql_auth_modulemod_auth_msql.o
cvs commit: apache/src mod_log_config.c
brian 96/06/26 18:23:29 Modified:src mod_log_config.c Log: Removed a comment about being experimental. Revision ChangesPath 1.7 +3 -5 apache/src/mod_log_config.c Index: mod_log_config.c === RCS file: /export/home/cvs/apache/src/mod_log_config.c,v retrieving revision 1.6 retrieving revision 1.7 diff -C3 -r1.6 -r1.7 *** mod_log_config.c 1996/03/04 13:12:54 1.6 --- mod_log_config.c 1996/06/27 01:23:26 1.7 *** *** 53,61 /* ! * This is an EXPERIMENTAL module, which implements the TransferLog directive ! * (same as the common log module), and an additional directive, LogFormat. ! * Bugs would not surprise me. * * The argument to LogFormat is a string, which can include literal * characters copied into the log files, and '%' directives as follows: --- 53,60 /* ! * This is module implements the TransferLog directive (same as the ! * common log module), and an additional directive, LogFormat. * * The argument to LogFormat is a string, which can include literal * characters copied into the log files, and '%' directives as follows: *** *** 111,118 * but have some indication which host they came from, though a %v * directive may well be a better way to handle this. * ! * --- rst ! */ #define DEFAULT_LOG_FORMAT %h %l %u %t \%r\ %s %b --- 110,116 * but have some indication which host they came from, though a %v * directive may well be a better way to handle this. * ! * --- rst */ #define DEFAULT_LOG_FORMAT %h %l %u %t \%r\ %s %b
cvs commit: apache/conf srm.conf-dist
brian 96/06/12 19:04:45 Modified:conf srm.conf-dist Log: Submitted by: Brian Behlendorf Removed the Meta keywords, since the cern_meta_dir module is now not compiled in by default. Revision ChangesPath 1.7 +2 -2 apache/conf/srm.conf-dist Index: srm.conf-dist === RCS file: /export/home/cvs/apache/conf/srm.conf-dist,v retrieving revision 1.6 retrieving revision 1.7 diff -C3 -r1.6 -r1.7 *** srm.conf-dist 1996/05/28 01:45:34 1.6 --- srm.conf-dist 1996/06/13 02:04:43 1.7 *** *** 185,196 # meta information files. These files contain additional HTTP headers # to include when sending the document ! MetaDir .web # MetaSuffix: specifies the file name suffix for the file containing the # meta information. ! MetaSuffix .meta # Customizable error response (Apache style) # these come in three flavors --- 185,196 # meta information files. These files contain additional HTTP headers # to include when sending the document ! #MetaDir .web # MetaSuffix: specifies the file name suffix for the file containing the # meta information. ! #MetaSuffix .meta # Customizable error response (Apache style) # these come in three flavors
cvs commit: apache/src http_request.c
brian 96/06/12 20:09:24
Modified:src http_request.c
Log:
Reviewed by: Brian Behlendorf
Submitted by: Andrew Wilson
Fixed compilation warning with an unused variable without STATUS
instrumentation.
Revision ChangesPath
1.9 +2 -0 apache/src/http_request.c
Index: http_request.c
===
RCS file: /export/home/cvs/apache/src/http_request.c,v
retrieving revision 1.8
retrieving revision 1.9
diff -C3 -r1.8 -r1.9
*** http_request.c1996/06/10 02:04:04 1.8
--- http_request.c1996/06/13 03:09:22 1.9
***
*** 749,755
--- 749,757
void process_request (request_rec *r)
{
+ #ifdef STATUS
int old_stat;
+ #endif /* STATUS */
process_request_internal (r);
#ifdef STATUS
old_stat = update_child_status (r-connection-child_num,
SERVER_BUSY_LOG,
cvs commit: apache/support Makefile htdigest.c change-passwd.readme inc2shtml.c unescape.c
brian 96/06/12 20:39:34
Modified:support Makefile htdigest.c
Removed: support change-passwd.readme inc2shtml.c unescape.c
Log:
Reviewed by: Brian Behlendorf
Submitted by: Mario Sergio, [EMAIL PROTECTED] + others
made sure the Makefile included compilation lines for rotatelogs and
resolvehosts.
fixed a compile warning in htdigest.c
removed various files that we were no longer supporting.
Revision ChangesPath
1.8 +9 -9 apache/support/Makefile
Index: Makefile
===
RCS file: /export/home/cvs/apache/support/Makefile,v
retrieving revision 1.7
retrieving revision 1.8
diff -C3 -r1.7 -r1.8
*** Makefile 1996/05/08 05:07:50 1.7
--- Makefile 1996/06/13 03:39:29 1.8
***
*** 18,24
.c.o:
$(CC) -c $(CFLAGS) $(INCLUDES) $
! TARGETS=htpasswd htdigest unescape inc2shtml httpd_monitor rotatelogs
all: $(TARGETS)
--- 18,24
.c.o:
$(CC) -c $(CFLAGS) $(INCLUDES) $
! TARGETS=htpasswd htdigest httpd_monitor rotatelogs logresolve
all: $(TARGETS)
***
*** 50,57
make all CC=cc EXTRA_LIBS=-lcrypt_i
! tar: htpasswd unescape
! $(RM) htpasswd unescape
htpasswd: htpasswd.c
$(CC) $(CFLAGS) htpasswd.c -o htpasswd $(EXTRA_LIBS)
--- 50,57
make all CC=cc EXTRA_LIBS=-lcrypt_i
! tar: htpasswd
! $(RM) htpasswd
htpasswd: htpasswd.c
$(CC) $(CFLAGS) htpasswd.c -o htpasswd $(EXTRA_LIBS)
***
*** 59,72
htdigest: htdigest.c
$(CC) $(CFLAGS) htdigest.c -o htdigest
- unescape: unescape.c
- $(CC) $(CFLAGS) unescape.c -o unescape
-
- inc2shtml: inc2shtml.c
- $(CC) $(CFLAGS) inc2shtml.c -o inc2shtml
-
httpd_monitor: httpd_monitor.c
$(CC) $(INCLUDES) $(CFLAGS) httpd_monitor.c -o httpd_monitor
clean:
rm -f $(TARGETS)
--- 59,72
htdigest: htdigest.c
$(CC) $(CFLAGS) htdigest.c -o htdigest
httpd_monitor: httpd_monitor.c
$(CC) $(INCLUDES) $(CFLAGS) httpd_monitor.c -o httpd_monitor
+
+ rotatelogs: rotatelogs.c
+ $(CC) $(INCLUDES) $(CFLAGS) rotatelogs.c -o rotatelogs
+
+ logresolve: logresolve.c
+ $(CC) $(INCLUDES) $(CFLAGS) logresolve.c -o logresolve
clean:
rm -f $(TARGETS)
1.2 +2 -2 apache/support/htdigest.c
Index: htdigest.c
===
RCS file: /export/home/cvs/apache/support/htdigest.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -C3 -r1.1 -r1.2
*** htdigest.c1996/05/08 05:07:50 1.1
--- htdigest.c1996/06/13 03:39:31 1.2
***
*** 74,81
char string[MAX_STRING_LEN];
unsigned int i;
! pw = strd(getpass(New password:));
! if(strcmp(pw,getpass(Re-type new password:))) {
fprintf(stderr,They don't match, sorry.\n);
if(tn)
unlink(tn);
--- 74,81
char string[MAX_STRING_LEN];
unsigned int i;
! pw = strd((char *) getpass(New password:));
! if(strcmp(pw,(char *) getpass(Re-type new password:))) {
fprintf(stderr,They don't match, sorry.\n);
if(tn)
unlink(tn);
cvs commit: apache/src CHANGES
brian 96/06/10 01:22:51 Modified:src CHANGES Log: Submitted by: Brian Behlendorf Updated the src CHANGES file, based on record in apache-cvs logs. Revision ChangesPath 1.28 +40 -0 apache/src/CHANGES Index: CHANGES === RCS file: /export/home/cvs/apache/src/CHANGES,v retrieving revision 1.27 retrieving revision 1.28 diff -C3 -r1.27 -r1.28 *** CHANGES 1996/05/27 19:48:37 1.27 --- CHANGES 1996/06/10 08:22:49 1.28 *** *** 1,8 --- 1,48 + *) Much of cgi-bin and all of cgi-src has been removed, due to + various security holes found and that we could no longer support + them. + + *) The Set-Cookie header is now special-special-cased to not + merge multiple instances, since certain popular browsers can not + handle multiple Set-Cookie instructions in a single header. + + *) rprintf() added to buffer code, occurances of sprintf removed. + + *) CONNECT method for proxy module, which means tunning SSL should work. + (No crypto needed) Also a NoCache config directive. + *) Several API additions: pstrndup(), table_unset() and get_token() functions now available to modules. + *) mod_imap fixups, in particular Location: headers are now complete + URL's. + + *) New info module which reports on installed module set through a + special URL, a la mod_status + + *) ServerPath directive added - allows for graceful transition + for Host:-header-based virtual hosts. + + *) Anonymous authentication module improvements + + *) MSQL authentication module improvements + + *) Status module design improved - output now tables-based + *) htdigest utility included for use with digest authentication module. + + *) mod_negotiation: Accept values with wildcards to be treated with + less priority than those without wildcards at the same quality + value. + + *) Bugs which were fixed: + a) numerous mod_proxy bugs + b) CGI early-termination bug + c) Keepalives not working with virtual hosts + d) RefererIgnore problems + e) closing fd's twice in mod_include (causing core dumps on +Linux and elsewhere). Changes with Apache 1.1b2.
cvs commit: apache/src httpd.h
brian 96/06/10 01:25:33 Modified:src httpd.h Log: Just updating the server version for release. Revision ChangesPath 1.28 +1 -1 apache/src/httpd.h Index: httpd.h === RCS file: /export/home/cvs/apache/src/httpd.h,v retrieving revision 1.27 retrieving revision 1.28 diff -C3 -r1.27 -r1.28 *** httpd.h 1996/06/10 02:04:04 1.27 --- httpd.h 1996/06/10 08:25:32 1.28 *** *** 238,244 * Example: Apache/1.1b3 MrWidget/0.1-alpha */ ! #define SERVER_VERSION Apache/1.1b3-dev /* SEE COMMENTS ABOVE */ #define SERVER_PROTOCOL HTTP/1.0 #define SERVER_SUPPORT http://www.apache.org/; --- 238,244 * Example: Apache/1.1b3 MrWidget/0.1-alpha */ ! #define SERVER_VERSION Apache/1.1b3 /* SEE COMMENTS ABOVE */ #define SERVER_PROTOCOL HTTP/1.0 #define SERVER_SUPPORT http://www.apache.org/;
cvs commit: apache/src httpd.h
brian 96/06/10 01:37:27 Modified:src httpd.h Log: Changed the server_version - this is the interim period until 1.1 final. (i.e., no more betas) Revision ChangesPath 1.29 +1 -1 apache/src/httpd.h Index: httpd.h === RCS file: /export/home/cvs/apache/src/httpd.h,v retrieving revision 1.28 retrieving revision 1.29 diff -C3 -r1.28 -r1.29 *** httpd.h 1996/06/10 08:25:32 1.28 --- httpd.h 1996/06/10 08:37:25 1.29 *** *** 238,244 * Example: Apache/1.1b3 MrWidget/0.1-alpha */ ! #define SERVER_VERSION Apache/1.1b3 /* SEE COMMENTS ABOVE */ #define SERVER_PROTOCOL HTTP/1.0 #define SERVER_SUPPORT http://www.apache.org/; --- 238,244 * Example: Apache/1.1b3 MrWidget/0.1-alpha */ ! #define SERVER_VERSION Apache/1.1-dev /* SEE COMMENTS ABOVE */ #define SERVER_PROTOCOL HTTP/1.0 #define SERVER_SUPPORT http://www.apache.org/;
cvs commit: apache/support htpasswd.c
brian 96/06/09 16:50:16
Modified:support htpasswd.c
Log:
Reviewed by: Brian Behlendorf ([EMAIL PROTECTED])
Submitted by: Mario Sergio Fujikawa Ferreira [EMAIL PROTECTED]
Fixes a prototype to remove a warning message.
Revision ChangesPath
1.2 +2 -2 apache/support/htpasswd.c
Index: htpasswd.c
===
RCS file: /export/home/cvs/apache/support/htpasswd.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -C3 -r1.1 -r1.2
*** htpasswd.c1996/01/14 18:49:48 1.1
--- htpasswd.c1996/06/09 23:50:13 1.2
***
*** 84,91
void add_password(char *user, FILE *f) {
char *pw, *cpw, salt[3];
! pw = strd(getpass(New password:));
! if(strcmp(pw,getpass(Re-type new password:))) {
fprintf(stderr,They don't match, sorry.\n);
if(tn)
unlink(tn);
--- 84,91
void add_password(char *user, FILE *f) {
char *pw, *cpw, salt[3];
! pw = strd((char *) getpass(New password:));
! if(strcmp(pw,(char *) getpass(Re-type new password:))) {
fprintf(stderr,They don't match, sorry.\n);
if(tn)
unlink(tn);
cvs commit: apache/src mod_imap.c
brian 96/06/07 10:30:07
Modified:src mod_imap.c
Log:
Reviewed by: Mark Cox
This patches several things:
1) brings back complete URL's in Location: headers
2) makes the default base into the URI for the mapfile
rather than
3) pointinrect() now can take any two opposing corners in
any order
4) closes potential for an infinite loop in mod_imap.c
5) if a mapfile isn't found, returns NOT_FOUND instead of SERVER_ERROR.
Revision ChangesPath
1.8 +23 -6 apache/src/mod_imap.c
Index: mod_imap.c
===
RCS file: /export/home/cvs/apache/src/mod_imap.c,v
retrieving revision 1.7
retrieving revision 1.8
diff -C3 -r1.7 -r1.8
*** mod_imap.c1996/05/29 11:46:42 1.7
--- mod_imap.c1996/06/07 17:30:05 1.8
***
*** 105,110
--- 105,111
#define IMAP_MENU_DEFAULT formatted
#define IMAP_DEFAULT_DEFAULT nocontent
+ #define IMAP_BASE_DEFAULT map
#ifdef SUNOS4
double strtod(); /* SunOS needed this */
***
*** 158,165
int pointinrect(double point[2], double coords[MAXVERTS][2])
{
! return ((point[X] = coords[0][X] point[X] = coords[1][X])
! (point[Y] = coords[0][Y] point[Y] = coords[1][Y]));
}
int pointincircle(double point[2], double coords[MAXVERTS][2])
--- 159,183
int pointinrect(double point[2], double coords[MAXVERTS][2])
{
! double max[2], min[2];
! if (coords[0][X] coords[1][X]) {
! max[0] = coords[0][X];
! min[0] = coords[1][X];
! } else {
! max[0] = coords[1][X];
! min[0] = coords[0][X];
! }
!
! if (coords[0][Y] coords[1][Y]) {
! max[1] = coords[0][Y];
! min[1] = coords[1][Y];
! } else {
! max[1] = coords[1][Y];
! min[1] = coords[0][Y];
! }
!
! return ((point[X] = min[0] point[X] = max[0])
! (point[Y] = min[1] point[Y] = max[1]));
}
int pointincircle(double point[2], double coords[MAXVERTS][2])
***
*** 441,446
--- 459,465
if ((string_pos = strrchr(directory, '/')))
*string_pos = '\0';
clen = strlen (directory);
+ if (clen == 0) break;
}
value += 2; /* jump over the '..' that we found in the value */
***
*** 606,617
char *imap_default = icr-imap_default ?
icr-imap_default : IMAP_DEFAULT_DEFAULT;
char *imap_base = icr-imap_base ?
! icr-imap_base : ; /* gets treated as http://servername/ */
FILE *imap = pfopen(r-pool, r-filename, r);
if ( ! imap )
! return SERVER_ERROR;
imap_url(r, NULL, imap_base, base); /* set base according to
default */
imap_url(r, NULL, imap_default, mapdflt); /* and default to global
default */
--- 625,636
char *imap_default = icr-imap_default ?
icr-imap_default : IMAP_DEFAULT_DEFAULT;
char *imap_base = icr-imap_base ?
! icr-imap_base : IMAP_BASE_DEFAULT;
FILE *imap = pfopen(r-pool, r-filename, r);
if ( ! imap )
! return NOT_FOUND;
imap_url(r, NULL, imap_base, base); /* set base according to
default */
imap_url(r, NULL, imap_default, mapdflt); /* and default to global
default */
***
*** 632,639
if (showmenu) {/* send start of imagemap menu if we're going to */
menu_header(r, imap_menu);
}
-
- imap_url(r, NULL, r-uri, base); /* Fake our base to allow relative URLs
*/
while (!cfg_getline(input, LARGEBUF, imap)) {
string_pos = input; /* always start at the beginning of line */
--- 651,656
Re: cvs commit: apache/src mod_info.c
On Tue, 28 May 1996, Paul Richards wrote: In reply to Brian Behlendorf who said brian 96/05/27 13:34:51 Added: src mod_info.c Log: Submitted by: Brian Behlendorf Obtained from: Rasmus Lerdorf Umm, that's not quite how those lines are meant to be used. Submitted by: Rasmus Lerdorf would have been correct, it's obvious you're the one committing it because there's a line with your name in it. The Obtained from: line is to attribute sources you grab code from such as NCSA or something without them actually submitting it to you. We added the Obtained from line because the NetBSD folks always used to complain when we nicked fixes from them and didn't attribute them for it in the commit message. Okay, sounds right, my apologies. Brian
