fuankg | 1 Jun 01:20 2009
Picon

svn commit: r780525 - in /httpd/mod_ftp/trunk: NWGNUftp-makefile NWGNUmakefile

Author: fuankg
Date: Sun May 31 23:20:50 2009
New Revision: 780525

URL: http://svn.apache.org/viewvc?rev=780525&view=rev
Log:
renamed NWGNUftp-makefile back to NWGNUmakefile since the NetWare build system fails if no
NWGNUmakefile is present.

Added:
    httpd/mod_ftp/trunk/NWGNUmakefile   (props changed)
      - copied unchanged from r780501, httpd/mod_ftp/trunk/NWGNUftp-makefile
Removed:
    httpd/mod_ftp/trunk/NWGNUftp-makefile

Propchange: httpd/mod_ftp/trunk/NWGNUmakefile
------------------------------------------------------------------------------
    svn:mergeinfo = 

wrowe | 1 Jun 02:41 2009
Picon

svn commit: r780540 - in /httpd/mod_ftp/trunk: NWGNUmakefile build/mkconfNW-ftp.awk configure.apxs

Author: wrowe
Date: Mon Jun  1 00:41:24 2009
New Revision: 780540

URL: http://svn.apache.org/viewvc?rev=780540&view=rev
Log:
fix eol style for netware (crlf flavor)

Modified:
    httpd/mod_ftp/trunk/NWGNUmakefile   (contents, props changed)
    httpd/mod_ftp/trunk/build/mkconfNW-ftp.awk
    httpd/mod_ftp/trunk/configure.apxs

Modified: httpd/mod_ftp/trunk/NWGNUmakefile
URL: http://svn.apache.org/viewvc/httpd/mod_ftp/trunk/NWGNUmakefile?rev=780540&r1=780539&r2=780540&view=diff
==============================================================================
--- httpd/mod_ftp/trunk/NWGNUmakefile (original)
+++ httpd/mod_ftp/trunk/NWGNUmakefile Mon Jun  1 00:41:24 2009
 <at>  <at>  -1,50 +1,50  <at>  <at> 
-#
-# Declare the sub-directories to be built here
-#
-
-SUBDIRS = \
-	modules\ftp \
-	$(EOLIST) 
-
-#
-# Get the 'head' of the build environment.  This includes default targets and
-# paths to tools
(Continue reading)

wrowe | 1 Jun 07:02 2009
Picon

svn propchange: r780540 - svn:log

Author: wrowe
Revision: 780540
Modified property: svn:log

Modified: svn:log at Mon Jun  1 05:02:32 2009
------------------------------------------------------------------------------
--- svn:log (original)
+++ svn:log Mon Jun  1 05:02:32 2009
 <at>  <at>  -1 +1,4  <at>  <at> 
-fix eol style for netware (crlf flavor)
+fix eol style for netware (crlf flavor).
+
+also silence the config-test noise; creating a config.apxs.log file
+to capture the test-compile results.

wrowe | 1 Jun 07:04 2009
Picon

svn commit: r780561 - /httpd/mod_ftp/trunk/Makefile.apxs

Author: wrowe
Date: Mon Jun  1 05:04:50 2009
New Revision: 780561

URL: http://svn.apache.org/viewvc?rev=780561&view=rev
Log:
clear out new config.apxs.log file on distclean

Modified:
    httpd/mod_ftp/trunk/Makefile.apxs

Modified: httpd/mod_ftp/trunk/Makefile.apxs
URL: http://svn.apache.org/viewvc/httpd/mod_ftp/trunk/Makefile.apxs?rev=780561&r1=780560&r2=780561&view=diff
==============================================================================
--- httpd/mod_ftp/trunk/Makefile.apxs (original)
+++ httpd/mod_ftp/trunk/Makefile.apxs Mon Jun  1 05:04:50 2009
 <at>  <at>  -21,7 +21,7  <at>  <at> 

 TARGETS         = 
 INSTALL_TARGETS = install-conf install-ftpdocs install-manual install-include
-DISTCLEAN_TARGETS  = modules/ftp/ftp_config.h
+DISTCLEAN_TARGETS  = config.apxs.log modules/ftp/ftp_config.h
 EXTRACLEAN_TARGETS = 

 include $(exp_installbuilddir)/rules.mk

jim | 1 Jun 14:15 2009
Picon

