You are viewing a plain text version of this content. The canonical link for it is here.
Posted to mod_dtcl-cvs@tcl.apache.org by da...@apache.org on 2001/06/23 16:11:03 UTC
cvs commit: tcl-moddtcl apache_request.c apache_request.h mod_dtcl.c
davidw 01/06/23 07:11:03
Modified: . apache_request.c apache_request.h mod_dtcl.c
Log:
Updated license to say 'mod_dtcl' instead of 'Apache' in the correct places.
Add call to set max upload size.
Revision Changes Path
1.8 +3 -2 tcl-moddtcl/apache_request.c
Index: apache_request.c
===================================================================
RCS file: /home/cvs/tcl-moddtcl/apache_request.c,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- apache_request.c 2001/06/21 17:47:09 1.7
+++ apache_request.c 2001/06/23 14:11:03 1.8
@@ -342,8 +342,9 @@
request_rec *r = req->r;
FILE *fp;
char prefix[] = "apreq";
- char *name;
- int fd, tries = 100;
+ char *name = NULL;
+ int fd = 0;
+ int tries = 100;
while (--tries > 0) {
if ( (name = tempnam(req->temp_dir, prefix)) == NULL )
1.7 +2 -1 tcl-moddtcl/apache_request.h
Index: apache_request.h
===================================================================
RCS file: /home/cvs/tcl-moddtcl/apache_request.h,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- apache_request.h 2001/06/21 17:47:10 1.6
+++ apache_request.h 2001/06/23 14:11:03 1.7
@@ -105,7 +105,6 @@
#define ApacheRequest_upload(req) \
((req->parsed || (ApacheRequest_parse(req) == OK)) ? req->upload : NULL)
-
#define ApacheUpload_FILE(upload) (upload->fp)
#define ApacheUpload_size(upload) (upload->size)
@@ -115,6 +114,8 @@
#define ApacheUpload_type(upload) \
ApacheUpload_info(upload, "Content-Type")
+
+#define ApacheRequest_set_post_max(req, max) (req->post_max = max)
char *ApacheUtil_expires(pool *p, char *time_str, int type);
#define EXPIRES_HTTP 1
1.33 +7 -15 tcl-moddtcl/mod_dtcl.c
Index: mod_dtcl.c
===================================================================
RCS file: /home/cvs/tcl-moddtcl/mod_dtcl.c,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- mod_dtcl.c 2001/06/21 17:47:10 1.32
+++ mod_dtcl.c 2001/06/23 14:11:03 1.33
@@ -3,7 +3,7 @@
/* ====================================================================
* The Apache Software License, Version 1.1
*
- * Copyright (c) 2000 The Apache Software Foundation. All rights
+ * Copyright (c) 2000, 2001 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -30,9 +30,9 @@
* software without prior written permission. For written
* permission, please contact apache@apache.org.
*
- * 5. Products derived from this software may not be called "Apache",
- * nor may "Apache" appear in their name, without prior written
- * permission of the Apache Software Foundation.
+ * 5. Products derived from this software may not be called "mod_dtcl"
+ * or "dtcl", nor may "dtcl" appear in their name, without prior
+ * written permission of the Apache Software Foundation.
*
* THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
* WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
@@ -55,22 +55,13 @@
*
* Portions of this software are based upon public domain software
* originally written at the National Center for Supercomputing Applications,
- * University of Illinois, Urbana-Champaign.
- */
+ * University of Illinois, Urbana-Champaign. */
-/* $Id: mod_dtcl.c,v 1.32 2001/06/21 17:47:10 davidw Exp $ */
+/* $Id: mod_dtcl.c,v 1.33 2001/06/23 14:11:03 davidw Exp $ */
/* mod_dtcl.c by David Welton <da...@apache.org> - originally mod_include. */
/* See http://tcl.apache.org/mod_dtcl/credits.ttml for additional credits. */
-/*
- * http_include.c: Handles the server-parsed HTML documents
- *
- * Original by Rob McCool; substantial fixups by David Robinson;
- * incorporated into the Apache module framework by rst.
- *
- */
-
#include "httpd.h"
#include "http_config.h"
#include "http_request.h"
@@ -739,6 +730,7 @@
/* Apache Request stuff */
req = ApacheRequest_new(r);
+ ApacheRequest_set_post_max(req, upload_max);
global_req = req;
#if 0
if (upload_files_to_var)