You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@httpd.apache.org by wr...@apache.org on 2010/12/21 00:23:03 UTC
svn commit: r1051316 - in /httpd/httpd/branches/2.2.x: README-win32.txt
build/NWGNUscripts.inc modules/proxy/mod_proxy_scgi.c
Author: wrowe
Date: Mon Dec 20 23:23:03 2010
New Revision: 1051316
URL: http://svn.apache.org/viewvc?rev=1051316&view=rev
Log:
Text, please
Modified:
httpd/httpd/branches/2.2.x/README-win32.txt (contents, props changed)
httpd/httpd/branches/2.2.x/build/NWGNUscripts.inc (contents, props changed)
httpd/httpd/branches/2.2.x/modules/proxy/mod_proxy_scgi.c (contents, props changed)
Modified: httpd/httpd/branches/2.2.x/README-win32.txt
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.2.x/README-win32.txt?rev=1051316&r1=1051315&r2=1051316&view=diff
==============================================================================
--- httpd/httpd/branches/2.2.x/README-win32.txt (original)
+++ httpd/httpd/branches/2.2.x/README-win32.txt Mon Dec 20 23:23:03 2010
@@ -1,55 +1,55 @@
-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.
-
+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.
+
Propchange: httpd/httpd/branches/2.2.x/README-win32.txt
------------------------------------------------------------------------------
svn:eol-style = native
Modified: httpd/httpd/branches/2.2.x/build/NWGNUscripts.inc
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.2.x/build/NWGNUscripts.inc?rev=1051316&r1=1051315&r2=1051316&view=diff
==============================================================================
--- httpd/httpd/branches/2.2.x/build/NWGNUscripts.inc (original)
+++ httpd/httpd/branches/2.2.x/build/NWGNUscripts.inc Mon Dec 20 23:23:03 2010
@@ -1,46 +1,46 @@
-# 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. >> $@
-
-
+# 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. >> $@
+
+
Propchange: httpd/httpd/branches/2.2.x/build/NWGNUscripts.inc
------------------------------------------------------------------------------
svn:eol-style = native
Modified: httpd/httpd/branches/2.2.x/modules/proxy/mod_proxy_scgi.c
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.2.x/modules/proxy/mod_proxy_scgi.c?rev=1051316&r1=1051315&r2=1051316&view=diff
==============================================================================
--- httpd/httpd/branches/2.2.x/modules/proxy/mod_proxy_scgi.c (original)
+++ httpd/httpd/branches/2.2.x/modules/proxy/mod_proxy_scgi.c Mon Dec 20 23:23:03 2010
@@ -246,7 +246,7 @@ static int send_headers(request_rec *r,
const char *ns_len;
const apr_array_header_t *env_table;
const apr_table_entry_t *env;
- int j;
+ int j;
apr_size_t len, bodylen_size;
apr_size_t headerlen = sizeof(CONTENT_LENGTH)
+ sizeof(SCGI_MAGIC)
Propchange: httpd/httpd/branches/2.2.x/modules/proxy/mod_proxy_scgi.c
------------------------------------------------------------------------------
svn:eol-style = native