Text, please

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@1051316 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/README-win32.txt b/README-win32.txt
index 40f6967885580b2b8ea187a8306f2bf2516195aa..86e232b7d4a3df2534ea278f459035061f155f3f 100644 (file)
--- a/README-win32.txt
+++ b/README-win32.txt
@@ -1,55 +1,55 @@
-New version of APR\r
-------------------\r
-\r
-Note that the included APR is now version 1.3, which adds several\r
-subtle changes in the behavior of file handling, pipes and process\r
-creation.  Most importantly, there is finer control over the handles\r
-inherited by processes, so the mod_fastcgi or mod_fcgid modules must \r
-be updated for httpd-2.2.9 to run correctly on Windows.\r
-\r
-Most other third party modules are unaffected by this change.\r
-\r
-\r
-Connecting to databases\r
------------------------\r
-\r
-Five SQL driver connectors (dbd) are provided in the binary distribution, \r
-for MySQL, SQLite3, PostgreSQL, Oracle and ODBC.  Two keyed database\r
-connectors are provided, SDBM and Oracle Berkeley DB.  All but SDBM will\r
-require you to install the corresponding client driver libraries.\r
-\r
-The sqlitedll.zip binary (containing sqlite3.dll) can be obtained from\r
-  http://www.sqlite.org/download.html\r
-note that this binary was built with version 3.6.16 (earlier and later\r
-version 3.6 driver .dll's may work.)  The lib binding is created using\r
-LIB /DEF:sqlite3.def and using the .h files from the _amalgamation zip.\r
-\r
-The Oracle Instant Client - Basic driver can be obtained from\r
-  http://www.oracle.com/technology/software/tech/oci/instantclient/htdocs/winsoft.html\r
-and note that this binary was built against version 11.1.0.6.0,\r
-other version 11.1 drivers may work.\r
-\r
-The PostgreSQL client binaries may be obtained from\r
-  http://www.postgresql.org/ftp/binary/v8.3.1/win32/\r
-and note that this binary was built against version 8.3.1-1, and\r
-again it may work with other 8.1 version .dll's.\r
-\r
-The MySQL client binaries ("Essentials" is sufficient) is obtained from \r
-  http://dev.mysql.com/downloads/mysql/5.1.html#win32\r
-but note that once using the MySQL database, the applicable exception \r
-clause demands copy-left terms on the resulting combination.\r
-\r
-The Oracle Berkeley DB binaries may be obtained from \r
-  http://www.oracle.com/technology/software/products/berkeley-db/index.html\r
-but note that once using the Berkeley DB code, the Oracle license\r
-demands copy-left terms on the resulting combination.\r
-\r
-NOTE: For whichever database backend(s) you configure, the corresponding\r
-driver .dll's must be in your PATH to test from console mode, and in the \r
-systemwide path if used for a service such as Apache httpd.\r
-\r
-The FreeTDS driver is not built on Windows, since the Microsoft ODBC is \r
-provided instead.  The sqlite2 and ndbm drivers are not used on Windows, \r
-as there is no point in legacy support of these old versions.  The ASF\r
-does not distribute binary builds of the gdbm binding.\r
-\r
+New version of APR
+------------------
+
+Note that the included APR is now version 1.3, which adds several
+subtle changes in the behavior of file handling, pipes and process
+creation.  Most importantly, there is finer control over the handles
+inherited by processes, so the mod_fastcgi or mod_fcgid modules must 
+be updated for httpd-2.2.9 to run correctly on Windows.
+
+Most other third party modules are unaffected by this change.
+
+
+Connecting to databases
+-----------------------
+
+Five SQL driver connectors (dbd) are provided in the binary distribution, 
+for MySQL, SQLite3, PostgreSQL, Oracle and ODBC.  Two keyed database
+connectors are provided, SDBM and Oracle Berkeley DB.  All but SDBM will
+require you to install the corresponding client driver libraries.
+
+The sqlitedll.zip binary (containing sqlite3.dll) can be obtained from
+  http://www.sqlite.org/download.html
+note that this binary was built with version 3.6.16 (earlier and later
+version 3.6 driver .dll's may work.)  The lib binding is created using
+LIB /DEF:sqlite3.def and using the .h files from the _amalgamation zip.
+
+The Oracle Instant Client - Basic driver can be obtained from
+  http://www.oracle.com/technology/software/tech/oci/instantclient/htdocs/winsoft.html
+and note that this binary was built against version 11.1.0.6.0,
+other version 11.1 drivers may work.
+
+The PostgreSQL client binaries may be obtained from
+  http://www.postgresql.org/ftp/binary/v8.3.1/win32/
+and note that this binary was built against version 8.3.1-1, and
+again it may work with other 8.1 version .dll's.
+
+The MySQL client binaries ("Essentials" is sufficient) is obtained from 
+  http://dev.mysql.com/downloads/mysql/5.1.html#win32
+but note that once using the MySQL database, the applicable exception 
+clause demands copy-left terms on the resulting combination.
+
+The Oracle Berkeley DB binaries may be obtained from 
+  http://www.oracle.com/technology/software/products/berkeley-db/index.html
+but note that once using the Berkeley DB code, the Oracle license
+demands copy-left terms on the resulting combination.
+
+NOTE: For whichever database backend(s) you configure, the corresponding
+driver .dll's must be in your PATH to test from console mode, and in the 
+systemwide path if used for a service such as Apache httpd.
+
+The FreeTDS driver is not built on Windows, since the Microsoft ODBC is 
+provided instead.  The sqlite2 and ndbm drivers are not used on Windows, 
+as there is no point in legacy support of these old versions.  The ASF
+does not distribute binary builds of the gdbm binding.
+

diff --git a/build/NWGNUscripts.inc b/build/NWGNUscripts.inc
index 9b04d19ce6314b636c59fffe8692d05ebe425751..0223bc88a2c8a0e21d90b2f6f77874f4df1c4215 100644 (file)
--- a/build/NWGNUscripts.inc
+++ b/build/NWGNUscripts.inc
@@ -1,46 +1,46 @@
-# Include for creating start/stop/restart NCF scripts.\r
-\r
-instscripts:: FORCE $(INSTALL)/$(BASEDIR)/ap2start.ncf $(INSTALL)/$(BASEDIR)/ap2auto.ncf $(INSTALL)/$(BASEDIR)/ap2rest.ncf $(INSTALL)/$(BASEDIR)/ap2stop.ncf $(INSTALL)/$(BASEDIR)/ap2prod.ncf\r
-\r
-$(INSTALL)/$(BASEDIR)/ap2start.ncf:\r
-       @echo # NCF to start Apache 2.x in own address space > $@\r
-       @echo # Make sure that httpstk isn't listening on 80 >> $@\r
-       @echo # httpcloseport 80 /silent >> $@\r
-       @echo # search add SYS:/$(BASEDIR) >> $@\r
-       @echo load address space = $(BASEDIR) SYS:/$(BASEDIR)/apache2 >> $@\r
-       @echo # If you have problems with 3rd-party modules try to load in OS space. >> $@\r
-       @echo # load $(BASEDIR)/apache2 >> $@\r
-       @echo. >> $@\r
-\r
-$(INSTALL)/$(BASEDIR)/ap2auto.ncf:\r
-       @echo # NCF to start Apache 2.x in own address space > $@\r
-       @echo # and let automatically restart in case it crashes >> $@\r
-       @echo # Make sure that httpstk isn't listening on 80 >> $@\r
-       @echo # httpcloseport 80 /silent >> $@\r
-       @echo # search add SYS:/$(BASEDIR) >> $@\r
-       @echo restart address space = $(BASEDIR) SYS:/$(BASEDIR)/apache2 >> $@\r
-       @echo # If you have problems with 3rd-party modules try to load in OS space. >> $@\r
-       @echo # load $(BASEDIR)/apache2 >> $@\r
-       @echo. >> $@\r
-\r
-$(INSTALL)/$(BASEDIR)/ap2rest.ncf:\r
-       @echo # NCF to restart Apache 2.x in own address space > $@\r
-       @echo apache2 restart -p $(BASEDIR) >> $@\r
-       @echo # If you have loaded Apache2.x in OS space use the line below. >> $@\r
-       @echo # apache2 restart >> $@\r
-       @echo. >> $@\r
-\r
-$(INSTALL)/$(BASEDIR)/ap2stop.ncf:\r
-       @echo # NCF to stop Apache 2.x in own address space > $@\r
-       @echo apache2 shutdown -p $(BASEDIR) >> $@\r
-       @echo # If you have loaded Apache2.x in OS space use the line below. >> $@\r
-       @echo # apache2 shutdown >> $@\r
-       @echo. >> $@\r
-\r
-$(INSTALL)/$(BASEDIR)/ap2prod.ncf:\r
-       @echo # NCF to create a product record for Apache 2.x in product database > $@\r
-       @echo PRODSYNC DEL APACHE$(VERSION_MAJMIN) >> $@\r
-       @echo PRODSYNC ADD APACHE$(VERSION_MAJMIN) ProductRecord "$(VERSION_STR)" "Apache $(VERSION_STR) Webserver" >> $@\r
-       @echo. >> $@\r
-\r
-\r
+# Include for creating start/stop/restart NCF scripts.
+
+instscripts:: FORCE $(INSTALL)/$(BASEDIR)/ap2start.ncf $(INSTALL)/$(BASEDIR)/ap2auto.ncf $(INSTALL)/$(BASEDIR)/ap2rest.ncf $(INSTALL)/$(BASEDIR)/ap2stop.ncf $(INSTALL)/$(BASEDIR)/ap2prod.ncf
+
+$(INSTALL)/$(BASEDIR)/ap2start.ncf:
+       @echo # NCF to start Apache 2.x in own address space > $@
+       @echo # Make sure that httpstk isn't listening on 80 >> $@
+       @echo # httpcloseport 80 /silent >> $@
+       @echo # search add SYS:/$(BASEDIR) >> $@
+       @echo load address space = $(BASEDIR) SYS:/$(BASEDIR)/apache2 >> $@
+       @echo # If you have problems with 3rd-party modules try to load in OS space. >> $@
+       @echo # load $(BASEDIR)/apache2 >> $@
+       @echo. >> $@
+
+$(INSTALL)/$(BASEDIR)/ap2auto.ncf:
+       @echo # NCF to start Apache 2.x in own address space > $@
+       @echo # and let automatically restart in case it crashes >> $@
+       @echo # Make sure that httpstk isn't listening on 80 >> $@
+       @echo # httpcloseport 80 /silent >> $@
+       @echo # search add SYS:/$(BASEDIR) >> $@
+       @echo restart address space = $(BASEDIR) SYS:/$(BASEDIR)/apache2 >> $@
+       @echo # If you have problems with 3rd-party modules try to load in OS space. >> $@
+       @echo # load $(BASEDIR)/apache2 >> $@
+       @echo. >> $@
+
+$(INSTALL)/$(BASEDIR)/ap2rest.ncf:
+       @echo # NCF to restart Apache 2.x in own address space > $@
+       @echo apache2 restart -p $(BASEDIR) >> $@
+       @echo # If you have loaded Apache2.x in OS space use the line below. >> $@
+       @echo # apache2 restart >> $@
+       @echo. >> $@
+
+$(INSTALL)/$(BASEDIR)/ap2stop.ncf:
+       @echo # NCF to stop Apache 2.x in own address space > $@
+       @echo apache2 shutdown -p $(BASEDIR) >> $@
+       @echo # If you have loaded Apache2.x in OS space use the line below. >> $@
+       @echo # apache2 shutdown >> $@
+       @echo. >> $@
+
+$(INSTALL)/$(BASEDIR)/ap2prod.ncf:
+       @echo # NCF to create a product record for Apache 2.x in product database > $@
+       @echo PRODSYNC DEL APACHE$(VERSION_MAJMIN) >> $@
+       @echo PRODSYNC ADD APACHE$(VERSION_MAJMIN) ProductRecord "$(VERSION_STR)" "Apache $(VERSION_STR) Webserver" >> $@
+       @echo. >> $@
+
+

diff --git a/modules/proxy/mod_proxy_scgi.c b/modules/proxy/mod_proxy_scgi.c
index b16fe153ef50410eb65afb2fe8d9cae1be4fc927..b9f05c0e5e00cb56eec3654058b757c6045d316a 100644 (file)
--- a/modules/proxy/mod_proxy_scgi.c
+++ b/modules/proxy/mod_proxy_scgi.c
@@ -246,7 +246,7 @@ static int send_headers(request_rec *r, proxy_conn_rec *conn)
     const char *ns_len;
     const apr_array_header_t *env_table;
     const apr_table_entry_t *env;
-    int j;\r
+    int j;
     apr_size_t len, bodylen_size;
     apr_size_t headerlen =   sizeof(CONTENT_LENGTH)
                            + sizeof(SCGI_MAGIC)