You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@httpd.apache.org by rb...@hyperreal.org on 2000/01/19 00:42:09 UTC
cvs commit: apache-2.0/src/modules/standard mod_access.c mod_asis.c mod_auth_digest.c mod_autoindex.c mod_cgi.c mod_dir.c mod_echo.c mod_env.c mod_imap.c mod_include.c mod_mime.c mod_negotiation.c mod_status.c mod_userdir.c
rbb 00/01/18 15:42:07
Modified: src/modules/standard mod_access.c mod_asis.c
mod_auth_digest.c mod_autoindex.c mod_cgi.c
mod_dir.c mod_echo.c mod_env.c mod_imap.c
mod_include.c mod_mime.c mod_negotiation.c
mod_status.c mod_userdir.c
Log:
This is a huge change to the configure system. Basically, this name space
protects most, if not all, of the Apache macros. This has been tested on
Linux using all of the Unix MPM's. The biggest push was that Apache's
httpd.h header file can no longer include the ap_config.h file. Most of the
other files include this themselves now.
Submitted by: Ryan Bloom and Manoj Kasichainula
Revision Changes Path
1.5 +2 -0 apache-2.0/src/modules/standard/mod_access.c
Index: mod_access.c
===================================================================
RCS file: /home/cvs/apache-2.0/src/modules/standard/mod_access.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- mod_access.c 1999/10/20 12:50:06 1.4
+++ mod_access.c 2000/01/18 23:41:51 1.5
@@ -62,11 +62,13 @@
*
*/
+#include "apr_network_io.h"
#include "httpd.h"
#include "http_core.h"
#include "http_config.h"
#include "http_log.h"
#include "http_request.h"
+#include <string.h>
enum allowdeny_type {
T_ENV,
1.15 +2 -0 apache-2.0/src/modules/standard/mod_asis.c
Index: mod_asis.c
===================================================================
RCS file: /home/cvs/apache-2.0/src/modules/standard/mod_asis.c,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- mod_asis.c 2000/01/06 14:43:37 1.14
+++ mod_asis.c 2000/01/18 23:41:51 1.15
@@ -63,6 +63,8 @@
#include "http_main.h"
#include "http_request.h"
+#define ASIS_MAGIC_TYPE "httpd/send-as-is"
+
static int asis_handler(request_rec *r)
{
ap_file_t *f = NULL;
1.5 +0 -1 apache-2.0/src/modules/standard/mod_auth_digest.c
Index: mod_auth_digest.c
===================================================================
RCS file: /home/cvs/apache-2.0/src/modules/standard/mod_auth_digest.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- mod_auth_digest.c 1999/11/19 18:48:28 1.4
+++ mod_auth_digest.c 2000/01/18 23:41:52 1.5
@@ -125,7 +125,6 @@
#include "http_request.h"
#include "http_log.h"
#include "http_protocol.h"
-#include "ap_config.h"
#include "ap_ctype.h"
#include "util_uri.h"
#include "util_md5.h"
1.21 +1 -0 apache-2.0/src/modules/standard/mod_autoindex.c
Index: mod_autoindex.c
===================================================================
RCS file: /home/cvs/apache-2.0/src/modules/standard/mod_autoindex.c,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- mod_autoindex.c 2000/01/10 15:35:50 1.20
+++ mod_autoindex.c 2000/01/18 23:41:52 1.21
@@ -73,6 +73,7 @@
#include "http_main.h"
#include "util_script.h"
#include "apr_fnmatch.h"
+#include <string.h>
module MODULE_VAR_EXPORT autoindex_module;
1.26 +2 -0 apache-2.0/src/modules/standard/mod_cgi.c
Index: mod_cgi.c
===================================================================
RCS file: /home/cvs/apache-2.0/src/modules/standard/mod_cgi.c,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- mod_cgi.c 2000/01/10 15:35:51 1.25
+++ mod_cgi.c 2000/01/18 23:41:52 1.26
@@ -77,6 +77,8 @@
#include "http_log.h"
#include "util_script.h"
#include "http_conf_globals.h"
+#include <sys/stat.h>
+#include <string.h>
module MODULE_VAR_EXPORT cgi_module;
1.6 +1 -1 apache-2.0/src/modules/standard/mod_dir.c
Index: mod_dir.c
===================================================================
RCS file: /home/cvs/apache-2.0/src/modules/standard/mod_dir.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- mod_dir.c 2000/01/10 15:35:51 1.5
+++ mod_dir.c 2000/01/18 23:41:53 1.6
@@ -152,7 +152,7 @@
num_names = d->index_names->nelts;
}
else {
- dummy_ptr[0] = DEFAULT_INDEX;
+ dummy_ptr[0] = AP_DEFAULT_INDEX;
names_ptr = dummy_ptr;
num_names = 1;
}
1.15 +1 -0 apache-2.0/src/modules/standard/mod_echo.c
Index: mod_echo.c
===================================================================
RCS file: /home/cvs/apache-2.0/src/modules/standard/mod_echo.c,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- mod_echo.c 1999/12/19 10:05:15 1.14
+++ mod_echo.c 2000/01/18 23:41:53 1.15
@@ -1,3 +1,4 @@
+#include "ap_mmn.h"
#include "httpd.h"
#include "http_config.h"
#include "http_connection.h"
1.4 +1 -0 apache-2.0/src/modules/standard/mod_env.c
Index: mod_env.c
===================================================================
RCS file: /home/cvs/apache-2.0/src/modules/standard/mod_env.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- mod_env.c 1999/08/31 05:33:48 1.3
+++ mod_env.c 2000/01/18 23:41:54 1.4
@@ -101,6 +101,7 @@
#include "httpd.h"
#include "http_config.h"
#include "http_request.h"
+#include <stdlib.h>
typedef struct {
ap_table_t *vars;
1.8 +1 -0 apache-2.0/src/modules/standard/mod_imap.c
Index: mod_imap.c
===================================================================
RCS file: /home/cvs/apache-2.0/src/modules/standard/mod_imap.c,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- mod_imap.c 1999/11/02 15:15:08 1.7
+++ mod_imap.c 2000/01/18 23:41:55 1.8
@@ -99,6 +99,7 @@
#include "http_main.h"
#include "http_log.h"
#include "util_script.h"
+#include <string.h>
#define IMAP_MAGIC_TYPE "application/x-httpd-imap"
#define MAXVERTS 100
1.18 +3 -0 apache-2.0/src/modules/standard/mod_include.c
Index: mod_include.c
===================================================================
RCS file: /home/cvs/apache-2.0/src/modules/standard/mod_include.c,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- mod_include.c 2000/01/09 05:18:30 1.17
+++ mod_include.c 2000/01/18 23:41:55 1.18
@@ -92,6 +92,9 @@
#include "http_log.h"
#include "http_main.h"
#include "util_script.h"
+#include <sys/stat.h>
+#include <string.h>
+#include <pwd.h>
#endif
#define STARTING_SEQUENCE "<!--#"
1.8 +3 -1 apache-2.0/src/modules/standard/mod_mime.c
Index: mod_mime.c
===================================================================
RCS file: /home/cvs/apache-2.0/src/modules/standard/mod_mime.c,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- mod_mime.c 2000/01/10 15:35:51 1.7
+++ mod_mime.c 2000/01/18 23:41:56 1.8
@@ -69,6 +69,8 @@
#include "http_log.h"
#include "http_request.h"
+#include <string.h>
+
typedef struct handlers_info {
char *name;
} handlers_info;
@@ -248,7 +250,7 @@
ap_status_t status;
if (!types_confname)
- types_confname = TYPES_CONFIG_FILE;
+ types_confname = AP_TYPES_CONFIG_FILE;
types_confname = ap_server_root_relative(p, types_confname);
1.17 +7 -3 apache-2.0/src/modules/standard/mod_negotiation.c
Index: mod_negotiation.c
===================================================================
RCS file: /home/cvs/apache-2.0/src/modules/standard/mod_negotiation.c,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- mod_negotiation.c 2000/01/10 15:35:51 1.16
+++ mod_negotiation.c 2000/01/18 23:41:56 1.17
@@ -62,6 +62,7 @@
* rst
*/
+#include "apr_file_io.h"
#include "httpd.h"
#include "http_config.h"
#include "http_request.h"
@@ -69,7 +70,10 @@
#include "http_core.h"
#include "http_log.h"
#include "util_script.h"
+#include <string.h>
+#define MAP_FILE_MAGIC_TYPE "application/x-type-map"
+
/* Commands --- configuring document caching on a per (virtual?)
* server basis...
*/
@@ -1442,15 +1446,15 @@
static float find_content_length(negotiation_state *neg, var_rec *variant)
{
- struct stat statb;
+ ap_finfo_t statb;
if (variant->bytes == 0) {
char *fullname = ap_make_full_path(neg->pool, neg->dir_name,
variant->file_name);
- if (stat(fullname, &statb) >= 0) {
+ if (ap_stat(&statb, fullname, neg->pool) == APR_SUCCESS) {
/* Note, precision may be lost */
- variant->bytes = (float) statb.st_size;
+ variant->bytes = (float) statb.size;
}
}
1.8 +2 -2 apache-2.0/src/modules/standard/mod_status.c
Index: mod_status.c
===================================================================
RCS file: /home/cvs/apache-2.0/src/modules/standard/mod_status.c,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- mod_status.c 2000/01/09 05:18:31 1.7
+++ mod_status.c 2000/01/18 23:41:56 1.8
@@ -55,17 +55,17 @@
*
*/
-#define CORE_PRIVATE
#include "httpd.h"
#include "http_config.h"
#include "http_core.h"
#include "http_protocol.h"
#include "mpm_status.h"
-#include <time.h>
#ifndef DEFAULT_TIME_FORMAT
#define DEFAULT_TIME_FORMAT "%A, %d-%b-%Y %H:%M:%S %Z"
#endif
+
+#define STATUS_MAGIC_TYPE "application/x-httpd-status"
module MODULE_VAR_EXPORT status_module;
1.5 +6 -0 apache-2.0/src/modules/standard/mod_userdir.c
Index: mod_userdir.c
===================================================================
RCS file: /home/cvs/apache-2.0/src/modules/standard/mod_userdir.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- mod_userdir.c 2000/01/06 14:43:41 1.4
+++ mod_userdir.c 2000/01/18 23:41:56 1.5
@@ -93,6 +93,12 @@
#include "httpd.h"
#include "http_config.h"
#include "http_request.h"
+#include <pwd.h>
+
+/* The default directory in user's home dir */
+#ifndef DEFAULT_USER_DIR
+#define DEFAULT_USER_DIR "public_html"
+#endif
module userdir_module;
Re: cvs commit: apache-2.0/src/modules/standard mod_access.c mod_asis.c
mod_auth_digest.c mod_autoindex.c mod_cgi.c mod_dir.c mod_echo.c mod_env.c
mod_imap.c mod_include.c mod_mime.c mod_negotiation.c mod_status.c mod_userdir.c
Posted by Ryan Bloom <rb...@raleigh.ibm.com>.
ARGH!!!
I ran the commit from the wrong directory. The work is on my other
machine. Things will be broken for about twenty mintues. Nothing I can
do about it.
Really sorry about this. :-)
Ryan
On Tue, 18 Jan 2000, Bill Stoddard wrote:
> Didn't you forget to commit httpd.h?
>
> ______________________________________________
> Bill Stoddard
>
> Come to the first official Apache Software Foundation
> Conference! <http://ApacheCon.Com/>
>
>
_______________________________________________________________________
Ryan Bloom rbb@raleigh.ibm.com
4205 S Miami Blvd
RTP, NC 27709
Come to the first official Apache Software Foundation
Conference! <http://ApacheCon.Com/>
Re: cvs commit: apache-2.0/src/modules/standard mod_access.c mod_asis.c mod_auth_digest.c mod_autoindex.c mod_cgi.c mod_dir.c mod_echo.c mod_env.c mod_imap.c mod_include.c mod_mime.c mod_negotiation.c mod_status.c mod_userdir.c
Posted by Bill Stoddard <st...@raleigh.ibm.com>.
Didn't you forget to commit httpd.h?
______________________________________________
Bill Stoddard
Come to the first official Apache Software Foundation
Conference! <http://ApacheCon.Com/>