svn commit: r780625 - in /httpd/mod_ftp/trunk/modules/ftp: ftp_commands.c ftp_protocol.h

Author: jim
Date: Mon Jun  1 12:15:50 2009
New Revision: 780625

URL: http://svn.apache.org/viewvc?rev=780625&view=rev
Log:
If using fchmod() we need these

Modified:
    httpd/mod_ftp/trunk/modules/ftp/ftp_commands.c
    httpd/mod_ftp/trunk/modules/ftp/ftp_protocol.h

Modified: httpd/mod_ftp/trunk/modules/ftp/ftp_commands.c
URL: http://svn.apache.org/viewvc/httpd/mod_ftp/trunk/modules/ftp/ftp_commands.c?rev=780625&r1=780624&r2=780625&view=diff
==============================================================================
--- httpd/mod_ftp/trunk/modules/ftp/ftp_commands.c (original)
+++ httpd/mod_ftp/trunk/modules/ftp/ftp_commands.c Mon Jun  1 12:15:50 2009
 <at>  <at>  -32,6 +32,11  <at>  <at> 
 #include <limits.h>
 #endif

+#ifdef HAVE_FCHMOD
+#include <sys/types.h>
+#include <sys/stat.h>
+#endif
+
 /* Wish APR had one of these */
 #if defined(WIN32) || defined(USE_WINSOCK)
 #define FTP_APR_EADDRINUSE (APR_OS_START_SYSERR + WSAEADDRINUSE)

(Continue reading)

jim | 1 Jun 14:21 2009
Picon

svn commit: r780629 - in /httpd/mod_ftp/trunk/modules/ftp: ftp_commands.c ftp_protocol.h ftp_util.c

Author: jim
Date: Mon Jun  1 12:21:48 2009
New Revision: 780629

URL: http://svn.apache.org/viewvc?rev=780629&view=rev
Log:
More compile-time warnings... protect with normal checks

Modified:
    httpd/mod_ftp/trunk/modules/ftp/ftp_commands.c
    httpd/mod_ftp/trunk/modules/ftp/ftp_protocol.h
    httpd/mod_ftp/trunk/modules/ftp/ftp_util.c

Modified: httpd/mod_ftp/trunk/modules/ftp/ftp_commands.c
URL: http://svn.apache.org/viewvc/httpd/mod_ftp/trunk/modules/ftp/ftp_commands.c?rev=780629&r1=780628&r2=780629&view=diff
==============================================================================
--- httpd/mod_ftp/trunk/modules/ftp/ftp_commands.c (original)
+++ httpd/mod_ftp/trunk/modules/ftp/ftp_commands.c Mon Jun  1 12:21:48 2009
 <at>  <at>  -33,9 +33,13  <at>  <at> 
 #endif

 #ifdef HAVE_FCHMOD
+#if APR_HAVE_SYS_TYPES_H
 #include <sys/types.h>
+#endif
+#if HAVE_SYS_STAT_H
 #include <sys/stat.h>
 #endif
+#endif

(Continue reading)

jim | 1 Jun 15:37 2009
Picon

svn commit: r780648 - in /httpd/httpd/trunk: CHANGES modules/mappers/mod_alias.c

Author: jim
Date: Mon Jun  1 13:37:59 2009
New Revision: 780648

URL: http://svn.apache.org/viewvc?rev=780648&view=rev
Log:
Fix error with arg counting

Modified:
    httpd/httpd/trunk/CHANGES
    httpd/httpd/trunk/modules/mappers/mod_alias.c

Modified: httpd/httpd/trunk/CHANGES
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/CHANGES?rev=780648&r1=780647&r2=780648&view=diff
==============================================================================
--- httpd/httpd/trunk/CHANGES [utf-8] (original)
+++ httpd/httpd/trunk/CHANGES [utf-8] Mon Jun  1 13:37:59 2009
 <at>  <at>  -7,7 +7,7  <at>  <at> 
      failed to send a request body. PR 46949 [Ruediger Pluem]

   *) mod_alias: check sanity in Redirect arguments.
-     PR 44729 [Sönke Tesch <st kino-fahrplan.de>]
+     PR 44729 [Sönke Tesch <st kino-fahrplan.de>, Jim Jagielski]

   *) mod_proxy_http: fix Host: header for literal IPv6 addresses.
      PR 47177 [Carlos Garcia Braschi <cgbraschi gmail.com>]

Modified: httpd/httpd/trunk/modules/mappers/mod_alias.c
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/mappers/mod_alias.c?rev=780648&r1=780647&r2=780648&view=diff
==============================================================================
(Continue reading)

rpluem | 1 Jun 16:08 2009
Picon

svn commit: r780655 - /httpd/httpd/trunk/modules/mappers/mod_alias.c

Author: rpluem
Date: Mon Jun  1 14:08:19 2009
New Revision: 780655

URL: http://svn.apache.org/viewvc?rev=780655&view=rev
Log:
* Some custom defined response codes also do not require 3 arguments (all that
  are not redirects).

Modified:
    httpd/httpd/trunk/modules/mappers/mod_alias.c

Modified: httpd/httpd/trunk/modules/mappers/mod_alias.c
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/mappers/mod_alias.c?rev=780655&r1=780654&r2=780655&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/mappers/mod_alias.c (original)
+++ httpd/httpd/trunk/modules/mappers/mod_alias.c Mon Jun  1 14:08:19 2009
 <at>  <at>  -180,9 +180,10  <at>  <at> 
     const char *f = arg2;
     const char *url = arg3;

-    if (!arg3 && !strcasecmp(arg1, "gone")) {
+    if (!arg3 && !strcasecmp(arg1, "gone"))
         status = HTTP_GONE;
-    }
+    else if (apr_isdigit(*arg1))
+        status = atoi(arg1);
     else if (arg3) {
         if (!strcasecmp(arg1, "permanent"))
             status = HTTP_MOVED_PERMANENTLY;
(Continue reading)

jim | 1 Jun 16:15 2009
Picon

svn commit: r780656 - /httpd/httpd/trunk/include/ap_slotmem.h

Author: jim
Date: Mon Jun  1 14:15:48 2009
New Revision: 780656

URL: http://svn.apache.org/viewvc?rev=780656&view=rev
Log:
Align doccos with code and clarify: grab tries to find a free
slot and returns that

Modified:
    httpd/httpd/trunk/include/ap_slotmem.h

Modified: httpd/httpd/trunk/include/ap_slotmem.h
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/include/ap_slotmem.h?rev=780656&r1=780655&r2=780656&view=diff
==============================================================================
--- httpd/httpd/trunk/include/ap_slotmem.h (original)
+++ httpd/httpd/trunk/include/ap_slotmem.h Mon Jun  1 14:15:48 2009
 <at>  <at>  -124,7 +124,7  <at>  <at> 
      */
     apr_status_t (* dptr)(ap_slotmem_instance_t *s, unsigned int item_id, void**mem);
     /**
-     * get/read the memory associated with this worker slot.
+     * get/read the data associated with this worker slot.
      *  <at> param s ap_slotmem_instance_t to use.
      *  <at> param item_id item to return for 0 to item_num
      *  <at> param dest address to store the data
 <at>  <at>  -133,7 +133,7  <at>  <at> 
      */
     apr_status_t (* get)(ap_slotmem_instance_t *s, unsigned int item_id, unsigned char *dest, apr_size_t dest_len);
     /**
(Continue reading)

jim | 1 Jun 16:16 2009
Picon

svn commit: r780657 - /httpd/httpd/trunk/include/ap_slotmem.h

Author: jim
Date: Mon Jun  1 14:16:47 2009
New Revision: 780657

URL: http://svn.apache.org/viewvc?rev=780657&view=rev
Log:
clarify ptr

Modified:
    httpd/httpd/trunk/include/ap_slotmem.h

Modified: httpd/httpd/trunk/include/ap_slotmem.h
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/include/ap_slotmem.h?rev=780657&r1=780656&r2=780657&view=diff
==============================================================================
--- httpd/httpd/trunk/include/ap_slotmem.h (original)
+++ httpd/httpd/trunk/include/ap_slotmem.h Mon Jun  1 14:16:47 2009
 <at>  <at>  -156,7 +156,7  <at>  <at> 
     /**
      * grab (or alloc) a free slot
      *  <at> param s ap_slotmem_instance_t to use.
-     *  <at> param item_id the available slot id and marked as in-use
+     *  <at> param item_id ptr to the available slot id and marked as in-use
      *  <at> return APR_SUCCESS if all went well
      */
     apr_status_t (* grab)(ap_slotmem_instance_t *s, unsigned int *item_id);


Gmane