diff --git a/CHANGES b/CHANGES index 2fd265d4..074913b5 100644 --- a/CHANGES +++ b/CHANGES @@ -1,3 +1,210 @@ +16 Dec 2013 - 2.7.6 +------------------- +Improvements: + +- Organizes all Makefile.am - 1cde4d2dd9d96747536c1c25d06ba0677069477f + Now using one file per line (sorted). This is the better way to handle it, since it reduces the possibility of merge conflicts. + +- nginx: generates config file using configure input. - 351b9cc357d439e30ebd61d89a9e38ecf55c6827 + The nginx config file was looking for depedencies by its own, by doing that it was ignoring the options that were passed to configure script. This commit deletes this config file and adds a meta-config which is populated by configure whenever the standalone-module is enabled. + +- nginx: adds lua support - da16d9e5d51d4ef8734687514a4e1368e7fb4284 + +- iis: Cosmetics fixies on sqli. - 5046c8327ea21c69b4c0d0c0057c692b05b09fef + This is needed to get it compiled with VS2011 on Windows8 + +- Regression tests: makes configuration compatible with 2.2 and 2.4 (try 2) - ae252ee8767069363906e5a611dff487b799b839 + +- nginx: Trying apxs and apxs2 while compiling nginx module - 65d9272fdc353e1263567b60604542d377d19672 + +- nginx: Trying apxs and apxs2 while compiling nginx module - 35fd75d859e4a8873b8843da1db13e04a1b08140 + +- macos: Using glibtoolize instead of libtoolize - 751a9f4e45213cd69f00c62c71edc9d7ad99b82d + +- regression-tests: makes configuration compatible with 2.2 and 2.4 - 6fc4cac37ab1be8d1232140042b58fe4bd93ee17 + +- Regression test: get it working with apache 2.4 - e9813cd0d9bfc5b0c9aa5832634ec1b39b805108 + Changes in httpd.conf.in to get it working with apache 2.4 + +- Code cosmetics. - 7366f35c1d80772d739b35da8faa972f92a72b97 + Changed to reduce the number of possible fails during Build Bot compilation. + +- iis: Waiting for 5 seconds before move curl directory - 9bf2959c919587ebc63f5a1b8c0785da8927bff5 + Testing buildbot. + +- Redefines unixd_set_global_mutex_perms on tests - f70f6f4281b806627e0cf0dbb9c84ae5864bdb16 + Avoding conflicts with the standalone implementation + +- Adds verbose quality check - 388943440cc9b8c6fdea09f5e365a2e5a3e792e2 + Vera++ and ccpcheck are not outputing to the stderr instead stdout allowing the buildbot to extract some numbers about it. + +- Adds support for coding style and quality check - b77e90152d119609ac78a7028383c3b79898b2cf + Initial effort to get the code on shape. This will be executed by the buildbots as soon as they get ready for it. + +- iis: New improvements on the Wix installer - 2ea5a74a7bfb00f21312e51e48aa6dac03d84600 + * Now the installation is divided in modules: ModSecurity and CRS. + * Added default configuration + * Configuration was moved to "Program Files" folder + * Build_msi script now using candle available in %PATH% + +- iis: Removes the installer helper dependency - 1a12648c9f6028f251af0f03c889397c7954b74c + Now using appcmd directly with WiX instead of calling the installer helper. + +- iis: Remove readme.html - 550d5aae21cba696cac1ce75ab8113e5255d5a59 + This HTML is about "Creating a Native Module for IIS7" not straight related to ModSecurity itself. + +- iis: Adds batch script to compile Wix - a2c5fc831baf0b324ebb66b0f878dacf1ec2f808 + This batch script can be used to generate our msi installer. + +- iis: Adds Wix installer resources - 3604763e15a665eb7a6ecae1f7e7c65cebbb1d17 + This is all about cosmetic changes. + +- iss: Removes Post-Build event. - 28bbde1bb218b004654cb865fc8563d69b848dc2 + There was a copy on Post-Build event using a hard coded path. This patch removes this Post-Build event. + +- iis: Relative paths on the VS project file - 368617ddb2443f9b6036f80a648d467d07c9a054 + There are a ModSecurityIIS solution and project files, those were using hard coded paths to meet the dependencies. As consequence of the last update in our build scripts, now we are able to built the dependencies and load it to our Visual Studio project using relative paths. + +- iis: Adds release script - 9477118903861ce80c4c27cb581bf3462315e98e + +- iis: fixies the Installer.cpp coding style - 79875b1af8e8571098345b91557bab9c06eb7c88 + +- iis: Removes AppWizard remade file - 91738f93bcc82b6ab756c550a66b6cf6af2fa9f8 + Apparently the AppWizard was used to generate part of this Installer, the ReadMe.txt created by the AppWizard was removed by this commit + +- iss: Removes pre-compiled headers - adfbeb85dcfa9466b72eebb8d1bd8eb7728bab79 + No need to use the pre-compiled headers in InstallerHelper, removing it, in order to keep the project lean. + +- iis: Moves installer to InstallerHelper - 6adf25667dd4bfa33010bd6d8ae3d35046a69967 + To organize the folder the Installer application was renamed to installer helper. It is not the real installer, it is just an helper which is executed during the installation phase. + +- iss: Removes fart dependencies - 8c3b8d81b613aaa38f28472af1eb26c90c7fc9da + This commit removes the dependency of the fart.exe utility. The utility was responsible to rename contents inside some dependencies build files. Those modifications are not longer needed. + +- iss: Better err handling in build scripts. - 192599bf63b6ae5aa08e4536a90d5d0a17f969f7 + Now checking for errors in every step of the build phase + +- iis: Moves build_module.bat to build_modsecurity.bat - e25c6b2e85ced7beba4d41867dbdf30e9c1286d3 + The build_modsecurity.bat is now on the iis sub-directory, not in the dependencies anymore. Its content was also changed fixing all the paths. + + +- iis: Identifies arch before unzip apache - cf5de78dfb9fffd21edf17af9e1db8f2fd83c804 + Currently we need the Apache binary which could be used in 32 or 64 bits. This patch makes usage of 'cl' to identify which architecture is set. + +- iis: Renamves winbuild to dependencies - 1447766e816a896e88c9c8f053fcc3f62797bac1 + Since the directory becomes all about dependencies there is no need to call it winbuild anymore. + +- iis: Removes unnecessary files from winbuild dir - 9f8cbf6ed8034ba42aa4967699308df09864fd18 + Those .mak files seems to be part of an old build system. Since the script are now working fine, this commit removes all those .mac files and also a CMakeList.txt and the Makefile.win. + +- iis: Improves the iis build system - b277e538f28c87c81c1b50925dd8b82996b88294 + Now checking for common errors while building. Refactoring on the build scripts, now there is this build_dependencies.bat script on the iis sub-folder. By calling this script all the dependencies should be build under the winbuild/. This commit also removes build scripts that were not needed anymore. + +- iis: Fixes the vcxproj file - a946a163f0ad822c760af80ca32dda61f0e6b2a9 + Versions of the dependencies were changed, as long as the version of the Visual Studio, now 12. + +- iis: Removes unecessary files from the build system - 26738d2e34bcc7620047bd23180e0e26a64c71ee + The following files were removed: + * VCVarsQueryRegistry.bat + * vcvars64.bat + * vsvars32.bat +The visual studio files can be called direcltly, not necessary to distribute those files, at least in VS12. + +- iss: Changes httpd version 2.4.6 - 0a772cb0748aa51a01800e0473309b9de792b456 + Apache version was changed to 2.4.6 to sync with the current apache lounge version. + +- iis: Changes the version of the dependencies - 3e6fb41d36b7a5e98a55d8f52b88b29d1bd50b64 + * pcre from 8.30 to 8.33 + * zlib from 1.2.7 to 1.2.8 + * libxml2 from 2.7.7 to 2.9.1 + * curl from 7.24 to 7.33.0 + +- Removes standalone/Makefile.in - e3c19d53d23c48fea337aae76a87b2a85c36a1f1 + Makefile.in is recommended to be in the repository whenever it is edit manually, in our case the automatically generated Makefile.in is ok. + + +Bug Fixes: + +- test: Avoids conflict of fuctions definition - cef72855e4106ce29e1d39103ebf9eb9ab28f17e + +- test: Makes the unit tests to work again - cc982ae42ec86c79a67be1a01c6ee35fb06c272c + The unit tests was not working due to lack update. This patch adds the necessary stuff to have it work again. + +- iis: Avoids directory link while building - ad330a44bfa39430cf6340cb52971568cccdf1d6 + Build scripts was creating links allowing the project to be loaded into Visual Studio without care about the dependencies versions. Sometimes windows refuse to delete those links leading the script to fail. This patch moves the sources directories instead of create links to it. + +- QA: Avoids the utilization of 3rd filedescriptor - 69c5ccac662f4e11a6eefd54a3e912583c067b9d + No need to use a 3rd description on the quality check scripts. Stderr is now redirected to stdout and filtered as needed. + +- Supports WarningCountingShellCommand in cppcheck and vera - baaf502363e68c3240b60adb7f7c91f5b4f0ba03 + WarningCountingShellCommand allow us to have some measurements on the buildbot waterfall. + +- iis: Using base_rules instead of activated_rules - 7b1537058fa451e0df7098cd907ef19f04102f9d + +- iis: Fix inet_pton build problem - a4202146b8d26b6615bbab986383fe0afae60d77 + There is a function named inet_pton on windows API, with different signature. This patch just override the windows function and point the inet_pton to our implementation. + +- iis: Adds Wix installer xml file.c - b32cb7d9ab397160f0154aa4bd4e9638658b41e6 + This commit adds the Wix template to our git repository. + +- iis: build_modsecurity.bat fixies - 7e03e3f840375ed682c35a5bb67932461cc77013 + This commit enable a cleanup on the mod_security build directory avoiding symbols with different architectures. + +- iis: Fix mlogc build on windows - 9b7663fa79377a0685130a019916d810f31e7478 + The libcurl path was not pointing to the correct directory + +- Fix #154, Uses addn instead of apr_table_setn - 1734221d9d3a78f9aafd68e35717da9ee1a4fe51 + The headers are represented in the format of an apr_table, which is able to handle elements with the same key, however the function apr_table_setn checks if the key exists before add the element, if so it replaces the old value with the new one. This was making our implementation to just keep the last added Cookie. The apr_table_addn function, which is now used, just add a new item without check for olders one. + +- Merge pull request #579 from zimmerle/revert_139 - 61e54f2067ae760808359926ff91d57275df1aac + Revert merge request #139 + +- Revert "Merge pull request #139 from chaizhenhua/remotes/trunk" - 7f7d00fa2c364716691df1b45779304b24a0debb + This reverts commit 10fd40fb0d06f6c577d870b6f15d2f6e2a3a5b1b, reversing changes made to 414033aafa94cd50c9b310afd3f164740caccc94. + +- Merge pull request #578 from client9/remotes/trunk - b0c3977845f60747b15ae10531b7d20355a22627 + libinjection sync to v3.8.0 + +- libinjection sync - a5f175d79fac1e69124da4e1e227b622e7e233d7 + +- Merge pull request #152 from client9/remotes/trunk - 88ebf8a0bdbc4db1be76f3a2e70df77cc52a5925 + Sync to libinjection v3.7.1 + +- libinjection sync - fcb6dc13ed6efb066fb9b70405eecab8b83a2d96 + +- libinjection sync - f52242a013f301ca5c17e59b662124833cb7cc6d + +- Merge pull request #148 from zimmerle/bugfix_charset_missing_string_terminator - b76e26d81ddafc2b99bffad53d1426f8fd33080a + Bugfix: missing string terminator while mounting the charset (nginx) + +- Bugfix: missing string terminator while mounting the charset (nginx) - ff19dcd5c53d4af61d0a9397d4616f47f80ee207 + The charset in headers is mounted using ngx_snprintf which does not place the string terminator. This patch adds the terminator at the end of the string. The size was correctly allocated, just missing the terminator. + +- Merge pull request #141 from client9/remotes/trunk - 9a630eea23a7ead4e77617c86dc937fd7a421a57 + libinjection sync to v3.6.0 + +- libinjection sync - 11217207e8f2e0cf15742273836399866971071a + +- Fix Chunked string case sensitive issue - CVE-2013-5705 - f8d441cd25172fdfe5b613442fedfc0da3cc333d + +- Revert "Fix Chuncked string case sensitive issue" - 3901128f17e0763ac1a260106b79859d2aad6d90 + This reverts commit 16a815a3c2735f62238ef99af26090a2b8430d3d. + +- Fix Chuncked string case sensitive issue - 16a815a3c2735f62238ef99af26090a2b8430d3d + +- Merge pull request #139 from chaizhenhua/remotes/trunk - 10fd40fb0d06f6c577d870b6f15d2f6e2a3a5b1b + Fixed fd leackage after reload + +- Merge pull request #138 from client9/remotes/trunk - 414033aafa94cd50c9b310afd3f164740caccc94 + libinjection sync + +- Fixed fd leackage after reload - e0993fcd7a166ce9e1a279a47d050af1311d9001 + +- libinjection sync - 2268626c20260e88cab9b7830f8a06101fa7172a + +- Fix logical disjunction and conjunction issues - 7e0a9ecf7d492e85650671a0cfcfd53e5f15df2c + + 23 Jul 2013 - 2.7.5 ------------------- Improvements: diff --git a/Makefile.am b/Makefile.am index 35b3797b..f9b4d878 100644 --- a/Makefile.am +++ b/Makefile.am @@ -5,35 +5,44 @@ CLEANFILES = MAINTAINERCLEANFILES = CLEANFILES += tests/regression/server_root/conf/*.t_*.conf \ -   tests/regression/server_root/logs/*.log + tests/regression/server_root/logs/*.log MAINTAINERCLEANFILES += $(CLEANFILES) \ - Makefile.in \ - aclocal.m4 \ - alp2/Makefile.in \ - apache2/Makefile.in \ - build/config.guess \ - build/config.sub \ - build/depcomp \ - build/libtool.m4 \ - build/ltmain.sh \ - build/ltoptions.m4 \ - build/ltsugar.m4 \ - build/ltversion.m4 \ - build/lt~obsolete.m4 \ - build/missing \ - configure \ - ext/Makefile.in \ - mlogc/Makefile.in \ - modsecurity_config_auto.h.in~ \ - config.log \ - Makefile \ - config.status + aclocal.m4 \ + alp2/Makefile.in \ + apache2/Makefile.in \ + build/config.guess \ + build/config.sub \ + build/depcomp \ + build/libtool.m4 \ + build/ltmain.sh \ + build/lt~obsolete.m4 \ + build/ltoptions.m4 \ + build/ltsugar.m4 \ + build/ltversion.m4 \ + build/missing \ + config.log \ + config.status \ + configure \ + ext/Makefile.in \ + Makefile \ + Makefile.in \ + mlogc/Makefile.in \ + modsecurity_config_auto.h.in~ -# Alias for "check" test: check test-regression: (cd tests && $(MAKE) test-regression) +cppcheck: + cppcheck . --enable=all --force 2>&1 | sed 's/^/warning: /g' 1>&2; + +check-coding-style: + for i in `(find . -iname "*.c" ; find . -iname "*.h")`; \ + do echo $$i...; \ + vera++ -rule L004 -param max-line-length=80 $$i 2>&1 | sed 's/^/warning: /g' 1>&2; \ + vera++ -rule L001 $$i 2>&1 | sed 's/^/warning: /g' 1>&2; \ + done; + .PHONY: test diff --git a/alp2/Makefile.am b/alp2/Makefile.am index 4b475451..aaab6293 100644 --- a/alp2/Makefile.am +++ b/alp2/Makefile.am @@ -1,6 +1,13 @@ lib_LTLIBRARIES = libalp2.la -include_HEADERS = alp2.h alp2_pp.h -libalp2_la_SOURCES = alp2.c alp2_pp.c -libalp2_la_CFLAGS = @APR_CFLAGS@ @APU_CFLAGS@ -libalp2_la_LDFLAGS = @APR_LDFLAGS@ @APU_LDFLAGS@ +include_HEADERS = alp2.h \ + alp2_pp.h + +libalp2_la_SOURCES = alp2.c \ + alp2_pp.c + +libalp2_la_CFLAGS = @APR_CFLAGS@ \ + @APU_CFLAGS@ + +libalp2_la_LDFLAGS = @APR_LDFLAGS@ \ + @APU_LDFLAGS@ diff --git a/apache2/Makefile.am b/apache2/Makefile.am index 550be2ed..8708882a 100644 --- a/apache2/Makefile.am +++ b/apache2/Makefile.am @@ -1,70 +1,132 @@ pkglibdir = $(prefix)/lib pkglib_LTLIBRARIES = mod_security2.la -#include_HEADERS = re.h modsecurity.h msc_logging.h msc_multipart.h \ -# msc_parsers.h msc_pcre.h msc_util.h msc_xml.h \ -# persist_dbm.h apache2.h msc_geo.h acmp.h utf8tables.h \ -# msc_lua.h msc_release.h -mod_security2_la_SOURCES = mod_security2.c \ - apache2_config.c apache2_io.c apache2_util.c \ - re.c re_operators.c re_actions.c re_tfns.c \ - re_variables.c msc_logging.c msc_xml.c \ - msc_multipart.c modsecurity.c msc_parsers.c \ - msc_util.c msc_pcre.c persist_dbm.c msc_reqbody.c \ - msc_geo.c msc_gsb.c msc_crypt.c msc_tree.c msc_unicode.c acmp.c msc_lua.c msc_release.c \ - libinjection/libinjection_sqli.c +mod_security2_la_SOURCES = acmp.c \ + apache2_config.c \ + apache2_io.c \ + apache2_util.c \ + libinjection/libinjection_sqli.c \ + mod_security2.c \ + modsecurity.c \ + msc_crypt.c \ + msc_geo.c \ + msc_gsb.c \ + msc_logging.c \ + msc_lua.c \ + msc_multipart.c \ + msc_parsers.c \ + msc_pcre.c \ + msc_release.c \ + msc_reqbody.c \ + msc_tree.c \ + msc_unicode.c \ + msc_util.c \ + msc_xml.c \ + persist_dbm.c \ + re_actions.c \ + re.c \ + re_operators.c \ + re_tfns.c \ + re_variables.c -mod_security2_la_CFLAGS = @APXS_CFLAGS@ @APR_CFLAGS@ @APU_CFLAGS@ \ - @PCRE_CFLAGS@ @LIBXML2_CFLAGS@ @LUA_CFLAGS@ @MODSEC_EXTRA_CFLAGS@ @CURL_CFLAGS@ -mod_security2_la_CPPFLAGS = @APR_CPPFLAGS@ @PCRE_CPPFLAGS@ @LIBXML2_CPPFLAGS@ -mod_security2_la_LIBADD = @APR_LDADD@ @APU_LDADD@ @PCRE_LDADD@ @LIBXML2_LDADD@ @LUA_LDADD@ +mod_security2_la_CFLAGS = @APR_CFLAGS@ \ + @APU_CFLAGS@ \ + @APXS_CFLAGS@ \ + @CURL_CFLAGS@ \ + @LIBXML2_CFLAGS@ \ + @LUA_CFLAGS@ \ + @MODSEC_EXTRA_CFLAGS@ \ + @PCRE_CFLAGS@ + + +mod_security2_la_CPPFLAGS = @APR_CPPFLAGS@ \ + @LIBXML2_CPPFLAGS@ \ + @PCRE_CPPFLAGS@ + +mod_security2_la_LIBADD = @APR_LDADD@ \ + @APU_LDADD@ \ + @LIBXML2_LDADD@ \ + @LUA_LDADD@ \ + @PCRE_LDADD@ if AIX mod_security2_la_LDFLAGS = -module -avoid-version \ - @APR_LDFLAGS@ @APU_LDFLAGS@ @APXS_LDFLAGS@ \ - @PCRE_LDFLAGS@ @LIBXML2_LDFLAGS@ @LUA_LDFLAGS@ + @APR_LDFLAGS@ \ + @APU_LDFLAGS@ \ + @APXS_LDFLAGS@ \ + @LIBXML2_LDFLAGS@ \ + @LUA_LDFLAGS@ \ + @PCRE_LDFLAGS@ endif if HPUX mod_security2_la_LDFLAGS = -module -avoid-version \ - @APR_LDFLAGS@ @APU_LDFLAGS@ @APXS_LDFLAGS@ \ - @PCRE_LDFLAGS@ @LIBXML2_LDFLAGS@ @LUA_LDFLAGS@ + @APR_LDFLAGS@ \ + @APU_LDFLAGS@ \ + @APXS_LDFLAGS@ \ + @LIBXML2_LDFLAGS@ \ + @LUA_LDFLAGS@ \ + @PCRE_LDFLAGS@ endif if MACOSX mod_security2_la_LDFLAGS = -module -avoid-version \ - @APR_LDFLAGS@ @APU_LDFLAGS@ @APXS_LDFLAGS@ \ - @PCRE_LDFLAGS@ @LIBXML2_LDFLAGS@ @LUA_LDFLAGS@ + @APR_LDFLAGS@ \ + @APU_LDFLAGS@ \ + @APXS_LDFLAGS@ \ + @LIBXML2_LDFLAGS@ \ + @LUA_LDFLAGS@ \ + @PCRE_LDFLAGS@ endif if SOLARIS mod_security2_la_LDFLAGS = -module -avoid-version \ - @APR_LDFLAGS@ @APU_LDFLAGS@ @APXS_LDFLAGS@ \ - @PCRE_LDFLAGS@ @LIBXML2_LDFLAGS@ @LUA_LDFLAGS@ + @APR_LDFLAGS@ \ + @APU_LDFLAGS@ \ + @APXS_LDFLAGS@ \ + @LIBXML2_LDFLAGS@ \ + @LUA_LDFLAGS@ \ + @PCRE_LDFLAGS@ endif if LINUX mod_security2_la_LDFLAGS = -no-undefined -module -avoid-version -R @PCRE_LD_PATH@ \ - @APR_LDFLAGS@ @APU_LDFLAGS@ @APXS_LDFLAGS@ \ - @PCRE_LDFLAGS@ @LIBXML2_LDFLAGS@ @LUA_LDFLAGS@ + @APR_LDFLAGS@ \ + @APU_LDFLAGS@ \ + @APXS_LDFLAGS@ \ + @LIBXML2_LDFLAGS@ \ + @LUA_LDFLAGS@ \ + @PCRE_LDFLAGS@ endif if FREEBSD mod_security2_la_LDFLAGS = -no-undefined -module -avoid-version \ - @APR_LDFLAGS@ @APU_LDFLAGS@ @APXS_LDFLAGS@ \ - @PCRE_LDFLAGS@ @LIBXML2_LDFLAGS@ @LUA_LDFLAGS@ + @APR_LDFLAGS@ \ + @APU_LDFLAGS@ \ + @APXS_LDFLAGS@ \ + @LIBXML2_LDFLAGS@ \ + @LUA_LDFLAGS@ \ + @PCRE_LDFLAGS@ endif if OPENBSD mod_security2_la_LDFLAGS = -no-undefined -module -avoid-version \ - @APR_LDFLAGS@ @APU_LDFLAGS@ @APXS_LDFLAGS@ \ - @PCRE_LDFLAGS@ @LIBXML2_LDFLAGS@ @LUA_LDFLAGS@ + @APR_LDFLAGS@ \ + @APU_LDFLAGS@ \ + @APXS_LDFLAGS@ \ + @LIBXML2_LDFLAGS@ \ + @LUA_LDFLAGS@ \ + @PCRE_LDFLAGS@ endif if NETBSD mod_security2_la_LDFLAGS = -no-undefined -module -avoid-version \ - @APR_LDFLAGS@ @APU_LDFLAGS@ @APXS_LDFLAGS@ \ - @PCRE_LDFLAGS@ @LIBXML2_LDFLAGS@ @LUA_LDFLAGS@ + @APR_LDFLAGS@ \ + @APU_LDFLAGS@ \ + @APXS_LDFLAGS@ \ + @LIBXML2_LDFLAGS@ \ + @LUA_LDFLAGS@ \ + @PCRE_LDFLAGS@ endif if LINUX diff --git a/apache2/libinjection/libinjection.h b/apache2/libinjection/libinjection.h index 4e5690d8..ec0cfc92 100644 --- a/apache2/libinjection/libinjection.h +++ b/apache2/libinjection/libinjection.h @@ -14,13 +14,6 @@ extern "C" { #endif -/* - * Version info. - * See python's normalized version - * http://www.python.org/dev/peps/pep-0386/#normalizedversion - */ -#define LIBINJECTION_VERSION "3.4.1" - /** * Libinjection's sqli module makes a "normalized" * value of the token. This is the maximum size @@ -37,6 +30,13 @@ extern "C" { #define LIBINJECTION_SQLI_MAX_TOKENS 5 #endif +#if LIBINJECTION_SQLI_MAX_TOKENS >= 8 +#define LIBINJECTION_SQLI_BUFFER_SZ (LIBINJECTION_SQLI_MAX_TOKENS + 1) +#else +#define LIBINJECTION_SQLI_BUFFER_SZ 8 +#endif + + enum lookup_type { FLAG_NONE = 0, FLAG_QUOTE_NONE = 1 << 1, @@ -52,7 +52,7 @@ enum lookup_type { LOOKUP_FINGERPRINT }; -typedef struct { +struct libinjection_sqli_token { #ifdef SWIG %immutable; #endif @@ -74,8 +74,9 @@ typedef struct { int count; char val[LIBINJECTION_SQLI_TOKEN_SIZE]; -} stoken_t; +}; +typedef struct libinjection_sqli_token stoken_t; /** * Pointer to function, takes cstr input, @@ -84,7 +85,7 @@ typedef struct { struct libinjection_sqli_state; typedef char (*ptr_lookup_fn)(struct libinjection_sqli_state*, int lookuptype, const char* word, size_t len); -typedef struct libinjection_sqli_state { +struct libinjection_sqli_state { #ifdef SWIG %immutable; #endif @@ -116,21 +117,26 @@ typedef struct libinjection_sqli_state { */ size_t pos; +#ifndef SWIG + /* for SWIG.. don't use this.. use functional API instead */ + /* MAX TOKENS + 1 since we use one extra token * to determine the type of the previous token */ - stoken_t tokenvec[LIBINJECTION_SQLI_MAX_TOKENS + 1]; + struct libinjection_sqli_token tokenvec[LIBINJECTION_SQLI_BUFFER_SZ]; +#endif /* * Pointer to token position in tokenvec, above */ - stoken_t *current; + struct libinjection_sqli_token *current; /* * fingerprint pattern c-string * +1 for ending null + * Mimimum of 8 bytes to add gcc's -fstack-protector to work */ - char fingerprint[LIBINJECTION_SQLI_MAX_TOKENS + 1]; + char fingerprint[LIBINJECTION_SQLI_BUFFER_SZ]; /* * Line number of code that said decided if the input was SQLi or @@ -181,12 +187,32 @@ typedef struct libinjection_sqli_state { */ int stats_tokens; -} sfilter; +}; + +struct libinjection_sqli_token* libinjection_sqli_get_token( + struct libinjection_sqli_state* sqlistate, int i); + + +typedef struct libinjection_sqli_state sfilter; + + +/* + * Version info. + * + * This is moved into a function to allow SWIG and other auto-generated + * binding to not be modified during minor release changes. We change + * change the version number in the c source file, and not regenerated + * the binding + * + * See python's normalized version + * http://www.python.org/dev/peps/pep-0386/#normalizedversion + */ +const char* libinjection_version(); /** * */ -void libinjection_sqli_init(sfilter* sql_state, +void libinjection_sqli_init(struct libinjection_sqli_state* sql_state, const char* s, size_t slen, int flags); @@ -204,18 +230,21 @@ void libinjection_sqli_init(sfilter* sql_state, * * \return 1 (true) if SQLi, 0 (false) if benign */ -int libinjection_is_sqli(sfilter * sql_state); +int libinjection_is_sqli(struct libinjection_sqli_state* sql_state); /* FOR H@CKERS ONLY * */ -void libinjection_sqli_callback(sfilter* sql_state, ptr_lookup_fn fn, void* userdata); +void libinjection_sqli_callback(struct libinjection_sqli_state* sql_state, + ptr_lookup_fn fn, + void* userdata); /* * Resets state, but keeps initial string and callbacks */ -void libinjection_sqli_reset(sfilter* sql_state, int flags); +void libinjection_sqli_reset(struct libinjection_sqli_state* sql_state, + int flags); /** * @@ -231,14 +260,17 @@ void libinjection_sqli_reset(sfilter* sql_state, int flags); * do not free! * */ -const char* libinjection_sqli_fingerprint(sfilter * sql_state, int flags); +const char* libinjection_sqli_fingerprint(struct libinjection_sqli_state* sql_state, + int flags); /** * The default "word" to token-type or fingerprint function. This * uses a ASCII case-insensitive binary tree. */ -char libinjection_sqli_lookup_word(sfilter *sql_state, int lookup_type, - const char* s, size_t slen); +char libinjection_sqli_lookup_word(struct libinjection_sqli_state* sql_state, + int lookup_type, + const char* s, + size_t slen); /* Streaming tokenization interface. * @@ -247,13 +279,13 @@ char libinjection_sqli_lookup_word(sfilter *sql_state, int lookup_type, * \returns 1, has a token, keep going, or 0 no tokens * */ -int libinjection_sqli_tokenize(sfilter * sql_state); +int libinjection_sqli_tokenize(struct libinjection_sqli_state * sql_state); /** * parses and folds input, up to 5 tokens * */ -int libinjection_sqli_fold(sfilter * sql_state); +int libinjection_sqli_fold(struct libinjection_sqli_state * sql_state); /** The built-in default function to match fingerprints * and do false negative/positive analysis. This calls the following @@ -264,20 +296,20 @@ int libinjection_sqli_fold(sfilter * sql_state); * * \param sql_state should be filled out after libinjection_sqli_fingerprint is called */ -int libinjection_sqli_check_fingerprint(sfilter *sql_state); +int libinjection_sqli_check_fingerprint(struct libinjection_sqli_state * sql_state); /* Given a pattern determine if it's a SQLi pattern. * * \return TRUE if sqli, false otherwise */ -int libinjection_sqli_blacklist(sfilter* sql_state); +int libinjection_sqli_blacklist(struct libinjection_sqli_state* sql_state); /* Given a positive match for a pattern (i.e. pattern is SQLi), this function * does additional analysis to reduce false positives. * * \return TRUE if sqli, false otherwise */ -int libinjection_sqli_not_whitelist(sfilter* sql_state); +int libinjection_sqli_not_whitelist(struct libinjection_sqli_state * sql_state); #ifdef __cplusplus } diff --git a/apache2/libinjection/libinjection_sqli.c b/apache2/libinjection/libinjection_sqli.c index 3634757f..fde8145c 100644 --- a/apache2/libinjection/libinjection_sqli.c +++ b/apache2/libinjection/libinjection_sqli.c @@ -14,6 +14,8 @@ #include #include +#define LIBINJECTION_VERSION "3.8.0" + #ifndef TRUE #define TRUE 1 #endif @@ -24,6 +26,7 @@ #define CHAR_NULL '\0' #define CHAR_SINGLE '\'' #define CHAR_DOUBLE '"' +#define CHAR_TICK '`' /* faster than calling out to libc isdigit */ #define ISDIGIT(a) ((unsigned)((a) - '0') <= 9) @@ -57,6 +60,9 @@ typedef enum { TYPE_COLLATE = (int)'A', TYPE_LEFTPARENS = (int)'(', TYPE_RIGHTPARENS = (int)')', /* not used? */ + TYPE_LEFTBRACE = (int)'{', + TYPE_RIGHTBRACE = (int)'}', + TYPE_DOT = (int)'.', TYPE_COMMA = (int)',', TYPE_COLON = (int)':', TYPE_SEMICOLON = (int)';', @@ -105,7 +111,7 @@ memchr2(const char *haystack, size_t haystack_len, char c0, char c1) if (cur[1] == c1) { return cur; } else { - cur += 2; //(c0 == c1) ? 1 : 2; + cur += 2; /* (c0 == c1) ? 1 : 2; */ } } else { cur += 1; @@ -116,18 +122,17 @@ memchr2(const char *haystack, size_t haystack_len, char c0, char c1) } /** + * memmem might not exist on some systems */ static const char * my_memmem(const char* haystack, size_t hlen, const char* needle, size_t nlen) { - const char* cur = NULL; - const char* last = NULL; - - if(nlen < 1 || needle == NULL || haystack == NULL) - return NULL; - + const char* cur; + const char* last; + assert(haystack); + assert(needle); + assert(nlen > 1); last = haystack + hlen - nlen; - for (cur = haystack; cur <= last; ++cur) { if (cur[0] == needle[0] && memcmp(cur, needle, nlen) == 0) { return cur; @@ -135,6 +140,7 @@ my_memmem(const char* haystack, size_t hlen, const char* needle, size_t nlen) } return NULL; } + /** Find largest string containing certain characters. * * C Standard library 'strspn' only works for 'c-strings' (null terminated) @@ -216,7 +222,7 @@ static int cstrcasecmp(const char *a, const char *b, size_t n) return -1; } } - //printf("off the edge\n"); + return (*a == 0) ? 0 : 1; } @@ -283,9 +289,11 @@ static void st_clear(stoken_t * st) static void st_assign_char(stoken_t * st, const char stype, size_t pos, size_t len, const char value) { + /* done to elimiate unused warning */ + (void)len; st->type = (char) stype; st->pos = pos; - st->len = len; + st->len = 1; st->val[0] = value; st->val[1] = CHAR_NULL; } @@ -297,7 +305,7 @@ static void st_assign(stoken_t * st, const char stype, size_t last = len < MSIZE ? len : (MSIZE - 1); st->type = (char) stype; st->pos = pos; - st->len = len; + st->len = last; memcpy(st->val, value, last); st->val[last] = CHAR_NULL; } @@ -329,7 +337,7 @@ static int st_is_unary_op(const stoken_t * st) case 2: return str[0] == '!' && str[1] == '!'; case 3: - return cstrcasecmp("NOT", str, len) == 0; + return cstrcasecmp("NOT", str, 3) == 0; default: return FALSE; } @@ -340,12 +348,12 @@ static int st_is_unary_op(const stoken_t * st) * */ -static size_t parse_white(sfilter * sf) +static size_t parse_white(struct libinjection_sqli_state * sf) { return sf->pos + 1; } -static size_t parse_operator1(sfilter * sf) +static size_t parse_operator1(struct libinjection_sqli_state * sf) { const char *cs = sf->s; size_t pos = sf->pos; @@ -354,7 +362,7 @@ static size_t parse_operator1(sfilter * sf) return pos + 1; } -static size_t parse_other(sfilter * sf) +static size_t parse_other(struct libinjection_sqli_state * sf) { const char *cs = sf->s; size_t pos = sf->pos; @@ -363,7 +371,7 @@ static size_t parse_other(sfilter * sf) return pos + 1; } -static size_t parse_char(sfilter * sf) +static size_t parse_char(struct libinjection_sqli_state * sf) { const char *cs = sf->s; size_t pos = sf->pos; @@ -372,7 +380,7 @@ static size_t parse_char(sfilter * sf) return pos + 1; } -static size_t parse_eol_comment(sfilter * sf) +static size_t parse_eol_comment(struct libinjection_sqli_state * sf) { const char *cs = sf->s; const size_t slen = sf->slen; @@ -392,7 +400,7 @@ static size_t parse_eol_comment(sfilter * sf) /** In Ansi mode, hash is an operator * In MYSQL mode, it's a EOL comment like '--' */ -static size_t parse_hash(sfilter * sf) +static size_t parse_hash(struct libinjection_sqli_state * sf) { sf->stats_comment_hash += 1; if (sf->flags & FLAG_SQL_MYSQL) { @@ -404,7 +412,7 @@ static size_t parse_hash(sfilter * sf) } } -static size_t parse_dash(sfilter * sf) +static size_t parse_dash(struct libinjection_sqli_state * sf) { const char *cs = sf->s; const size_t slen = sf->slen; @@ -476,8 +484,9 @@ static size_t is_mysql_comment(const char *cs, const size_t len, size_t pos) return 1; } -static size_t parse_slash(sfilter * sf) +static size_t parse_slash(struct libinjection_sqli_state * sf) { + const char* ptr; size_t clen; const char *cs = sf->s; const size_t slen = sf->slen; @@ -485,7 +494,6 @@ static size_t parse_slash(sfilter * sf) const char* cur = cs + pos; char ctype = TYPE_COMMENT; size_t pos1 = pos + 1; - const char *ptr; if (pos1 == slen || cs[pos1] != '*') { return parse_operator1(sf); } @@ -494,11 +502,16 @@ static size_t parse_slash(sfilter * sf) * skip over initial '/x' */ ptr = memchr2(cur + 2, slen - (pos + 2), '*', '/'); - if (ptr == NULL) { + + /* + * (ptr == NULL) causes false positive in cppcheck 1.61 + * casting to type seems to fix it + */ + if (ptr == (const char*) NULL) { /* till end of line */ clen = slen - pos; } else { - clen = (ptr +2) - cur; + clen = (ptr + 2) - cur; } /* @@ -522,7 +535,7 @@ static size_t parse_slash(sfilter * sf) } -static size_t parse_backslash(sfilter * sf) +static size_t parse_backslash(struct libinjection_sqli_state * sf) { const char *cs = sf->s; const size_t slen = sf->slen; @@ -540,7 +553,7 @@ static size_t parse_backslash(sfilter * sf) } } -static size_t parse_operator2(sfilter * sf) +static size_t parse_operator2(struct libinjection_sqli_state * sf) { char ch; const char *cs = sf->s; @@ -675,7 +688,7 @@ static size_t parse_string_core(const char *cs, const size_t len, size_t pos, /** * Used when first char is a ' or " */ -static size_t parse_string(sfilter * sf) +static size_t parse_string(struct libinjection_sqli_state * sf) { const char *cs = sf->s; const size_t slen = sf->slen; @@ -692,7 +705,7 @@ static size_t parse_string(sfilter * sf) * N or n: mysql "National Character set" * E : psql "Escaped String" */ -static size_t parse_estring(sfilter * sf) +static size_t parse_estring(struct libinjection_sqli_state * sf) { const char *cs = sf->s; const size_t slen = sf->slen; @@ -704,36 +717,7 @@ static size_t parse_estring(sfilter * sf) return parse_string_core(cs, slen, pos, sf->current, CHAR_SINGLE, 2); } -/** MySQL ad-hoc character encoding - * - * if something starts with a underscore - * check to see if it's in this form - * _[a-z0-9] and if it's a character encoding - * If not, let the normal 'word parser' - * handle it. - */ -static size_t parse_underscore(sfilter *sf) -{ - char ch; - const char *cs = sf->s; - size_t slen = sf->slen; - size_t pos = sf->pos; - - size_t xlen = strlenspn(cs + pos + 1, slen - pos - 1, - "0123456789abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ"); - if (xlen == 0) { - return parse_word(sf); - } - st_assign(sf->current, TYPE_BAREWORD, pos, xlen, cs + pos); - ch = sf->lookup(sf, LOOKUP_TYPE, sf->current->val, sf->current->len); - if (ch == TYPE_SQLTYPE) { - sf->current->type = TYPE_SQLTYPE; - return xlen + 1; - } - return parse_word(sf); -} - -static size_t parse_ustring(sfilter * sf) +static size_t parse_ustring(struct libinjection_sqli_state * sf) { const char *cs = sf->s; size_t slen = sf->slen; @@ -752,7 +736,7 @@ static size_t parse_ustring(sfilter * sf) } } -static size_t parse_qstring_core(sfilter * sf, int offset) +static size_t parse_qstring_core(struct libinjection_sqli_state * sf, int offset) { char ch; const char *strend; @@ -774,7 +758,11 @@ static size_t parse_qstring_core(sfilter * sf, int offset) } ch = cs[pos + 2]; - if (ch < 33 && ch > 127) { + + /* the ch > 127 is un-needed since + * we assume char is signed + */ + if (ch < 33 /* || ch > 127 */) { return parse_word(sf); } switch (ch) { @@ -801,7 +789,7 @@ static size_t parse_qstring_core(sfilter * sf, int offset) /* * Oracle's q string */ -static size_t parse_qstring(sfilter * sf) +static size_t parse_qstring(struct libinjection_sqli_state * sf) { return parse_qstring_core(sf, 0); } @@ -810,7 +798,7 @@ static size_t parse_qstring(sfilter * sf) * mysql's N'STRING' or * ... Oracle's nq string */ -static size_t parse_nqstring(sfilter * sf) +static size_t parse_nqstring(struct libinjection_sqli_state * sf) { size_t slen = sf->slen; size_t pos = sf->pos; @@ -824,7 +812,7 @@ static size_t parse_nqstring(sfilter * sf) * binary literal string * re: [bB]'[01]*' */ -static size_t parse_bstring(sfilter *sf) +static size_t parse_bstring(struct libinjection_sqli_state *sf) { size_t wlen; const char *cs = sf->s; @@ -853,7 +841,7 @@ static size_t parse_bstring(sfilter *sf) * mysql has requirement of having EVEN number of chars, * but pgsql does not */ -static size_t parse_xstring(sfilter *sf) +static size_t parse_xstring(struct libinjection_sqli_state *sf) { size_t wlen; const char *cs = sf->s; @@ -876,7 +864,26 @@ static size_t parse_xstring(sfilter *sf) return pos + 2 + wlen + 1; } -static size_t parse_word(sfilter * sf) +/** + * This handles MS SQLSERVER bracket words + * http://stackoverflow.com/questions/3551284/sql-serverwhat-do-brackets-mean-around-column-name + * + */ +static size_t parse_bword(struct libinjection_sqli_state * sf) +{ + const char *cs = sf->s; + size_t pos = sf->pos; + const char* endptr = (const char*) memchr(cs + pos, ']', sf->slen - pos); + if (endptr == NULL) { + st_assign(sf->current, TYPE_BAREWORD, pos, sf->slen - pos, cs + pos); + return sf->slen; + } else { + st_assign(sf->current, TYPE_BAREWORD, pos, (endptr - cs) - pos + 1, cs + pos); + return (endptr - cs) + 1; + } +} + +static size_t parse_word(struct libinjection_sqli_state * sf) { char ch; char delim; @@ -884,7 +891,7 @@ static size_t parse_word(sfilter * sf) const char *cs = sf->s; size_t pos = sf->pos; size_t wlen = strlencspn(cs + pos, sf->slen - pos, - " <>:\\?=@!#~+-*/&|^%(),';\t\n\v\f\r\"\000"); + " []{}<>:\\?=@!#~+-*/&|^%(),';\t\n\v\f\r\"\240\000"); st_assign(sf->current, TYPE_BAREWORD, pos, wlen, cs + pos); @@ -914,7 +921,6 @@ static size_t parse_word(sfilter * sf) if (wlen < LIBINJECTION_SQLI_TOKEN_SIZE) { ch = sf->lookup(sf, LOOKUP_WORD, sf->current->val, wlen); - if (ch == CHAR_NULL) { ch = TYPE_BAREWORD; } @@ -927,9 +933,9 @@ static size_t parse_word(sfilter * sf) * and a bare word. * */ -static size_t parse_tick(sfilter* sf) +static size_t parse_tick(struct libinjection_sqli_state* sf) { - size_t pos = parse_string_core(sf->s, sf->slen, sf->pos, sf->current, '`', 1); + size_t pos = parse_string_core(sf->s, sf->slen, sf->pos, sf->current, CHAR_TICK, 1); /* we could check to see if start and end of * of string are both "`", i.e. make sure we have @@ -948,12 +954,12 @@ static size_t parse_tick(sfilter* sf) /* otherwise it's a 'n' type -- mysql treats * everything as a bare word */ - sf->current->type = TYPE_STRING; + sf->current->type = TYPE_BAREWORD; } return pos; } -static size_t parse_var(sfilter * sf) +static size_t parse_var(struct libinjection_sqli_state * sf) { size_t xlen; const char *cs = sf->s; @@ -1005,7 +1011,7 @@ static size_t parse_var(sfilter * sf) } } -static size_t parse_money(sfilter *sf) +static size_t parse_money(struct libinjection_sqli_state *sf) { size_t xlen; const char* strend; @@ -1083,7 +1089,7 @@ static size_t parse_money(sfilter *sf) } } -static size_t parse_number(sfilter * sf) +static size_t parse_number(struct libinjection_sqli_state * sf) { size_t xlen; size_t start; @@ -1091,6 +1097,9 @@ static size_t parse_number(sfilter * sf) const char *cs = sf->s; const size_t slen = sf->slen; size_t pos = sf->pos; + int have_dot = 0; + int have_e = 0; + int have_exp = 0; /* cs[pos] == '0' has 1/10 chance of being true, * while pos+1< slen is almost always true @@ -1120,23 +1129,27 @@ static size_t parse_number(sfilter * sf) } if (pos < slen && cs[pos] == '.') { + have_dot = 1; pos += 1; while (pos < slen && ISDIGIT(cs[pos])) { pos += 1; } if (pos - start == 1) { - st_assign_char(sf->current, TYPE_BAREWORD, start, 1, '.'); + /* only one character read so far */ + st_assign_char(sf->current, TYPE_DOT, start, 1, '.'); return pos; } } if (pos < slen) { if (cs[pos] == 'E' || cs[pos] == 'e') { + have_e = 1; pos += 1; if (pos < slen && (cs[pos] == '+' || cs[pos] == '-')) { pos += 1; } while (pos < slen && ISDIGIT(cs[pos])) { + have_exp = 1; pos += 1; } } @@ -1145,17 +1158,50 @@ static size_t parse_number(sfilter * sf) /* oracle's ending float or double suffix * http://docs.oracle.com/cd/B19306_01/server.102/b14200/sql_elements003.htm#i139891 */ - if (pos < slen) { - if (cs[pos] == 'd' || cs[pos] == 'D' || cs[pos] == 'f' || cs[pos] == 'F') { + if (pos < slen && (cs[pos] == 'd' || cs[pos] == 'D' || cs[pos] == 'f' || cs[pos] == 'F')) { + if (pos + 1 == slen) { + /* line ends evaluate "... 1.2f$" as '1.2f' */ pos += 1; + } else if ((char_is_white(cs[pos+1]) || cs[pos+1] == ';')) { + /* + * easy case, evaluate "... 1.2f ... as '1.2f' + */ + pos += 1; + } else if (cs[pos+1] == 'u' || cs[pos+1] == 'U') { + /* + * a bit of a hack but makes '1fUNION' parse as '1f UNION' + */ + pos += 1; + } else { + /* it's like "123FROM" */ + /* parse as "123" only */ } } - st_assign(sf->current, TYPE_NUMBER, start, pos - start, cs + start); + if (have_dot == 1 && have_e == 1 && have_exp == 0) { + /* very special form of + * "1234.e" + * "10.10E" + * ".E" + * this is a WORD not a number!! */ + st_assign(sf->current, TYPE_BAREWORD, start, pos - start, cs + start); + } else { + st_assign(sf->current, TYPE_NUMBER, start, pos - start, cs + start); + } return pos; } -int libinjection_sqli_tokenize(sfilter * sf) +/* + * API to return version. This allows us to increment the version + * without having to regenerated the SWIG (or other binding) in minor + * releases. + */ +const char* libinjection_version() +{ + return LIBINJECTION_VERSION; +} + +int libinjection_sqli_tokenize(struct libinjection_sqli_state * sf) { pt2Function fnptr; size_t *pos = &sf->pos; @@ -1186,7 +1232,7 @@ int libinjection_sqli_tokenize(sfilter * sf) /* * get current character */ - const unsigned ch = (unsigned int) (s[*pos]); + const unsigned char ch = (unsigned int) (s[*pos]); /* * if not ascii, then continue... @@ -1194,16 +1240,23 @@ int libinjection_sqli_tokenize(sfilter * sf) * it's a string */ if (ch > 127) { - fnptr = parse_word; - } else { - /* - * look up the parser, and call it - * - * Porting Note: this is mapping of char to function - * charparsers[ch]() - */ - fnptr = char_parse_map[ch]; + /* 160 or 0xA0 or octal 240 is "latin1 non-breaking space" + * but is treated as a space in mysql. + */ + if (ch == 160) { + fnptr = parse_white; + } else { + fnptr = parse_word; + } + } else { + /* + * look up the parser, and call it + * + * Porting Note: this is mapping of char to function + * charparsers[ch]() + */ + fnptr = char_parse_map[ch]; } *pos = (*fnptr) (sf); @@ -1218,13 +1271,13 @@ int libinjection_sqli_tokenize(sfilter * sf) return FALSE; } -void libinjection_sqli_init(sfilter * sf, const char *s, size_t len, int flags) +void libinjection_sqli_init(struct libinjection_sqli_state * sf, const char *s, size_t len, int flags) { if (flags == 0) { flags = FLAG_QUOTE_NONE | FLAG_SQL_ANSI; } - memset(sf, 0, sizeof(sfilter)); + memset(sf, 0, sizeof(struct libinjection_sqli_state)); sf->s = s; sf->slen = len; sf->lookup = libinjection_sqli_lookup_word; @@ -1233,17 +1286,20 @@ void libinjection_sqli_init(sfilter * sf, const char *s, size_t len, int flags) sf->current = &(sf->tokenvec[0]); } -void libinjection_sqli_reset(sfilter * sf, int flags) +void libinjection_sqli_reset(struct libinjection_sqli_state * sf, int flags) { + void *userdata = sf->userdata; + ptr_lookup_fn lookup = sf->lookup;; + if (flags == 0) { flags = FLAG_QUOTE_NONE | FLAG_SQL_ANSI; } libinjection_sqli_init(sf, sf->s, sf->slen, flags); - sf->lookup = sf->lookup; - sf->userdata = sf->userdata; + sf->lookup = lookup; + sf->userdata = userdata; } -void libinjection_sqli_callback(sfilter * sf, ptr_lookup_fn fn, void* userdata) +void libinjection_sqli_callback(struct libinjection_sqli_state * sf, ptr_lookup_fn fn, void* userdata) { if (fn == NULL) { sf->lookup = libinjection_sqli_lookup_word; @@ -1270,7 +1326,7 @@ void libinjection_sqli_callback(sfilter * sf, ptr_lookup_fn fn, void* userdata) * This is just: multikeywords[token.value + ' ' + token2.value] * */ -static int syntax_merge_words(sfilter * sf,stoken_t * a, stoken_t * b) +static int syntax_merge_words(struct libinjection_sqli_state * sf,stoken_t * a, stoken_t * b) { size_t sz1; size_t sz2; @@ -1280,14 +1336,20 @@ static int syntax_merge_words(sfilter * sf,stoken_t * a, stoken_t * b) /* first token is of right type? */ if (! - (a->type == TYPE_KEYWORD || a->type == TYPE_BAREWORD || a->type == TYPE_OPERATOR || - a->type == TYPE_UNION || a->type == TYPE_EXPRESSION || a->type == TYPE_SQLTYPE)) { + (a->type == TYPE_KEYWORD || + a->type == TYPE_BAREWORD || + a->type == TYPE_OPERATOR || + a->type == TYPE_UNION || + a->type == TYPE_FUNCTION || + a->type == TYPE_EXPRESSION || + a->type == TYPE_SQLTYPE)) { return CHAR_NULL; } if (b->type != TYPE_KEYWORD && b->type != TYPE_BAREWORD && b->type != TYPE_OPERATOR && b->type != TYPE_SQLTYPE && b->type != TYPE_LOGIC_OPERATOR && + b->type != TYPE_FUNCTION && b->type != TYPE_UNION && b->type != TYPE_EXPRESSION) { return CHAR_NULL; } @@ -1316,7 +1378,7 @@ static int syntax_merge_words(sfilter * sf,stoken_t * a, stoken_t * b) } } -int libinjection_sqli_fold(sfilter * sf) +int libinjection_sqli_fold(struct libinjection_sqli_state * sf) { stoken_t last_comment; @@ -1351,7 +1413,54 @@ int libinjection_sqli_fold(sfilter * sf) } while (1) { - FOLD_DEBUG + FOLD_DEBUG; + + /* do we have all the max number of tokens? if so do + * some special cases for 5 tokens + */ + if (pos >= LIBINJECTION_SQLI_MAX_TOKENS) { + if ( + ( + sf->tokenvec[0].type == TYPE_NUMBER && + (sf->tokenvec[1].type == TYPE_OPERATOR || sf->tokenvec[1].type == TYPE_COMMA) && + sf->tokenvec[2].type == TYPE_LEFTPARENS && + sf->tokenvec[3].type == TYPE_NUMBER && + sf->tokenvec[4].type == TYPE_RIGHTPARENS + ) || + ( + sf->tokenvec[0].type == TYPE_BAREWORD && + sf->tokenvec[1].type == TYPE_OPERATOR && + sf->tokenvec[2].type == TYPE_LEFTPARENS && + (sf->tokenvec[3].type == TYPE_BAREWORD || sf->tokenvec[3].type == TYPE_NUMBER) && + sf->tokenvec[4].type == TYPE_RIGHTPARENS + ) || + ( + sf->tokenvec[0].type == TYPE_NUMBER && + sf->tokenvec[1].type == TYPE_RIGHTPARENS && + sf->tokenvec[2].type == TYPE_COMMA && + sf->tokenvec[3].type == TYPE_LEFTPARENS && + sf->tokenvec[4].type == TYPE_NUMBER + ) + ) + { + if (pos > LIBINJECTION_SQLI_MAX_TOKENS) { + //printf("TRUNCATE pos = %lu vs. %lu\n", pos, LIBINJECTION_SQLI_MAX_TOKENS); + st_copy(&(sf->tokenvec[1]), &(sf->tokenvec[LIBINJECTION_SQLI_MAX_TOKENS])); + pos = 2; + left = 0; + } else { + //printf("HEREIAM\n"); + pos = 1; + left = 0; + } + } + } + + if (! more || left >= LIBINJECTION_SQLI_MAX_TOKENS) { + left = pos; + break; + } + /* get up to two tokens */ while (more && pos <= LIBINJECTION_SQLI_MAX_TOKENS && (pos - left) < 2) { sf->current = &(sf->tokenvec[pos]); @@ -1365,11 +1474,11 @@ int libinjection_sqli_fold(sfilter * sf) } } } - FOLD_DEBUG + FOLD_DEBUG; /* did we get 2 tokens? if not then we are done */ if (pos - left < 2) { left = pos; - break; + continue; } /* FOLD: "ss" -> "s" @@ -1399,15 +1508,15 @@ int libinjection_sqli_fold(sfilter * sf) sf->tokenvec[left+1].type = TYPE_TSQL; left += 2; continue; /* reparse everything, but we probably can advance left, and pos */ - } else if ((sf->tokenvec[left].type ==TYPE_OPERATOR || sf->tokenvec[left].type ==TYPE_LOGIC_OPERATOR) && + } else if ((sf->tokenvec[left].type ==TYPE_OPERATOR || + sf->tokenvec[left].type ==TYPE_LOGIC_OPERATOR) && st_is_unary_op(&sf->tokenvec[left+1])) { pos -= 1; sf->stats_folds += 1; - if (left > 0) { - left -= 1; - } + left = 0; continue; - } else if (sf->tokenvec[left].type ==TYPE_LEFTPARENS && st_is_unary_op(&sf->tokenvec[left+1])) { + } else if (sf->tokenvec[left].type ==TYPE_LEFTPARENS && + st_is_unary_op(&sf->tokenvec[left+1])) { pos -= 1; sf->stats_folds += 1; if (left > 0) { @@ -1444,9 +1553,10 @@ int libinjection_sqli_fold(sfilter * sf) cstrcasecmp("LOCALTIMESTAMP", sf->tokenvec[left].val, sf->tokenvec[left].len) == 0 )) { - // pos is the same - // other conversions need to go here... for instance - // password CAN be a function, coalese CAN be a function + /* pos is the same + * other conversions need to go here... for instance + * password CAN be a function, coalese CAN be a function + */ sf->tokenvec[left].type = TYPE_FUNCTION; continue; } else if (sf->tokenvec[left].type == TYPE_KEYWORD && ( @@ -1478,8 +1588,11 @@ int libinjection_sqli_fold(sfilter * sf) */ continue; } else if (sf->tokenvec[left].type == TYPE_SQLTYPE && - (sf->tokenvec[left+1].type == TYPE_BAREWORD || sf->tokenvec[left+1].type == TYPE_NUMBER || - sf->tokenvec[left+1].type == TYPE_VARIABLE || sf->tokenvec[left+1].type == TYPE_STRING)) { + (sf->tokenvec[left+1].type == TYPE_BAREWORD || + sf->tokenvec[left+1].type == TYPE_NUMBER || + sf->tokenvec[left+1].type == TYPE_FUNCTION || + sf->tokenvec[left+1].type == TYPE_VARIABLE || + sf->tokenvec[left+1].type == TYPE_STRING)) { st_copy(&sf->tokenvec[left], &sf->tokenvec[left+1]); pos -= 1; sf->stats_folds += 1; @@ -1506,12 +1619,42 @@ int libinjection_sqli_fold(sfilter * sf) } left = 0; continue; + } else if (sf->tokenvec[left].type == TYPE_LEFTPARENS && + sf->tokenvec[left+1].type == TYPE_LEFTPARENS) { + pos -= 1; + sf->stats_folds += 1; + continue; + } else if (sf->tokenvec[left].type == TYPE_RIGHTPARENS && + sf->tokenvec[left+1].type == TYPE_RIGHTPARENS) { + pos -= 1; + sf->stats_folds += 1; + continue; + } else if (sf->tokenvec[left].type == TYPE_SQLTYPE && + sf->tokenvec[left+1].type == TYPE_SQLTYPE) { + pos -= 1; + sf->stats_folds += 1; + continue; + } else if (sf->tokenvec[left].type == TYPE_LEFTBRACE && + sf->tokenvec[left+1].type == TYPE_BAREWORD) { + /* weird ODBC / MYSQL {foo expr} --> expr + * but for this rule we just strip away the "{ foo" part + */ + if (left > 0) { + left -= 1; + } + pos -= 2; + sf->stats_folds += 2; + continue; + } else if (sf->tokenvec[left+1].type == TYPE_RIGHTBRACE) { + pos -= 1; + sf->stats_folds += 1; + continue; } /* all cases of handing 2 tokens is done and nothing matched. Get one more token */ - FOLD_DEBUG + FOLD_DEBUG; while (more && pos <= LIBINJECTION_SQLI_MAX_TOKENS && pos - left < 3) { sf->current = &(sf->tokenvec[pos]); more = libinjection_sqli_tokenize(sf); @@ -1528,7 +1671,7 @@ int libinjection_sqli_fold(sfilter * sf) /* do we have three tokens? If not then we are done */ if (pos -left < 3) { left = pos; - break; + continue; } /* @@ -1553,25 +1696,37 @@ int libinjection_sqli_fold(sfilter * sf) continue; } else if (sf->tokenvec[left].type == TYPE_VARIABLE && sf->tokenvec[left+1].type == TYPE_OPERATOR && - (sf->tokenvec[left+2].type == TYPE_VARIABLE || sf->tokenvec[left+2].type == TYPE_NUMBER || + (sf->tokenvec[left+2].type == TYPE_VARIABLE || + sf->tokenvec[left+2].type == TYPE_NUMBER || sf->tokenvec[left+2].type == TYPE_BAREWORD)) { pos -= 2; continue; - } else if ((sf->tokenvec[left].type == TYPE_BAREWORD || sf->tokenvec[left].type == TYPE_NUMBER ) && + } else if ((sf->tokenvec[left].type == TYPE_BAREWORD || + sf->tokenvec[left].type == TYPE_NUMBER ) && sf->tokenvec[left+1].type == TYPE_OPERATOR && - (sf->tokenvec[left+2].type == TYPE_NUMBER || sf->tokenvec[left+2].type == TYPE_BAREWORD)) { + (sf->tokenvec[left+2].type == TYPE_NUMBER || + sf->tokenvec[left+2].type == TYPE_BAREWORD)) { pos -= 2; continue; - } else if ((sf->tokenvec[left].type == TYPE_BAREWORD || sf->tokenvec[left].type == TYPE_NUMBER || - sf->tokenvec[left].type == TYPE_VARIABLE || sf->tokenvec[left].type == TYPE_STRING) && - sf->tokenvec[left+1].type == TYPE_OPERATOR && streq(sf->tokenvec[left+1].val, "::") && + } else if ((sf->tokenvec[left].type == TYPE_BAREWORD || + sf->tokenvec[left].type == TYPE_NUMBER || + sf->tokenvec[left].type == TYPE_VARIABLE || + sf->tokenvec[left].type == TYPE_STRING) && + sf->tokenvec[left+1].type == TYPE_OPERATOR && + streq(sf->tokenvec[left+1].val, "::") && sf->tokenvec[left+2].type == TYPE_SQLTYPE) { pos -= 2; sf->stats_folds += 2; continue; - } else if ((sf->tokenvec[left].type == TYPE_BAREWORD || sf->tokenvec[left].type == TYPE_NUMBER || sf->tokenvec[left].type == TYPE_STRING) && + } else if ((sf->tokenvec[left].type == TYPE_BAREWORD || + sf->tokenvec[left].type == TYPE_NUMBER || + sf->tokenvec[left].type == TYPE_STRING || + sf->tokenvec[left].type == TYPE_VARIABLE) && sf->tokenvec[left+1].type == TYPE_COMMA && - (sf->tokenvec[left+2].type == TYPE_NUMBER || sf->tokenvec[left+2].type == TYPE_BAREWORD || sf->tokenvec[left+2].type == TYPE_STRING)) { + (sf->tokenvec[left+2].type == TYPE_NUMBER || + sf->tokenvec[left+2].type == TYPE_BAREWORD || + sf->tokenvec[left+2].type == TYPE_STRING || + sf->tokenvec[left+2].type == TYPE_VARIABLE)) { pos -= 2; if (left > 0) { left -= 1; @@ -1597,8 +1752,9 @@ int libinjection_sqli_fold(sfilter * sf) sf->tokenvec[left+2].type == TYPE_VARIABLE || sf->tokenvec[left+2].type == TYPE_STRING || sf->tokenvec[left+2].type == TYPE_FUNCTION )) { - // remove unary operators - // select - 1 + /* remove unary operators + * select - 1 + */ st_copy(&sf->tokenvec[left+1], &sf->tokenvec[left+2]); pos -= 1; continue; @@ -1607,8 +1763,7 @@ int libinjection_sqli_fold(sfilter * sf) (sf->tokenvec[left+2].type == TYPE_NUMBER || sf->tokenvec[left+2].type == TYPE_BAREWORD || sf->tokenvec[left+2].type == TYPE_VARIABLE || - sf->tokenvec[left+2].type == TYPE_STRING || - sf->tokenvec[left+2].type == TYPE_FUNCTION )) { + sf->tokenvec[left+2].type == TYPE_STRING)) { /* * interesting case turn ", -1" ->> ",1" PLUS we need to back up * one token if possible to see if more folding can be done @@ -1622,14 +1777,35 @@ int libinjection_sqli_fold(sfilter * sf) assert(pos >= 3); pos -= 3; continue; - } else if ((sf->tokenvec[left].type == TYPE_BAREWORD || sf->tokenvec[left].type == TYPE_STRING)&& - (sf->tokenvec[left+1].type == TYPE_BAREWORD && sf->tokenvec[left+1].val[0] == '.') && - (sf->tokenvec[left+2].type == TYPE_BAREWORD || sf->tokenvec[left].type == TYPE_STRING)) { - /* ignore the '.n' - * typically is this dabasename.table + } else if (sf->tokenvec[left].type == TYPE_COMMA && + st_is_unary_op(&sf->tokenvec[left+1]) && + sf->tokenvec[left+2].type == TYPE_FUNCTION) { + + /* Seperate case from above since you end up with + * 1,-sin(1) --> 1 (1) + * Here, just do + * 1,-sin(1) --> 1,sin(1) + * just remove unary opartor */ + st_copy(&sf->tokenvec[left+1], &sf->tokenvec[left+2]); + pos -= 1; + continue; + } else if ((sf->tokenvec[left].type == TYPE_BAREWORD) && + (sf->tokenvec[left+1].type == TYPE_DOT) && + (sf->tokenvec[left+2].type == TYPE_BAREWORD)) { + /* ignore the '.n' + * typically is this databasename.table + */ + assert(pos >= 3); pos -= 2; continue; + } else if ((sf->tokenvec[left].type == TYPE_EXPRESSION) && + (sf->tokenvec[left+1].type == TYPE_DOT) && + (sf->tokenvec[left+2].type == TYPE_BAREWORD)) { + /* select . `foo` --> select `foo` */ + st_copy(&sf->tokenvec[left+1], &sf->tokenvec[left+2]); + pos -= 1; + continue; } @@ -1671,7 +1847,7 @@ int libinjection_sqli_fold(sfilter * sf) * double quote. * */ -const char* libinjection_sqli_fingerprint(sfilter * sql_state, int flags) +const char* libinjection_sqli_fingerprint(struct libinjection_sqli_state * sql_state, int flags) { int i; int tlen = 0; @@ -1679,6 +1855,23 @@ const char* libinjection_sqli_fingerprint(sfilter * sql_state, int flags) libinjection_sqli_reset(sql_state, flags); tlen = libinjection_sqli_fold(sql_state); + + /* Check for magic PHP backquote comment + * If: + * * last token is of type "bareword" + * * And is quoted in a backtick + * * And isn't closed + * * And it's empty? + * Then convert it to comment + */ + if (tlen > 2 && + sql_state->tokenvec[tlen-1].type == TYPE_BAREWORD && + sql_state->tokenvec[tlen-1].str_open == CHAR_TICK && + sql_state->tokenvec[tlen-1].len == 0 && + sql_state->tokenvec[tlen-1].str_close == CHAR_NULL) { + sql_state->tokenvec[tlen-1].type = TYPE_COMMENT; + } + for (i = 0; i < tlen; ++i) { sql_state->fingerprint[i] = sql_state->tokenvec[i].type; } @@ -1709,6 +1902,7 @@ const char* libinjection_sqli_fingerprint(sfilter * sql_state, int flags) sql_state->tokenvec[1].type = CHAR_NULL; } + return sql_state->fingerprint; } @@ -1718,13 +1912,13 @@ const char* libinjection_sqli_fingerprint(sfilter * sql_state, int flags) */ #define UNUSED(x) (void)(x) -int libinjection_sqli_check_fingerprint(sfilter* sql_state) +int libinjection_sqli_check_fingerprint(struct libinjection_sqli_state* sql_state) { return libinjection_sqli_blacklist(sql_state) && libinjection_sqli_not_whitelist(sql_state); } -char libinjection_sqli_lookup_word(sfilter *sql_state, int lookup_type, +char libinjection_sqli_lookup_word(struct libinjection_sqli_state *sql_state, int lookup_type, const char* str, size_t len) { if (lookup_type == LOOKUP_FINGERPRINT) { @@ -1734,13 +1928,17 @@ char libinjection_sqli_lookup_word(sfilter *sql_state, int lookup_type, } } -int libinjection_sqli_blacklist(sfilter* sql_state) +int libinjection_sqli_blacklist(struct libinjection_sqli_state* sql_state) { - char fp2[LIBINJECTION_SQLI_MAX_TOKENS + 2]; + /* + * use minimum of 8 bytes to make sure gcc -fstack-protector + * works correctly + */ + char fp2[LIBINJECTION_SQLI_MAX_TOKENS + 2 < 8 ? 8 : LIBINJECTION_SQLI_MAX_TOKENS + 2]; char ch; size_t i; - int patmatch = 0; size_t len = strlen(sql_state->fingerprint); + int patmatch; if (len < 1) { sql_state->reason = __LINE__; @@ -1783,7 +1981,7 @@ int libinjection_sqli_blacklist(sfilter* sql_state) /* * return TRUE if sqli, false is benign */ -int libinjection_sqli_not_whitelist(sfilter* sql_state) +int libinjection_sqli_not_whitelist(struct libinjection_sqli_state* sql_state) { /* * We assume we got a SQLi match @@ -1793,6 +1991,21 @@ int libinjection_sqli_not_whitelist(sfilter* sql_state) char ch; size_t tlen = strlen(sql_state->fingerprint); + if (tlen > 1 && sql_state->fingerprint[tlen-1] == TYPE_COMMENT) { + /* + * if ending comment is contains 'sp_password' then it's sqli! + * MS Audit log appearantly ignores anything with + * 'sp_password' in it. Unable to find primary refernece to + * this "feature" of SQL Server but seems to be known sqli + * technique + */ + if (my_memmem(sql_state->s, sql_state->slen, + "sp_password", strlen("sp_password"))) { + sql_state->reason = __LINE__; + return TRUE; + } + } + switch (tlen) { case 2:{ /* @@ -1825,20 +2038,6 @@ int libinjection_sqli_not_whitelist(sfilter* sql_state) return FALSE; } - /* - * if ending comment is contains 'sp_password' then it's sqli! - * MS Audit log appearantly ignores anything with - * 'sp_password' in it. Unable to find primary refernece to - * this "feature" of SQL Server but seems to be known sqli - * technique - */ - if (sql_state->tokenvec[1].type == TYPE_COMMENT && - my_memmem(sql_state->tokenvec[1].val, sql_state->tokenvec[1].len, - "sp_password", strlen("sp_password"))) { - sql_state->reason = __LINE__; - return TRUE; - } - /* * for fingerprint like 'nc', only comments of /x are treated * as SQL... ending comments of "--" and "#" are not sqli @@ -1859,19 +2058,6 @@ int libinjection_sqli_not_whitelist(sfilter* sql_state) return TRUE; } - /* - * if 'oc' then input must be 'CASE/x' - * used in HPP attack - */ - if (sql_state->tokenvec[0].type == TYPE_OPERATOR && - sql_state->tokenvec[1].type == TYPE_COMMENT && - sql_state->tokenvec[1].val[0] == '/' && - cstrcasecmp("CASE", sql_state->tokenvec[0].val, sql_state->tokenvec[0].len) != 0) - { - sql_state->reason = __LINE__; - return FALSE; - } - /** * there are some odd base64-looking query string values * 1234-ABCDEFEhfhihwuefi-- @@ -1955,8 +2141,11 @@ int libinjection_sqli_not_whitelist(sfilter* sql_state) */ sql_state->reason = __LINE__; return FALSE; - } else if (streq(sql_state->fingerprint, "s&n") || streq(sql_state->fingerprint, "n&1") || streq(sql_state->fingerprint, "1&1") || - streq(sql_state->fingerprint, "1&v") || streq(sql_state->fingerprint, "1&s")) { + } else if (streq(sql_state->fingerprint, "s&n") || + streq(sql_state->fingerprint, "n&1") || + streq(sql_state->fingerprint, "1&1") || + streq(sql_state->fingerprint, "1&v") || + streq(sql_state->fingerprint, "1&s")) { /* 'sexy and 17' not sqli * 'sexy and 17<18' sqli */ @@ -1964,12 +2153,6 @@ int libinjection_sqli_not_whitelist(sfilter* sql_state) sql_state->reason = __LINE__; return FALSE; } - } else if (streq(sql_state->fingerprint, "so1")) { - if (sql_state->tokenvec[0].str_open != CHAR_NULL) { - /* "foo" -1 is ok, foo"-1 is not */ - sql_state->reason = __LINE__; - return FALSE; - } } else if (sql_state->tokenvec[1].type == TYPE_KEYWORD) { if ((sql_state->tokenvec[1].len < 5) || cstrcasecmp("INTO", sql_state->tokenvec[1].val, 4)) { @@ -1983,18 +2166,6 @@ int libinjection_sqli_not_whitelist(sfilter* sql_state) break; } /* case 3 */ case 4: - if (streq(sql_state->fingerprint, "s&1s")) { - /* look for ...foo" and 1=1 ` - * where the ending string is actually a comment in - * php mysql magic land. This check is needed - * since normal non sqli text often folds to - * s&1s.. this check figures that out - */ - if (sql_state->stats_tokens == 4) { - sql_state->reason = __LINE__; - return FALSE; - } - } case 5: { /* nothing right now */ break; @@ -2008,13 +2179,25 @@ int libinjection_sqli_not_whitelist(sfilter* sql_state) * * */ -static int reparse_as_mysql(sfilter * sql_state) +static int reparse_as_mysql(struct libinjection_sqli_state * sql_state) { return sql_state->stats_comment_ddx || sql_state->stats_comment_hash; } -int libinjection_is_sqli(sfilter * sql_state) +/* + * This function is mostly use with SWIG + */ +struct libinjection_sqli_token* +libinjection_sqli_get_token(struct libinjection_sqli_state * sql_state, int i) +{ + if (i < 0 || i > LIBINJECTION_SQLI_MAX_TOKENS) { + return NULL; + } + return &(sql_state->tokenvec[i]); +} + +int libinjection_is_sqli(struct libinjection_sqli_state * sql_state) { const char *s = sql_state->s; size_t slen = sql_state->slen; diff --git a/apache2/libinjection/libinjection_sqli_data.h b/apache2/libinjection/libinjection_sqli_data.h index 49e910cc..8f2d2e97 100644 --- a/apache2/libinjection/libinjection_sqli_data.h +++ b/apache2/libinjection/libinjection_sqli_data.h @@ -24,13 +24,13 @@ static size_t parse_word(sfilter * sf); static size_t parse_var(sfilter * sf); static size_t parse_number(sfilter * sf); static size_t parse_tick(sfilter * sf); -static size_t parse_underscore(sfilter * sf); static size_t parse_ustring(sfilter * sf); static size_t parse_qstring(sfilter * sf); static size_t parse_nqstring(sfilter * sf); static size_t parse_xstring(sfilter * sf); static size_t parse_bstring(sfilter * sf); static size_t parse_estring(sfilter * sf); +static size_t parse_bword(sfilter * sf); typedef size_t (*pt2Function)(sfilter *sf); @@ -126,11 +126,11 @@ static const pt2Function char_parse_map[] = { &parse_xstring, /* 88 */ &parse_word, /* 89 */ &parse_word, /* 90 */ - &parse_other, /* 91 */ + &parse_bword, /* 91 */ &parse_backslash, /* 92 */ &parse_other, /* 93 */ &parse_operator1, /* 94 */ - &parse_underscore, /* 95 */ + &parse_word, /* 95 */ &parse_tick, /* 96 */ &parse_word, /* 97 */ &parse_bstring, /* 98 */ @@ -158,9 +158,9 @@ static const pt2Function char_parse_map[] = { &parse_xstring, /* 120 */ &parse_word, /* 121 */ &parse_word, /* 122 */ - &parse_other, /* 123 */ + &parse_char, /* 123 */ &parse_operator2, /* 124 */ - &parse_other, /* 125 */ + &parse_char, /* 125 */ &parse_operator1, /* 126 */ &parse_white, /* 127 */ }; @@ -177,43 +177,24 @@ static const keyword_t sql_keywords[] = { {"+=", 'o'}, {"-=", 'o'}, {"/=", 'o'}, - {"0&((((", 'F'}, - {"0&(((1", 'F'}, - {"0&(((F", 'F'}, - {"0&(((N", 'F'}, - {"0&(((S", 'F'}, - {"0&(((V", 'F'}, - {"0&((1)", 'F'}, - {"0&((1O", 'F'}, - {"0&((F(", 'F'}, - {"0&((N)", 'F'}, - {"0&((NO", 'F'}, - {"0&((S)", 'F'}, - {"0&((SO", 'F'}, - {"0&((V)", 'F'}, - {"0&((VO", 'F'}, - {"0&(1))", 'F'}, {"0&(1)O", 'F'}, {"0&(1)U", 'F'}, {"0&(1O(", 'F'}, {"0&(1OF", 'F'}, {"0&(1OS", 'F'}, {"0&(1OV", 'F'}, - {"0&(F((", 'F'}, {"0&(F()", 'F'}, {"0&(F(1", 'F'}, {"0&(F(F", 'F'}, {"0&(F(N", 'F'}, {"0&(F(S", 'F'}, {"0&(F(V", 'F'}, - {"0&(N))", 'F'}, {"0&(N)O", 'F'}, {"0&(N)U", 'F'}, {"0&(NO(", 'F'}, {"0&(NOF", 'F'}, {"0&(NOS", 'F'}, {"0&(NOV", 'F'}, - {"0&(S))", 'F'}, {"0&(S)O", 'F'}, {"0&(S)U", 'F'}, {"0&(SO(", 'F'}, @@ -222,13 +203,11 @@ static const keyword_t sql_keywords[] = { {"0&(SON", 'F'}, {"0&(SOS", 'F'}, {"0&(SOV", 'F'}, - {"0&(V))", 'F'}, {"0&(V)O", 'F'}, {"0&(V)U", 'F'}, {"0&(VO(", 'F'}, {"0&(VOF", 'F'}, {"0&(VOS", 'F'}, - {"0&1O((", 'F'}, {"0&1O(1", 'F'}, {"0&1O(F", 'F'}, {"0&1O(N", 'F'}, @@ -253,14 +232,6 @@ static const keyword_t sql_keywords[] = { {"0&1UEN", 'F'}, {"0&1UES", 'F'}, {"0&1UEV", 'F'}, - {"0&F(((", 'F'}, - {"0&F(()", 'F'}, - {"0&F((1", 'F'}, - {"0&F((F", 'F'}, - {"0&F((N", 'F'}, - {"0&F((S", 'F'}, - {"0&F((V", 'F'}, - {"0&F())", 'F'}, {"0&F()O", 'F'}, {"0&F()U", 'F'}, {"0&F(1)", 'F'}, @@ -272,7 +243,6 @@ static const keyword_t sql_keywords[] = { {"0&F(SO", 'F'}, {"0&F(V)", 'F'}, {"0&F(VO", 'F'}, - {"0&NO((", 'F'}, {"0&NO(1", 'F'}, {"0&NO(F", 'F'}, {"0&NO(N", 'F'}, @@ -297,7 +267,6 @@ static const keyword_t sql_keywords[] = { {"0&NUEN", 'F'}, {"0&NUES", 'F'}, {"0&NUEV", 'F'}, - {"0&SO((", 'F'}, {"0&SO(1", 'F'}, {"0&SO(F", 'F'}, {"0&SO(N", 'F'}, @@ -334,7 +303,6 @@ static const keyword_t sql_keywords[] = { {"0&SUEN", 'F'}, {"0&SUES", 'F'}, {"0&SUEV", 'F'}, - {"0&VO((", 'F'}, {"0&VO(1", 'F'}, {"0&VO(F", 'F'}, {"0&VO(N", 'F'}, @@ -354,17 +322,6 @@ static const keyword_t sql_keywords[] = { {"0&VUEN", 'F'}, {"0&VUES", 'F'}, {"0&VUEV", 'F'}, - {"0)))))", 'F'}, - {"0))))U", 'F'}, - {"0)))UE", 'F'}, - {"0))UE(", 'F'}, - {"0))UE1", 'F'}, - {"0))UEF", 'F'}, - {"0))UEK", 'F'}, - {"0))UEN", 'F'}, - {"0))UES", 'F'}, - {"0))UEV", 'F'}, - {"0)UE((", 'F'}, {"0)UE(1", 'F'}, {"0)UE(F", 'F'}, {"0)UE(N", 'F'}, @@ -385,13 +342,6 @@ static const keyword_t sql_keywords[] = { {"0)UESO", 'F'}, {"0)UEVK", 'F'}, {"0)UEVO", 'F'}, - {"01&(((", 'F'}, - {"01&((1", 'F'}, - {"01&((E", 'F'}, - {"01&((F", 'F'}, - {"01&((N", 'F'}, - {"01&((S", 'F'}, - {"01&((V", 'F'}, {"01&(1&", 'F'}, {"01&(1)", 'F'}, {"01&(1,", 'F'}, @@ -403,6 +353,7 @@ static const keyword_t sql_keywords[] = { {"01&(EN", 'F'}, {"01&(EO", 'F'}, {"01&(ES", 'F'}, + {"01&(ET", 'F'}, {"01&(EV", 'F'}, {"01&(F(", 'F'}, {"01&(N&", 'F'}, @@ -413,6 +364,7 @@ static const keyword_t sql_keywords[] = { {"01&(S)", 'F'}, {"01&(S,", 'F'}, {"01&(SO", 'F'}, + {"01&(T(", 'F'}, {"01&(V&", 'F'}, {"01&(V)", 'F'}, {"01&(V,", 'F'}, @@ -425,7 +377,8 @@ static const keyword_t sql_keywords[] = { {"01&1&S", 'F'}, {"01&1&V", 'F'}, {"01&1)&", 'F'}, - {"01&1))", 'F'}, + {"01&1)C", 'F'}, + {"01&1)O", 'F'}, {"01&1)U", 'F'}, {"01&1;", 'F'}, {"01&1;C", 'F'}, @@ -458,7 +411,6 @@ static const keyword_t sql_keywords[] = { {"01&1U;", 'F'}, {"01&1UC", 'F'}, {"01&1UE", 'F'}, - {"01&E((", 'F'}, {"01&E(1", 'F'}, {"01&E(F", 'F'}, {"01&E(N", 'F'}, @@ -494,12 +446,13 @@ static const keyword_t sql_keywords[] = { {"01&EVC", 'F'}, {"01&EVK", 'F'}, {"01&EVO", 'F'}, - {"01&F((", 'F'}, {"01&F()", 'F'}, {"01&F(1", 'F'}, + {"01&F(E", 'F'}, {"01&F(F", 'F'}, {"01&F(N", 'F'}, {"01&F(S", 'F'}, + {"01&F(T", 'F'}, {"01&F(V", 'F'}, {"01&K&(", 'F'}, {"01&K&1", 'F'}, @@ -507,7 +460,6 @@ static const keyword_t sql_keywords[] = { {"01&K&N", 'F'}, {"01&K&S", 'F'}, {"01&K&V", 'F'}, - {"01&K((", 'F'}, {"01&K(1", 'F'}, {"01&K(F", 'F'}, {"01&K(N", 'F'}, @@ -532,7 +484,8 @@ static const keyword_t sql_keywords[] = { {"01&N&S", 'F'}, {"01&N&V", 'F'}, {"01&N)&", 'F'}, - {"01&N))", 'F'}, + {"01&N)C", 'F'}, + {"01&N)O", 'F'}, {"01&N)U", 'F'}, {"01&N;", 'F'}, {"01&N;C", 'F'}, @@ -571,7 +524,8 @@ static const keyword_t sql_keywords[] = { {"01&S&S", 'F'}, {"01&S&V", 'F'}, {"01&S)&", 'F'}, - {"01&S))", 'F'}, + {"01&S)C", 'F'}, + {"01&S)O", 'F'}, {"01&S)U", 'F'}, {"01&S1", 'F'}, {"01&S1;", 'F'}, @@ -614,6 +568,12 @@ static const keyword_t sql_keywords[] = { {"01&SV;", 'F'}, {"01&SVC", 'F'}, {"01&SVO", 'F'}, + {"01&T(1", 'F'}, + {"01&T(E", 'F'}, + {"01&T(F", 'F'}, + {"01&T(N", 'F'}, + {"01&T(S", 'F'}, + {"01&T(V", 'F'}, {"01&V", 'F'}, {"01&V&(", 'F'}, {"01&V&1", 'F'}, @@ -622,7 +582,8 @@ static const keyword_t sql_keywords[] = { {"01&V&S", 'F'}, {"01&V&V", 'F'}, {"01&V)&", 'F'}, - {"01&V))", 'F'}, + {"01&V)C", 'F'}, + {"01&V)O", 'F'}, {"01&V)U", 'F'}, {"01&V;", 'F'}, {"01&V;C", 'F'}, @@ -658,17 +619,11 @@ static const keyword_t sql_keywords[] = { {"01&VU;", 'F'}, {"01&VUC", 'F'}, {"01&VUE", 'F'}, - {"01((((", 'F'}, - {"01(((E", 'F'}, - {"01(((U", 'F'}, - {"01((EK", 'F'}, - {"01((EN", 'F'}, - {"01((U(", 'F'}, + {"01(EF(", 'F'}, + {"01(EKF", 'F'}, {"01(EKN", 'F'}, {"01(ENK", 'F'}, - {"01(U((", 'F'}, {"01(U(E", 'F'}, - {"01)&((", 'F'}, {"01)&(1", 'F'}, {"01)&(E", 'F'}, {"01)&(F", 'F'}, @@ -712,54 +667,6 @@ static const keyword_t sql_keywords[] = { {"01)&VF", 'F'}, {"01)&VO", 'F'}, {"01)&VU", 'F'}, - {"01))&(", 'F'}, - {"01))&1", 'F'}, - {"01))&F", 'F'}, - {"01))&N", 'F'}, - {"01))&S", 'F'}, - {"01))&V", 'F'}, - {"01)))&", 'F'}, - {"01))))", 'F'}, - {"01))),", 'F'}, - {"01)));", 'F'}, - {"01)))B", 'F'}, - {"01)))E", 'F'}, - {"01)))K", 'F'}, - {"01)))O", 'F'}, - {"01)))U", 'F'}, - {"01)),(", 'F'}, - {"01));E", 'F'}, - {"01));T", 'F'}, - {"01))B(", 'F'}, - {"01))B1", 'F'}, - {"01))BF", 'F'}, - {"01))BN", 'F'}, - {"01))BS", 'F'}, - {"01))BV", 'F'}, - {"01))E(", 'F'}, - {"01))E1", 'F'}, - {"01))EF", 'F'}, - {"01))EK", 'F'}, - {"01))EN", 'F'}, - {"01))ES", 'F'}, - {"01))EV", 'F'}, - {"01))K(", 'F'}, - {"01))K1", 'F'}, - {"01))KB", 'F'}, - {"01))KF", 'F'}, - {"01))KN", 'F'}, - {"01))KS", 'F'}, - {"01))KU", 'F'}, - {"01))KV", 'F'}, - {"01))O(", 'F'}, - {"01))O1", 'F'}, - {"01))OF", 'F'}, - {"01))ON", 'F'}, - {"01))OS", 'F'}, - {"01))OV", 'F'}, - {"01))U(", 'F'}, - {"01))UE", 'F'}, - {"01),((", 'F'}, {"01),(1", 'F'}, {"01),(F", 'F'}, {"01),(N", 'F'}, @@ -781,7 +688,6 @@ static const keyword_t sql_keywords[] = { {"01);TO", 'F'}, {"01);TS", 'F'}, {"01);TV", 'F'}, - {"01)B((", 'F'}, {"01)B(1", 'F'}, {"01)B(F", 'F'}, {"01)B(N", 'F'}, @@ -817,7 +723,7 @@ static const keyword_t sql_keywords[] = { {"01)BVK", 'F'}, {"01)BVO", 'F'}, {"01)BVU", 'F'}, - {"01)E((", 'F'}, + {"01)C", 'F'}, {"01)E(1", 'F'}, {"01)E(F", 'F'}, {"01)E(N", 'F'}, @@ -838,7 +744,6 @@ static const keyword_t sql_keywords[] = { {"01)ESO", 'F'}, {"01)EVC", 'F'}, {"01)EVO", 'F'}, - {"01)K((", 'F'}, {"01)K(1", 'F'}, {"01)K(F", 'F'}, {"01)K(N", 'F'}, @@ -876,12 +781,12 @@ static const keyword_t sql_keywords[] = { {"01)KVE", 'F'}, {"01)KVO", 'F'}, {"01)KVU", 'F'}, - {"01)O((", 'F'}, {"01)O(1", 'F'}, {"01)O(E", 'F'}, {"01)O(F", 'F'}, {"01)O(N", 'F'}, {"01)O(S", 'F'}, + {"01)O(T", 'F'}, {"01)O(V", 'F'}, {"01)O1", 'F'}, {"01)O1&", 'F'}, @@ -893,7 +798,6 @@ static const keyword_t sql_keywords[] = { {"01)O1O", 'F'}, {"01)O1U", 'F'}, {"01)OF(", 'F'}, - {"01)ON", 'F'}, {"01)ON&", 'F'}, {"01)ON)", 'F'}, {"01)ON;", 'F'}, @@ -920,7 +824,6 @@ static const keyword_t sql_keywords[] = { {"01)OVK", 'F'}, {"01)OVO", 'F'}, {"01)OVU", 'F'}, - {"01)U((", 'F'}, {"01)U(E", 'F'}, {"01)UE(", 'F'}, {"01)UE1", 'F'}, @@ -929,13 +832,6 @@ static const keyword_t sql_keywords[] = { {"01)UEN", 'F'}, {"01)UES", 'F'}, {"01)UEV", 'F'}, - {"01,(((", 'F'}, - {"01,((1", 'F'}, - {"01,((E", 'F'}, - {"01,((F", 'F'}, - {"01,((N", 'F'}, - {"01,((S", 'F'}, - {"01,((V", 'F'}, {"01,(1)", 'F'}, {"01,(1O", 'F'}, {"01,(E(", 'F'}, @@ -952,7 +848,6 @@ static const keyword_t sql_keywords[] = { {"01,(SO", 'F'}, {"01,(V)", 'F'}, {"01,(VO", 'F'}, - {"01,F((", 'F'}, {"01,F()", 'F'}, {"01,F(1", 'F'}, {"01,F(F", 'F'}, @@ -960,7 +855,6 @@ static const keyword_t sql_keywords[] = { {"01,F(S", 'F'}, {"01,F(T", 'F'}, {"01,F(V", 'F'}, - {"01,V))", 'F'}, {"01,V),", 'F'}, {"01,V)O", 'F'}, {"01,VB(", 'F'}, @@ -973,7 +867,6 @@ static const keyword_t sql_keywords[] = { {"01,VOF", 'F'}, {"01,VOS", 'F'}, {"01,VUE", 'F'}, - {"01;E((", 'F'}, {"01;E(1", 'F'}, {"01;E(E", 'F'}, {"01;E(F", 'F'}, @@ -983,6 +876,7 @@ static const keyword_t sql_keywords[] = { {"01;E1,", 'F'}, {"01;E1;", 'F'}, {"01;E1C", 'F'}, + {"01;E1K", 'F'}, {"01;E1O", 'F'}, {"01;E1T", 'F'}, {"01;EF(", 'F'}, @@ -996,6 +890,7 @@ static const keyword_t sql_keywords[] = { {"01;EN,", 'F'}, {"01;EN;", 'F'}, {"01;ENC", 'F'}, + {"01;ENE", 'F'}, {"01;ENK", 'F'}, {"01;ENO", 'F'}, {"01;ENT", 'F'}, @@ -1003,15 +898,16 @@ static const keyword_t sql_keywords[] = { {"01;ES,", 'F'}, {"01;ES;", 'F'}, {"01;ESC", 'F'}, + {"01;ESK", 'F'}, {"01;ESO", 'F'}, {"01;EST", 'F'}, {"01;EV,", 'F'}, {"01;EV;", 'F'}, {"01;EVC", 'F'}, + {"01;EVK", 'F'}, {"01;EVO", 'F'}, {"01;EVT", 'F'}, {"01;N:T", 'F'}, - {"01;T((", 'F'}, {"01;T(1", 'F'}, {"01;T(E", 'F'}, {"01;T(F", 'F'}, @@ -1022,6 +918,7 @@ static const keyword_t sql_keywords[] = { {"01;T1;", 'F'}, {"01;T1C", 'F'}, {"01;T1F", 'F'}, + {"01;T1K", 'F'}, {"01;T1O", 'F'}, {"01;T1T", 'F'}, {"01;T;", 'F'}, @@ -1040,7 +937,6 @@ static const keyword_t sql_keywords[] = { {"01;TN1", 'F'}, {"01;TN;", 'F'}, {"01;TNC", 'F'}, - {"01;TNE", 'F'}, {"01;TNF", 'F'}, {"01;TNK", 'F'}, {"01;TNN", 'F'}, @@ -1053,6 +949,7 @@ static const keyword_t sql_keywords[] = { {"01;TS;", 'F'}, {"01;TSC", 'F'}, {"01;TSF", 'F'}, + {"01;TSK", 'F'}, {"01;TSO", 'F'}, {"01;TST", 'F'}, {"01;TT(", 'F'}, @@ -1065,14 +962,9 @@ static const keyword_t sql_keywords[] = { {"01;TV;", 'F'}, {"01;TVC", 'F'}, {"01;TVF", 'F'}, + {"01;TVK", 'F'}, {"01;TVO", 'F'}, {"01;TVT", 'F'}, - {"01A(((", 'F'}, - {"01A((1", 'F'}, - {"01A((F", 'F'}, - {"01A((N", 'F'}, - {"01A((S", 'F'}, - {"01A((V", 'F'}, {"01A(F(", 'F'}, {"01A(N)", 'F'}, {"01A(NO", 'F'}, @@ -1080,7 +972,6 @@ static const keyword_t sql_keywords[] = { {"01A(SO", 'F'}, {"01A(V)", 'F'}, {"01A(VO", 'F'}, - {"01AF((", 'F'}, {"01AF()", 'F'}, {"01AF(1", 'F'}, {"01AF(F", 'F'}, @@ -1105,12 +996,6 @@ static const keyword_t sql_keywords[] = { {"01AVOF", 'F'}, {"01AVOS", 'F'}, {"01AVUE", 'F'}, - {"01B(((", 'F'}, - {"01B((1", 'F'}, - {"01B((F", 'F'}, - {"01B((N", 'F'}, - {"01B((S", 'F'}, - {"01B((V", 'F'}, {"01B(1)", 'F'}, {"01B(1O", 'F'}, {"01B(F(", 'F'}, @@ -1151,14 +1036,12 @@ static const keyword_t sql_keywords[] = { {"01B1OV", 'F'}, {"01B1U(", 'F'}, {"01B1UE", 'F'}, - {"01BE((", 'F'}, {"01BE(1", 'F'}, {"01BE(F", 'F'}, {"01BE(N", 'F'}, {"01BE(S", 'F'}, {"01BE(V", 'F'}, {"01BEK(", 'F'}, - {"01BF((", 'F'}, {"01BF()", 'F'}, {"01BF(1", 'F'}, {"01BF(F", 'F'}, @@ -1263,12 +1146,6 @@ static const keyword_t sql_keywords[] = { {"01BVU(", 'F'}, {"01BVUE", 'F'}, {"01C", 'F'}, - {"01E(((", 'F'}, - {"01E((1", 'F'}, - {"01E((F", 'F'}, - {"01E((N", 'F'}, - {"01E((S", 'F'}, - {"01E((V", 'F'}, {"01E(1)", 'F'}, {"01E(1O", 'F'}, {"01E(F(", 'F'}, @@ -1284,14 +1161,12 @@ static const keyword_t sql_keywords[] = { {"01E1OS", 'F'}, {"01E1OV", 'F'}, {"01E1UE", 'F'}, - {"01EF((", 'F'}, {"01EF()", 'F'}, {"01EF(1", 'F'}, {"01EF(F", 'F'}, {"01EF(N", 'F'}, {"01EF(S", 'F'}, {"01EF(V", 'F'}, - {"01EK((", 'F'}, {"01EK(1", 'F'}, {"01EK(E", 'F'}, {"01EK(F", 'F'}, @@ -1335,7 +1210,6 @@ static const keyword_t sql_keywords[] = { {"01ESOS", 'F'}, {"01ESOV", 'F'}, {"01ESUE", 'F'}, - {"01EU((", 'F'}, {"01EU(1", 'F'}, {"01EU(F", 'F'}, {"01EU(N", 'F'}, @@ -1361,14 +1235,6 @@ static const keyword_t sql_keywords[] = { {"01EVOF", 'F'}, {"01EVOS", 'F'}, {"01EVUE", 'F'}, - {"01F(((", 'F'}, - {"01F(()", 'F'}, - {"01F((1", 'F'}, - {"01F((F", 'F'}, - {"01F((N", 'F'}, - {"01F((S", 'F'}, - {"01F((V", 'F'}, - {"01F())", 'F'}, {"01F()1", 'F'}, {"01F()F", 'F'}, {"01F()K", 'F'}, @@ -1380,6 +1246,13 @@ static const keyword_t sql_keywords[] = { {"01F(1)", 'F'}, {"01F(1N", 'F'}, {"01F(1O", 'F'}, + {"01F(E(", 'F'}, + {"01F(E1", 'F'}, + {"01F(EF", 'F'}, + {"01F(EK", 'F'}, + {"01F(EN", 'F'}, + {"01F(ES", 'F'}, + {"01F(EV", 'F'}, {"01F(F(", 'F'}, {"01F(N)", 'F'}, {"01F(N,", 'F'}, @@ -1388,13 +1261,6 @@ static const keyword_t sql_keywords[] = { {"01F(SO", 'F'}, {"01F(V)", 'F'}, {"01F(VO", 'F'}, - {"01K(((", 'F'}, - {"01K((1", 'F'}, - {"01K((F", 'F'}, - {"01K((N", 'F'}, - {"01K((S", 'F'}, - {"01K((V", 'F'}, - {"01K(1)", 'F'}, {"01K(1O", 'F'}, {"01K(F(", 'F'}, {"01K(N)", 'F'}, @@ -1409,14 +1275,6 @@ static const keyword_t sql_keywords[] = { {"01K)&N", 'F'}, {"01K)&S", 'F'}, {"01K)&V", 'F'}, - {"01K))&", 'F'}, - {"01K)))", 'F'}, - {"01K));", 'F'}, - {"01K))B", 'F'}, - {"01K))E", 'F'}, - {"01K))K", 'F'}, - {"01K))O", 'F'}, - {"01K))U", 'F'}, {"01K);E", 'F'}, {"01K);T", 'F'}, {"01K)B(", 'F'}, @@ -1465,7 +1323,6 @@ static const keyword_t sql_keywords[] = { {"01K1OV", 'F'}, {"01K1U(", 'F'}, {"01K1UE", 'F'}, - {"01KF((", 'F'}, {"01KF()", 'F'}, {"01KF(1", 'F'}, {"01KF(F", 'F'}, @@ -1569,12 +1426,6 @@ static const keyword_t sql_keywords[] = { {"01KVU(", 'F'}, {"01KVUE", 'F'}, {"01N&F(", 'F'}, - {"01N(((", 'F'}, - {"01N((1", 'F'}, - {"01N((F", 'F'}, - {"01N((N", 'F'}, - {"01N((S", 'F'}, - {"01N((V", 'F'}, {"01N(1)", 'F'}, {"01N(1O", 'F'}, {"01N(F(", 'F'}, @@ -1582,12 +1433,8 @@ static const keyword_t sql_keywords[] = { {"01N(SO", 'F'}, {"01N(V)", 'F'}, {"01N(VO", 'F'}, - {"01N)))", 'F'}, - {"01N))N", 'F'}, - {"01N))U", 'F'}, {"01N)UE", 'F'}, {"01N,F(", 'F'}, - {"01NE((", 'F'}, {"01NE(1", 'F'}, {"01NE(F", 'F'}, {"01NE(N", 'F'}, @@ -1602,32 +1449,12 @@ static const keyword_t sql_keywords[] = { {"01NESO", 'F'}, {"01NEVC", 'F'}, {"01NEVO", 'F'}, - {"01NF((", 'F'}, {"01NF()", 'F'}, {"01NF(1", 'F'}, {"01NF(F", 'F'}, {"01NF(N", 'F'}, {"01NF(S", 'F'}, {"01NF(V", 'F'}, - {"01NO((", 'F'}, - {"01NO(1", 'F'}, - {"01NO(F", 'F'}, - {"01NO(N", 'F'}, - {"01NO(S", 'F'}, - {"01NO(V", 'F'}, - {"01NOF(", 'F'}, - {"01NOS(", 'F'}, - {"01NOS1", 'F'}, - {"01NOSF", 'F'}, - {"01NOSO", 'F'}, - {"01NOSU", 'F'}, - {"01NOSV", 'F'}, - {"01NOV(", 'F'}, - {"01NOVF", 'F'}, - {"01NOVO", 'F'}, - {"01NOVS", 'F'}, - {"01NOVU", 'F'}, - {"01NU((", 'F'}, {"01NU(E", 'F'}, {"01NUE", 'F'}, {"01NUE(", 'F'}, @@ -1639,15 +1466,6 @@ static const keyword_t sql_keywords[] = { {"01NUEN", 'F'}, {"01NUES", 'F'}, {"01NUEV", 'F'}, - {"01O(((", 'F'}, - {"01O((1", 'F'}, - {"01O((E", 'F'}, - {"01O((F", 'F'}, - {"01O((N", 'F'}, - {"01O((O", 'F'}, - {"01O((S", 'F'}, - {"01O((T", 'F'}, - {"01O((V", 'F'}, {"01O(1&", 'F'}, {"01O(1)", 'F'}, {"01O(1,", 'F'}, @@ -1659,6 +1477,7 @@ static const keyword_t sql_keywords[] = { {"01O(EK", 'F'}, {"01O(EN", 'F'}, {"01O(ES", 'F'}, + {"01O(ET", 'F'}, {"01O(EV", 'F'}, {"01O(F(", 'F'}, {"01O(N&", 'F'}, @@ -1680,13 +1499,13 @@ static const keyword_t sql_keywords[] = { {"01O(V)", 'F'}, {"01O(V,", 'F'}, {"01O(VO", 'F'}, - {"01OF((", 'F'}, {"01OF()", 'F'}, {"01OF(1", 'F'}, {"01OF(E", 'F'}, {"01OF(F", 'F'}, {"01OF(N", 'F'}, {"01OF(S", 'F'}, + {"01OF(T", 'F'}, {"01OF(V", 'F'}, {"01OK&(", 'F'}, {"01OK&1", 'F'}, @@ -1694,7 +1513,6 @@ static const keyword_t sql_keywords[] = { {"01OK&N", 'F'}, {"01OK&S", 'F'}, {"01OK&V", 'F'}, - {"01OK((", 'F'}, {"01OK(1", 'F'}, {"01OK(F", 'F'}, {"01OK(N", 'F'}, @@ -1722,16 +1540,16 @@ static const keyword_t sql_keywords[] = { {"01OS&K", 'F'}, {"01OS&N", 'F'}, {"01OS&S", 'F'}, + {"01OS&T", 'F'}, {"01OS&U", 'F'}, {"01OS&V", 'F'}, - {"01OS((", 'F'}, {"01OS(E", 'F'}, {"01OS(U", 'F'}, {"01OS)&", 'F'}, - {"01OS))", 'F'}, {"01OS),", 'F'}, {"01OS);", 'F'}, {"01OS)B", 'F'}, + {"01OS)C", 'F'}, {"01OS)E", 'F'}, {"01OS)K", 'F'}, {"01OS)O", 'F'}, @@ -1809,13 +1627,13 @@ static const keyword_t sql_keywords[] = { {"01OSVO", 'F'}, {"01OSVS", 'F'}, {"01OSVU", 'F'}, - {"01OT((", 'F'}, {"01OT(1", 'F'}, + {"01OT(E", 'F'}, {"01OT(F", 'F'}, {"01OT(N", 'F'}, {"01OT(S", 'F'}, + {"01OT(T", 'F'}, {"01OT(V", 'F'}, - {"01OU((", 'F'}, {"01OU(E", 'F'}, {"01OUEK", 'F'}, {"01OUEN", 'F'}, @@ -1827,16 +1645,16 @@ static const keyword_t sql_keywords[] = { {"01OV&K", 'F'}, {"01OV&N", 'F'}, {"01OV&S", 'F'}, + {"01OV&T", 'F'}, {"01OV&U", 'F'}, {"01OV&V", 'F'}, - {"01OV((", 'F'}, {"01OV(E", 'F'}, {"01OV(U", 'F'}, {"01OV)&", 'F'}, - {"01OV))", 'F'}, {"01OV),", 'F'}, {"01OV);", 'F'}, {"01OV)B", 'F'}, + {"01OV)C", 'F'}, {"01OV)E", 'F'}, {"01OV)K", 'F'}, {"01OV)O", 'F'}, @@ -1909,7 +1727,6 @@ static const keyword_t sql_keywords[] = { {"01OVUS", 'F'}, {"01OVUT", 'F'}, {"01OVUV", 'F'}, - {"01SF((", 'F'}, {"01SF()", 'F'}, {"01SF(1", 'F'}, {"01SF(F", 'F'}, @@ -1928,13 +1745,6 @@ static const keyword_t sql_keywords[] = { {"01SVOF", 'F'}, {"01SVOS", 'F'}, {"01U", 'F'}, - {"01U(((", 'F'}, - {"01U((1", 'F'}, - {"01U((E", 'F'}, - {"01U((F", 'F'}, - {"01U((N", 'F'}, - {"01U((S", 'F'}, - {"01U((V", 'F'}, {"01U(1)", 'F'}, {"01U(1O", 'F'}, {"01U(E(", 'F'}, @@ -1963,7 +1773,6 @@ static const keyword_t sql_keywords[] = { {"01U;C", 'F'}, {"01UC", 'F'}, {"01UE", 'F'}, - {"01UE((", 'F'}, {"01UE(1", 'F'}, {"01UE(E", 'F'}, {"01UE(F", 'F'}, @@ -2015,6 +1824,7 @@ static const keyword_t sql_keywords[] = { {"01UENC", 'F'}, {"01UENF", 'F'}, {"01UENK", 'F'}, + {"01UENN", 'F'}, {"01UENO", 'F'}, {"01UENS", 'F'}, {"01UENU", 'F'}, @@ -2049,16 +1859,13 @@ static const keyword_t sql_keywords[] = { {"01UEVO", 'F'}, {"01UEVS", 'F'}, {"01UEVU", 'F'}, - {"01UF((", 'F'}, {"01UF()", 'F'}, {"01UF(1", 'F'}, {"01UF(F", 'F'}, {"01UF(N", 'F'}, {"01UF(S", 'F'}, {"01UF(V", 'F'}, - {"01UK((", 'F'}, {"01UK(E", 'F'}, - {"01UN((", 'F'}, {"01UN(1", 'F'}, {"01UN(F", 'F'}, {"01UN(S", 'F'}, @@ -2084,7 +1891,6 @@ static const keyword_t sql_keywords[] = { {"01UNS(", 'F'}, {"01UNS,", 'F'}, {"01UNSO", 'F'}, - {"01UO((", 'F'}, {"01UO(E", 'F'}, {"01UON(", 'F'}, {"01UON1", 'F'}, @@ -2114,14 +1920,12 @@ static const keyword_t sql_keywords[] = { {"01UVO(", 'F'}, {"01UVOF", 'F'}, {"01UVOS", 'F'}, - {"01VF((", 'F'}, {"01VF()", 'F'}, {"01VF(1", 'F'}, {"01VF(F", 'F'}, {"01VF(N", 'F'}, {"01VF(S", 'F'}, {"01VF(V", 'F'}, - {"01VO((", 'F'}, {"01VO(1", 'F'}, {"01VO(F", 'F'}, {"01VO(N", 'F'}, @@ -2149,52 +1953,18 @@ static const keyword_t sql_keywords[] = { {"01VUEC", 'F'}, {"01VUEK", 'F'}, {"0;TKNC", 'F'}, - {"0E((((", 'F'}, - {"0E(((1", 'F'}, - {"0E(((E", 'F'}, - {"0E(((F", 'F'}, - {"0E(((N", 'F'}, - {"0E(((S", 'F'}, - {"0E(((V", 'F'}, - {"0E((1(", 'F'}, - {"0E((1)", 'F'}, - {"0E((1,", 'F'}, - {"0E((1F", 'F'}, - {"0E((1N", 'F'}, - {"0E((1O", 'F'}, - {"0E((1S", 'F'}, - {"0E((1V", 'F'}, - {"0E((E(", 'F'}, - {"0E((E1", 'F'}, - {"0E((EF", 'F'}, - {"0E((EK", 'F'}, - {"0E((EN", 'F'}, - {"0E((ES", 'F'}, - {"0E((EV", 'F'}, - {"0E((F(", 'F'}, - {"0E((N(", 'F'}, - {"0E((N)", 'F'}, - {"0E((N,", 'F'}, - {"0E((N1", 'F'}, - {"0E((NF", 'F'}, - {"0E((NO", 'F'}, - {"0E((S(", 'F'}, - {"0E((S)", 'F'}, - {"0E((S,", 'F'}, - {"0E((S1", 'F'}, - {"0E((SF", 'F'}, - {"0E((SO", 'F'}, - {"0E((SV", 'F'}, - {"0E((V(", 'F'}, - {"0E((V)", 'F'}, - {"0E((V,", 'F'}, - {"0E((VF", 'F'}, - {"0E((VO", 'F'}, - {"0E((VS", 'F'}, + {"0E(1&(", 'F'}, + {"0E(1&1", 'F'}, + {"0E(1&F", 'F'}, + {"0E(1&N", 'F'}, + {"0E(1&S", 'F'}, + {"0E(1&V", 'F'}, {"0E(1)&", 'F'}, - {"0E(1))", 'F'}, {"0E(1),", 'F'}, {"0E(1)1", 'F'}, + {"0E(1);", 'F'}, + {"0E(1)B", 'F'}, + {"0E(1)C", 'F'}, {"0E(1)F", 'F'}, {"0E(1)K", 'F'}, {"0E(1)N", 'F'}, @@ -2205,7 +1975,6 @@ static const keyword_t sql_keywords[] = { {"0E(1,F", 'F'}, {"0E(1F(", 'F'}, {"0E(1N)", 'F'}, - {"0E(1NO", 'F'}, {"0E(1O(", 'F'}, {"0E(1OF", 'F'}, {"0E(1OS", 'F'}, @@ -2213,13 +1982,14 @@ static const keyword_t sql_keywords[] = { {"0E(1S)", 'F'}, {"0E(1V)", 'F'}, {"0E(1VO", 'F'}, - {"0E(E((", 'F'}, {"0E(E(1", 'F'}, {"0E(E(E", 'F'}, {"0E(E(F", 'F'}, {"0E(E(N", 'F'}, {"0E(E(S", 'F'}, {"0E(E(V", 'F'}, + {"0E(E1&", 'F'}, + {"0E(E1)", 'F'}, {"0E(E1O", 'F'}, {"0E(EF(", 'F'}, {"0E(EK(", 'F'}, @@ -2227,26 +1997,42 @@ static const keyword_t sql_keywords[] = { {"0E(EKF", 'F'}, {"0E(EKN", 'F'}, {"0E(EKS", 'F'}, + {"0E(EKT", 'F'}, {"0E(EKV", 'F'}, + {"0E(EN&", 'F'}, + {"0E(EN)", 'F'}, {"0E(ENO", 'F'}, + {"0E(ES&", 'F'}, + {"0E(ES)", 'F'}, {"0E(ESO", 'F'}, + {"0E(ET(", 'F'}, + {"0E(EV&", 'F'}, + {"0E(EV)", 'F'}, {"0E(EVO", 'F'}, - {"0E(F((", 'F'}, {"0E(F()", 'F'}, {"0E(F(1", 'F'}, + {"0E(F(E", 'F'}, {"0E(F(F", 'F'}, {"0E(F(N", 'F'}, {"0E(F(S", 'F'}, + {"0E(F(T", 'F'}, {"0E(F(V", 'F'}, - {"0E(N((", 'F'}, + {"0E(N&(", 'F'}, + {"0E(N&1", 'F'}, + {"0E(N&F", 'F'}, + {"0E(N&N", 'F'}, + {"0E(N&S", 'F'}, + {"0E(N&V", 'F'}, {"0E(N(1", 'F'}, {"0E(N(F", 'F'}, {"0E(N(S", 'F'}, {"0E(N(V", 'F'}, {"0E(N)&", 'F'}, - {"0E(N))", 'F'}, {"0E(N),", 'F'}, {"0E(N)1", 'F'}, + {"0E(N);", 'F'}, + {"0E(N)B", 'F'}, + {"0E(N)C", 'F'}, {"0E(N)F", 'F'}, {"0E(N)K", 'F'}, {"0E(N)N", 'F'}, @@ -2262,10 +2048,18 @@ static const keyword_t sql_keywords[] = { {"0E(NOF", 'F'}, {"0E(NOS", 'F'}, {"0E(NOV", 'F'}, + {"0E(S&(", 'F'}, + {"0E(S&1", 'F'}, + {"0E(S&F", 'F'}, + {"0E(S&N", 'F'}, + {"0E(S&S", 'F'}, + {"0E(S&V", 'F'}, {"0E(S)&", 'F'}, - {"0E(S))", 'F'}, {"0E(S),", 'F'}, {"0E(S)1", 'F'}, + {"0E(S);", 'F'}, + {"0E(S)B", 'F'}, + {"0E(S)C", 'F'}, {"0E(S)F", 'F'}, {"0E(S)K", 'F'}, {"0E(S)N", 'F'}, @@ -2285,10 +2079,24 @@ static const keyword_t sql_keywords[] = { {"0E(SOV", 'F'}, {"0E(SV)", 'F'}, {"0E(SVO", 'F'}, + {"0E(T(1", 'F'}, + {"0E(T(E", 'F'}, + {"0E(T(F", 'F'}, + {"0E(T(N", 'F'}, + {"0E(T(S", 'F'}, + {"0E(T(V", 'F'}, + {"0E(V&(", 'F'}, + {"0E(V&1", 'F'}, + {"0E(V&F", 'F'}, + {"0E(V&N", 'F'}, + {"0E(V&S", 'F'}, + {"0E(V&V", 'F'}, {"0E(V)&", 'F'}, - {"0E(V))", 'F'}, {"0E(V),", 'F'}, {"0E(V)1", 'F'}, + {"0E(V);", 'F'}, + {"0E(V)B", 'F'}, + {"0E(V)C", 'F'}, {"0E(V)F", 'F'}, {"0E(V)K", 'F'}, {"0E(V)N", 'F'}, @@ -2303,23 +2111,33 @@ static const keyword_t sql_keywords[] = { {"0E(VOS", 'F'}, {"0E(VS)", 'F'}, {"0E(VSO", 'F'}, - {"0E1&((", 'F'}, + {"0E1&(1", 'F'}, {"0E1&(E", 'F'}, + {"0E1&(F", 'F'}, + {"0E1&(N", 'F'}, + {"0E1&(S", 'F'}, + {"0E1&(V", 'F'}, + {"0E1&1)", 'F'}, + {"0E1&1O", 'F'}, + {"0E1&F(", 'F'}, + {"0E1&N)", 'F'}, + {"0E1&NO", 'F'}, + {"0E1&S)", 'F'}, + {"0E1&SO", 'F'}, + {"0E1&V)", 'F'}, + {"0E1&VO", 'F'}, {"0E1)", 'F'}, - {"0E1))", 'F'}, - {"0E1)))", 'F'}, - {"0E1))1", 'F'}, - {"0E1));", 'F'}, - {"0E1))C", 'F'}, - {"0E1))F", 'F'}, - {"0E1))K", 'F'}, - {"0E1))N", 'F'}, - {"0E1))O", 'F'}, - {"0E1))S", 'F'}, - {"0E1))U", 'F'}, - {"0E1))V", 'F'}, + {"0E1)&(", 'F'}, + {"0E1)&1", 'F'}, + {"0E1)&F", 'F'}, + {"0E1)&N", 'F'}, + {"0E1)&S", 'F'}, + {"0E1)&V", 'F'}, {"0E1);", 'F'}, + {"0E1);(", 'F'}, {"0E1);C", 'F'}, + {"0E1);E", 'F'}, + {"0E1);T", 'F'}, {"0E1)C", 'F'}, {"0E1)KN", 'F'}, {"0E1)O(", 'F'}, @@ -2329,7 +2147,6 @@ static const keyword_t sql_keywords[] = { {"0E1)OS", 'F'}, {"0E1)OV", 'F'}, {"0E1)UE", 'F'}, - {"0E1,((", 'F'}, {"0E1,(1", 'F'}, {"0E1,(F", 'F'}, {"0E1,(N", 'F'}, @@ -2339,14 +2156,27 @@ static const keyword_t sql_keywords[] = { {"0E1,V,", 'F'}, {"0E1,VK", 'F'}, {"0E1,VO", 'F'}, - {"0E1F((", 'F'}, + {"0E1;(E", 'F'}, + {"0E1B(1", 'F'}, + {"0E1B(F", 'F'}, + {"0E1B(N", 'F'}, + {"0E1B(S", 'F'}, + {"0E1B(V", 'F'}, + {"0E1B1)", 'F'}, + {"0E1B1O", 'F'}, + {"0E1BF(", 'F'}, + {"0E1BN)", 'F'}, + {"0E1BNO", 'F'}, + {"0E1BS)", 'F'}, + {"0E1BSO", 'F'}, + {"0E1BV)", 'F'}, + {"0E1BVO", 'F'}, {"0E1F()", 'F'}, {"0E1F(1", 'F'}, {"0E1F(F", 'F'}, {"0E1F(N", 'F'}, {"0E1F(S", 'F'}, {"0E1F(V", 'F'}, - {"0E1K((", 'F'}, {"0E1K(1", 'F'}, {"0E1K(E", 'F'}, {"0E1K(F", 'F'}, @@ -2362,26 +2192,24 @@ static const keyword_t sql_keywords[] = { {"0E1KN;", 'F'}, {"0E1KNC", 'F'}, {"0E1KNK", 'F'}, + {"0E1KNU", 'F'}, {"0E1KS)", 'F'}, {"0E1KSK", 'F'}, {"0E1KSO", 'F'}, {"0E1KV)", 'F'}, {"0E1KVK", 'F'}, {"0E1KVO", 'F'}, + {"0E1N)U", 'F'}, {"0E1N;", 'F'}, {"0E1N;C", 'F'}, {"0E1NC", 'F'}, {"0E1NKN", 'F'}, - {"0E1NO(", 'F'}, - {"0E1NOF", 'F'}, - {"0E1NOS", 'F'}, - {"0E1NOV", 'F'}, - {"0E1O((", 'F'}, {"0E1O(1", 'F'}, {"0E1O(E", 'F'}, {"0E1O(F", 'F'}, {"0E1O(N", 'F'}, {"0E1O(S", 'F'}, + {"0E1O(T", 'F'}, {"0E1O(V", 'F'}, {"0E1OF(", 'F'}, {"0E1OS&", 'F'}, @@ -2389,21 +2217,35 @@ static const keyword_t sql_keywords[] = { {"0E1OS)", 'F'}, {"0E1OS,", 'F'}, {"0E1OS1", 'F'}, + {"0E1OS;", 'F'}, + {"0E1OSB", 'F'}, {"0E1OSF", 'F'}, {"0E1OSK", 'F'}, {"0E1OSO", 'F'}, + {"0E1OSU", 'F'}, {"0E1OSV", 'F'}, {"0E1OV&", 'F'}, {"0E1OV(", 'F'}, {"0E1OV)", 'F'}, {"0E1OV,", 'F'}, + {"0E1OV;", 'F'}, + {"0E1OVB", 'F'}, {"0E1OVF", 'F'}, {"0E1OVK", 'F'}, {"0E1OVO", 'F'}, {"0E1OVS", 'F'}, + {"0E1OVU", 'F'}, {"0E1S;", 'F'}, {"0E1S;C", 'F'}, {"0E1SC", 'F'}, + {"0E1U(E", 'F'}, + {"0E1UE(", 'F'}, + {"0E1UE1", 'F'}, + {"0E1UEF", 'F'}, + {"0E1UEK", 'F'}, + {"0E1UEN", 'F'}, + {"0E1UES", 'F'}, + {"0E1UEV", 'F'}, {"0E1V", 'F'}, {"0E1V;", 'F'}, {"0E1V;C", 'F'}, @@ -2414,50 +2256,47 @@ static const keyword_t sql_keywords[] = { {"0ECHO", 'F'}, {"0ECHO;", 'F'}, {"0ECHOC", 'F'}, - {"0EE(((", 'F'}, - {"0EE((F", 'F'}, {"0EE(F(", 'F'}, - {"0EEK((", 'F'}, {"0EEK(F", 'F'}, - {"0EF(((", 'F'}, - {"0EF(()", 'F'}, - {"0EF((1", 'F'}, - {"0EF((F", 'F'}, - {"0EF((N", 'F'}, - {"0EF((O", 'F'}, - {"0EF((S", 'F'}, - {"0EF((V", 'F'}, {"0EF()&", 'F'}, - {"0EF())", 'F'}, {"0EF(),", 'F'}, {"0EF()1", 'F'}, + {"0EF();", 'F'}, + {"0EF()B", 'F'}, {"0EF()F", 'F'}, {"0EF()K", 'F'}, {"0EF()N", 'F'}, {"0EF()O", 'F'}, {"0EF()S", 'F'}, + {"0EF()U", 'F'}, {"0EF()V", 'F'}, + {"0EF(1&", 'F'}, {"0EF(1)", 'F'}, {"0EF(1,", 'F'}, {"0EF(1O", 'F'}, + {"0EF(E(", 'F'}, + {"0EF(E1", 'F'}, + {"0EF(EF", 'F'}, + {"0EF(EK", 'F'}, + {"0EF(EN", 'F'}, + {"0EF(ES", 'F'}, + {"0EF(EV", 'F'}, {"0EF(F(", 'F'}, + {"0EF(N&", 'F'}, {"0EF(N)", 'F'}, {"0EF(N,", 'F'}, {"0EF(NO", 'F'}, {"0EF(O)", 'F'}, + {"0EF(S&", 'F'}, {"0EF(S)", 'F'}, {"0EF(S,", 'F'}, {"0EF(SO", 'F'}, + {"0EF(T(", 'F'}, + {"0EF(V&", 'F'}, {"0EF(V)", 'F'}, {"0EF(V,", 'F'}, {"0EF(VO", 'F'}, - {"0EK(((", 'F'}, - {"0EK((1", 'F'}, - {"0EK((E", 'F'}, - {"0EK((F", 'F'}, - {"0EK((N", 'F'}, - {"0EK((S", 'F'}, - {"0EK((V", 'F'}, + {"0EK(1&", 'F'}, {"0EK(1(", 'F'}, {"0EK(1)", 'F'}, {"0EK(1,", 'F'}, @@ -2472,14 +2311,17 @@ static const keyword_t sql_keywords[] = { {"0EK(EK", 'F'}, {"0EK(EN", 'F'}, {"0EK(ES", 'F'}, + {"0EK(ET", 'F'}, {"0EK(EV", 'F'}, {"0EK(F(", 'F'}, + {"0EK(N&", 'F'}, {"0EK(N(", 'F'}, {"0EK(N)", 'F'}, {"0EK(N,", 'F'}, {"0EK(N1", 'F'}, {"0EK(NF", 'F'}, {"0EK(NO", 'F'}, + {"0EK(S&", 'F'}, {"0EK(S(", 'F'}, {"0EK(S)", 'F'}, {"0EK(S,", 'F'}, @@ -2487,6 +2329,8 @@ static const keyword_t sql_keywords[] = { {"0EK(SF", 'F'}, {"0EK(SO", 'F'}, {"0EK(SV", 'F'}, + {"0EK(T(", 'F'}, + {"0EK(V&", 'F'}, {"0EK(V(", 'F'}, {"0EK(V)", 'F'}, {"0EK(V,", 'F'}, @@ -2494,8 +2338,13 @@ static const keyword_t sql_keywords[] = { {"0EK(VO", 'F'}, {"0EK(VS", 'F'}, {"0EK1&(", 'F'}, + {"0EK1&1", 'F'}, + {"0EK1&F", 'F'}, + {"0EK1&N", 'F'}, + {"0EK1&S", 'F'}, + {"0EK1&V", 'F'}, {"0EK1)", 'F'}, - {"0EK1))", 'F'}, + {"0EK1)&", 'F'}, {"0EK1);", 'F'}, {"0EK1)C", 'F'}, {"0EK1)K", 'F'}, @@ -2504,6 +2353,13 @@ static const keyword_t sql_keywords[] = { {"0EK1,(", 'F'}, {"0EK1,F", 'F'}, {"0EK1,V", 'F'}, + {"0EK1;(", 'F'}, + {"0EK1B(", 'F'}, + {"0EK1B1", 'F'}, + {"0EK1BF", 'F'}, + {"0EK1BN", 'F'}, + {"0EK1BS", 'F'}, + {"0EK1BV", 'F'}, {"0EK1F(", 'F'}, {"0EK1K(", 'F'}, {"0EK1K1", 'F'}, @@ -2512,11 +2368,11 @@ static const keyword_t sql_keywords[] = { {"0EK1KS", 'F'}, {"0EK1KV", 'F'}, {"0EK1N", 'F'}, + {"0EK1N)", 'F'}, {"0EK1N;", 'F'}, {"0EK1NC", 'F'}, {"0EK1NF", 'F'}, {"0EK1NK", 'F'}, - {"0EK1NO", 'F'}, {"0EK1O(", 'F'}, {"0EK1OF", 'F'}, {"0EK1OS", 'F'}, @@ -2526,31 +2382,37 @@ static const keyword_t sql_keywords[] = { {"0EK1SC", 'F'}, {"0EK1SF", 'F'}, {"0EK1SK", 'F'}, + {"0EK1U(", 'F'}, + {"0EK1UE", 'F'}, {"0EK1V", 'F'}, {"0EK1V;", 'F'}, {"0EK1VC", 'F'}, {"0EK1VF", 'F'}, {"0EK1VK", 'F'}, {"0EK1VO", 'F'}, - {"0EKE((", 'F'}, {"0EKE(F", 'F'}, {"0EKEK(", 'F'}, - {"0EKF((", 'F'}, {"0EKF()", 'F'}, {"0EKF(1", 'F'}, + {"0EKF(E", 'F'}, {"0EKF(F", 'F'}, {"0EKF(N", 'F'}, {"0EKF(O", 'F'}, {"0EKF(S", 'F'}, + {"0EKF(T", 'F'}, {"0EKF(V", 'F'}, {"0EKN&(", 'F'}, - {"0EKN((", 'F'}, + {"0EKN&1", 'F'}, + {"0EKN&F", 'F'}, + {"0EKN&N", 'F'}, + {"0EKN&S", 'F'}, + {"0EKN&V", 'F'}, {"0EKN(1", 'F'}, {"0EKN(F", 'F'}, {"0EKN(S", 'F'}, {"0EKN(V", 'F'}, {"0EKN)", 'F'}, - {"0EKN))", 'F'}, + {"0EKN)&", 'F'}, {"0EKN);", 'F'}, {"0EKN)C", 'F'}, {"0EKN)K", 'F'}, @@ -2565,6 +2427,13 @@ static const keyword_t sql_keywords[] = { {"0EKN1F", 'F'}, {"0EKN1K", 'F'}, {"0EKN1O", 'F'}, + {"0EKN;(", 'F'}, + {"0EKNB(", 'F'}, + {"0EKNB1", 'F'}, + {"0EKNBF", 'F'}, + {"0EKNBN", 'F'}, + {"0EKNBS", 'F'}, + {"0EKNBV", 'F'}, {"0EKNF(", 'F'}, {"0EKNK(", 'F'}, {"0EKNK1", 'F'}, @@ -2572,16 +2441,23 @@ static const keyword_t sql_keywords[] = { {"0EKNKN", 'F'}, {"0EKNKS", 'F'}, {"0EKNKV", 'F'}, - {"0EKO((", 'F'}, + {"0EKNU(", 'F'}, + {"0EKNUE", 'F'}, {"0EKO(1", 'F'}, {"0EKO(F", 'F'}, {"0EKO(N", 'F'}, {"0EKO(S", 'F'}, {"0EKO(V", 'F'}, {"0EKOK(", 'F'}, + {"0EKOKN", 'F'}, {"0EKS&(", 'F'}, + {"0EKS&1", 'F'}, + {"0EKS&F", 'F'}, + {"0EKS&N", 'F'}, + {"0EKS&S", 'F'}, + {"0EKS&V", 'F'}, {"0EKS)", 'F'}, - {"0EKS))", 'F'}, + {"0EKS)&", 'F'}, {"0EKS);", 'F'}, {"0EKS)C", 'F'}, {"0EKS)K", 'F'}, @@ -2596,6 +2472,13 @@ static const keyword_t sql_keywords[] = { {"0EKS1F", 'F'}, {"0EKS1K", 'F'}, {"0EKS1O", 'F'}, + {"0EKS;(", 'F'}, + {"0EKSB(", 'F'}, + {"0EKSB1", 'F'}, + {"0EKSBF", 'F'}, + {"0EKSBN", 'F'}, + {"0EKSBS", 'F'}, + {"0EKSBV", 'F'}, {"0EKSF(", 'F'}, {"0EKSK(", 'F'}, {"0EKSK1", 'F'}, @@ -2609,15 +2492,29 @@ static const keyword_t sql_keywords[] = { {"0EKSON", 'F'}, {"0EKSOS", 'F'}, {"0EKSOV", 'F'}, + {"0EKSU(", 'F'}, + {"0EKSUE", 'F'}, {"0EKSV", 'F'}, {"0EKSV;", 'F'}, {"0EKSVC", 'F'}, {"0EKSVF", 'F'}, {"0EKSVK", 'F'}, {"0EKSVO", 'F'}, + {"0EKT(1", 'F'}, + {"0EKT(E", 'F'}, + {"0EKT(F", 'F'}, + {"0EKT(N", 'F'}, + {"0EKT(S", 'F'}, + {"0EKT(T", 'F'}, + {"0EKT(V", 'F'}, {"0EKV&(", 'F'}, + {"0EKV&1", 'F'}, + {"0EKV&F", 'F'}, + {"0EKV&N", 'F'}, + {"0EKV&S", 'F'}, + {"0EKV&V", 'F'}, {"0EKV)", 'F'}, - {"0EKV))", 'F'}, + {"0EKV)&", 'F'}, {"0EKV);", 'F'}, {"0EKV)C", 'F'}, {"0EKV)K", 'F'}, @@ -2629,6 +2526,13 @@ static const keyword_t sql_keywords[] = { {"0EKV,N", 'F'}, {"0EKV,S", 'F'}, {"0EKV,V", 'F'}, + {"0EKV;(", 'F'}, + {"0EKVB(", 'F'}, + {"0EKVB1", 'F'}, + {"0EKVBF", 'F'}, + {"0EKVBN", 'F'}, + {"0EKVBS", 'F'}, + {"0EKVBV", 'F'}, {"0EKVF(", 'F'}, {"0EKVK(", 'F'}, {"0EKVK1", 'F'}, @@ -2645,14 +2549,23 @@ static const keyword_t sql_keywords[] = { {"0EKVSF", 'F'}, {"0EKVSK", 'F'}, {"0EKVSO", 'F'}, - {"0EN&((", 'F'}, + {"0EKVU(", 'F'}, + {"0EKVUE", 'F'}, + {"0EN&(1", 'F'}, {"0EN&(E", 'F'}, - {"0EN(((", 'F'}, - {"0EN((1", 'F'}, - {"0EN((F", 'F'}, - {"0EN((N", 'F'}, - {"0EN((S", 'F'}, - {"0EN((V", 'F'}, + {"0EN&(F", 'F'}, + {"0EN&(N", 'F'}, + {"0EN&(S", 'F'}, + {"0EN&(V", 'F'}, + {"0EN&1)", 'F'}, + {"0EN&1O", 'F'}, + {"0EN&F(", 'F'}, + {"0EN&N)", 'F'}, + {"0EN&NO", 'F'}, + {"0EN&S)", 'F'}, + {"0EN&SO", 'F'}, + {"0EN&V)", 'F'}, + {"0EN&VO", 'F'}, {"0EN(1O", 'F'}, {"0EN(F(", 'F'}, {"0EN(S)", 'F'}, @@ -2660,20 +2573,17 @@ static const keyword_t sql_keywords[] = { {"0EN(V)", 'F'}, {"0EN(VO", 'F'}, {"0EN)", 'F'}, - {"0EN))", 'F'}, - {"0EN)))", 'F'}, - {"0EN))1", 'F'}, - {"0EN));", 'F'}, - {"0EN))C", 'F'}, - {"0EN))F", 'F'}, - {"0EN))K", 'F'}, - {"0EN))N", 'F'}, - {"0EN))O", 'F'}, - {"0EN))S", 'F'}, - {"0EN))U", 'F'}, - {"0EN))V", 'F'}, + {"0EN)&(", 'F'}, + {"0EN)&1", 'F'}, + {"0EN)&F", 'F'}, + {"0EN)&N", 'F'}, + {"0EN)&S", 'F'}, + {"0EN)&V", 'F'}, {"0EN);", 'F'}, + {"0EN);(", 'F'}, {"0EN);C", 'F'}, + {"0EN);E", 'F'}, + {"0EN);T", 'F'}, {"0EN)C", 'F'}, {"0EN)KN", 'F'}, {"0EN)O(", 'F'}, @@ -2683,7 +2593,6 @@ static const keyword_t sql_keywords[] = { {"0EN)OS", 'F'}, {"0EN)OV", 'F'}, {"0EN)UE", 'F'}, - {"0EN,((", 'F'}, {"0EN,(1", 'F'}, {"0EN,(F", 'F'}, {"0EN,(N", 'F'}, @@ -2700,14 +2609,27 @@ static const keyword_t sql_keywords[] = { {"0EN1OF", 'F'}, {"0EN1OS", 'F'}, {"0EN1OV", 'F'}, - {"0ENF((", 'F'}, + {"0EN;(E", 'F'}, + {"0ENB(1", 'F'}, + {"0ENB(F", 'F'}, + {"0ENB(N", 'F'}, + {"0ENB(S", 'F'}, + {"0ENB(V", 'F'}, + {"0ENB1)", 'F'}, + {"0ENB1O", 'F'}, + {"0ENBF(", 'F'}, + {"0ENBN)", 'F'}, + {"0ENBNO", 'F'}, + {"0ENBS)", 'F'}, + {"0ENBSO", 'F'}, + {"0ENBV)", 'F'}, + {"0ENBVO", 'F'}, {"0ENF()", 'F'}, {"0ENF(1", 'F'}, {"0ENF(F", 'F'}, {"0ENF(N", 'F'}, {"0ENF(S", 'F'}, {"0ENF(V", 'F'}, - {"0ENK((", 'F'}, {"0ENK(1", 'F'}, {"0ENK(E", 'F'}, {"0ENK(F", 'F'}, @@ -2724,18 +2646,19 @@ static const keyword_t sql_keywords[] = { {"0ENKNB", 'F'}, {"0ENKNC", 'F'}, {"0ENKNK", 'F'}, + {"0ENKNU", 'F'}, {"0ENKS)", 'F'}, {"0ENKSK", 'F'}, {"0ENKSO", 'F'}, {"0ENKV)", 'F'}, {"0ENKVK", 'F'}, {"0ENKVO", 'F'}, - {"0ENO((", 'F'}, {"0ENO(1", 'F'}, {"0ENO(E", 'F'}, {"0ENO(F", 'F'}, {"0ENO(N", 'F'}, {"0ENO(S", 'F'}, + {"0ENO(T", 'F'}, {"0ENO(V", 'F'}, {"0ENOF(", 'F'}, {"0ENOS&", 'F'}, @@ -2743,24 +2666,32 @@ static const keyword_t sql_keywords[] = { {"0ENOS)", 'F'}, {"0ENOS,", 'F'}, {"0ENOS1", 'F'}, + {"0ENOS;", 'F'}, + {"0ENOSB", 'F'}, {"0ENOSF", 'F'}, {"0ENOSK", 'F'}, {"0ENOSO", 'F'}, + {"0ENOSU", 'F'}, {"0ENOSV", 'F'}, {"0ENOV&", 'F'}, {"0ENOV(", 'F'}, {"0ENOV)", 'F'}, {"0ENOV,", 'F'}, + {"0ENOV;", 'F'}, + {"0ENOVB", 'F'}, {"0ENOVF", 'F'}, {"0ENOVK", 'F'}, {"0ENOVO", 'F'}, {"0ENOVS", 'F'}, - {"0EO(((", 'F'}, - {"0EO((1", 'F'}, - {"0EO((F", 'F'}, - {"0EO((N", 'F'}, - {"0EO((S", 'F'}, - {"0EO((V", 'F'}, + {"0ENOVU", 'F'}, + {"0ENU(E", 'F'}, + {"0ENUE(", 'F'}, + {"0ENUE1", 'F'}, + {"0ENUEF", 'F'}, + {"0ENUEK", 'F'}, + {"0ENUEN", 'F'}, + {"0ENUES", 'F'}, + {"0ENUEV", 'F'}, {"0EO(1,", 'F'}, {"0EO(1O", 'F'}, {"0EO(F(", 'F'}, @@ -2770,25 +2701,35 @@ static const keyword_t sql_keywords[] = { {"0EO(SO", 'F'}, {"0EO(V,", 'F'}, {"0EO(VO", 'F'}, - {"0EOK((", 'F'}, {"0EOK(E", 'F'}, - {"0ES&((", 'F'}, + {"0EOKNK", 'F'}, + {"0ES&(1", 'F'}, {"0ES&(E", 'F'}, + {"0ES&(F", 'F'}, + {"0ES&(N", 'F'}, + {"0ES&(S", 'F'}, + {"0ES&(V", 'F'}, + {"0ES&1)", 'F'}, + {"0ES&1O", 'F'}, + {"0ES&F(", 'F'}, + {"0ES&N)", 'F'}, + {"0ES&NO", 'F'}, + {"0ES&S)", 'F'}, + {"0ES&SO", 'F'}, + {"0ES&V)", 'F'}, + {"0ES&VO", 'F'}, {"0ES)", 'F'}, - {"0ES))", 'F'}, - {"0ES)))", 'F'}, - {"0ES))1", 'F'}, - {"0ES));", 'F'}, - {"0ES))C", 'F'}, - {"0ES))F", 'F'}, - {"0ES))K", 'F'}, - {"0ES))N", 'F'}, - {"0ES))O", 'F'}, - {"0ES))S", 'F'}, - {"0ES))U", 'F'}, - {"0ES))V", 'F'}, + {"0ES)&(", 'F'}, + {"0ES)&1", 'F'}, + {"0ES)&F", 'F'}, + {"0ES)&N", 'F'}, + {"0ES)&S", 'F'}, + {"0ES)&V", 'F'}, {"0ES);", 'F'}, + {"0ES);(", 'F'}, {"0ES);C", 'F'}, + {"0ES);E", 'F'}, + {"0ES);T", 'F'}, {"0ES)C", 'F'}, {"0ES)KN", 'F'}, {"0ES)O(", 'F'}, @@ -2798,7 +2739,6 @@ static const keyword_t sql_keywords[] = { {"0ES)OS", 'F'}, {"0ES)OV", 'F'}, {"0ES)UE", 'F'}, - {"0ES,((", 'F'}, {"0ES,(1", 'F'}, {"0ES,(F", 'F'}, {"0ES,(N", 'F'}, @@ -2816,14 +2756,27 @@ static const keyword_t sql_keywords[] = { {"0ES1OF", 'F'}, {"0ES1OS", 'F'}, {"0ES1OV", 'F'}, - {"0ESF((", 'F'}, + {"0ES;(E", 'F'}, + {"0ESB(1", 'F'}, + {"0ESB(F", 'F'}, + {"0ESB(N", 'F'}, + {"0ESB(S", 'F'}, + {"0ESB(V", 'F'}, + {"0ESB1)", 'F'}, + {"0ESB1O", 'F'}, + {"0ESBF(", 'F'}, + {"0ESBN)", 'F'}, + {"0ESBNO", 'F'}, + {"0ESBS)", 'F'}, + {"0ESBSO", 'F'}, + {"0ESBV)", 'F'}, + {"0ESBVO", 'F'}, {"0ESF()", 'F'}, {"0ESF(1", 'F'}, {"0ESF(F", 'F'}, {"0ESF(N", 'F'}, {"0ESF(S", 'F'}, {"0ESF(V", 'F'}, - {"0ESK((", 'F'}, {"0ESK(1", 'F'}, {"0ESK(E", 'F'}, {"0ESK(F", 'F'}, @@ -2839,28 +2792,32 @@ static const keyword_t sql_keywords[] = { {"0ESKN;", 'F'}, {"0ESKNC", 'F'}, {"0ESKNK", 'F'}, + {"0ESKNU", 'F'}, {"0ESKS)", 'F'}, {"0ESKSK", 'F'}, {"0ESKSO", 'F'}, {"0ESKV)", 'F'}, {"0ESKVK", 'F'}, {"0ESKVO", 'F'}, - {"0ESO((", 'F'}, {"0ESO(1", 'F'}, {"0ESO(E", 'F'}, {"0ESO(F", 'F'}, {"0ESO(N", 'F'}, {"0ESO(S", 'F'}, + {"0ESO(T", 'F'}, {"0ESO(V", 'F'}, {"0ESO1&", 'F'}, {"0ESO1(", 'F'}, {"0ESO1)", 'F'}, {"0ESO1,", 'F'}, + {"0ESO1;", 'F'}, + {"0ESO1B", 'F'}, {"0ESO1F", 'F'}, {"0ESO1K", 'F'}, {"0ESO1N", 'F'}, {"0ESO1O", 'F'}, {"0ESO1S", 'F'}, + {"0ESO1U", 'F'}, {"0ESO1V", 'F'}, {"0ESOF(", 'F'}, {"0ESON&", 'F'}, @@ -2868,26 +2825,43 @@ static const keyword_t sql_keywords[] = { {"0ESON)", 'F'}, {"0ESON,", 'F'}, {"0ESON1", 'F'}, + {"0ESON;", 'F'}, + {"0ESONB", 'F'}, {"0ESONF", 'F'}, {"0ESONK", 'F'}, {"0ESONO", 'F'}, + {"0ESONU", 'F'}, {"0ESOS&", 'F'}, {"0ESOS(", 'F'}, {"0ESOS)", 'F'}, {"0ESOS,", 'F'}, {"0ESOS1", 'F'}, + {"0ESOS;", 'F'}, + {"0ESOSB", 'F'}, {"0ESOSF", 'F'}, {"0ESOSK", 'F'}, {"0ESOSO", 'F'}, + {"0ESOSU", 'F'}, {"0ESOSV", 'F'}, {"0ESOV&", 'F'}, {"0ESOV(", 'F'}, {"0ESOV)", 'F'}, {"0ESOV,", 'F'}, + {"0ESOV;", 'F'}, + {"0ESOVB", 'F'}, {"0ESOVF", 'F'}, {"0ESOVK", 'F'}, {"0ESOVO", 'F'}, {"0ESOVS", 'F'}, + {"0ESOVU", 'F'}, + {"0ESU(E", 'F'}, + {"0ESUE(", 'F'}, + {"0ESUE1", 'F'}, + {"0ESUEF", 'F'}, + {"0ESUEK", 'F'}, + {"0ESUEN", 'F'}, + {"0ESUES", 'F'}, + {"0ESUEV", 'F'}, {"0ESV", 'F'}, {"0ESV;", 'F'}, {"0ESV;C", 'F'}, @@ -2895,23 +2869,54 @@ static const keyword_t sql_keywords[] = { {"0ESVO(", 'F'}, {"0ESVOF", 'F'}, {"0ESVOS", 'F'}, - {"0EV&((", 'F'}, + {"0ET(1&", 'F'}, + {"0ET(1)", 'F'}, + {"0ET(1O", 'F'}, + {"0ET(E(", 'F'}, + {"0ET(E1", 'F'}, + {"0ET(EF", 'F'}, + {"0ET(EK", 'F'}, + {"0ET(EN", 'F'}, + {"0ET(ES", 'F'}, + {"0ET(EV", 'F'}, + {"0ET(F(", 'F'}, + {"0ET(N&", 'F'}, + {"0ET(N)", 'F'}, + {"0ET(NO", 'F'}, + {"0ET(S&", 'F'}, + {"0ET(S)", 'F'}, + {"0ET(SO", 'F'}, + {"0ET(T(", 'F'}, + {"0ET(V&", 'F'}, + {"0ET(V)", 'F'}, + {"0ET(VO", 'F'}, + {"0EV&(1", 'F'}, {"0EV&(E", 'F'}, + {"0EV&(F", 'F'}, + {"0EV&(N", 'F'}, + {"0EV&(S", 'F'}, + {"0EV&(V", 'F'}, + {"0EV&1)", 'F'}, + {"0EV&1O", 'F'}, + {"0EV&F(", 'F'}, + {"0EV&N)", 'F'}, + {"0EV&NO", 'F'}, + {"0EV&S)", 'F'}, + {"0EV&SO", 'F'}, + {"0EV&V)", 'F'}, + {"0EV&VO", 'F'}, {"0EV)", 'F'}, - {"0EV))", 'F'}, - {"0EV)))", 'F'}, - {"0EV))1", 'F'}, - {"0EV));", 'F'}, - {"0EV))C", 'F'}, - {"0EV))F", 'F'}, - {"0EV))K", 'F'}, - {"0EV))N", 'F'}, - {"0EV))O", 'F'}, - {"0EV))S", 'F'}, - {"0EV))U", 'F'}, - {"0EV))V", 'F'}, + {"0EV)&(", 'F'}, + {"0EV)&1", 'F'}, + {"0EV)&F", 'F'}, + {"0EV)&N", 'F'}, + {"0EV)&S", 'F'}, + {"0EV)&V", 'F'}, {"0EV);", 'F'}, + {"0EV);(", 'F'}, {"0EV);C", 'F'}, + {"0EV);E", 'F'}, + {"0EV);T", 'F'}, {"0EV)C", 'F'}, {"0EV)KN", 'F'}, {"0EV)O(", 'F'}, @@ -2921,7 +2926,6 @@ static const keyword_t sql_keywords[] = { {"0EV)OS", 'F'}, {"0EV)OV", 'F'}, {"0EV)UE", 'F'}, - {"0EV,((", 'F'}, {"0EV,(1", 'F'}, {"0EV,(F", 'F'}, {"0EV,(N", 'F'}, @@ -2940,14 +2944,27 @@ static const keyword_t sql_keywords[] = { {"0EV,V,", 'F'}, {"0EV,VK", 'F'}, {"0EV,VO", 'F'}, - {"0EVF((", 'F'}, + {"0EV;(E", 'F'}, + {"0EVB(1", 'F'}, + {"0EVB(F", 'F'}, + {"0EVB(N", 'F'}, + {"0EVB(S", 'F'}, + {"0EVB(V", 'F'}, + {"0EVB1)", 'F'}, + {"0EVB1O", 'F'}, + {"0EVBF(", 'F'}, + {"0EVBN)", 'F'}, + {"0EVBNO", 'F'}, + {"0EVBS)", 'F'}, + {"0EVBSO", 'F'}, + {"0EVBV)", 'F'}, + {"0EVBVO", 'F'}, {"0EVF()", 'F'}, {"0EVF(1", 'F'}, {"0EVF(F", 'F'}, {"0EVF(N", 'F'}, {"0EVF(S", 'F'}, {"0EVF(V", 'F'}, - {"0EVK((", 'F'}, {"0EVK(1", 'F'}, {"0EVK(E", 'F'}, {"0EVK(F", 'F'}, @@ -2963,6 +2980,7 @@ static const keyword_t sql_keywords[] = { {"0EVKN;", 'F'}, {"0EVKNC", 'F'}, {"0EVKNK", 'F'}, + {"0EVKNU", 'F'}, {"0EVKS)", 'F'}, {"0EVKSK", 'F'}, {"0EVKSO", 'F'}, @@ -2970,6 +2988,7 @@ static const keyword_t sql_keywords[] = { {"0EVKVK", 'F'}, {"0EVKVO", 'F'}, {"0EVN", 'F'}, + {"0EVN)U", 'F'}, {"0EVN;", 'F'}, {"0EVN;C", 'F'}, {"0EVNC", 'F'}, @@ -2978,12 +2997,12 @@ static const keyword_t sql_keywords[] = { {"0EVNOF", 'F'}, {"0EVNOS", 'F'}, {"0EVNOV", 'F'}, - {"0EVO((", 'F'}, {"0EVO(1", 'F'}, {"0EVO(E", 'F'}, {"0EVO(F", 'F'}, {"0EVO(N", 'F'}, {"0EVO(S", 'F'}, + {"0EVO(T", 'F'}, {"0EVO(V", 'F'}, {"0EVOF(", 'F'}, {"0EVOS&", 'F'}, @@ -2991,9 +3010,12 @@ static const keyword_t sql_keywords[] = { {"0EVOS)", 'F'}, {"0EVOS,", 'F'}, {"0EVOS1", 'F'}, + {"0EVOS;", 'F'}, + {"0EVOSB", 'F'}, {"0EVOSF", 'F'}, {"0EVOSK", 'F'}, {"0EVOSO", 'F'}, + {"0EVOSU", 'F'}, {"0EVOSV", 'F'}, {"0EVS", 'F'}, {"0EVS;", 'F'}, @@ -3005,56 +3027,14 @@ static const keyword_t sql_keywords[] = { {"0EVSON", 'F'}, {"0EVSOS", 'F'}, {"0EVSOV", 'F'}, - {"0F((((", 'F'}, - {"0F((()", 'F'}, - {"0F(((1", 'F'}, - {"0F(((E", 'F'}, - {"0F(((F", 'F'}, - {"0F(((K", 'F'}, - {"0F(((N", 'F'}, - {"0F(((S", 'F'}, - {"0F(((T", 'F'}, - {"0F(((V", 'F'}, - {"0F(()&", 'F'}, - {"0F(())", 'F'}, - {"0F((),", 'F'}, - {"0F(()1", 'F'}, - {"0F(();", 'F'}, - {"0F(()A", 'F'}, - {"0F(()B", 'F'}, - {"0F(()C", 'F'}, - {"0F(()E", 'F'}, - {"0F(()F", 'F'}, - {"0F(()K", 'F'}, - {"0F(()N", 'F'}, - {"0F(()O", 'F'}, - {"0F(()S", 'F'}, - {"0F(()U", 'F'}, - {"0F(()V", 'F'}, - {"0F((1)", 'F'}, - {"0F((1,", 'F'}, - {"0F((1O", 'F'}, - {"0F((E(", 'F'}, - {"0F((E1", 'F'}, - {"0F((EF", 'F'}, - {"0F((EK", 'F'}, - {"0F((EN", 'F'}, - {"0F((ES", 'F'}, - {"0F((EV", 'F'}, - {"0F((F(", 'F'}, - {"0F((K(", 'F'}, - {"0F((K,", 'F'}, - {"0F((N)", 'F'}, - {"0F((N,", 'F'}, - {"0F((NO", 'F'}, - {"0F((S)", 'F'}, - {"0F((S,", 'F'}, - {"0F((SO", 'F'}, - {"0F((T)", 'F'}, - {"0F((T,", 'F'}, - {"0F((V)", 'F'}, - {"0F((V,", 'F'}, - {"0F((VO", 'F'}, + {"0EVU(E", 'F'}, + {"0EVUE(", 'F'}, + {"0EVUE1", 'F'}, + {"0EVUEF", 'F'}, + {"0EVUEK", 'F'}, + {"0EVUEN", 'F'}, + {"0EVUES", 'F'}, + {"0EVUEV", 'F'}, {"0F()&(", 'F'}, {"0F()&1", 'F'}, {"0F()&E", 'F'}, @@ -3062,23 +3042,8 @@ static const keyword_t sql_keywords[] = { {"0F()&K", 'F'}, {"0F()&N", 'F'}, {"0F()&S", 'F'}, + {"0F()&T", 'F'}, {"0F()&V", 'F'}, - {"0F())&", 'F'}, - {"0F()))", 'F'}, - {"0F()),", 'F'}, - {"0F())1", 'F'}, - {"0F());", 'F'}, - {"0F())A", 'F'}, - {"0F())B", 'F'}, - {"0F())C", 'F'}, - {"0F())E", 'F'}, - {"0F())F", 'F'}, - {"0F())K", 'F'}, - {"0F())N", 'F'}, - {"0F())O", 'F'}, - {"0F())S", 'F'}, - {"0F())U", 'F'}, - {"0F())V", 'F'}, {"0F(),(", 'F'}, {"0F(),1", 'F'}, {"0F(),F", 'F'}, @@ -3168,9 +3133,14 @@ static const keyword_t sql_keywords[] = { {"0F()VO", 'F'}, {"0F()VS", 'F'}, {"0F()VU", 'F'}, + {"0F(1&(", 'F'}, + {"0F(1&1", 'F'}, + {"0F(1&F", 'F'}, + {"0F(1&N", 'F'}, + {"0F(1&S", 'F'}, + {"0F(1&V", 'F'}, {"0F(1)", 'F'}, {"0F(1)&", 'F'}, - {"0F(1))", 'F'}, {"0F(1),", 'F'}, {"0F(1)1", 'F'}, {"0F(1);", 'F'}, @@ -3192,12 +3162,15 @@ static const keyword_t sql_keywords[] = { {"0F(1OF", 'F'}, {"0F(1OS", 'F'}, {"0F(1OV", 'F'}, - {"0F(E((", 'F'}, {"0F(E(1", 'F'}, + {"0F(E(E", 'F'}, {"0F(E(F", 'F'}, {"0F(E(N", 'F'}, {"0F(E(S", 'F'}, {"0F(E(V", 'F'}, + {"0F(E1&", 'F'}, + {"0F(E1)", 'F'}, + {"0F(E1K", 'F'}, {"0F(E1O", 'F'}, {"0F(EF(", 'F'}, {"0F(EK(", 'F'}, @@ -3205,24 +3178,40 @@ static const keyword_t sql_keywords[] = { {"0F(EKF", 'F'}, {"0F(EKN", 'F'}, {"0F(EKS", 'F'}, + {"0F(EKT", 'F'}, {"0F(EKV", 'F'}, + {"0F(EN&", 'F'}, + {"0F(EN)", 'F'}, + {"0F(ENK", 'F'}, {"0F(ENO", 'F'}, + {"0F(ES&", 'F'}, + {"0F(ES)", 'F'}, + {"0F(ESK", 'F'}, {"0F(ESO", 'F'}, + {"0F(ET(", 'F'}, + {"0F(EV&", 'F'}, + {"0F(EV)", 'F'}, + {"0F(EVK", 'F'}, {"0F(EVO", 'F'}, - {"0F(F((", 'F'}, {"0F(F()", 'F'}, {"0F(F(1", 'F'}, + {"0F(F(E", 'F'}, {"0F(F(F", 'F'}, {"0F(F(N", 'F'}, {"0F(F(S", 'F'}, + {"0F(F(T", 'F'}, {"0F(F(V", 'F'}, - {"0F(K((", 'F'}, {"0F(K()", 'F'}, {"0F(K,(", 'F'}, {"0F(K,F", 'F'}, + {"0F(N&(", 'F'}, + {"0F(N&1", 'F'}, + {"0F(N&F", 'F'}, + {"0F(N&N", 'F'}, + {"0F(N&S", 'F'}, + {"0F(N&V", 'F'}, {"0F(N)", 'F'}, {"0F(N)&", 'F'}, - {"0F(N))", 'F'}, {"0F(N),", 'F'}, {"0F(N)1", 'F'}, {"0F(N);", 'F'}, @@ -3244,9 +3233,14 @@ static const keyword_t sql_keywords[] = { {"0F(NOF", 'F'}, {"0F(NOS", 'F'}, {"0F(NOV", 'F'}, + {"0F(S&(", 'F'}, + {"0F(S&1", 'F'}, + {"0F(S&F", 'F'}, + {"0F(S&N", 'F'}, + {"0F(S&S", 'F'}, + {"0F(S&V", 'F'}, {"0F(S)", 'F'}, {"0F(S)&", 'F'}, - {"0F(S))", 'F'}, {"0F(S),", 'F'}, {"0F(S)1", 'F'}, {"0F(S);", 'F'}, @@ -3270,7 +3264,13 @@ static const keyword_t sql_keywords[] = { {"0F(SON", 'F'}, {"0F(SOS", 'F'}, {"0F(SOV", 'F'}, - {"0F(T))", 'F'}, + {"0F(T(1", 'F'}, + {"0F(T(E", 'F'}, + {"0F(T(F", 'F'}, + {"0F(T(N", 'F'}, + {"0F(T(S", 'F'}, + {"0F(T(T", 'F'}, + {"0F(T(V", 'F'}, {"0F(T),", 'F'}, {"0F(T,(", 'F'}, {"0F(T,1", 'F'}, @@ -3278,9 +3278,14 @@ static const keyword_t sql_keywords[] = { {"0F(T,N", 'F'}, {"0F(T,S", 'F'}, {"0F(T,V", 'F'}, + {"0F(V&(", 'F'}, + {"0F(V&1", 'F'}, + {"0F(V&F", 'F'}, + {"0F(V&N", 'F'}, + {"0F(V&S", 'F'}, + {"0F(V&V", 'F'}, {"0F(V)", 'F'}, {"0F(V)&", 'F'}, - {"0F(V))", 'F'}, {"0F(V),", 'F'}, {"0F(V)1", 'F'}, {"0F(V);", 'F'}, @@ -3304,22 +3309,6 @@ static const keyword_t sql_keywords[] = { {"0F(VO(", 'F'}, {"0F(VOF", 'F'}, {"0F(VOS", 'F'}, - {"0K((((", 'F'}, - {"0K(((1", 'F'}, - {"0K(((F", 'F'}, - {"0K(((N", 'F'}, - {"0K(((S", 'F'}, - {"0K(((V", 'F'}, - {"0K((1)", 'F'}, - {"0K((1O", 'F'}, - {"0K((F(", 'F'}, - {"0K((N)", 'F'}, - {"0K((NO", 'F'}, - {"0K((S)", 'F'}, - {"0K((SO", 'F'}, - {"0K((V)", 'F'}, - {"0K((VO", 'F'}, - {"0K(1))", 'F'}, {"0K(1),", 'F'}, {"0K(1)A", 'F'}, {"0K(1)K", 'F'}, @@ -3328,14 +3317,12 @@ static const keyword_t sql_keywords[] = { {"0K(1OF", 'F'}, {"0K(1OS", 'F'}, {"0K(1OV", 'F'}, - {"0K(F((", 'F'}, {"0K(F()", 'F'}, {"0K(F(1", 'F'}, {"0K(F(F", 'F'}, {"0K(F(N", 'F'}, {"0K(F(S", 'F'}, {"0K(F(V", 'F'}, - {"0K(N))", 'F'}, {"0K(N),", 'F'}, {"0K(N)A", 'F'}, {"0K(N)K", 'F'}, @@ -3344,7 +3331,6 @@ static const keyword_t sql_keywords[] = { {"0K(NOF", 'F'}, {"0K(NOS", 'F'}, {"0K(NOV", 'F'}, - {"0K(S))", 'F'}, {"0K(S),", 'F'}, {"0K(S)A", 'F'}, {"0K(S)K", 'F'}, @@ -3355,7 +3341,6 @@ static const keyword_t sql_keywords[] = { {"0K(SON", 'F'}, {"0K(SOS", 'F'}, {"0K(SOV", 'F'}, - {"0K(V))", 'F'}, {"0K(V),", 'F'}, {"0K(V)A", 'F'}, {"0K(V)K", 'F'}, @@ -3363,7 +3348,6 @@ static const keyword_t sql_keywords[] = { {"0K(VO(", 'F'}, {"0K(VOF", 'F'}, {"0K(VOS", 'F'}, - {"0K1,((", 'F'}, {"0K1,(1", 'F'}, {"0K1,(F", 'F'}, {"0K1,(N", 'F'}, @@ -3372,7 +3356,6 @@ static const keyword_t sql_keywords[] = { {"0K1,F(", 'F'}, {"0K1,VC", 'F'}, {"0K1,VO", 'F'}, - {"0K1A((", 'F'}, {"0K1A(F", 'F'}, {"0K1A(N", 'F'}, {"0K1A(S", 'F'}, @@ -3381,7 +3364,6 @@ static const keyword_t sql_keywords[] = { {"0K1ASO", 'F'}, {"0K1ATO", 'F'}, {"0K1AVO", 'F'}, - {"0K1K((", 'F'}, {"0K1K(1", 'F'}, {"0K1K(F", 'F'}, {"0K1K(N", 'F'}, @@ -3395,7 +3377,6 @@ static const keyword_t sql_keywords[] = { {"0K1KSU", 'F'}, {"0K1KVO", 'F'}, {"0K1KVU", 'F'}, - {"0K1O((", 'F'}, {"0K1O(1", 'F'}, {"0K1O(F", 'F'}, {"0K1O(N", 'F'}, @@ -3417,14 +3398,6 @@ static const keyword_t sql_keywords[] = { {"0K1OVK", 'F'}, {"0K1OVO", 'F'}, {"0K1OVS", 'F'}, - {"0KF(((", 'F'}, - {"0KF(()", 'F'}, - {"0KF((1", 'F'}, - {"0KF((F", 'F'}, - {"0KF((N", 'F'}, - {"0KF((S", 'F'}, - {"0KF((V", 'F'}, - {"0KF())", 'F'}, {"0KF(),", 'F'}, {"0KF()A", 'F'}, {"0KF()K", 'F'}, @@ -3438,7 +3411,6 @@ static const keyword_t sql_keywords[] = { {"0KF(SO", 'F'}, {"0KF(V)", 'F'}, {"0KF(VO", 'F'}, - {"0KN,((", 'F'}, {"0KN,(1", 'F'}, {"0KN,(F", 'F'}, {"0KN,(N", 'F'}, @@ -3447,7 +3419,6 @@ static const keyword_t sql_keywords[] = { {"0KN,F(", 'F'}, {"0KN,VC", 'F'}, {"0KN,VO", 'F'}, - {"0KNA((", 'F'}, {"0KNA(F", 'F'}, {"0KNA(N", 'F'}, {"0KNA(S", 'F'}, @@ -3456,7 +3427,6 @@ static const keyword_t sql_keywords[] = { {"0KNASO", 'F'}, {"0KNATO", 'F'}, {"0KNAVO", 'F'}, - {"0KNK((", 'F'}, {"0KNK(1", 'F'}, {"0KNK(F", 'F'}, {"0KNK(N", 'F'}, @@ -3470,7 +3440,6 @@ static const keyword_t sql_keywords[] = { {"0KNKSU", 'F'}, {"0KNKVO", 'F'}, {"0KNKVU", 'F'}, - {"0KS,((", 'F'}, {"0KS,(1", 'F'}, {"0KS,(F", 'F'}, {"0KS,(N", 'F'}, @@ -3479,7 +3448,6 @@ static const keyword_t sql_keywords[] = { {"0KS,F(", 'F'}, {"0KS,VC", 'F'}, {"0KS,VO", 'F'}, - {"0KSA((", 'F'}, {"0KSA(F", 'F'}, {"0KSA(N", 'F'}, {"0KSA(S", 'F'}, @@ -3488,7 +3456,6 @@ static const keyword_t sql_keywords[] = { {"0KSASO", 'F'}, {"0KSATO", 'F'}, {"0KSAVO", 'F'}, - {"0KSK((", 'F'}, {"0KSK(1", 'F'}, {"0KSK(F", 'F'}, {"0KSK(N", 'F'}, @@ -3502,7 +3469,6 @@ static const keyword_t sql_keywords[] = { {"0KSKSU", 'F'}, {"0KSKVO", 'F'}, {"0KSKVU", 'F'}, - {"0KSO((", 'F'}, {"0KSO(1", 'F'}, {"0KSO(F", 'F'}, {"0KSO(N", 'F'}, @@ -3540,7 +3506,6 @@ static const keyword_t sql_keywords[] = { {"0KSOVK", 'F'}, {"0KSOVO", 'F'}, {"0KSOVS", 'F'}, - {"0KV,((", 'F'}, {"0KV,(1", 'F'}, {"0KV,(F", 'F'}, {"0KV,(N", 'F'}, @@ -3555,7 +3520,6 @@ static const keyword_t sql_keywords[] = { {"0KV,SO", 'F'}, {"0KV,VC", 'F'}, {"0KV,VO", 'F'}, - {"0KVA((", 'F'}, {"0KVA(F", 'F'}, {"0KVA(N", 'F'}, {"0KVA(S", 'F'}, @@ -3564,7 +3528,6 @@ static const keyword_t sql_keywords[] = { {"0KVASO", 'F'}, {"0KVATO", 'F'}, {"0KVAVO", 'F'}, - {"0KVK((", 'F'}, {"0KVK(1", 'F'}, {"0KVK(F", 'F'}, {"0KVK(N", 'F'}, @@ -3578,7 +3541,6 @@ static const keyword_t sql_keywords[] = { {"0KVKSU", 'F'}, {"0KVKVO", 'F'}, {"0KVKVU", 'F'}, - {"0KVO((", 'F'}, {"0KVO(1", 'F'}, {"0KVO(F", 'F'}, {"0KVO(N", 'F'}, @@ -3593,14 +3555,6 @@ static const keyword_t sql_keywords[] = { {"0KVOSK", 'F'}, {"0KVOSO", 'F'}, {"0KVOSV", 'F'}, - {"0N&(((", 'F'}, - {"0N&((1", 'F'}, - {"0N&((E", 'F'}, - {"0N&((F", 'F'}, - {"0N&((N", 'F'}, - {"0N&((O", 'F'}, - {"0N&((S", 'F'}, - {"0N&((V", 'F'}, {"0N&(1&", 'F'}, {"0N&(1)", 'F'}, {"0N&(1,", 'F'}, @@ -3612,6 +3566,7 @@ static const keyword_t sql_keywords[] = { {"0N&(EN", 'F'}, {"0N&(EO", 'F'}, {"0N&(ES", 'F'}, + {"0N&(ET", 'F'}, {"0N&(EV", 'F'}, {"0N&(F(", 'F'}, {"0N&(N&", 'F'}, @@ -3628,6 +3583,7 @@ static const keyword_t sql_keywords[] = { {"0N&(S)", 'F'}, {"0N&(S,", 'F'}, {"0N&(SO", 'F'}, + {"0N&(T(", 'F'}, {"0N&(V&", 'F'}, {"0N&(V)", 'F'}, {"0N&(V,", 'F'}, @@ -3640,7 +3596,8 @@ static const keyword_t sql_keywords[] = { {"0N&1&S", 'F'}, {"0N&1&V", 'F'}, {"0N&1)&", 'F'}, - {"0N&1))", 'F'}, + {"0N&1)C", 'F'}, + {"0N&1)O", 'F'}, {"0N&1)U", 'F'}, {"0N&1;", 'F'}, {"0N&1;C", 'F'}, @@ -3673,7 +3630,6 @@ static const keyword_t sql_keywords[] = { {"0N&1U;", 'F'}, {"0N&1UC", 'F'}, {"0N&1UE", 'F'}, - {"0N&E((", 'F'}, {"0N&E(1", 'F'}, {"0N&E(F", 'F'}, {"0N&E(N", 'F'}, @@ -3706,12 +3662,13 @@ static const keyword_t sql_keywords[] = { {"0N&EVC", 'F'}, {"0N&EVK", 'F'}, {"0N&EVO", 'F'}, - {"0N&F((", 'F'}, {"0N&F()", 'F'}, {"0N&F(1", 'F'}, + {"0N&F(E", 'F'}, {"0N&F(F", 'F'}, {"0N&F(N", 'F'}, {"0N&F(S", 'F'}, + {"0N&F(T", 'F'}, {"0N&F(V", 'F'}, {"0N&K&(", 'F'}, {"0N&K&1", 'F'}, @@ -3719,7 +3676,6 @@ static const keyword_t sql_keywords[] = { {"0N&K&N", 'F'}, {"0N&K&S", 'F'}, {"0N&K&V", 'F'}, - {"0N&K((", 'F'}, {"0N&K(1", 'F'}, {"0N&K(F", 'F'}, {"0N&K(N", 'F'}, @@ -3743,7 +3699,8 @@ static const keyword_t sql_keywords[] = { {"0N&N&S", 'F'}, {"0N&N&V", 'F'}, {"0N&N)&", 'F'}, - {"0N&N))", 'F'}, + {"0N&N)C", 'F'}, + {"0N&N)O", 'F'}, {"0N&N)U", 'F'}, {"0N&N;C", 'F'}, {"0N&N;E", 'F'}, @@ -3776,7 +3733,8 @@ static const keyword_t sql_keywords[] = { {"0N&S&S", 'F'}, {"0N&S&V", 'F'}, {"0N&S)&", 'F'}, - {"0N&S))", 'F'}, + {"0N&S)C", 'F'}, + {"0N&S)O", 'F'}, {"0N&S)U", 'F'}, {"0N&S1", 'F'}, {"0N&S1;", 'F'}, @@ -3819,6 +3777,12 @@ static const keyword_t sql_keywords[] = { {"0N&SV;", 'F'}, {"0N&SVC", 'F'}, {"0N&SVO", 'F'}, + {"0N&T(1", 'F'}, + {"0N&T(E", 'F'}, + {"0N&T(F", 'F'}, + {"0N&T(N", 'F'}, + {"0N&T(S", 'F'}, + {"0N&T(V", 'F'}, {"0N&V", 'F'}, {"0N&V&(", 'F'}, {"0N&V&1", 'F'}, @@ -3827,7 +3791,8 @@ static const keyword_t sql_keywords[] = { {"0N&V&S", 'F'}, {"0N&V&V", 'F'}, {"0N&V)&", 'F'}, - {"0N&V))", 'F'}, + {"0N&V)C", 'F'}, + {"0N&V)O", 'F'}, {"0N&V)U", 'F'}, {"0N&V;", 'F'}, {"0N&V;C", 'F'}, @@ -3863,27 +3828,6 @@ static const keyword_t sql_keywords[] = { {"0N&VU;", 'F'}, {"0N&VUC", 'F'}, {"0N&VUE", 'F'}, - {"0N((((", 'F'}, - {"0N(((1", 'F'}, - {"0N(((E", 'F'}, - {"0N(((F", 'F'}, - {"0N(((N", 'F'}, - {"0N(((S", 'F'}, - {"0N(((U", 'F'}, - {"0N(((V", 'F'}, - {"0N((1)", 'F'}, - {"0N((1O", 'F'}, - {"0N((EK", 'F'}, - {"0N((EN", 'F'}, - {"0N((F(", 'F'}, - {"0N((N)", 'F'}, - {"0N((NO", 'F'}, - {"0N((S)", 'F'}, - {"0N((SO", 'F'}, - {"0N((U(", 'F'}, - {"0N((V)", 'F'}, - {"0N((VO", 'F'}, - {"0N(1))", 'F'}, {"0N(1)F", 'F'}, {"0N(1)O", 'F'}, {"0N(1)U", 'F'}, @@ -3892,16 +3836,15 @@ static const keyword_t sql_keywords[] = { {"0N(1OF", 'F'}, {"0N(1OS", 'F'}, {"0N(1OV", 'F'}, + {"0N(EF(", 'F'}, {"0N(EKN", 'F'}, {"0N(ENK", 'F'}, - {"0N(F((", 'F'}, {"0N(F()", 'F'}, {"0N(F(1", 'F'}, {"0N(F(F", 'F'}, {"0N(F(N", 'F'}, {"0N(F(S", 'F'}, {"0N(F(V", 'F'}, - {"0N(S))", 'F'}, {"0N(S)1", 'F'}, {"0N(S)F", 'F'}, {"0N(S)N", 'F'}, @@ -3915,9 +3858,7 @@ static const keyword_t sql_keywords[] = { {"0N(SON", 'F'}, {"0N(SOS", 'F'}, {"0N(SOV", 'F'}, - {"0N(U((", 'F'}, {"0N(U(E", 'F'}, - {"0N(V))", 'F'}, {"0N(V)1", 'F'}, {"0N(V)F", 'F'}, {"0N(V)N", 'F'}, @@ -3928,7 +3869,6 @@ static const keyword_t sql_keywords[] = { {"0N(VO(", 'F'}, {"0N(VOF", 'F'}, {"0N(VOS", 'F'}, - {"0N)&((", 'F'}, {"0N)&(1", 'F'}, {"0N)&(E", 'F'}, {"0N)&(F", 'F'}, @@ -3972,54 +3912,6 @@ static const keyword_t sql_keywords[] = { {"0N)&VF", 'F'}, {"0N)&VO", 'F'}, {"0N)&VU", 'F'}, - {"0N))&(", 'F'}, - {"0N))&1", 'F'}, - {"0N))&F", 'F'}, - {"0N))&N", 'F'}, - {"0N))&S", 'F'}, - {"0N))&V", 'F'}, - {"0N)))&", 'F'}, - {"0N))))", 'F'}, - {"0N))),", 'F'}, - {"0N)));", 'F'}, - {"0N)))B", 'F'}, - {"0N)))E", 'F'}, - {"0N)))K", 'F'}, - {"0N)))O", 'F'}, - {"0N)))U", 'F'}, - {"0N)),(", 'F'}, - {"0N));E", 'F'}, - {"0N));T", 'F'}, - {"0N))B(", 'F'}, - {"0N))B1", 'F'}, - {"0N))BF", 'F'}, - {"0N))BN", 'F'}, - {"0N))BS", 'F'}, - {"0N))BV", 'F'}, - {"0N))E(", 'F'}, - {"0N))E1", 'F'}, - {"0N))EF", 'F'}, - {"0N))EK", 'F'}, - {"0N))EN", 'F'}, - {"0N))ES", 'F'}, - {"0N))EV", 'F'}, - {"0N))K(", 'F'}, - {"0N))K1", 'F'}, - {"0N))KB", 'F'}, - {"0N))KF", 'F'}, - {"0N))KN", 'F'}, - {"0N))KS", 'F'}, - {"0N))KU", 'F'}, - {"0N))KV", 'F'}, - {"0N))O(", 'F'}, - {"0N))O1", 'F'}, - {"0N))OF", 'F'}, - {"0N))ON", 'F'}, - {"0N))OS", 'F'}, - {"0N))OV", 'F'}, - {"0N))U(", 'F'}, - {"0N))UE", 'F'}, - {"0N),((", 'F'}, {"0N),(1", 'F'}, {"0N),(F", 'F'}, {"0N),(N", 'F'}, @@ -4041,7 +3933,6 @@ static const keyword_t sql_keywords[] = { {"0N);TO", 'F'}, {"0N);TS", 'F'}, {"0N);TV", 'F'}, - {"0N)B((", 'F'}, {"0N)B(1", 'F'}, {"0N)B(F", 'F'}, {"0N)B(N", 'F'}, @@ -4077,7 +3968,6 @@ static const keyword_t sql_keywords[] = { {"0N)BVK", 'F'}, {"0N)BVO", 'F'}, {"0N)BVU", 'F'}, - {"0N)E((", 'F'}, {"0N)E(1", 'F'}, {"0N)E(F", 'F'}, {"0N)E(N", 'F'}, @@ -4098,7 +3988,6 @@ static const keyword_t sql_keywords[] = { {"0N)ESO", 'F'}, {"0N)EVC", 'F'}, {"0N)EVO", 'F'}, - {"0N)K((", 'F'}, {"0N)K(1", 'F'}, {"0N)K(F", 'F'}, {"0N)K(N", 'F'}, @@ -4136,12 +4025,12 @@ static const keyword_t sql_keywords[] = { {"0N)KVE", 'F'}, {"0N)KVO", 'F'}, {"0N)KVU", 'F'}, - {"0N)O((", 'F'}, {"0N)O(1", 'F'}, {"0N)O(E", 'F'}, {"0N)O(F", 'F'}, {"0N)O(N", 'F'}, {"0N)O(S", 'F'}, + {"0N)O(T", 'F'}, {"0N)O(V", 'F'}, {"0N)O1&", 'F'}, {"0N)O1)", 'F'}, @@ -4179,7 +4068,6 @@ static const keyword_t sql_keywords[] = { {"0N)OVK", 'F'}, {"0N)OVO", 'F'}, {"0N)OVU", 'F'}, - {"0N)U((", 'F'}, {"0N)U(E", 'F'}, {"0N)UE(", 'F'}, {"0N)UE1", 'F'}, @@ -4188,13 +4076,6 @@ static const keyword_t sql_keywords[] = { {"0N)UEN", 'F'}, {"0N)UES", 'F'}, {"0N)UEV", 'F'}, - {"0N,(((", 'F'}, - {"0N,((1", 'F'}, - {"0N,((E", 'F'}, - {"0N,((F", 'F'}, - {"0N,((N", 'F'}, - {"0N,((S", 'F'}, - {"0N,((V", 'F'}, {"0N,(1)", 'F'}, {"0N,(1O", 'F'}, {"0N,(E(", 'F'}, @@ -4210,7 +4091,6 @@ static const keyword_t sql_keywords[] = { {"0N,(SO", 'F'}, {"0N,(V)", 'F'}, {"0N,(VO", 'F'}, - {"0N,F((", 'F'}, {"0N,F()", 'F'}, {"0N,F(1", 'F'}, {"0N,F(F", 'F'}, @@ -4218,7 +4098,6 @@ static const keyword_t sql_keywords[] = { {"0N,F(S", 'F'}, {"0N,F(T", 'F'}, {"0N,F(V", 'F'}, - {"0N,V))", 'F'}, {"0N,V),", 'F'}, {"0N,V)O", 'F'}, {"0N,V,(", 'F'}, @@ -4237,14 +4116,12 @@ static const keyword_t sql_keywords[] = { {"0N,VOF", 'F'}, {"0N,VOS", 'F'}, {"0N,VUE", 'F'}, - {"0N1F((", 'F'}, {"0N1F()", 'F'}, {"0N1F(1", 'F'}, {"0N1F(F", 'F'}, {"0N1F(N", 'F'}, {"0N1F(S", 'F'}, {"0N1F(V", 'F'}, - {"0N1O((", 'F'}, {"0N1O(1", 'F'}, {"0N1O(F", 'F'}, {"0N1O(N", 'F'}, @@ -4275,7 +4152,6 @@ static const keyword_t sql_keywords[] = { {"0N1VO(", 'F'}, {"0N1VOF", 'F'}, {"0N1VOS", 'F'}, - {"0N;E((", 'F'}, {"0N;E(1", 'F'}, {"0N;E(E", 'F'}, {"0N;E(F", 'F'}, @@ -4285,6 +4161,7 @@ static const keyword_t sql_keywords[] = { {"0N;E1,", 'F'}, {"0N;E1;", 'F'}, {"0N;E1C", 'F'}, + {"0N;E1K", 'F'}, {"0N;E1O", 'F'}, {"0N;E1T", 'F'}, {"0N;EF(", 'F'}, @@ -4298,6 +4175,7 @@ static const keyword_t sql_keywords[] = { {"0N;EN,", 'F'}, {"0N;EN;", 'F'}, {"0N;ENC", 'F'}, + {"0N;ENE", 'F'}, {"0N;ENK", 'F'}, {"0N;ENO", 'F'}, {"0N;ENT", 'F'}, @@ -4305,15 +4183,16 @@ static const keyword_t sql_keywords[] = { {"0N;ES,", 'F'}, {"0N;ES;", 'F'}, {"0N;ESC", 'F'}, + {"0N;ESK", 'F'}, {"0N;ESO", 'F'}, {"0N;EST", 'F'}, {"0N;EV,", 'F'}, {"0N;EV;", 'F'}, {"0N;EVC", 'F'}, + {"0N;EVK", 'F'}, {"0N;EVO", 'F'}, {"0N;EVT", 'F'}, {"0N;N:T", 'F'}, - {"0N;T((", 'F'}, {"0N;T(1", 'F'}, {"0N;T(E", 'F'}, {"0N;T(F", 'F'}, @@ -4324,6 +4203,7 @@ static const keyword_t sql_keywords[] = { {"0N;T1;", 'F'}, {"0N;T1C", 'F'}, {"0N;T1F", 'F'}, + {"0N;T1K", 'F'}, {"0N;T1O", 'F'}, {"0N;T1T", 'F'}, {"0N;T;", 'F'}, @@ -4355,6 +4235,7 @@ static const keyword_t sql_keywords[] = { {"0N;TS;", 'F'}, {"0N;TSC", 'F'}, {"0N;TSF", 'F'}, + {"0N;TSK", 'F'}, {"0N;TSO", 'F'}, {"0N;TST", 'F'}, {"0N;TT(", 'F'}, @@ -4367,14 +4248,9 @@ static const keyword_t sql_keywords[] = { {"0N;TV;", 'F'}, {"0N;TVC", 'F'}, {"0N;TVF", 'F'}, + {"0N;TVK", 'F'}, {"0N;TVO", 'F'}, {"0N;TVT", 'F'}, - {"0NA(((", 'F'}, - {"0NA((1", 'F'}, - {"0NA((F", 'F'}, - {"0NA((N", 'F'}, - {"0NA((S", 'F'}, - {"0NA((V", 'F'}, {"0NA(F(", 'F'}, {"0NA(N)", 'F'}, {"0NA(NO", 'F'}, @@ -4382,7 +4258,6 @@ static const keyword_t sql_keywords[] = { {"0NA(SO", 'F'}, {"0NA(V)", 'F'}, {"0NA(VO", 'F'}, - {"0NAF((", 'F'}, {"0NAF()", 'F'}, {"0NAF(1", 'F'}, {"0NAF(F", 'F'}, @@ -4407,12 +4282,6 @@ static const keyword_t sql_keywords[] = { {"0NAVOF", 'F'}, {"0NAVOS", 'F'}, {"0NAVUE", 'F'}, - {"0NB(((", 'F'}, - {"0NB((1", 'F'}, - {"0NB((F", 'F'}, - {"0NB((N", 'F'}, - {"0NB((S", 'F'}, - {"0NB((V", 'F'}, {"0NB(1)", 'F'}, {"0NB(1O", 'F'}, {"0NB(F(", 'F'}, @@ -4453,14 +4322,12 @@ static const keyword_t sql_keywords[] = { {"0NB1OV", 'F'}, {"0NB1U(", 'F'}, {"0NB1UE", 'F'}, - {"0NBE((", 'F'}, {"0NBE(1", 'F'}, {"0NBE(F", 'F'}, {"0NBE(N", 'F'}, {"0NBE(S", 'F'}, {"0NBE(V", 'F'}, {"0NBEK(", 'F'}, - {"0NBF((", 'F'}, {"0NBF()", 'F'}, {"0NBF(1", 'F'}, {"0NBF(F", 'F'}, @@ -4564,12 +4431,6 @@ static const keyword_t sql_keywords[] = { {"0NBVU(", 'F'}, {"0NBVUE", 'F'}, {"0NC", 'F'}, - {"0NE(((", 'F'}, - {"0NE((1", 'F'}, - {"0NE((F", 'F'}, - {"0NE((N", 'F'}, - {"0NE((S", 'F'}, - {"0NE((V", 'F'}, {"0NE(1)", 'F'}, {"0NE(1O", 'F'}, {"0NE(F(", 'F'}, @@ -4585,7 +4446,6 @@ static const keyword_t sql_keywords[] = { {"0NE1OS", 'F'}, {"0NE1OV", 'F'}, {"0NE1UE", 'F'}, - {"0NEF((", 'F'}, {"0NEF()", 'F'}, {"0NEF(1", 'F'}, {"0NEF(F", 'F'}, @@ -4607,7 +4467,6 @@ static const keyword_t sql_keywords[] = { {"0NESOS", 'F'}, {"0NESOV", 'F'}, {"0NESUE", 'F'}, - {"0NEU((", 'F'}, {"0NEU(1", 'F'}, {"0NEU(F", 'F'}, {"0NEU(N", 'F'}, @@ -4633,14 +4492,6 @@ static const keyword_t sql_keywords[] = { {"0NEVOF", 'F'}, {"0NEVOS", 'F'}, {"0NEVUE", 'F'}, - {"0NF(((", 'F'}, - {"0NF(()", 'F'}, - {"0NF((1", 'F'}, - {"0NF((F", 'F'}, - {"0NF((N", 'F'}, - {"0NF((S", 'F'}, - {"0NF((V", 'F'}, - {"0NF())", 'F'}, {"0NF()1", 'F'}, {"0NF()F", 'F'}, {"0NF()K", 'F'}, @@ -4652,6 +4503,13 @@ static const keyword_t sql_keywords[] = { {"0NF(1)", 'F'}, {"0NF(1N", 'F'}, {"0NF(1O", 'F'}, + {"0NF(E(", 'F'}, + {"0NF(E1", 'F'}, + {"0NF(EF", 'F'}, + {"0NF(EK", 'F'}, + {"0NF(EN", 'F'}, + {"0NF(ES", 'F'}, + {"0NF(EV", 'F'}, {"0NF(F(", 'F'}, {"0NF(N)", 'F'}, {"0NF(N,", 'F'}, @@ -4660,12 +4518,6 @@ static const keyword_t sql_keywords[] = { {"0NF(SO", 'F'}, {"0NF(V)", 'F'}, {"0NF(VO", 'F'}, - {"0NK(((", 'F'}, - {"0NK((1", 'F'}, - {"0NK((F", 'F'}, - {"0NK((N", 'F'}, - {"0NK((S", 'F'}, - {"0NK((V", 'F'}, {"0NK(1)", 'F'}, {"0NK(1O", 'F'}, {"0NK(F(", 'F'}, @@ -4681,14 +4533,6 @@ static const keyword_t sql_keywords[] = { {"0NK)&N", 'F'}, {"0NK)&S", 'F'}, {"0NK)&V", 'F'}, - {"0NK))&", 'F'}, - {"0NK)))", 'F'}, - {"0NK));", 'F'}, - {"0NK))B", 'F'}, - {"0NK))E", 'F'}, - {"0NK))K", 'F'}, - {"0NK))O", 'F'}, - {"0NK))U", 'F'}, {"0NK);E", 'F'}, {"0NK);T", 'F'}, {"0NK)B(", 'F'}, @@ -4736,7 +4580,6 @@ static const keyword_t sql_keywords[] = { {"0NK1OV", 'F'}, {"0NK1U(", 'F'}, {"0NK1UE", 'F'}, - {"0NKF((", 'F'}, {"0NKF()", 'F'}, {"0NKF(1", 'F'}, {"0NKF(F", 'F'}, @@ -4836,15 +4679,6 @@ static const keyword_t sql_keywords[] = { {"0NKVOS", 'F'}, {"0NKVU(", 'F'}, {"0NKVUE", 'F'}, - {"0NO(((", 'F'}, - {"0NO((1", 'F'}, - {"0NO((E", 'F'}, - {"0NO((F", 'F'}, - {"0NO((N", 'F'}, - {"0NO((O", 'F'}, - {"0NO((S", 'F'}, - {"0NO((T", 'F'}, - {"0NO((V", 'F'}, {"0NO(1&", 'F'}, {"0NO(1)", 'F'}, {"0NO(1,", 'F'}, @@ -4856,6 +4690,7 @@ static const keyword_t sql_keywords[] = { {"0NO(EK", 'F'}, {"0NO(EN", 'F'}, {"0NO(ES", 'F'}, + {"0NO(ET", 'F'}, {"0NO(EV", 'F'}, {"0NO(F(", 'F'}, {"0NO(N&", 'F'}, @@ -4877,13 +4712,13 @@ static const keyword_t sql_keywords[] = { {"0NO(V)", 'F'}, {"0NO(V,", 'F'}, {"0NO(VO", 'F'}, - {"0NOF((", 'F'}, {"0NOF()", 'F'}, {"0NOF(1", 'F'}, {"0NOF(E", 'F'}, {"0NOF(F", 'F'}, {"0NOF(N", 'F'}, {"0NOF(S", 'F'}, + {"0NOF(T", 'F'}, {"0NOF(V", 'F'}, {"0NOK&(", 'F'}, {"0NOK&1", 'F'}, @@ -4891,7 +4726,6 @@ static const keyword_t sql_keywords[] = { {"0NOK&N", 'F'}, {"0NOK&S", 'F'}, {"0NOK&V", 'F'}, - {"0NOK((", 'F'}, {"0NOK(1", 'F'}, {"0NOK(F", 'F'}, {"0NOK(N", 'F'}, @@ -4919,16 +4753,16 @@ static const keyword_t sql_keywords[] = { {"0NOS&K", 'F'}, {"0NOS&N", 'F'}, {"0NOS&S", 'F'}, + {"0NOS&T", 'F'}, {"0NOS&U", 'F'}, {"0NOS&V", 'F'}, - {"0NOS((", 'F'}, {"0NOS(E", 'F'}, {"0NOS(U", 'F'}, {"0NOS)&", 'F'}, - {"0NOS))", 'F'}, {"0NOS),", 'F'}, {"0NOS);", 'F'}, {"0NOS)B", 'F'}, + {"0NOS)C", 'F'}, {"0NOS)E", 'F'}, {"0NOS)K", 'F'}, {"0NOS)O", 'F'}, @@ -5006,13 +4840,13 @@ static const keyword_t sql_keywords[] = { {"0NOSVO", 'F'}, {"0NOSVS", 'F'}, {"0NOSVU", 'F'}, - {"0NOT((", 'F'}, {"0NOT(1", 'F'}, + {"0NOT(E", 'F'}, {"0NOT(F", 'F'}, {"0NOT(N", 'F'}, {"0NOT(S", 'F'}, + {"0NOT(T", 'F'}, {"0NOT(V", 'F'}, - {"0NOU((", 'F'}, {"0NOU(E", 'F'}, {"0NOUEK", 'F'}, {"0NOUEN", 'F'}, @@ -5023,16 +4857,16 @@ static const keyword_t sql_keywords[] = { {"0NOV&K", 'F'}, {"0NOV&N", 'F'}, {"0NOV&S", 'F'}, + {"0NOV&T", 'F'}, {"0NOV&U", 'F'}, {"0NOV&V", 'F'}, - {"0NOV((", 'F'}, {"0NOV(E", 'F'}, {"0NOV(U", 'F'}, {"0NOV)&", 'F'}, - {"0NOV))", 'F'}, {"0NOV),", 'F'}, {"0NOV);", 'F'}, {"0NOV)B", 'F'}, + {"0NOV)C", 'F'}, {"0NOV)E", 'F'}, {"0NOV)K", 'F'}, {"0NOV)O", 'F'}, @@ -5113,13 +4947,6 @@ static const keyword_t sql_keywords[] = { {"0NSUE;", 'F'}, {"0NSUEC", 'F'}, {"0NSUEK", 'F'}, - {"0NU(((", 'F'}, - {"0NU((1", 'F'}, - {"0NU((E", 'F'}, - {"0NU((F", 'F'}, - {"0NU((N", 'F'}, - {"0NU((S", 'F'}, - {"0NU((V", 'F'}, {"0NU(1)", 'F'}, {"0NU(1O", 'F'}, {"0NU(E(", 'F'}, @@ -5148,7 +4975,6 @@ static const keyword_t sql_keywords[] = { {"0NU;C", 'F'}, {"0NUC", 'F'}, {"0NUE", 'F'}, - {"0NUE((", 'F'}, {"0NUE(1", 'F'}, {"0NUE(E", 'F'}, {"0NUE(F", 'F'}, @@ -5234,16 +5060,13 @@ static const keyword_t sql_keywords[] = { {"0NUEVO", 'F'}, {"0NUEVS", 'F'}, {"0NUEVU", 'F'}, - {"0NUF((", 'F'}, {"0NUF()", 'F'}, {"0NUF(1", 'F'}, {"0NUF(F", 'F'}, {"0NUF(N", 'F'}, {"0NUF(S", 'F'}, {"0NUF(V", 'F'}, - {"0NUK((", 'F'}, {"0NUK(E", 'F'}, - {"0NUN((", 'F'}, {"0NUN(1", 'F'}, {"0NUN(F", 'F'}, {"0NUN(S", 'F'}, @@ -5269,7 +5092,6 @@ static const keyword_t sql_keywords[] = { {"0NUNS(", 'F'}, {"0NUNS,", 'F'}, {"0NUNSO", 'F'}, - {"0NUO((", 'F'}, {"0NUO(E", 'F'}, {"0NUON(", 'F'}, {"0NUON1", 'F'}, @@ -5299,18 +5121,103 @@ static const keyword_t sql_keywords[] = { {"0NUVO(", 'F'}, {"0NUVOF", 'F'}, {"0NUVOS", 'F'}, - {"0OF(((", 'F'}, - {"0OF((1", 'F'}, - {"0OF((F", 'F'}, - {"0OF((N", 'F'}, - {"0OF((S", 'F'}, - {"0OF((V", 'F'}, + {"0O(1)O", 'F'}, + {"0O(1)U", 'F'}, + {"0O(1O(", 'F'}, + {"0O(1OF", 'F'}, + {"0O(1OS", 'F'}, + {"0O(1OV", 'F'}, + {"0O(F()", 'F'}, + {"0O(F(1", 'F'}, + {"0O(F(F", 'F'}, + {"0O(F(N", 'F'}, + {"0O(F(S", 'F'}, + {"0O(F(V", 'F'}, + {"0O(N)O", 'F'}, + {"0O(N)U", 'F'}, + {"0O(NO(", 'F'}, + {"0O(NOF", 'F'}, + {"0O(NOS", 'F'}, + {"0O(NOV", 'F'}, + {"0O(S)O", 'F'}, + {"0O(S)U", 'F'}, + {"0O(SO(", 'F'}, + {"0O(SO1", 'F'}, + {"0O(SOF", 'F'}, + {"0O(SON", 'F'}, + {"0O(SOS", 'F'}, + {"0O(SOV", 'F'}, + {"0O(V)O", 'F'}, + {"0O(V)U", 'F'}, + {"0O(VO(", 'F'}, + {"0O(VOF", 'F'}, + {"0O(VOS", 'F'}, + {"0O1O(1", 'F'}, + {"0O1O(F", 'F'}, + {"0O1O(N", 'F'}, + {"0O1O(S", 'F'}, + {"0O1O(V", 'F'}, + {"0O1OF(", 'F'}, + {"0O1OSO", 'F'}, + {"0O1OSU", 'F'}, + {"0O1OVO", 'F'}, + {"0O1OVU", 'F'}, + {"0O1UE(", 'F'}, + {"0O1UE1", 'F'}, + {"0O1UEF", 'F'}, + {"0O1UEK", 'F'}, + {"0O1UEN", 'F'}, + {"0O1UES", 'F'}, + {"0O1UEV", 'F'}, + {"0OF()O", 'F'}, + {"0OF()U", 'F'}, + {"0OF(1)", 'F'}, {"0OF(1O", 'F'}, {"0OF(F(", 'F'}, + {"0OF(N)", 'F'}, {"0OF(NO", 'F'}, + {"0OF(S)", 'F'}, {"0OF(SO", 'F'}, + {"0OF(V)", 'F'}, {"0OF(VO", 'F'}, - {"0OUE((", 'F'}, + {"0ONO(1", 'F'}, + {"0ONO(F", 'F'}, + {"0ONO(N", 'F'}, + {"0ONO(S", 'F'}, + {"0ONO(V", 'F'}, + {"0ONOF(", 'F'}, + {"0ONOSO", 'F'}, + {"0ONOSU", 'F'}, + {"0ONOVO", 'F'}, + {"0ONOVU", 'F'}, + {"0ONUE(", 'F'}, + {"0ONUE1", 'F'}, + {"0ONUEF", 'F'}, + {"0ONUEK", 'F'}, + {"0ONUEN", 'F'}, + {"0ONUES", 'F'}, + {"0ONUEV", 'F'}, + {"0OSO(1", 'F'}, + {"0OSO(F", 'F'}, + {"0OSO(N", 'F'}, + {"0OSO(S", 'F'}, + {"0OSO(V", 'F'}, + {"0OSO1O", 'F'}, + {"0OSO1U", 'F'}, + {"0OSOF(", 'F'}, + {"0OSONO", 'F'}, + {"0OSONU", 'F'}, + {"0OSOSO", 'F'}, + {"0OSOSU", 'F'}, + {"0OSOVO", 'F'}, + {"0OSOVU", 'F'}, + {"0OSUE(", 'F'}, + {"0OSUE1", 'F'}, + {"0OSUEF", 'F'}, + {"0OSUEK", 'F'}, + {"0OSUEN", 'F'}, + {"0OSUES", 'F'}, + {"0OSUEV", 'F'}, {"0OUE(1", 'F'}, {"0OUE(F", 'F'}, {"0OUE(N", 'F'}, @@ -5331,13 +5238,21 @@ static const keyword_t sql_keywords[] = { {"0OUESO", 'F'}, {"0OUEV,", 'F'}, {"0OUEVO", 'F'}, - {"0S&(((", 'F'}, - {"0S&((1", 'F'}, - {"0S&((E", 'F'}, - {"0S&((F", 'F'}, - {"0S&((N", 'F'}, - {"0S&((S", 'F'}, - {"0S&((V", 'F'}, + {"0OVO(1", 'F'}, + {"0OVO(F", 'F'}, + {"0OVO(N", 'F'}, + {"0OVO(S", 'F'}, + {"0OVO(V", 'F'}, + {"0OVOF(", 'F'}, + {"0OVOSO", 'F'}, + {"0OVOSU", 'F'}, + {"0OVUE(", 'F'}, + {"0OVUE1", 'F'}, + {"0OVUEF", 'F'}, + {"0OVUEK", 'F'}, + {"0OVUEN", 'F'}, + {"0OVUES", 'F'}, + {"0OVUEV", 'F'}, {"0S&(1&", 'F'}, {"0S&(1)", 'F'}, {"0S&(1,", 'F'}, @@ -5349,6 +5264,7 @@ static const keyword_t sql_keywords[] = { {"0S&(EN", 'F'}, {"0S&(EO", 'F'}, {"0S&(ES", 'F'}, + {"0S&(ET", 'F'}, {"0S&(EV", 'F'}, {"0S&(F(", 'F'}, {"0S&(N&", 'F'}, @@ -5359,6 +5275,7 @@ static const keyword_t sql_keywords[] = { {"0S&(S)", 'F'}, {"0S&(S,", 'F'}, {"0S&(SO", 'F'}, + {"0S&(T(", 'F'}, {"0S&(V&", 'F'}, {"0S&(V)", 'F'}, {"0S&(V,", 'F'}, @@ -5371,7 +5288,8 @@ static const keyword_t sql_keywords[] = { {"0S&1&S", 'F'}, {"0S&1&V", 'F'}, {"0S&1)&", 'F'}, - {"0S&1))", 'F'}, + {"0S&1)C", 'F'}, + {"0S&1)O", 'F'}, {"0S&1)U", 'F'}, {"0S&1;", 'F'}, {"0S&1;C", 'F'}, @@ -5398,14 +5316,12 @@ static const keyword_t sql_keywords[] = { {"0S&1OO", 'F'}, {"0S&1OS", 'F'}, {"0S&1OV", 'F'}, - {"0S&1S", 'F'}, {"0S&1TN", 'F'}, {"0S&1U", 'F'}, {"0S&1U(", 'F'}, {"0S&1U;", 'F'}, {"0S&1UC", 'F'}, {"0S&1UE", 'F'}, - {"0S&E((", 'F'}, {"0S&E(1", 'F'}, {"0S&E(F", 'F'}, {"0S&E(N", 'F'}, @@ -5439,12 +5355,13 @@ static const keyword_t sql_keywords[] = { {"0S&EVC", 'F'}, {"0S&EVK", 'F'}, {"0S&EVO", 'F'}, - {"0S&F((", 'F'}, {"0S&F()", 'F'}, {"0S&F(1", 'F'}, + {"0S&F(E", 'F'}, {"0S&F(F", 'F'}, {"0S&F(N", 'F'}, {"0S&F(S", 'F'}, + {"0S&F(T", 'F'}, {"0S&F(V", 'F'}, {"0S&K&(", 'F'}, {"0S&K&1", 'F'}, @@ -5452,7 +5369,6 @@ static const keyword_t sql_keywords[] = { {"0S&K&N", 'F'}, {"0S&K&S", 'F'}, {"0S&K&V", 'F'}, - {"0S&K((", 'F'}, {"0S&K(1", 'F'}, {"0S&K(F", 'F'}, {"0S&K(N", 'F'}, @@ -5478,7 +5394,8 @@ static const keyword_t sql_keywords[] = { {"0S&N&S", 'F'}, {"0S&N&V", 'F'}, {"0S&N)&", 'F'}, - {"0S&N))", 'F'}, + {"0S&N)C", 'F'}, + {"0S&N)O", 'F'}, {"0S&N)U", 'F'}, {"0S&N;", 'F'}, {"0S&N;C", 'F'}, @@ -5517,7 +5434,8 @@ static const keyword_t sql_keywords[] = { {"0S&S&S", 'F'}, {"0S&S&V", 'F'}, {"0S&S)&", 'F'}, - {"0S&S))", 'F'}, + {"0S&S)C", 'F'}, + {"0S&S)O", 'F'}, {"0S&S)U", 'F'}, {"0S&S1", 'F'}, {"0S&S1;", 'F'}, @@ -5560,6 +5478,12 @@ static const keyword_t sql_keywords[] = { {"0S&SV;", 'F'}, {"0S&SVC", 'F'}, {"0S&SVO", 'F'}, + {"0S&T(1", 'F'}, + {"0S&T(E", 'F'}, + {"0S&T(F", 'F'}, + {"0S&T(N", 'F'}, + {"0S&T(S", 'F'}, + {"0S&T(V", 'F'}, {"0S&V", 'F'}, {"0S&V&(", 'F'}, {"0S&V&1", 'F'}, @@ -5568,7 +5492,8 @@ static const keyword_t sql_keywords[] = { {"0S&V&S", 'F'}, {"0S&V&V", 'F'}, {"0S&V)&", 'F'}, - {"0S&V))", 'F'}, + {"0S&V)C", 'F'}, + {"0S&V)O", 'F'}, {"0S&V)U", 'F'}, {"0S&V;", 'F'}, {"0S&V;C", 'F'}, @@ -5604,17 +5529,11 @@ static const keyword_t sql_keywords[] = { {"0S&VU;", 'F'}, {"0S&VUC", 'F'}, {"0S&VUE", 'F'}, - {"0S((((", 'F'}, - {"0S(((E", 'F'}, - {"0S(((U", 'F'}, - {"0S((EK", 'F'}, - {"0S((EN", 'F'}, - {"0S((U(", 'F'}, + {"0S(EF(", 'F'}, + {"0S(EKF", 'F'}, {"0S(EKN", 'F'}, {"0S(ENK", 'F'}, - {"0S(U((", 'F'}, {"0S(U(E", 'F'}, - {"0S)&((", 'F'}, {"0S)&(1", 'F'}, {"0S)&(E", 'F'}, {"0S)&(F", 'F'}, @@ -5658,54 +5577,6 @@ static const keyword_t sql_keywords[] = { {"0S)&VF", 'F'}, {"0S)&VO", 'F'}, {"0S)&VU", 'F'}, - {"0S))&(", 'F'}, - {"0S))&1", 'F'}, - {"0S))&F", 'F'}, - {"0S))&N", 'F'}, - {"0S))&S", 'F'}, - {"0S))&V", 'F'}, - {"0S)))&", 'F'}, - {"0S))))", 'F'}, - {"0S))),", 'F'}, - {"0S)));", 'F'}, - {"0S)))B", 'F'}, - {"0S)))E", 'F'}, - {"0S)))K", 'F'}, - {"0S)))O", 'F'}, - {"0S)))U", 'F'}, - {"0S)),(", 'F'}, - {"0S));E", 'F'}, - {"0S));T", 'F'}, - {"0S))B(", 'F'}, - {"0S))B1", 'F'}, - {"0S))BF", 'F'}, - {"0S))BN", 'F'}, - {"0S))BS", 'F'}, - {"0S))BV", 'F'}, - {"0S))E(", 'F'}, - {"0S))E1", 'F'}, - {"0S))EF", 'F'}, - {"0S))EK", 'F'}, - {"0S))EN", 'F'}, - {"0S))ES", 'F'}, - {"0S))EV", 'F'}, - {"0S))K(", 'F'}, - {"0S))K1", 'F'}, - {"0S))KB", 'F'}, - {"0S))KF", 'F'}, - {"0S))KN", 'F'}, - {"0S))KS", 'F'}, - {"0S))KU", 'F'}, - {"0S))KV", 'F'}, - {"0S))O(", 'F'}, - {"0S))O1", 'F'}, - {"0S))OF", 'F'}, - {"0S))ON", 'F'}, - {"0S))OS", 'F'}, - {"0S))OV", 'F'}, - {"0S))U(", 'F'}, - {"0S))UE", 'F'}, - {"0S),((", 'F'}, {"0S),(1", 'F'}, {"0S),(F", 'F'}, {"0S),(N", 'F'}, @@ -5727,7 +5598,6 @@ static const keyword_t sql_keywords[] = { {"0S);TO", 'F'}, {"0S);TS", 'F'}, {"0S);TV", 'F'}, - {"0S)B((", 'F'}, {"0S)B(1", 'F'}, {"0S)B(F", 'F'}, {"0S)B(N", 'F'}, @@ -5763,7 +5633,7 @@ static const keyword_t sql_keywords[] = { {"0S)BVK", 'F'}, {"0S)BVO", 'F'}, {"0S)BVU", 'F'}, - {"0S)E((", 'F'}, + {"0S)C", 'F'}, {"0S)E(1", 'F'}, {"0S)E(F", 'F'}, {"0S)E(N", 'F'}, @@ -5784,7 +5654,6 @@ static const keyword_t sql_keywords[] = { {"0S)ESO", 'F'}, {"0S)EVC", 'F'}, {"0S)EVO", 'F'}, - {"0S)K((", 'F'}, {"0S)K(1", 'F'}, {"0S)K(F", 'F'}, {"0S)K(N", 'F'}, @@ -5822,12 +5691,12 @@ static const keyword_t sql_keywords[] = { {"0S)KVE", 'F'}, {"0S)KVO", 'F'}, {"0S)KVU", 'F'}, - {"0S)O((", 'F'}, {"0S)O(1", 'F'}, {"0S)O(E", 'F'}, {"0S)O(F", 'F'}, {"0S)O(N", 'F'}, {"0S)O(S", 'F'}, + {"0S)O(T", 'F'}, {"0S)O(V", 'F'}, {"0S)O1", 'F'}, {"0S)O1&", 'F'}, @@ -5839,7 +5708,6 @@ static const keyword_t sql_keywords[] = { {"0S)O1O", 'F'}, {"0S)O1U", 'F'}, {"0S)OF(", 'F'}, - {"0S)ON", 'F'}, {"0S)ON&", 'F'}, {"0S)ON)", 'F'}, {"0S)ON;", 'F'}, @@ -5866,7 +5734,6 @@ static const keyword_t sql_keywords[] = { {"0S)OVK", 'F'}, {"0S)OVO", 'F'}, {"0S)OVU", 'F'}, - {"0S)U((", 'F'}, {"0S)U(E", 'F'}, {"0S)UE(", 'F'}, {"0S)UE1", 'F'}, @@ -5875,13 +5742,6 @@ static const keyword_t sql_keywords[] = { {"0S)UEN", 'F'}, {"0S)UES", 'F'}, {"0S)UEV", 'F'}, - {"0S,(((", 'F'}, - {"0S,((1", 'F'}, - {"0S,((E", 'F'}, - {"0S,((F", 'F'}, - {"0S,((N", 'F'}, - {"0S,((S", 'F'}, - {"0S,((V", 'F'}, {"0S,(1)", 'F'}, {"0S,(1O", 'F'}, {"0S,(E(", 'F'}, @@ -5898,7 +5758,6 @@ static const keyword_t sql_keywords[] = { {"0S,(SO", 'F'}, {"0S,(V)", 'F'}, {"0S,(VO", 'F'}, - {"0S,F((", 'F'}, {"0S,F()", 'F'}, {"0S,F(1", 'F'}, {"0S,F(F", 'F'}, @@ -5906,7 +5765,6 @@ static const keyword_t sql_keywords[] = { {"0S,F(S", 'F'}, {"0S,F(T", 'F'}, {"0S,F(V", 'F'}, - {"0S,V))", 'F'}, {"0S,V),", 'F'}, {"0S,V)O", 'F'}, {"0S,VB(", 'F'}, @@ -5919,7 +5777,6 @@ static const keyword_t sql_keywords[] = { {"0S,VOF", 'F'}, {"0S,VOS", 'F'}, {"0S,VUE", 'F'}, - {"0S1F((", 'F'}, {"0S1F()", 'F'}, {"0S1F(1", 'F'}, {"0S1F(F", 'F'}, @@ -5927,11 +5784,6 @@ static const keyword_t sql_keywords[] = { {"0S1F(S", 'F'}, {"0S1F(V", 'F'}, {"0S1NC", 'F'}, - {"0S1NO(", 'F'}, - {"0S1NOF", 'F'}, - {"0S1NOS", 'F'}, - {"0S1NOV", 'F'}, - {"0S1O((", 'F'}, {"0S1O(1", 'F'}, {"0S1O(F", 'F'}, {"0S1O(N", 'F'}, @@ -5963,7 +5815,6 @@ static const keyword_t sql_keywords[] = { {"0S1VO(", 'F'}, {"0S1VOF", 'F'}, {"0S1VOS", 'F'}, - {"0S;E((", 'F'}, {"0S;E(1", 'F'}, {"0S;E(E", 'F'}, {"0S;E(F", 'F'}, @@ -5973,6 +5824,7 @@ static const keyword_t sql_keywords[] = { {"0S;E1,", 'F'}, {"0S;E1;", 'F'}, {"0S;E1C", 'F'}, + {"0S;E1K", 'F'}, {"0S;E1O", 'F'}, {"0S;E1T", 'F'}, {"0S;EF(", 'F'}, @@ -5986,6 +5838,7 @@ static const keyword_t sql_keywords[] = { {"0S;EN,", 'F'}, {"0S;EN;", 'F'}, {"0S;ENC", 'F'}, + {"0S;ENE", 'F'}, {"0S;ENK", 'F'}, {"0S;ENO", 'F'}, {"0S;ENT", 'F'}, @@ -5993,15 +5846,16 @@ static const keyword_t sql_keywords[] = { {"0S;ES,", 'F'}, {"0S;ES;", 'F'}, {"0S;ESC", 'F'}, + {"0S;ESK", 'F'}, {"0S;ESO", 'F'}, {"0S;EST", 'F'}, {"0S;EV,", 'F'}, {"0S;EV;", 'F'}, {"0S;EVC", 'F'}, + {"0S;EVK", 'F'}, {"0S;EVO", 'F'}, {"0S;EVT", 'F'}, {"0S;N:T", 'F'}, - {"0S;T((", 'F'}, {"0S;T(1", 'F'}, {"0S;T(E", 'F'}, {"0S;T(F", 'F'}, @@ -6012,6 +5866,7 @@ static const keyword_t sql_keywords[] = { {"0S;T1;", 'F'}, {"0S;T1C", 'F'}, {"0S;T1F", 'F'}, + {"0S;T1K", 'F'}, {"0S;T1O", 'F'}, {"0S;T1T", 'F'}, {"0S;T;", 'F'}, @@ -6043,6 +5898,7 @@ static const keyword_t sql_keywords[] = { {"0S;TS;", 'F'}, {"0S;TSC", 'F'}, {"0S;TSF", 'F'}, + {"0S;TSK", 'F'}, {"0S;TSO", 'F'}, {"0S;TST", 'F'}, {"0S;TT(", 'F'}, @@ -6055,14 +5911,9 @@ static const keyword_t sql_keywords[] = { {"0S;TV;", 'F'}, {"0S;TVC", 'F'}, {"0S;TVF", 'F'}, + {"0S;TVK", 'F'}, {"0S;TVO", 'F'}, {"0S;TVT", 'F'}, - {"0SA(((", 'F'}, - {"0SA((1", 'F'}, - {"0SA((F", 'F'}, - {"0SA((N", 'F'}, - {"0SA((S", 'F'}, - {"0SA((V", 'F'}, {"0SA(F(", 'F'}, {"0SA(N)", 'F'}, {"0SA(NO", 'F'}, @@ -6070,7 +5921,6 @@ static const keyword_t sql_keywords[] = { {"0SA(SO", 'F'}, {"0SA(V)", 'F'}, {"0SA(VO", 'F'}, - {"0SAF((", 'F'}, {"0SAF()", 'F'}, {"0SAF(1", 'F'}, {"0SAF(F", 'F'}, @@ -6095,12 +5945,6 @@ static const keyword_t sql_keywords[] = { {"0SAVOF", 'F'}, {"0SAVOS", 'F'}, {"0SAVUE", 'F'}, - {"0SB(((", 'F'}, - {"0SB((1", 'F'}, - {"0SB((F", 'F'}, - {"0SB((N", 'F'}, - {"0SB((S", 'F'}, - {"0SB((V", 'F'}, {"0SB(1)", 'F'}, {"0SB(1O", 'F'}, {"0SB(F(", 'F'}, @@ -6141,14 +5985,12 @@ static const keyword_t sql_keywords[] = { {"0SB1OV", 'F'}, {"0SB1U(", 'F'}, {"0SB1UE", 'F'}, - {"0SBE((", 'F'}, {"0SBE(1", 'F'}, {"0SBE(F", 'F'}, {"0SBE(N", 'F'}, {"0SBE(S", 'F'}, {"0SBE(V", 'F'}, {"0SBEK(", 'F'}, - {"0SBF((", 'F'}, {"0SBF()", 'F'}, {"0SBF(1", 'F'}, {"0SBF(F", 'F'}, @@ -6253,12 +6095,6 @@ static const keyword_t sql_keywords[] = { {"0SBVU(", 'F'}, {"0SBVUE", 'F'}, {"0SC", 'F'}, - {"0SE(((", 'F'}, - {"0SE((1", 'F'}, - {"0SE((F", 'F'}, - {"0SE((N", 'F'}, - {"0SE((S", 'F'}, - {"0SE((V", 'F'}, {"0SE(1)", 'F'}, {"0SE(1O", 'F'}, {"0SE(F(", 'F'}, @@ -6274,14 +6110,12 @@ static const keyword_t sql_keywords[] = { {"0SE1OS", 'F'}, {"0SE1OV", 'F'}, {"0SE1UE", 'F'}, - {"0SEF((", 'F'}, {"0SEF()", 'F'}, {"0SEF(1", 'F'}, {"0SEF(F", 'F'}, {"0SEF(N", 'F'}, {"0SEF(S", 'F'}, {"0SEF(V", 'F'}, - {"0SEK((", 'F'}, {"0SEK(1", 'F'}, {"0SEK(E", 'F'}, {"0SEK(F", 'F'}, @@ -6325,7 +6159,6 @@ static const keyword_t sql_keywords[] = { {"0SESOS", 'F'}, {"0SESOV", 'F'}, {"0SESUE", 'F'}, - {"0SEU((", 'F'}, {"0SEU(1", 'F'}, {"0SEU(F", 'F'}, {"0SEU(N", 'F'}, @@ -6351,14 +6184,6 @@ static const keyword_t sql_keywords[] = { {"0SEVOF", 'F'}, {"0SEVOS", 'F'}, {"0SEVUE", 'F'}, - {"0SF(((", 'F'}, - {"0SF(()", 'F'}, - {"0SF((1", 'F'}, - {"0SF((F", 'F'}, - {"0SF((N", 'F'}, - {"0SF((S", 'F'}, - {"0SF((V", 'F'}, - {"0SF())", 'F'}, {"0SF()1", 'F'}, {"0SF()F", 'F'}, {"0SF()K", 'F'}, @@ -6370,6 +6195,13 @@ static const keyword_t sql_keywords[] = { {"0SF(1)", 'F'}, {"0SF(1N", 'F'}, {"0SF(1O", 'F'}, + {"0SF(E(", 'F'}, + {"0SF(E1", 'F'}, + {"0SF(EF", 'F'}, + {"0SF(EK", 'F'}, + {"0SF(EN", 'F'}, + {"0SF(ES", 'F'}, + {"0SF(EV", 'F'}, {"0SF(F(", 'F'}, {"0SF(N)", 'F'}, {"0SF(N,", 'F'}, @@ -6378,12 +6210,6 @@ static const keyword_t sql_keywords[] = { {"0SF(SO", 'F'}, {"0SF(V)", 'F'}, {"0SF(VO", 'F'}, - {"0SK(((", 'F'}, - {"0SK((1", 'F'}, - {"0SK((F", 'F'}, - {"0SK((N", 'F'}, - {"0SK((S", 'F'}, - {"0SK((V", 'F'}, {"0SK(1)", 'F'}, {"0SK(1O", 'F'}, {"0SK(F(", 'F'}, @@ -6399,14 +6225,6 @@ static const keyword_t sql_keywords[] = { {"0SK)&N", 'F'}, {"0SK)&S", 'F'}, {"0SK)&V", 'F'}, - {"0SK))&", 'F'}, - {"0SK)))", 'F'}, - {"0SK));", 'F'}, - {"0SK))B", 'F'}, - {"0SK))E", 'F'}, - {"0SK))K", 'F'}, - {"0SK))O", 'F'}, - {"0SK))U", 'F'}, {"0SK);E", 'F'}, {"0SK);T", 'F'}, {"0SK)B(", 'F'}, @@ -6455,7 +6273,6 @@ static const keyword_t sql_keywords[] = { {"0SK1OV", 'F'}, {"0SK1U(", 'F'}, {"0SK1UE", 'F'}, - {"0SKF((", 'F'}, {"0SKF()", 'F'}, {"0SKF(1", 'F'}, {"0SKF(F", 'F'}, @@ -6558,15 +6375,6 @@ static const keyword_t sql_keywords[] = { {"0SKVOS", 'F'}, {"0SKVU(", 'F'}, {"0SKVUE", 'F'}, - {"0SO(((", 'F'}, - {"0SO((1", 'F'}, - {"0SO((E", 'F'}, - {"0SO((F", 'F'}, - {"0SO((N", 'F'}, - {"0SO((O", 'F'}, - {"0SO((S", 'F'}, - {"0SO((T", 'F'}, - {"0SO((V", 'F'}, {"0SO(1&", 'F'}, {"0SO(1)", 'F'}, {"0SO(1,", 'F'}, @@ -6578,6 +6386,7 @@ static const keyword_t sql_keywords[] = { {"0SO(EK", 'F'}, {"0SO(EN", 'F'}, {"0SO(ES", 'F'}, + {"0SO(ET", 'F'}, {"0SO(EV", 'F'}, {"0SO(F(", 'F'}, {"0SO(N&", 'F'}, @@ -6606,16 +6415,16 @@ static const keyword_t sql_keywords[] = { {"0SO1&K", 'F'}, {"0SO1&N", 'F'}, {"0SO1&S", 'F'}, + {"0SO1&T", 'F'}, {"0SO1&U", 'F'}, {"0SO1&V", 'F'}, - {"0SO1((", 'F'}, {"0SO1(E", 'F'}, {"0SO1(U", 'F'}, {"0SO1)&", 'F'}, - {"0SO1))", 'F'}, {"0SO1),", 'F'}, {"0SO1);", 'F'}, {"0SO1)B", 'F'}, + {"0SO1)C", 'F'}, {"0SO1)E", 'F'}, {"0SO1)K", 'F'}, {"0SO1)O", 'F'}, @@ -6665,7 +6474,6 @@ static const keyword_t sql_keywords[] = { {"0SO1N,", 'F'}, {"0SO1NE", 'F'}, {"0SO1NF", 'F'}, - {"0SO1NO", 'F'}, {"0SO1NU", 'F'}, {"0SO1O(", 'F'}, {"0SO1OF", 'F'}, @@ -6696,13 +6504,13 @@ static const keyword_t sql_keywords[] = { {"0SO1VO", 'F'}, {"0SO1VS", 'F'}, {"0SO1VU", 'F'}, - {"0SOF((", 'F'}, {"0SOF()", 'F'}, {"0SOF(1", 'F'}, {"0SOF(E", 'F'}, {"0SOF(F", 'F'}, {"0SOF(N", 'F'}, {"0SOF(S", 'F'}, + {"0SOF(T", 'F'}, {"0SOF(V", 'F'}, {"0SOK&(", 'F'}, {"0SOK&1", 'F'}, @@ -6710,7 +6518,6 @@ static const keyword_t sql_keywords[] = { {"0SOK&N", 'F'}, {"0SOK&S", 'F'}, {"0SOK&V", 'F'}, - {"0SOK((", 'F'}, {"0SOK(1", 'F'}, {"0SOK(F", 'F'}, {"0SOK(N", 'F'}, @@ -6737,9 +6544,9 @@ static const keyword_t sql_keywords[] = { {"0SON&K", 'F'}, {"0SON&N", 'F'}, {"0SON&S", 'F'}, + {"0SON&T", 'F'}, {"0SON&U", 'F'}, {"0SON&V", 'F'}, - {"0SON((", 'F'}, {"0SON(1", 'F'}, {"0SON(E", 'F'}, {"0SON(F", 'F'}, @@ -6747,10 +6554,10 @@ static const keyword_t sql_keywords[] = { {"0SON(U", 'F'}, {"0SON(V", 'F'}, {"0SON)&", 'F'}, - {"0SON))", 'F'}, {"0SON),", 'F'}, {"0SON);", 'F'}, {"0SON)B", 'F'}, + {"0SON)C", 'F'}, {"0SON)E", 'F'}, {"0SON)K", 'F'}, {"0SON)O", 'F'}, @@ -6828,16 +6635,16 @@ static const keyword_t sql_keywords[] = { {"0SOS&K", 'F'}, {"0SOS&N", 'F'}, {"0SOS&S", 'F'}, + {"0SOS&T", 'F'}, {"0SOS&U", 'F'}, {"0SOS&V", 'F'}, - {"0SOS((", 'F'}, {"0SOS(E", 'F'}, {"0SOS(U", 'F'}, {"0SOS)&", 'F'}, - {"0SOS))", 'F'}, {"0SOS),", 'F'}, {"0SOS);", 'F'}, {"0SOS)B", 'F'}, + {"0SOS)C", 'F'}, {"0SOS)E", 'F'}, {"0SOS)K", 'F'}, {"0SOS)O", 'F'}, @@ -6916,13 +6723,13 @@ static const keyword_t sql_keywords[] = { {"0SOSVO", 'F'}, {"0SOSVS", 'F'}, {"0SOSVU", 'F'}, - {"0SOT((", 'F'}, {"0SOT(1", 'F'}, + {"0SOT(E", 'F'}, {"0SOT(F", 'F'}, {"0SOT(N", 'F'}, {"0SOT(S", 'F'}, + {"0SOT(T", 'F'}, {"0SOT(V", 'F'}, - {"0SOU((", 'F'}, {"0SOU(E", 'F'}, {"0SOUEK", 'F'}, {"0SOUEN", 'F'}, @@ -6934,16 +6741,16 @@ static const keyword_t sql_keywords[] = { {"0SOV&K", 'F'}, {"0SOV&N", 'F'}, {"0SOV&S", 'F'}, + {"0SOV&T", 'F'}, {"0SOV&U", 'F'}, {"0SOV&V", 'F'}, - {"0SOV((", 'F'}, {"0SOV(E", 'F'}, {"0SOV(U", 'F'}, {"0SOV)&", 'F'}, - {"0SOV))", 'F'}, {"0SOV),", 'F'}, {"0SOV);", 'F'}, {"0SOV)B", 'F'}, + {"0SOV)C", 'F'}, {"0SOV)E", 'F'}, {"0SOV)K", 'F'}, {"0SOV)O", 'F'}, @@ -7016,13 +6823,6 @@ static const keyword_t sql_keywords[] = { {"0SOVUS", 'F'}, {"0SOVUT", 'F'}, {"0SOVUV", 'F'}, - {"0SU(((", 'F'}, - {"0SU((1", 'F'}, - {"0SU((E", 'F'}, - {"0SU((F", 'F'}, - {"0SU((N", 'F'}, - {"0SU((S", 'F'}, - {"0SU((V", 'F'}, {"0SU(1)", 'F'}, {"0SU(1O", 'F'}, {"0SU(E(", 'F'}, @@ -7051,7 +6851,6 @@ static const keyword_t sql_keywords[] = { {"0SU;C", 'F'}, {"0SUC", 'F'}, {"0SUE", 'F'}, - {"0SUE((", 'F'}, {"0SUE(1", 'F'}, {"0SUE(E", 'F'}, {"0SUE(F", 'F'}, @@ -7137,16 +6936,13 @@ static const keyword_t sql_keywords[] = { {"0SUEVO", 'F'}, {"0SUEVS", 'F'}, {"0SUEVU", 'F'}, - {"0SUF((", 'F'}, {"0SUF()", 'F'}, {"0SUF(1", 'F'}, {"0SUF(F", 'F'}, {"0SUF(N", 'F'}, {"0SUF(S", 'F'}, {"0SUF(V", 'F'}, - {"0SUK((", 'F'}, {"0SUK(E", 'F'}, - {"0SUN((", 'F'}, {"0SUN(1", 'F'}, {"0SUN(F", 'F'}, {"0SUN(S", 'F'}, @@ -7172,7 +6968,6 @@ static const keyword_t sql_keywords[] = { {"0SUNS(", 'F'}, {"0SUNS,", 'F'}, {"0SUNSO", 'F'}, - {"0SUO((", 'F'}, {"0SUO(E", 'F'}, {"0SUON(", 'F'}, {"0SUON1", 'F'}, @@ -7202,14 +6997,12 @@ static const keyword_t sql_keywords[] = { {"0SUVO(", 'F'}, {"0SUVOF", 'F'}, {"0SUVOS", 'F'}, - {"0SVF((", 'F'}, {"0SVF()", 'F'}, {"0SVF(1", 'F'}, {"0SVF(F", 'F'}, {"0SVF(N", 'F'}, {"0SVF(S", 'F'}, {"0SVF(V", 'F'}, - {"0SVO((", 'F'}, {"0SVO(1", 'F'}, {"0SVO(F", 'F'}, {"0SVO(N", 'F'}, @@ -7236,65 +7029,74 @@ static const keyword_t sql_keywords[] = { {"0SVUE;", 'F'}, {"0SVUEC", 'F'}, {"0SVUEK", 'F'}, - {"0T((((", 'F'}, - {"0T(((1", 'F'}, - {"0T(((F", 'F'}, - {"0T(((N", 'F'}, - {"0T(((S", 'F'}, - {"0T(((V", 'F'}, - {"0T((1(", 'F'}, - {"0T((1)", 'F'}, - {"0T((1F", 'F'}, - {"0T((1N", 'F'}, - {"0T((1O", 'F'}, - {"0T((1S", 'F'}, - {"0T((1V", 'F'}, - {"0T((F(", 'F'}, - {"0T((N(", 'F'}, - {"0T((N)", 'F'}, - {"0T((N1", 'F'}, - {"0T((NF", 'F'}, - {"0T((NO", 'F'}, - {"0T((NS", 'F'}, - {"0T((S(", 'F'}, - {"0T((S)", 'F'}, - {"0T((S1", 'F'}, - {"0T((SF", 'F'}, - {"0T((SN", 'F'}, - {"0T((SO", 'F'}, - {"0T((SV", 'F'}, - {"0T((V(", 'F'}, - {"0T((V)", 'F'}, - {"0T((VF", 'F'}, - {"0T((VO", 'F'}, - {"0T((VS", 'F'}, - {"0T(1))", 'F'}, + {"0T(1&(", 'F'}, + {"0T(1&1", 'F'}, + {"0T(1&F", 'F'}, + {"0T(1&N", 'F'}, + {"0T(1&S", 'F'}, + {"0T(1&V", 'F'}, + {"0T(1)&", 'F'}, + {"0T(1)C", 'F'}, {"0T(1)F", 'F'}, {"0T(1)O", 'F'}, {"0T(1)U", 'F'}, {"0T(1F(", 'F'}, {"0T(1N)", 'F'}, - {"0T(1NO", 'F'}, {"0T(1O(", 'F'}, {"0T(1OF", 'F'}, {"0T(1OS", 'F'}, + {"0T(1OT", 'F'}, {"0T(1OV", 'F'}, {"0T(1S)", 'F'}, {"0T(1V)", 'F'}, {"0T(1VO", 'F'}, - {"0T(F((", 'F'}, + {"0T(E(1", 'F'}, + {"0T(E(E", 'F'}, + {"0T(E(F", 'F'}, + {"0T(E(N", 'F'}, + {"0T(E(S", 'F'}, + {"0T(E(V", 'F'}, + {"0T(E1&", 'F'}, + {"0T(E1)", 'F'}, + {"0T(E1O", 'F'}, + {"0T(EF(", 'F'}, + {"0T(EK(", 'F'}, + {"0T(EK1", 'F'}, + {"0T(EKF", 'F'}, + {"0T(EKN", 'F'}, + {"0T(EKS", 'F'}, + {"0T(EKT", 'F'}, + {"0T(EKV", 'F'}, + {"0T(EN&", 'F'}, + {"0T(EN)", 'F'}, + {"0T(ENO", 'F'}, + {"0T(ES&", 'F'}, + {"0T(ES)", 'F'}, + {"0T(ESO", 'F'}, + {"0T(ET(", 'F'}, + {"0T(EV&", 'F'}, + {"0T(EV)", 'F'}, + {"0T(EVO", 'F'}, {"0T(F()", 'F'}, {"0T(F(1", 'F'}, + {"0T(F(E", 'F'}, {"0T(F(F", 'F'}, {"0T(F(N", 'F'}, {"0T(F(S", 'F'}, + {"0T(F(T", 'F'}, {"0T(F(V", 'F'}, - {"0T(N((", 'F'}, + {"0T(N&(", 'F'}, + {"0T(N&1", 'F'}, + {"0T(N&F", 'F'}, + {"0T(N&N", 'F'}, + {"0T(N&S", 'F'}, + {"0T(N&V", 'F'}, {"0T(N(1", 'F'}, {"0T(N(F", 'F'}, {"0T(N(S", 'F'}, {"0T(N(V", 'F'}, - {"0T(N))", 'F'}, + {"0T(N)&", 'F'}, + {"0T(N)C", 'F'}, {"0T(N)F", 'F'}, {"0T(N)O", 'F'}, {"0T(N)U", 'F'}, @@ -7304,10 +7106,18 @@ static const keyword_t sql_keywords[] = { {"0T(NO(", 'F'}, {"0T(NOF", 'F'}, {"0T(NOS", 'F'}, + {"0T(NOT", 'F'}, {"0T(NOV", 'F'}, {"0T(NS)", 'F'}, {"0T(NSO", 'F'}, - {"0T(S))", 'F'}, + {"0T(S&(", 'F'}, + {"0T(S&1", 'F'}, + {"0T(S&F", 'F'}, + {"0T(S&N", 'F'}, + {"0T(S&S", 'F'}, + {"0T(S&V", 'F'}, + {"0T(S)&", 'F'}, + {"0T(S)C", 'F'}, {"0T(S)F", 'F'}, {"0T(S)O", 'F'}, {"0T(S)U", 'F'}, @@ -7321,10 +7131,24 @@ static const keyword_t sql_keywords[] = { {"0T(SOF", 'F'}, {"0T(SON", 'F'}, {"0T(SOS", 'F'}, + {"0T(SOT", 'F'}, {"0T(SOV", 'F'}, {"0T(SV)", 'F'}, {"0T(SVO", 'F'}, - {"0T(V))", 'F'}, + {"0T(T(1", 'F'}, + {"0T(T(E", 'F'}, + {"0T(T(F", 'F'}, + {"0T(T(N", 'F'}, + {"0T(T(S", 'F'}, + {"0T(T(V", 'F'}, + {"0T(V&(", 'F'}, + {"0T(V&1", 'F'}, + {"0T(V&F", 'F'}, + {"0T(V&N", 'F'}, + {"0T(V&S", 'F'}, + {"0T(V&V", 'F'}, + {"0T(V)&", 'F'}, + {"0T(V)C", 'F'}, {"0T(V)F", 'F'}, {"0T(V)O", 'F'}, {"0T(V)U", 'F'}, @@ -7332,16 +7156,15 @@ static const keyword_t sql_keywords[] = { {"0T(VO(", 'F'}, {"0T(VOF", 'F'}, {"0T(VOS", 'F'}, + {"0T(VOT", 'F'}, {"0T(VS)", 'F'}, {"0T(VSO", 'F'}, {"0T(VV)", 'F'}, - {"0T1F((", 'F'}, {"0T1F(1", 'F'}, {"0T1F(F", 'F'}, {"0T1F(N", 'F'}, {"0T1F(S", 'F'}, {"0T1F(V", 'F'}, - {"0T1O((", 'F'}, {"0T1O(1", 'F'}, {"0T1O(F", 'F'}, {"0T1O(N", 'F'}, @@ -7352,14 +7175,6 @@ static const keyword_t sql_keywords[] = { {"0T1OSO", 'F'}, {"0T1OVF", 'F'}, {"0T1OVO", 'F'}, - {"0TF(((", 'F'}, - {"0TF(()", 'F'}, - {"0TF((1", 'F'}, - {"0TF((F", 'F'}, - {"0TF((N", 'F'}, - {"0TF((S", 'F'}, - {"0TF((V", 'F'}, - {"0TF())", 'F'}, {"0TF()F", 'F'}, {"0TF()O", 'F'}, {"0TF(1)", 'F'}, @@ -7371,12 +7186,6 @@ static const keyword_t sql_keywords[] = { {"0TF(SO", 'F'}, {"0TF(V)", 'F'}, {"0TF(VO", 'F'}, - {"0TN(((", 'F'}, - {"0TN((1", 'F'}, - {"0TN((F", 'F'}, - {"0TN((N", 'F'}, - {"0TN((S", 'F'}, - {"0TN((V", 'F'}, {"0TN(1)", 'F'}, {"0TN(1O", 'F'}, {"0TN(F(", 'F'}, @@ -7390,14 +7199,12 @@ static const keyword_t sql_keywords[] = { {"0TN1OF", 'F'}, {"0TN1OS", 'F'}, {"0TN1OV", 'F'}, - {"0TNF((", 'F'}, {"0TNF()", 'F'}, {"0TNF(1", 'F'}, {"0TNF(F", 'F'}, {"0TNF(N", 'F'}, {"0TNF(S", 'F'}, {"0TNF(V", 'F'}, - {"0TNO((", 'F'}, {"0TNO(1", 'F'}, {"0TNO(F", 'F'}, {"0TNO(N", 'F'}, @@ -7418,12 +7225,6 @@ static const keyword_t sql_keywords[] = { {"0TNSOV", 'F'}, {"0TNV;", 'F'}, {"0TNVOS", 'F'}, - {"0TO(((", 'F'}, - {"0TO((1", 'F'}, - {"0TO((F", 'F'}, - {"0TO((N", 'F'}, - {"0TO((S", 'F'}, - {"0TO((V", 'F'}, {"0TO(1)", 'F'}, {"0TO(1O", 'F'}, {"0TO(F(", 'F'}, @@ -7438,7 +7239,6 @@ static const keyword_t sql_keywords[] = { {"0TO1OS", 'F'}, {"0TO1OV", 'F'}, {"0TO1UE", 'F'}, - {"0TOF((", 'F'}, {"0TOF()", 'F'}, {"0TOF(1", 'F'}, {"0TOF(F", 'F'}, @@ -7461,13 +7261,11 @@ static const keyword_t sql_keywords[] = { {"0TOVOF", 'F'}, {"0TOVOS", 'F'}, {"0TOVUE", 'F'}, - {"0TSF((", 'F'}, {"0TSF(1", 'F'}, {"0TSF(F", 'F'}, {"0TSF(N", 'F'}, {"0TSF(S", 'F'}, {"0TSF(V", 'F'}, - {"0TSO((", 'F'}, {"0TSO(1", 'F'}, {"0TSO(F", 'F'}, {"0TSO(N", 'F'}, @@ -7482,13 +7280,11 @@ static const keyword_t sql_keywords[] = { {"0TSOSO", 'F'}, {"0TSOVF", 'F'}, {"0TSOVO", 'F'}, - {"0TVF((", 'F'}, {"0TVF(1", 'F'}, {"0TVF(F", 'F'}, {"0TVF(N", 'F'}, {"0TVF(S", 'F'}, {"0TVF(V", 'F'}, - {"0TVO((", 'F'}, {"0TVO(1", 'F'}, {"0TVO(F", 'F'}, {"0TVO(N", 'F'}, @@ -7497,17 +7293,6 @@ static const keyword_t sql_keywords[] = { {"0TVOF(", 'F'}, {"0TVOSF", 'F'}, {"0TVOSO", 'F'}, - {"0U((((", 'F'}, - {"0U(((E", 'F'}, - {"0U((E(", 'F'}, - {"0U((E1", 'F'}, - {"0U((EF", 'F'}, - {"0U((EK", 'F'}, - {"0U((EN", 'F'}, - {"0U((EO", 'F'}, - {"0U((ES", 'F'}, - {"0U((EV", 'F'}, - {"0U(E((", 'F'}, {"0U(E(1", 'F'}, {"0U(E(F", 'F'}, {"0U(E(K", 'F'}, @@ -7532,12 +7317,6 @@ static const keyword_t sql_keywords[] = { {"0U(ESO", 'F'}, {"0U(EV)", 'F'}, {"0U(EVO", 'F'}, - {"0UE(((", 'F'}, - {"0UE((1", 'F'}, - {"0UE((F", 'F'}, - {"0UE((N", 'F'}, - {"0UE((S", 'F'}, - {"0UE((V", 'F'}, {"0UE(1)", 'F'}, {"0UE(1,", 'F'}, {"0UE(1O", 'F'}, @@ -7568,14 +7347,12 @@ static const keyword_t sql_keywords[] = { {"0UE1OF", 'F'}, {"0UE1OS", 'F'}, {"0UE1OV", 'F'}, - {"0UEF((", 'F'}, {"0UEF()", 'F'}, {"0UEF(1", 'F'}, {"0UEF(F", 'F'}, {"0UEF(N", 'F'}, {"0UEF(S", 'F'}, {"0UEF(V", 'F'}, - {"0UEK((", 'F'}, {"0UEK(1", 'F'}, {"0UEK(F", 'F'}, {"0UEK(N", 'F'}, @@ -7606,8 +7383,6 @@ static const keyword_t sql_keywords[] = { {"0UEKVC", 'F'}, {"0UEKVK", 'F'}, {"0UEKVO", 'F'}, - {"0UEN", 'F'}, - {"0UEN((", 'F'}, {"0UEN()", 'F'}, {"0UEN,(", 'F'}, {"0UEN,F", 'F'}, @@ -7663,24 +7438,11 @@ static const keyword_t sql_keywords[] = { {"0UEVO(", 'F'}, {"0UEVOF", 'F'}, {"0UEVOS", 'F'}, - {"0UF(((", 'F'}, - {"0UF((1", 'F'}, - {"0UF((F", 'F'}, - {"0UF((N", 'F'}, - {"0UF((S", 'F'}, - {"0UF((V", 'F'}, {"0UF(1O", 'F'}, {"0UF(F(", 'F'}, {"0UF(NO", 'F'}, {"0UF(SO", 'F'}, {"0UF(VO", 'F'}, - {"0V&(((", 'F'}, - {"0V&((1", 'F'}, - {"0V&((E", 'F'}, - {"0V&((F", 'F'}, - {"0V&((N", 'F'}, - {"0V&((S", 'F'}, - {"0V&((V", 'F'}, {"0V&(1&", 'F'}, {"0V&(1)", 'F'}, {"0V&(1,", 'F'}, @@ -7692,6 +7454,7 @@ static const keyword_t sql_keywords[] = { {"0V&(EN", 'F'}, {"0V&(EO", 'F'}, {"0V&(ES", 'F'}, + {"0V&(ET", 'F'}, {"0V&(EV", 'F'}, {"0V&(F(", 'F'}, {"0V&(N&", 'F'}, @@ -7702,6 +7465,7 @@ static const keyword_t sql_keywords[] = { {"0V&(S)", 'F'}, {"0V&(S,", 'F'}, {"0V&(SO", 'F'}, + {"0V&(T(", 'F'}, {"0V&(V&", 'F'}, {"0V&(V)", 'F'}, {"0V&(V,", 'F'}, @@ -7714,7 +7478,8 @@ static const keyword_t sql_keywords[] = { {"0V&1&S", 'F'}, {"0V&1&V", 'F'}, {"0V&1)&", 'F'}, - {"0V&1))", 'F'}, + {"0V&1)C", 'F'}, + {"0V&1)O", 'F'}, {"0V&1)U", 'F'}, {"0V&1;", 'F'}, {"0V&1;C", 'F'}, @@ -7747,7 +7512,6 @@ static const keyword_t sql_keywords[] = { {"0V&1U;", 'F'}, {"0V&1UC", 'F'}, {"0V&1UE", 'F'}, - {"0V&E((", 'F'}, {"0V&E(1", 'F'}, {"0V&E(F", 'F'}, {"0V&E(N", 'F'}, @@ -7781,12 +7545,13 @@ static const keyword_t sql_keywords[] = { {"0V&EVC", 'F'}, {"0V&EVK", 'F'}, {"0V&EVO", 'F'}, - {"0V&F((", 'F'}, {"0V&F()", 'F'}, {"0V&F(1", 'F'}, + {"0V&F(E", 'F'}, {"0V&F(F", 'F'}, {"0V&F(N", 'F'}, {"0V&F(S", 'F'}, + {"0V&F(T", 'F'}, {"0V&F(V", 'F'}, {"0V&K&(", 'F'}, {"0V&K&1", 'F'}, @@ -7794,7 +7559,6 @@ static const keyword_t sql_keywords[] = { {"0V&K&N", 'F'}, {"0V&K&S", 'F'}, {"0V&K&V", 'F'}, - {"0V&K((", 'F'}, {"0V&K(1", 'F'}, {"0V&K(F", 'F'}, {"0V&K(N", 'F'}, @@ -7820,7 +7584,8 @@ static const keyword_t sql_keywords[] = { {"0V&N&S", 'F'}, {"0V&N&V", 'F'}, {"0V&N)&", 'F'}, - {"0V&N))", 'F'}, + {"0V&N)C", 'F'}, + {"0V&N)O", 'F'}, {"0V&N)U", 'F'}, {"0V&N;", 'F'}, {"0V&N;C", 'F'}, @@ -7859,7 +7624,8 @@ static const keyword_t sql_keywords[] = { {"0V&S&S", 'F'}, {"0V&S&V", 'F'}, {"0V&S)&", 'F'}, - {"0V&S))", 'F'}, + {"0V&S)C", 'F'}, + {"0V&S)O", 'F'}, {"0V&S)U", 'F'}, {"0V&S1", 'F'}, {"0V&S1;", 'F'}, @@ -7902,6 +7668,12 @@ static const keyword_t sql_keywords[] = { {"0V&SV;", 'F'}, {"0V&SVC", 'F'}, {"0V&SVO", 'F'}, + {"0V&T(1", 'F'}, + {"0V&T(E", 'F'}, + {"0V&T(F", 'F'}, + {"0V&T(N", 'F'}, + {"0V&T(S", 'F'}, + {"0V&T(V", 'F'}, {"0V&V", 'F'}, {"0V&V&(", 'F'}, {"0V&V&1", 'F'}, @@ -7910,7 +7682,8 @@ static const keyword_t sql_keywords[] = { {"0V&V&S", 'F'}, {"0V&V&V", 'F'}, {"0V&V)&", 'F'}, - {"0V&V))", 'F'}, + {"0V&V)C", 'F'}, + {"0V&V)O", 'F'}, {"0V&V)U", 'F'}, {"0V&V;", 'F'}, {"0V&V;C", 'F'}, @@ -7946,17 +7719,11 @@ static const keyword_t sql_keywords[] = { {"0V&VU;", 'F'}, {"0V&VUC", 'F'}, {"0V&VUE", 'F'}, - {"0V((((", 'F'}, - {"0V(((E", 'F'}, - {"0V(((U", 'F'}, - {"0V((EK", 'F'}, - {"0V((EN", 'F'}, - {"0V((U(", 'F'}, + {"0V(EF(", 'F'}, + {"0V(EKF", 'F'}, {"0V(EKN", 'F'}, {"0V(ENK", 'F'}, - {"0V(U((", 'F'}, {"0V(U(E", 'F'}, - {"0V)&((", 'F'}, {"0V)&(1", 'F'}, {"0V)&(E", 'F'}, {"0V)&(F", 'F'}, @@ -8000,54 +7767,6 @@ static const keyword_t sql_keywords[] = { {"0V)&VF", 'F'}, {"0V)&VO", 'F'}, {"0V)&VU", 'F'}, - {"0V))&(", 'F'}, - {"0V))&1", 'F'}, - {"0V))&F", 'F'}, - {"0V))&N", 'F'}, - {"0V))&S", 'F'}, - {"0V))&V", 'F'}, - {"0V)))&", 'F'}, - {"0V))))", 'F'}, - {"0V))),", 'F'}, - {"0V)));", 'F'}, - {"0V)))B", 'F'}, - {"0V)))E", 'F'}, - {"0V)))K", 'F'}, - {"0V)))O", 'F'}, - {"0V)))U", 'F'}, - {"0V)),(", 'F'}, - {"0V));E", 'F'}, - {"0V));T", 'F'}, - {"0V))B(", 'F'}, - {"0V))B1", 'F'}, - {"0V))BF", 'F'}, - {"0V))BN", 'F'}, - {"0V))BS", 'F'}, - {"0V))BV", 'F'}, - {"0V))E(", 'F'}, - {"0V))E1", 'F'}, - {"0V))EF", 'F'}, - {"0V))EK", 'F'}, - {"0V))EN", 'F'}, - {"0V))ES", 'F'}, - {"0V))EV", 'F'}, - {"0V))K(", 'F'}, - {"0V))K1", 'F'}, - {"0V))KB", 'F'}, - {"0V))KF", 'F'}, - {"0V))KN", 'F'}, - {"0V))KS", 'F'}, - {"0V))KU", 'F'}, - {"0V))KV", 'F'}, - {"0V))O(", 'F'}, - {"0V))O1", 'F'}, - {"0V))OF", 'F'}, - {"0V))ON", 'F'}, - {"0V))OS", 'F'}, - {"0V))OV", 'F'}, - {"0V))U(", 'F'}, - {"0V))UE", 'F'}, - {"0V),((", 'F'}, {"0V),(1", 'F'}, {"0V),(F", 'F'}, {"0V),(N", 'F'}, @@ -8069,7 +7788,6 @@ static const keyword_t sql_keywords[] = { {"0V);TO", 'F'}, {"0V);TS", 'F'}, {"0V);TV", 'F'}, - {"0V)B((", 'F'}, {"0V)B(1", 'F'}, {"0V)B(F", 'F'}, {"0V)B(N", 'F'}, @@ -8105,7 +7823,7 @@ static const keyword_t sql_keywords[] = { {"0V)BVK", 'F'}, {"0V)BVO", 'F'}, {"0V)BVU", 'F'}, - {"0V)E((", 'F'}, + {"0V)C", 'F'}, {"0V)E(1", 'F'}, {"0V)E(F", 'F'}, {"0V)E(N", 'F'}, @@ -8126,7 +7844,6 @@ static const keyword_t sql_keywords[] = { {"0V)ESO", 'F'}, {"0V)EVC", 'F'}, {"0V)EVO", 'F'}, - {"0V)K((", 'F'}, {"0V)K(1", 'F'}, {"0V)K(F", 'F'}, {"0V)K(N", 'F'}, @@ -8164,12 +7881,12 @@ static const keyword_t sql_keywords[] = { {"0V)KVE", 'F'}, {"0V)KVO", 'F'}, {"0V)KVU", 'F'}, - {"0V)O((", 'F'}, {"0V)O(1", 'F'}, {"0V)O(E", 'F'}, {"0V)O(F", 'F'}, {"0V)O(N", 'F'}, {"0V)O(S", 'F'}, + {"0V)O(T", 'F'}, {"0V)O(V", 'F'}, {"0V)O1", 'F'}, {"0V)O1&", 'F'}, @@ -8208,7 +7925,6 @@ static const keyword_t sql_keywords[] = { {"0V)OVK", 'F'}, {"0V)OVO", 'F'}, {"0V)OVU", 'F'}, - {"0V)U((", 'F'}, {"0V)U(E", 'F'}, {"0V)UE(", 'F'}, {"0V)UE1", 'F'}, @@ -8217,13 +7933,6 @@ static const keyword_t sql_keywords[] = { {"0V)UEN", 'F'}, {"0V)UES", 'F'}, {"0V)UEV", 'F'}, - {"0V,(((", 'F'}, - {"0V,((1", 'F'}, - {"0V,((E", 'F'}, - {"0V,((F", 'F'}, - {"0V,((N", 'F'}, - {"0V,((S", 'F'}, - {"0V,((V", 'F'}, {"0V,(1)", 'F'}, {"0V,(1O", 'F'}, {"0V,(E(", 'F'}, @@ -8240,7 +7949,6 @@ static const keyword_t sql_keywords[] = { {"0V,(SO", 'F'}, {"0V,(V)", 'F'}, {"0V,(VO", 'F'}, - {"0V,1))", 'F'}, {"0V,1),", 'F'}, {"0V,1)O", 'F'}, {"0V,1B(", 'F'}, @@ -8254,7 +7962,6 @@ static const keyword_t sql_keywords[] = { {"0V,1OS", 'F'}, {"0V,1OV", 'F'}, {"0V,1UE", 'F'}, - {"0V,F((", 'F'}, {"0V,F()", 'F'}, {"0V,F(1", 'F'}, {"0V,F(F", 'F'}, @@ -8262,7 +7969,6 @@ static const keyword_t sql_keywords[] = { {"0V,F(S", 'F'}, {"0V,F(T", 'F'}, {"0V,F(V", 'F'}, - {"0V,N))", 'F'}, {"0V,N),", 'F'}, {"0V,N)O", 'F'}, {"0V,NB(", 'F'}, @@ -8276,7 +7982,6 @@ static const keyword_t sql_keywords[] = { {"0V,NOS", 'F'}, {"0V,NOV", 'F'}, {"0V,NUE", 'F'}, - {"0V,S))", 'F'}, {"0V,S),", 'F'}, {"0V,S)O", 'F'}, {"0V,SB(", 'F'}, @@ -8292,7 +7997,6 @@ static const keyword_t sql_keywords[] = { {"0V,SOS", 'F'}, {"0V,SOV", 'F'}, {"0V,SUE", 'F'}, - {"0V,V))", 'F'}, {"0V,V),", 'F'}, {"0V,V)O", 'F'}, {"0V,VB(", 'F'}, @@ -8305,7 +8009,6 @@ static const keyword_t sql_keywords[] = { {"0V,VOF", 'F'}, {"0V,VOS", 'F'}, {"0V,VUE", 'F'}, - {"0V;E((", 'F'}, {"0V;E(1", 'F'}, {"0V;E(E", 'F'}, {"0V;E(F", 'F'}, @@ -8315,6 +8018,7 @@ static const keyword_t sql_keywords[] = { {"0V;E1,", 'F'}, {"0V;E1;", 'F'}, {"0V;E1C", 'F'}, + {"0V;E1K", 'F'}, {"0V;E1O", 'F'}, {"0V;E1T", 'F'}, {"0V;EF(", 'F'}, @@ -8328,6 +8032,7 @@ static const keyword_t sql_keywords[] = { {"0V;EN,", 'F'}, {"0V;EN;", 'F'}, {"0V;ENC", 'F'}, + {"0V;ENE", 'F'}, {"0V;ENK", 'F'}, {"0V;ENO", 'F'}, {"0V;ENT", 'F'}, @@ -8335,15 +8040,16 @@ static const keyword_t sql_keywords[] = { {"0V;ES,", 'F'}, {"0V;ES;", 'F'}, {"0V;ESC", 'F'}, + {"0V;ESK", 'F'}, {"0V;ESO", 'F'}, {"0V;EST", 'F'}, {"0V;EV,", 'F'}, {"0V;EV;", 'F'}, {"0V;EVC", 'F'}, + {"0V;EVK", 'F'}, {"0V;EVO", 'F'}, {"0V;EVT", 'F'}, {"0V;N:T", 'F'}, - {"0V;T((", 'F'}, {"0V;T(1", 'F'}, {"0V;T(E", 'F'}, {"0V;T(F", 'F'}, @@ -8354,6 +8060,7 @@ static const keyword_t sql_keywords[] = { {"0V;T1;", 'F'}, {"0V;T1C", 'F'}, {"0V;T1F", 'F'}, + {"0V;T1K", 'F'}, {"0V;T1O", 'F'}, {"0V;T1T", 'F'}, {"0V;T;", 'F'}, @@ -8385,6 +8092,7 @@ static const keyword_t sql_keywords[] = { {"0V;TS;", 'F'}, {"0V;TSC", 'F'}, {"0V;TSF", 'F'}, + {"0V;TSK", 'F'}, {"0V;TSO", 'F'}, {"0V;TST", 'F'}, {"0V;TT(", 'F'}, @@ -8397,14 +8105,9 @@ static const keyword_t sql_keywords[] = { {"0V;TV;", 'F'}, {"0V;TVC", 'F'}, {"0V;TVF", 'F'}, + {"0V;TVK", 'F'}, {"0V;TVO", 'F'}, {"0V;TVT", 'F'}, - {"0VA(((", 'F'}, - {"0VA((1", 'F'}, - {"0VA((F", 'F'}, - {"0VA((N", 'F'}, - {"0VA((S", 'F'}, - {"0VA((V", 'F'}, {"0VA(F(", 'F'}, {"0VA(N)", 'F'}, {"0VA(NO", 'F'}, @@ -8412,7 +8115,6 @@ static const keyword_t sql_keywords[] = { {"0VA(SO", 'F'}, {"0VA(V)", 'F'}, {"0VA(VO", 'F'}, - {"0VAF((", 'F'}, {"0VAF()", 'F'}, {"0VAF(1", 'F'}, {"0VAF(F", 'F'}, @@ -8437,12 +8139,6 @@ static const keyword_t sql_keywords[] = { {"0VAVOF", 'F'}, {"0VAVOS", 'F'}, {"0VAVUE", 'F'}, - {"0VB(((", 'F'}, - {"0VB((1", 'F'}, - {"0VB((F", 'F'}, - {"0VB((N", 'F'}, - {"0VB((S", 'F'}, - {"0VB((V", 'F'}, {"0VB(1)", 'F'}, {"0VB(1O", 'F'}, {"0VB(F(", 'F'}, @@ -8483,14 +8179,12 @@ static const keyword_t sql_keywords[] = { {"0VB1OV", 'F'}, {"0VB1U(", 'F'}, {"0VB1UE", 'F'}, - {"0VBE((", 'F'}, {"0VBE(1", 'F'}, {"0VBE(F", 'F'}, {"0VBE(N", 'F'}, {"0VBE(S", 'F'}, {"0VBE(V", 'F'}, {"0VBEK(", 'F'}, - {"0VBF((", 'F'}, {"0VBF()", 'F'}, {"0VBF(1", 'F'}, {"0VBF(F", 'F'}, @@ -8595,12 +8289,6 @@ static const keyword_t sql_keywords[] = { {"0VBVU(", 'F'}, {"0VBVUE", 'F'}, {"0VC", 'F'}, - {"0VE(((", 'F'}, - {"0VE((1", 'F'}, - {"0VE((F", 'F'}, - {"0VE((N", 'F'}, - {"0VE((S", 'F'}, - {"0VE((V", 'F'}, {"0VE(1)", 'F'}, {"0VE(1O", 'F'}, {"0VE(F(", 'F'}, @@ -8616,14 +8304,12 @@ static const keyword_t sql_keywords[] = { {"0VE1OS", 'F'}, {"0VE1OV", 'F'}, {"0VE1UE", 'F'}, - {"0VEF((", 'F'}, {"0VEF()", 'F'}, {"0VEF(1", 'F'}, {"0VEF(F", 'F'}, {"0VEF(N", 'F'}, {"0VEF(S", 'F'}, {"0VEF(V", 'F'}, - {"0VEK((", 'F'}, {"0VEK(1", 'F'}, {"0VEK(E", 'F'}, {"0VEK(F", 'F'}, @@ -8667,7 +8353,6 @@ static const keyword_t sql_keywords[] = { {"0VESOS", 'F'}, {"0VESOV", 'F'}, {"0VESUE", 'F'}, - {"0VEU((", 'F'}, {"0VEU(1", 'F'}, {"0VEU(F", 'F'}, {"0VEU(N", 'F'}, @@ -8693,14 +8378,6 @@ static const keyword_t sql_keywords[] = { {"0VEVOF", 'F'}, {"0VEVOS", 'F'}, {"0VEVUE", 'F'}, - {"0VF(((", 'F'}, - {"0VF(()", 'F'}, - {"0VF((1", 'F'}, - {"0VF((F", 'F'}, - {"0VF((N", 'F'}, - {"0VF((S", 'F'}, - {"0VF((V", 'F'}, - {"0VF())", 'F'}, {"0VF()1", 'F'}, {"0VF()F", 'F'}, {"0VF()K", 'F'}, @@ -8712,6 +8389,13 @@ static const keyword_t sql_keywords[] = { {"0VF(1)", 'F'}, {"0VF(1N", 'F'}, {"0VF(1O", 'F'}, + {"0VF(E(", 'F'}, + {"0VF(E1", 'F'}, + {"0VF(EF", 'F'}, + {"0VF(EK", 'F'}, + {"0VF(EN", 'F'}, + {"0VF(ES", 'F'}, + {"0VF(EV", 'F'}, {"0VF(F(", 'F'}, {"0VF(N)", 'F'}, {"0VF(N,", 'F'}, @@ -8720,12 +8404,6 @@ static const keyword_t sql_keywords[] = { {"0VF(SO", 'F'}, {"0VF(V)", 'F'}, {"0VF(VO", 'F'}, - {"0VK(((", 'F'}, - {"0VK((1", 'F'}, - {"0VK((F", 'F'}, - {"0VK((N", 'F'}, - {"0VK((S", 'F'}, - {"0VK((V", 'F'}, {"0VK(1)", 'F'}, {"0VK(1O", 'F'}, {"0VK(F(", 'F'}, @@ -8741,14 +8419,6 @@ static const keyword_t sql_keywords[] = { {"0VK)&N", 'F'}, {"0VK)&S", 'F'}, {"0VK)&V", 'F'}, - {"0VK))&", 'F'}, - {"0VK)))", 'F'}, - {"0VK));", 'F'}, - {"0VK))B", 'F'}, - {"0VK))E", 'F'}, - {"0VK))K", 'F'}, - {"0VK))O", 'F'}, - {"0VK))U", 'F'}, {"0VK);E", 'F'}, {"0VK);T", 'F'}, {"0VK)B(", 'F'}, @@ -8797,7 +8467,6 @@ static const keyword_t sql_keywords[] = { {"0VK1OV", 'F'}, {"0VK1U(", 'F'}, {"0VK1UE", 'F'}, - {"0VKF((", 'F'}, {"0VKF()", 'F'}, {"0VKF(1", 'F'}, {"0VKF(F", 'F'}, @@ -8900,15 +8569,6 @@ static const keyword_t sql_keywords[] = { {"0VKVOS", 'F'}, {"0VKVU(", 'F'}, {"0VKVUE", 'F'}, - {"0VO(((", 'F'}, - {"0VO((1", 'F'}, - {"0VO((E", 'F'}, - {"0VO((F", 'F'}, - {"0VO((N", 'F'}, - {"0VO((O", 'F'}, - {"0VO((S", 'F'}, - {"0VO((T", 'F'}, - {"0VO((V", 'F'}, {"0VO(1&", 'F'}, {"0VO(1)", 'F'}, {"0VO(1,", 'F'}, @@ -8920,6 +8580,7 @@ static const keyword_t sql_keywords[] = { {"0VO(EK", 'F'}, {"0VO(EN", 'F'}, {"0VO(ES", 'F'}, + {"0VO(ET", 'F'}, {"0VO(EV", 'F'}, {"0VO(F(", 'F'}, {"0VO(N&", 'F'}, @@ -8941,13 +8602,13 @@ static const keyword_t sql_keywords[] = { {"0VO(V)", 'F'}, {"0VO(V,", 'F'}, {"0VO(VO", 'F'}, - {"0VOF((", 'F'}, {"0VOF()", 'F'}, {"0VOF(1", 'F'}, {"0VOF(E", 'F'}, {"0VOF(F", 'F'}, {"0VOF(N", 'F'}, {"0VOF(S", 'F'}, + {"0VOF(T", 'F'}, {"0VOF(V", 'F'}, {"0VOK&(", 'F'}, {"0VOK&1", 'F'}, @@ -8955,7 +8616,6 @@ static const keyword_t sql_keywords[] = { {"0VOK&N", 'F'}, {"0VOK&S", 'F'}, {"0VOK&V", 'F'}, - {"0VOK((", 'F'}, {"0VOK(1", 'F'}, {"0VOK(F", 'F'}, {"0VOK(N", 'F'}, @@ -8983,16 +8643,16 @@ static const keyword_t sql_keywords[] = { {"0VOS&K", 'F'}, {"0VOS&N", 'F'}, {"0VOS&S", 'F'}, + {"0VOS&T", 'F'}, {"0VOS&U", 'F'}, {"0VOS&V", 'F'}, - {"0VOS((", 'F'}, {"0VOS(E", 'F'}, {"0VOS(U", 'F'}, {"0VOS)&", 'F'}, - {"0VOS))", 'F'}, {"0VOS),", 'F'}, {"0VOS);", 'F'}, {"0VOS)B", 'F'}, + {"0VOS)C", 'F'}, {"0VOS)E", 'F'}, {"0VOS)K", 'F'}, {"0VOS)O", 'F'}, @@ -9071,24 +8731,17 @@ static const keyword_t sql_keywords[] = { {"0VOSVO", 'F'}, {"0VOSVS", 'F'}, {"0VOSVU", 'F'}, - {"0VOT((", 'F'}, {"0VOT(1", 'F'}, + {"0VOT(E", 'F'}, {"0VOT(F", 'F'}, {"0VOT(N", 'F'}, {"0VOT(S", 'F'}, + {"0VOT(T", 'F'}, {"0VOT(V", 'F'}, - {"0VOU((", 'F'}, {"0VOU(E", 'F'}, {"0VOUEK", 'F'}, {"0VOUEN", 'F'}, {"0VU", 'F'}, - {"0VU(((", 'F'}, - {"0VU((1", 'F'}, - {"0VU((E", 'F'}, - {"0VU((F", 'F'}, - {"0VU((N", 'F'}, - {"0VU((S", 'F'}, - {"0VU((V", 'F'}, {"0VU(1)", 'F'}, {"0VU(1O", 'F'}, {"0VU(E(", 'F'}, @@ -9117,7 +8770,6 @@ static const keyword_t sql_keywords[] = { {"0VU;C", 'F'}, {"0VUC", 'F'}, {"0VUE", 'F'}, - {"0VUE((", 'F'}, {"0VUE(1", 'F'}, {"0VUE(E", 'F'}, {"0VUE(F", 'F'}, @@ -9203,16 +8855,13 @@ static const keyword_t sql_keywords[] = { {"0VUEVO", 'F'}, {"0VUEVS", 'F'}, {"0VUEVU", 'F'}, - {"0VUF((", 'F'}, {"0VUF()", 'F'}, {"0VUF(1", 'F'}, {"0VUF(F", 'F'}, {"0VUF(N", 'F'}, {"0VUF(S", 'F'}, {"0VUF(V", 'F'}, - {"0VUK((", 'F'}, {"0VUK(E", 'F'}, - {"0VUN((", 'F'}, {"0VUN(1", 'F'}, {"0VUN(F", 'F'}, {"0VUN(S", 'F'}, @@ -9238,7 +8887,6 @@ static const keyword_t sql_keywords[] = { {"0VUNS(", 'F'}, {"0VUNS,", 'F'}, {"0VUNSO", 'F'}, - {"0VUO((", 'F'}, {"0VUO(E", 'F'}, {"0VUON(", 'F'}, {"0VUON1", 'F'}, @@ -9295,6 +8943,7 @@ static const keyword_t sql_keywords[] = { {"ALTER TABLE", 'k'}, {"ANALYZE", 'k'}, {"AND", '&'}, + {"ANY", 'f'}, {"ANYARRAY", 't'}, {"ANYELEMENT", 't'}, {"ANYNONARRY", 't'}, @@ -9585,6 +9234,7 @@ static const keyword_t sql_keywords[] = { {"FROM", 'k'}, {"FROM_DAYS", 'f'}, {"FROM_UNIXTIME", 'f'}, + {"FULL JOIN", 'k'}, {"FULL OUTER", 'k'}, {"FULL OUTER JOIN", 'k'}, {"FULLTEXT", 'k'}, @@ -9626,6 +9276,8 @@ static const keyword_t sql_keywords[] = { {"IDENT_SEED", 'f'}, {"IF", 'f'}, {"IF EXISTS", 'f'}, + {"IF NOT", 'n'}, + {"IF NOT EXISTS", 'f'}, {"IFF", 'f'}, {"IFNULL", 'f'}, {"IGNORE", 'k'}, @@ -9774,6 +9426,7 @@ static const keyword_t sql_keywords[] = { {"NAME_CONST", 'f'}, {"NATURAL", 'n'}, {"NATURAL FULL", 'k'}, + {"NATURAL FULL OUTER JOIN", 'k'}, {"NATURAL INNER", 'k'}, {"NATURAL JOIN", 'k'}, {"NATURAL LEFT", 'k'}, @@ -9781,6 +9434,7 @@ static const keyword_t sql_keywords[] = { {"NATURAL LEFT OUTER JOIN", 'k'}, {"NATURAL OUTER", 'k'}, {"NATURAL RIGHT", 'k'}, + {"NATURAL RIGHT OUTER JOIN", 'k'}, {"NETMASK", 'f'}, {"NEXT VALUE", 'n'}, {"NEXT VALUE FOR", 'k'}, @@ -9986,6 +9640,7 @@ static const keyword_t sql_keywords[] = { {"SMALLDATETIMEFROMPARTS", 'f'}, {"SMALLINT", 't'}, {"SMALLSERIAL", 't'}, + {"SOME", 'f'}, {"SOUNDEX", 'f'}, {"SOUNDS", 'o'}, {"SOUNDS LIKE", 'o'}, @@ -10224,5 +9879,5 @@ static const keyword_t sql_keywords[] = { {"||", '&'}, {"~*", 'o'}, }; -static const size_t sql_keywords_sz = 10057; +static const size_t sql_keywords_sz = 9712; #endif diff --git a/apache2/modsecurity.c b/apache2/modsecurity.c index 6b77132d..b36775d2 100644 --- a/apache2/modsecurity.c +++ b/apache2/modsecurity.c @@ -297,7 +297,7 @@ apr_status_t modsecurity_tx_init(modsec_rec *msr) { if (msr->request_content_length == -1) { /* There's no C-L, but is chunked encoding used? */ char *transfer_encoding = (char *)apr_table_get(msr->request_headers, "Transfer-Encoding"); - if ((transfer_encoding != NULL)&&(strstr(transfer_encoding, "chunked") != NULL)) { + if ((transfer_encoding != NULL)&&(m_strcasestr(transfer_encoding, "chunked") != NULL)) { msr->reqbody_should_exist = 1; msr->reqbody_chunked = 1; } diff --git a/apache2/msc_unicode.c b/apache2/msc_unicode.c index 47d0d796..85ab192f 100644 --- a/apache2/msc_unicode.c +++ b/apache2/msc_unicode.c @@ -110,7 +110,7 @@ static int unicode_map_create(directory_config *dcfg, char **error_msg) ucode = apr_strtok(mapping,":", &hmap); sscanf(ucode,"%x",&Code); sscanf(hmap,"%x",&Map); - if(Code >= 0 || Code <= 65535) { + if(Code >= 0 && Code <= 65535) { unicode_map_table[Code] = Map; } diff --git a/apache2/msc_util.c b/apache2/msc_util.c index 23ae0375..c5f86172 100644 --- a/apache2/msc_util.c +++ b/apache2/msc_util.c @@ -836,7 +836,7 @@ char *m_strcasestr(const char *haystack, const char *needle) { } #ifdef WIN32 -int inet_pton(int family, const char *src, void *dst) { +int my_inet_pton(int family, const char *src, void *dst) { struct addrinfo addr; struct sockaddr_in *in = NULL; #if APR_HAVE_IPV6 diff --git a/apache2/msc_util.h b/apache2/msc_util.h index ea716d33..1dd84a2e 100644 --- a/apache2/msc_util.h +++ b/apache2/msc_util.h @@ -50,6 +50,9 @@ int DSOLOCAL inet_pton(int family, const char *src, void *dst); int DSOLOCAL swap_int32(int x); #endif +#ifdef WIN32 +#define inet_pton(x, y, z) my_inet_pton(x, y, z) +#endif char DSOLOCAL *utf8_unicode_inplace_ex(apr_pool_t *mp, unsigned char *input, long int input_len, int *changed); diff --git a/autogen.sh b/autogen.sh index e2afe462..3d51987a 100755 --- a/autogen.sh +++ b/autogen.sh @@ -7,7 +7,8 @@ rm -rf autom4te.cache rm -f aclocal.m4 -libtoolize --force --copy +case `uname` in Darwin*) glibtoolize --force --copy ;; + *) libtoolize --force --copy ;; esac autoreconf --install autoheader automake --add-missing --foreign --copy --force-missing diff --git a/configure.ac b/configure.ac index 59b40ceb..ced68a12 100644 --- a/configure.ac +++ b/configure.ac @@ -707,6 +707,7 @@ AC_CONFIG_FILES([apache2/Makefile]) fi if test "$build_standalone_module" -ne 0; then AC_CONFIG_FILES([standalone/Makefile]) +AC_CONFIG_FILES([nginx/modsecurity/config]) fi if test "$build_extentions" -ne 0; then AC_CONFIG_FILES([ext/Makefile]) diff --git a/ext/Makefile.am b/ext/Makefile.am index 58964a3f..c98ca38a 100644 --- a/ext/Makefile.am +++ b/ext/Makefile.am @@ -1,17 +1,32 @@ + EXT_CFLAGS = -I../apache2 \ - @APXS_CFLAGS@ @APR_CFLAGS@ @APU_CFLAGS@ \ - @LIBXML2_CFLAGS@ @LUA_CFLAGS@ -EXT_CPPFLAGS = @APR_CPPFLAGS@ @LIBXML2_CPPFLAGS@ -EXT_LIBADD = @APR_LDADD@ @APU_LDADD@ @LIBXML2_LDADD@ @LUA_LDADD@ + @APR_CFLAGS@ \ + @APU_CFLAGS@ \ + @APXS_CFLAGS@ \ + @LIBXML2_CFLAGS@ \ + @LUA_CFLAGS@ + +EXT_CPPFLAGS = @APR_CPPFLAGS@ \ + @LIBXML2_CPPFLAGS@ + +EXT_LIBADD = @APR_LDADD@ \ + @APU_LDADD@ \ + @LIBXML2_LDADD@ \ + @LUA_LDADD@ + EXT_LDFLAGS = -no-undefined -module -avoid-version \ - @APR_LDFLAGS@ @APU_LDFLAGS@ @APXS_LDFLAGS@ \ - @LIBXML2_LDFLAGS@ @LUA_LDFLAGS@ + @APR_LDFLAGS@ \ + @APU_LDFLAGS@ \ + @APXS_LDFLAGS@ \ + @LIBXML2_LDFLAGS@ \ + @LUA_LDFLAGS@ pkglibdir = $(prefix)/lib + pkglib_LTLIBRARIES = mod_op_strstr.la \ - mod_tfn_reverse.la \ - mod_var_remote_addr_port.la \ - mod_reqbody_example.la + mod_tfn_reverse.la \ + mod_var_remote_addr_port.la \ + mod_reqbody_example.la mod_op_strstr_la_SOURCES = mod_op_strstr.c mod_op_strstr_la_CFLAGS = $(EXT_CFLAGS) diff --git a/iis/ModSecurityIIS.sln b/iis/ModSecurityIIS.sln index 1b272dd1..79a29843 100644 --- a/iis/ModSecurityIIS.sln +++ b/iis/ModSecurityIIS.sln @@ -1,6 +1,8 @@  -Microsoft Visual Studio Solution File, Format Version 11.00 -# Visual Studio 2010 +Microsoft Visual Studio Solution File, Format Version 12.00 +# Visual Studio Express 2013 for Windows Desktop +VisualStudioVersion = 12.0.21005.1 +MinimumVisualStudioVersion = 10.0.40219.1 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ModSecurityIIS", "ModSecurityIIS.vcxproj", "{D1F7201F-064B-48AB-868C-FED22464841C}" EndProject Global diff --git a/iis/ModSecurityIIS.vcxproj b/iis/ModSecurityIIS.vcxproj old mode 100644 new mode 100755 index 8570be80..2dd8eee5 --- a/iis/ModSecurityIIS.vcxproj +++ b/iis/ModSecurityIIS.vcxproj @@ -1,5 +1,5 @@  - + Debug @@ -26,15 +26,19 @@ Application + v120 Application + v120 DynamicLibrary + v120 DynamicLibrary + v120 @@ -79,7 +83,7 @@ Disabled - C:\work\pcre-8.30\include;C:\work\pcre-8.30;C:\work\libxml2-2.7.7\include;C:\work\apache24\include;..\apache2;..\standalone + dependencies\build_dir\pcre\include;dependencies\build_dir\pcre;dependencies\build_dir\libxml2\include;dependencies\build_dir\apache24\include;..\apache2;..\standalone _MBCS;%(PreprocessorDefinitions);WIN32;WINNT;inline=APR_INLINE;AP_DECLARE_STATIC;VERSION_IIS NotUsing precomp.h @@ -89,18 +93,17 @@ mymodule.def true - kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;ws2_32.lib;%(AdditionalDependencies);C:\work\apache24\lib\libapr-1.lib;C:\work\apache24\lib\libaprutil-1.lib;C:\work\pcre-8.30\pcre.lib;C:\work\libxml2-2.7.7\win32\bin.msvc\libxml2.lib + kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;ws2_32.lib;%(AdditionalDependencies);dependencies\build_dir\apache24\lib\libapr-1.lib;dependencies\build_dir\apache24\lib\libaprutil-1.lib;dependencies\build_dir\pcre\pcre.lib;dependencies\build_dir\libxml2\win32\bin.msvc\libxml2.lib - copy /y $(TargetPath) c:\drop\$(PlatformShortName) -copy /y $(TargetDir)$(TargetName).pdb c:\drop\$(PlatformShortName) - + + Disabled - C:\work\pcre-8.30\include;C:\work\pcre-8.30;C:\work\libxml2-2.7.7\include;C:\apache22\include;..\apache2;..\standalone;c:\work\apache24\include + dependencies\build_dir\pcre\include;dependencies\build_dir\pcre;dependencies\build_dir\libxml2\include;..\apache2;..\standalone;dependencies\build_dir\apache24\include _MBCS;%(PreprocessorDefinitions);WIN32;WINNT;inline=APR_INLINE;AP_DECLARE_STATIC NotUsing precomp.h @@ -110,47 +113,46 @@ copy /y $(TargetDir)$(TargetName).pdb c:\drop\$(PlatformShortName) mymodule.def true - kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;ws2_32.lib;%(AdditionalDependencies);libapr-1.lib;libaprutil-1.lib;pcre.lib;libxml2.lib - c:\drop\amd64 + kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;ws2_32.lib;%(AdditionalDependencies);dependencies\build_dir\apache24\lib\libapr-1.lib;dependencies\build_dir\apache24\lib\libaprutil-1.lib;dependencies\build_dir\pcre\pcre.lib;dependencies\build_dir\libxml2\win32\bin.msvc\libxml2.lib + C:\core__\ModSecurity\iis\release\x64 + /LIBPATH:"C:\core__\ModSecurity\iis\release\x64" %(AdditionalOptions) - copy /y $(TargetPath) c:\drop\$(PlatformShortName) -copy /y $(TargetDir)$(TargetName).pdb c:\drop\$(PlatformShortName) - + + _MBCS;%(PreprocessorDefinitions);WIN32;WINNT;inline=APR_INLINE;AP_DECLARE_STATIC;VERSION_IIS NotUsing - C:\work\pcre-8.30\include;C:\work\pcre-8.30;C:\work\libxml2-2.7.7\include;C:\apache22\include;..\apache2;..\standalone + dependencies\build_dir\pcre\include;dependencies\build_dir\pcre;dependencies\build_dir\libxml2\include;..\apache2;..\standalone mymodule.def - kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;ws2_32.lib;%(AdditionalDependencies);C:\apache22\lib\libapr-1.lib;C:\apache22\lib\libaprutil-1.lib;C:\work\pcre-8.30\pcre.lib;C:\work\libxml2-2.7.7\win32\bin.msvc\libxml2.lib + kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;ws2_32.lib;%(AdditionalDependencies);dependencies\build_dir\apache24\lib\libapr-1.lib;dependencies\build_dir\apache24\lib\libaprutil-1.lib;dependencies\build_dir\pcre\pcre.lib;dependencies\build_dir\libxml2\win32\bin.msvc\libxml2.lib - copy /y $(TargetPath) c:\drop\$(PlatformShortName) -copy /y $(TargetDir)$(TargetName).pdb c:\drop\$(PlatformShortName) - + + _MBCS;%(PreprocessorDefinitions);WIN32;WINNT;inline=APR_INLINE;AP_DECLARE_STATIC NotUsing - C:\work\pcre-8.30\include;C:\work\pcre-8.30;C:\work\libxml2-2.7.7\include;C:\apache22\include;..\apache2;..\standalone + dependencies\build_dir\pcre\include;dependencies\build_dir\pcre;dependencies\build_dir\libxml2\include;..\apache2;..\standalone;dependencies\build_dir\apache24\include mymodule.def - kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;ws2_32.lib;%(AdditionalDependencies);libapr-1.lib;libaprutil-1.lib;pcre.lib;libxml2.lib - c:\drop\amd64 - true + kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;ws2_32.lib;%(AdditionalDependencies);dependencies\build_dir\apache24\lib\libapr-1.lib;dependencies\build_dir\apache24\lib\libaprutil-1.lib;dependencies\build_dir\pcre\pcre.lib;dependencies\build_dir\libxml2\win32\bin.msvc\libxml2.lib + + + false - copy /y $(TargetPath) c:\drop\$(PlatformShortName) -copy /y $(TargetDir)$(TargetName).pdb c:\drop\$(PlatformShortName) - + + @@ -158,6 +160,7 @@ copy /y $(TargetDir)$(TargetName).pdb c:\drop\$(PlatformShortName) + @@ -203,6 +206,8 @@ copy /y $(TargetDir)$(TargetName).pdb c:\drop\$(PlatformShortName) + + diff --git a/iis/ModSecurityIIS.vcxproj.filters b/iis/ModSecurityIIS.vcxproj.filters old mode 100644 new mode 100755 index b191e9f3..e21bb224 --- a/iis/ModSecurityIIS.vcxproj.filters +++ b/iis/ModSecurityIIS.vcxproj.filters @@ -103,6 +103,7 @@ ModSecurity + @@ -174,6 +175,8 @@ ModSecurity + + diff --git a/iis/ModSecurityIIS/Installer/Installer.cpp b/iis/ModSecurityIIS/Installer/Installer.cpp deleted file mode 100644 index 24f6d907..00000000 --- a/iis/ModSecurityIIS/Installer/Installer.cpp +++ /dev/null @@ -1,1994 +0,0 @@ -// Installer.cpp : Defines the entry point for the console application. -// - -#include "stdafx.h" -#include -#include -#include "XUnzip.h" - -// Logging level definition. -#define EVENT_ERROR 100 -#define EVENT_CRITICAL 75 -#define EVENT_IMPORTANT 50 -#define EVENT_NORMAL 25 -#define EVENT_LEVEL_MASK 0xFFFF - -#define EVENT_APPLOG (1 << 17) -#define EVENT_SYSLOG (1 << 18) -#define EVENT_STDOUT (1 << 19) -#define EVENT_STDERR (1 << 20) - -// This class uese IIS7.0 native API to operate on -// %windir%\system32\inetsrv\config\applicationHost.config -class Iis7Config -{ - public: - Iis7Config() {} - virtual ~Iis7Config() {} - - // Defines the IIS running mode. - enum AppMode { - MODE_X64, // IIS runs under x86_64 mode. - MODE_X86, // IIS runs under i386 mode. - MODE_UNKNOWN, // IIS run under an unknow mode. - MODE_FAIL // Failed to retrieve app mode. - }; - - static void Log(int event_meta, const char *event_pattern, ...) { - const int kErrorLen = 2048; - char event_message[kErrorLen]; - va_list argptr; - - // If current event is less than log_level_, return directly. - int event_level = event_meta & EVENT_LEVEL_MASK; - //if (event_level < log_level_) return; - - // Combile log type with default log type. - int event_type = event_meta;// | log_type_; - - va_start(argptr, event_pattern); - vsnprintf(event_message, kErrorLen, event_pattern, argptr); - va_end(argptr); - -// #ifdef WIN32 - // Only write error and critical event to windows event log -// if ((event_type & EVENT_SYSLOG) != 0 && event_level >= EVENT_CRITICAL) { - WORD windows_event_type; - if (event_level == EVENT_ERROR) { - windows_event_type = EVENTLOG_ERROR_TYPE; - } else { // if (event_level == EVENT_CRITICAL) - windows_event_type= EVENTLOG_INFORMATION_TYPE; - } - - LPCSTR event_message_pointer = event_message; - - // Get a handle to the event log. - HANDLE h = RegisterEventSource(NULL, L"ModSecurityIIS Installer"); - if (h != NULL) { - // Report the event. - ReportEventA(h, // event log handle - windows_event_type, // event type - 0, // event category - 1, // event identifier - NULL, // no user security identifier - 1, // number of strings - 0, // no data - &event_message_pointer, // pointer to strings - NULL); // no data - DeregisterEventSource(h); - } -// } -// #endif // WIN32 - - // Output log to file -/* if ((event_type & EVENT_APPLOG) != 0) { - if (CreateLogFile()) { - FILE* file = fopen(log_file_name_.c_str(), "a+"); - if (file != NULL) { - fputs(FormatW3CTime(time(NULL)).c_str(), file); - fputs(": ", file); - fputs(event_message, file); - fputs("\n", file); - fclose(file); - } else if ((event_type & EVENT_STDERR) != 0) { - fprintf(stderr, "%s: Failed to open log file (%d).\n", - FormatW3CTime(time(NULL)).c_str(), errno); - } - } else if ((event_type & EVENT_STDERR) != 0) { - fprintf(stderr, "%s: Failed to create log file (%d)\n", - FormatW3CTime(time(NULL)).c_str(), errno); - } - } - - // Output to std err. - if ((event_type & EVENT_STDERR) != 0) { - fprintf(stderr, "%s: %s\n", - FormatW3CTime(time(NULL)).c_str(), event_message); - }*/ - } - - static void Log(int event_meta, const wchar_t *event_pattern, ...) { - const int kErrorLen = 2048; - wchar_t event_message[kErrorLen]; - va_list argptr; - - // If current event is less than log_level_, return directly. - int event_level = event_meta & EVENT_LEVEL_MASK; - //if (event_level < log_level_) return; - - // Combile log type with default log type. - int event_type = event_meta;// | log_type_; - - va_start(argptr, event_pattern); - _vsnwprintf(event_message, kErrorLen, event_pattern, argptr); - va_end(argptr); - -// #ifdef WIN32 - // Only write error and critical event to windows event log -// if ((event_type & EVENT_SYSLOG) != 0 && event_level >= EVENT_CRITICAL) { - WORD windows_event_type; - if (event_level == EVENT_ERROR) { - windows_event_type = EVENTLOG_ERROR_TYPE; - } else { // if (event_level == EVENT_CRITICAL) - windows_event_type= EVENTLOG_INFORMATION_TYPE; - } - - LPCWSTR event_message_pointer = event_message; - - // Get a handle to the event log. - HANDLE h = RegisterEventSource(NULL, L"ModSecurityIIS Installer"); - if (h != NULL) { - // Report the event. - ReportEventW(h, // event log handle - windows_event_type, // event type - 0, // event category - 1, // event identifier - NULL, // no user security identifier - 1, // number of strings - 0, // no data - &event_message_pointer, // pointer to strings - NULL); // no data - DeregisterEventSource(h); - } -// } -// #endif // WIN32 - - // Output log to file -/* if ((event_type & EVENT_APPLOG) != 0) { - if (CreateLogFile()) { - FILE* file = fopen(log_file_name_.c_str(), "a+"); - if (file != NULL) { - fputs(FormatW3CTime(time(NULL)).c_str(), file); - fputs(": ", file); - fputs(event_message, file); - fputs("\n", file); - fclose(file); - } else if ((event_type & EVENT_STDERR) != 0) { - fprintf(stderr, "%s: Failed to open log file (%d).\n", - FormatW3CTime(time(NULL)).c_str(), errno); - } - } else if ((event_type & EVENT_STDERR) != 0) { - fprintf(stderr, "%s: Failed to create log file (%d)\n", - FormatW3CTime(time(NULL)).c_str(), errno); - } - } - - // Output to std err. - if ((event_type & EVENT_STDERR) != 0) { - fprintf(stderr, "%s: %s\n", - FormatW3CTime(time(NULL)).c_str(), event_message); - }*/ - } - - // Install/uninstall filters in IIS. - // Actually, add/remove entry to/from - // adn sections. - static bool InstallFilter(const wchar_t* dll_file); - static bool UninstallFilter(); - - // Install/uninstall a site for Admin Console. - // Permissions for CGI exe are set/unset accordingly. -/* static bool InstallAdminConsole(const char* site_root, const char* cgi_path); - static bool UninstallAdminConsole(const char* site_root, - const char* cgi_path); -*/ - // Determine whether version 7 mode supported. - static bool IsSupported(); - - // Load configuration from IIS - // Actually, load from section. - virtual bool Load(); - - // Get IIS 7 running mode. - static AppMode GetAppMode(); - - private: - // Module name - static BSTR kModuleName; - static BSTR kConfigName; - - // Admin Console site name, "Google Sitemap Generator Admin Console". - //static BSTR kSiteName; - - static bool Iis7Config::AddToConfigSections(IAppHostWritableAdminManager* manager, - BSTR config); - - // Add an entry to section, like: - // - static bool AddToGlobalModules(IAppHostWritableAdminManager* manager, - BSTR image); - - // Add an entry to section, like: - // - static bool AddToModules(IAppHostWritableAdminManager* manager); - - // All CGI exe to be executed. - // "cgi_path" is the executable file path. - //static bool SetCGIRestriction(IAppHostWritableAdminManager* manager, - // BSTR cgi_path); - - // Create Admin Console site. - // "site_root" is the site root directory. - //static bool CreateAdminConsoleSite(IAppHostWritableAdminManager *manager, - // BSTR site_root); - - // Remove customization for Admin Console site. - // This customzation is added in CustomizeAdminConsole method. - //static bool RemoveAdminConsoleCustomization(IAppHostWritableAdminManager* manager); - - // Add customization for Admin Console site. - // Actually, it adds a tag for the Admin Console site. - //static bool CustomizeAdminConsole(IAppHostWritableAdminManager* manager, - // BSTR cgi_path); - - // Set property value. - static bool SetProperty(IAppHostElement* element, BSTR name, BSTR value); - - // Get property value. - static bool GetProperty(IAppHostElement* element, BSTR name, VARIANT* value); - - // Get the index from given collection, whose key=value. - // *index == -1 indicates nothing found. - static bool GetFromCollection(IAppHostElementCollection* collection, - BSTR property_key, BSTR property_value, - short* index); - - // Get the element from given colletion. - // The element should contains a propery, whose key/value is given by arg. - // "*element = NULL" indicates nothing can be found. - static bool GetFromCollection(IAppHostElementCollection* collection, - BSTR property_key, BSTR property_value, - IAppHostElement** element); - - // Get child's index from given collection, whose key = value. - // *index == -1 indicates no such child. - static bool GetFromChildren(IAppHostChildElementCollection* children, - BSTR child_name, short* index); - - // Get child element form given child collection. - // The child element should contains a property, whose key/value is given by - // arg. *element = NULL indicates no such child. - static bool GetFromChildren(IAppHostChildElementCollection* children, - BSTR child_name, IAppHostElement** element); - - // Remove an entry from given section. - static bool RemoveFromCollection(IAppHostWritableAdminManager* manager, - BSTR section, BSTR property_name, BSTR property_value); - - // Load site configuration from an element. - //bool LoadSite(IAppHostElement* site_element); - - static int Iis7Config::GetNativeSystemInfo(SYSTEM_INFO* system_info); -}; - -BSTR Iis7Config::kModuleName = L"ModSecurityIIS"; -BSTR Iis7Config::kConfigName = L"ModSecurity"; -//BSTR Iis7Config::kSiteName = L"ModSecurityIIS Admin Console"; - -#define CHECK_HRESULT(expression, msg) \ -{ \ -HRESULT _hr = (expression); \ -if (FAILED(_hr)) { \ - Log(EVENT_ERROR, msg " (0x%0x)", _hr); \ - break; \ -} \ -} -#define CHECK_BOOL(expression, msg) \ - if (!expression) { \ - Log(EVENT_ERROR, msg); \ - break; \ - } - -bool Iis7Config::Load() { - IAppHostAdminManager* admin_manager = NULL; - IAppHostElement* parent = NULL; - IAppHostElementCollection* collection = NULL; - IAppHostElement* element = NULL; - - //BSTR section_name = SysAllocString(L"system.applicationHost/sites"); - BSTR bstr_config_path = SysAllocString(L"MACHINE/WEBROOT/APPHOST"); - - HRESULT hresult = S_OK; - bool result = false; - do { - // Initialize com - hresult = CoInitializeEx(NULL, COINIT_MULTITHREADED); - if (FAILED(hresult)) { - Log(EVENT_ERROR, "Failed to intialize COM."); - break; - } - - // Create an admin manager - hresult = CoCreateInstance(__uuidof(AppHostAdminManager), NULL, - CLSCTX_INPROC_SERVER, - __uuidof(IAppHostAdminManager), - reinterpret_cast(&admin_manager)); - if (FAILED(hresult)) { - Log(EVENT_ERROR, "Failed to create AppHostAdminManager."); - break; - } -/* - // Get section - hresult = admin_manager->GetAdminSection(section_name, bstr_config_path, &parent); - if (FAILED(hresult)) { - Log(EVENT_ERROR, "Unable to access sites configuration."); - break; - } else if (&parent == NULL) { - Log(EVENT_ERROR, "Unable to get sites configuration."); - break; - } - - // Get all the child elements of - hresult = parent->get_Collection(&collection); - if (FAILED(hresult)) { - Log(EVENT_ERROR, "Unable to access child collection."); - break; - } else if (&collection == NULL) { - Log(EVENT_ERROR, "Unable to get child collection."); - break; - } - - // Iterate all the children of - DWORD element_count = 0; - hresult = collection->get_Count(&element_count); - for(USHORT i = 0; i < element_count; ++i) { - VARIANT item_index; - item_index.vt = VT_I2; - item_index.iVal = i; - - // Get the child element - hresult = collection->get_Item(item_index, &element); - if (FAILED(hresult) || &element == NULL) { - Log(EVENT_ERROR, "Failed to iterate child (%d) of sites.", i); - continue; - } - - if (!LoadSite(element)) { - Log(EVENT_ERROR, "Failed to load site from site (%d).", i); - continue; - } - - element->Release(); - element = NULL; - } -*/ - result = true; - } while (false); - - // Exiting / Unwinding - if (element != NULL) element->Release(); - if (collection != NULL) collection->Release(); - if (parent != NULL) parent->Release(); - if (admin_manager != NULL) admin_manager->Release(); - - //SysFreeString(section_name); - SysFreeString(bstr_config_path); - CoUninitialize(); - - return result; -} - -bool Iis7Config::InstallFilter(const wchar_t* dll_file) { - IAppHostWritableAdminManager* admin_manager = NULL; - BSTR bstr_config_path = SysAllocString(L"MACHINE/WEBROOT/APPHOST"); - - // Build the full path of ModSecurity module DLL. - BSTR module_wpath = SysAllocString(dll_file); - BSTR config = SysAllocString(kConfigName); - - HRESULT hresult = S_OK; - bool result = false; - do { - // Initialize com - hresult = CoInitializeEx(NULL, COINIT_MULTITHREADED); - if (FAILED(hresult)) { - Log(EVENT_ERROR, "Failed to intialize COM."); - break; - } - - // Create a writable admin manager - hresult = CoCreateInstance(__uuidof(AppHostWritableAdminManager), NULL, - CLSCTX_INPROC_SERVER, - __uuidof(IAppHostWritableAdminManager), - reinterpret_cast(&admin_manager)); - if (FAILED(hresult)) { - Log(EVENT_ERROR, "Failed to create AppHostWritableAdminManager."); - break; - } - - // set commit path - hresult = admin_manager->put_CommitPath(L"MACHINE/WEBROOT/APPHOST"); - if (FAILED(hresult)) { - Log(EVENT_ERROR, "Failed to put commit path."); - break; - } - - // Add ModSecurity entry to section - if (!AddToGlobalModules(admin_manager, module_wpath)) { - Log(EVENT_ERROR, "Failed to add entry to globalModules."); - break; - } - - // Add ModSecurity entry to section - if (!AddToModules(admin_manager)) { - Log(EVENT_ERROR, "Failed to add entry to modules."); - break; - } - - if(!AddToConfigSections(admin_manager, config)) { - Log(EVENT_ERROR, "Failed to add entry to config sections."); - break; - } - - // Save changes. - hresult = admin_manager->CommitChanges(); - if (FAILED(hresult)) { - Log(EVENT_ERROR, "Failed to save changes to install module."); - break; - } - - result = true; - } while (false); - - // Exiting / Unwinding - if (admin_manager != NULL) admin_manager->Release(); - - SysFreeString(module_wpath); - SysFreeString(bstr_config_path); - SysFreeString(config); - - CoUninitialize(); - - return result; -} - -bool Iis7Config::UninstallFilter() { - IAppHostWritableAdminManager* admin_manager = NULL; - BSTR bstr_config_path = SysAllocString(L"MACHINE/WEBROOT/APPHOST"); - - HRESULT hresult = S_OK; - bool result = false; - do { - // Initialize com - hresult = CoInitializeEx(NULL, COINIT_MULTITHREADED); - if (FAILED(hresult)) { - Log(EVENT_ERROR, "Failed to intialize COM."); - break; - } - - // Create a writable admin manager - hresult = CoCreateInstance(__uuidof(AppHostWritableAdminManager), NULL, - CLSCTX_INPROC_SERVER, - __uuidof(IAppHostWritableAdminManager), - reinterpret_cast(&admin_manager)); - if (FAILED(hresult)) { - Log(EVENT_ERROR, "Failed to create AppHostWritableAdminManager."); - break; - } - - // set commit path - hresult = admin_manager->put_CommitPath(bstr_config_path); - if (FAILED(hresult)) { - Log(EVENT_ERROR, "Failed to put commit path."); - break; - } - - // Remove ModSecurity entry from section. - if (!RemoveFromCollection(admin_manager, L"system.webServer/globalModules", L"name", kModuleName)) { - Log(EVENT_ERROR, "Failed to remove entry from globalModules."); - break; - } - - // Remove ModSecurity entry from section. - if (!RemoveFromCollection(admin_manager, L"system.webServer/modules", L"name", kModuleName)) { - Log(EVENT_ERROR, "Failed to remove entry from modules."); - break; - } - - // Save changes. - hresult = admin_manager->CommitChanges(); - if (FAILED(hresult)) { - Log(EVENT_ERROR, "Failed to save changes to install module."); - break; - } - - result = true; - } while (false); - - // Exiting / Unwinding - if (admin_manager != NULL) admin_manager->Release(); - SysFreeString(bstr_config_path); - - CoUninitialize(); - - return result; -} - -// Add section to , like: -//
-bool Iis7Config::AddToConfigSections(IAppHostWritableAdminManager* manager, - BSTR config) { - HRESULT hr; - bool result = false; - IAppHostConfigManager * pCfgMgr = NULL; - IAppHostConfigFile * pCfgFile = NULL; - IAppHostSectionGroup * pRtSctnGrp = NULL; - IAppHostSectionGroup * pSctnGrp = NULL; - IAppHostSectionDefinitionCollection * pSctnDefCol = NULL; - IAppHostSectionDefinition * pSctnDef = NULL; - - BSTR bstrConfigCommitPath = SysAllocString(L"MACHINE/WEBROOT/APPHOST"); - BSTR bstrSctnGrpName = SysAllocString(L"system.webServer"); - BSTR bstrDeny = SysAllocString(L"Allow"); - BSTR bstrAppHostOnly = SysAllocString(L"Everywhere"); - - // Get an IAppHostConfigManager - hr = manager -> get_ConfigManager ( &pCfgMgr ); - if ( FAILED( hr ) || ( &pCfgMgr == NULL ) ) - { - Log(EVENT_ERROR, "ERROR: Unable to get a config manager.\n" ); - goto exit; - } - - // Get an IAppHostConfigFile - hr = pCfgMgr -> GetConfigFile ( bstrConfigCommitPath, &pCfgFile ); - if ( FAILED ( hr ) || ( &pCfgFile == NULL ) ) - { - if ( E_ACCESSDENIED == hr ) - { - Log(EVENT_ERROR, "ERROR: Access to configuration denied.\n" ); - Log(EVENT_ERROR, " Run sample as an administrator.\n" ); - } - else - { - Log(EVENT_ERROR, "ERROR: Unable to get config file.\n" ); - } - goto exit; - } - - // Get the root section group - hr = pCfgFile -> get_RootSectionGroup ( &pRtSctnGrp ); - if ( FAILED ( hr ) || ( &pRtSctnGrp == NULL ) ) - { - Log(EVENT_ERROR, "ERROR: Unable to access root section group\n" ); - goto exit; - } - - ULONG i, cnt; - - hr = pRtSctnGrp ->get_Count(&cnt); - if ( FAILED ( hr )) - { - Log(EVENT_ERROR, "ERROR: Unable to enumerate root section group\n" ); - goto exit; - } - - for(i = 0; i < cnt; i++) - { - VARIANT v; - BSTR name; - - v.vt = VT_I4; - v.intVal = i; - - hr = pRtSctnGrp->get_Item(v, &pSctnGrp); - if ( FAILED ( hr ) || ( &pSctnGrp == NULL ) ) - { - Log(EVENT_ERROR, "ERROR: Unable to access root section item\n" ); - goto exit; - } - - hr = pSctnGrp->get_Name(&name); - if ( FAILED ( hr )) - { - Log(EVENT_ERROR, "ERROR: Unable to get root section name\n" ); - goto exit; - } - - if(wcscmp(name, L"system.webServer") == 0) - break; - - pSctnGrp->Release(); - } - - if(i == cnt) - { - Log(EVENT_ERROR, "ERROR: Unable to find system.webServer section group\n"); - goto exit; - } - - // Get the section collection - hr = pSctnGrp -> get_Sections ( &pSctnDefCol ); - if ( FAILED ( hr ) || ( &pSctnDefCol == NULL ) ) - { - Log(EVENT_ERROR, "ERROR: Unable to access section collection\n" ); - goto exit; - } - - hr = pSctnDefCol->get_Count(&cnt); - if ( FAILED ( hr )) - { - Log(EVENT_ERROR, "ERROR: Unable to enumerate section collection\n" ); - goto exit; - } - - for(i = 0; i < cnt; i++) - { - VARIANT v; - BSTR name; - - v.vt = VT_I4; - v.intVal = i; - - hr = pSctnDefCol->get_Item(v, &pSctnDef); - if ( FAILED ( hr ) || ( &pSctnDef == NULL ) ) - { - Log(EVENT_ERROR, "ERROR: Unable to access section item\n" ); - goto exit; - } - - hr = pSctnDef->get_Name(&name); - if ( FAILED ( hr )) - { - Log(EVENT_ERROR, "ERROR: Unable to get section name\n" ); - goto exit; - } - - if(wcscmp(name, config) == 0) - break; - - pSctnDef->Release(); - } - - if(i == cnt) - { - // Add the new section - hr = pSctnDefCol -> AddSection ( config, &pSctnDef ); - if ( FAILED ( hr ) || ( &pSctnDef == NULL ) ) - { - Log(EVENT_ERROR, "ERROR: Unable to add new section\n" ); - goto exit; - } - } - - // Set the section attributes - pSctnDef -> put_OverrideModeDefault ( bstrDeny ); - pSctnDef -> put_AllowDefinition ( bstrAppHostOnly ); - - result = true; -exit: - // Exiting / Unwinding - if ( pRtSctnGrp != NULL ) - { - pRtSctnGrp->Release(); - pRtSctnGrp = NULL; - } - if ( pSctnGrp != NULL ) - { - pSctnGrp->Release(); - pSctnGrp = NULL; - } - if ( pSctnDefCol != NULL ) - { - pSctnDefCol->Release(); - pSctnDefCol = NULL; - } - if ( pSctnDef != NULL ) - { - pSctnDef->Release(); - pSctnDef = NULL; - } - if ( pCfgFile != NULL ) - { - pCfgFile->Release(); - pCfgFile = NULL; - } - if ( pCfgMgr != NULL ) - { - pCfgMgr->Release(); - pCfgMgr = NULL; - } - - SysFreeString( bstrConfigCommitPath ); - SysFreeString( bstrSctnGrpName ); - SysFreeString( bstrDeny ); - SysFreeString( bstrAppHostOnly ); - - return result; -} - -// Add an entry to section, like: -// -bool Iis7Config::AddToGlobalModules(IAppHostWritableAdminManager* manager, - BSTR image) { - IAppHostElement* parent = NULL; - IAppHostElementCollection* collection = NULL; - IAppHostElement* element = NULL; - - BSTR bstr_section_name = SysAllocString(L"system.webServer/globalModules"); - BSTR bstr_config_path = SysAllocString(L"MACHINE/WEBROOT/APPHOST"); - BSTR bstr_element_name = SysAllocString(L"add"); - - HRESULT hresult = S_OK; - bool result = false; - do { - // Get section - hresult = manager->GetAdminSection(bstr_section_name, - bstr_config_path, &parent); - if (FAILED(hresult)) { - Log(EVENT_ERROR, "Unable to access globalModules configuration."); - break; - } else if (&parent == NULL) { - Log(EVENT_ERROR, "Unable to get globalModules configuration."); - break; - } - - // Get collection of - hresult = parent->get_Collection(&collection); - if (FAILED(hresult)) { - Log(EVENT_ERROR, "Unable to access globalModules child collection."); - break; - } else if (&collection == NULL) { - Log(EVENT_ERROR, "Unable to get globalModules child collection."); - break; - } - - // create a global modules child element, like: - // - - // First to detect old modules. - if (!GetFromCollection(collection, L"name", kModuleName, &element)) { - Log(EVENT_ERROR, "Failed to try detect old modules."); - break; - } - - // No old ModSecurity module, create/add one. - if (element == NULL) { - hresult = collection->CreateNewElement(bstr_element_name, &element); - if (FAILED(hresult)) { - Log(EVENT_ERROR, "Failed to create globalModules/add element."); - break; - } - - if (!SetProperty(element, L"name", kModuleName)) { - Log(EVENT_ERROR, "Failed to set name property."); - break; - } - // Add the new element to collection - hresult = collection->AddElement(element); - if (FAILED(hresult)) { - Log(EVENT_ERROR, "Failed to add globalModule/add element."); - break; - } - } - - if (!SetProperty(element, L"image", image)) { - Log(EVENT_ERROR, "Failed to set image property."); - break; - } - - result = true; - } while (false); - - // Exiting / Unwinding - if (element != NULL) element->Release(); - if (collection != NULL) collection->Release(); - if (parent != NULL) parent->Release(); - - SysFreeString(bstr_section_name); - SysFreeString(bstr_config_path); - SysFreeString(bstr_element_name); - - return result; -} - - -// Add an entry to section, like: -// -bool Iis7Config::AddToModules(IAppHostWritableAdminManager* manager) { - IAppHostElement* parent = NULL; - IAppHostElementCollection* collection = NULL; - IAppHostElement* element = NULL; - - BSTR bstr_section_name = SysAllocString(L"system.webServer/modules"); - BSTR bstr_config_path = SysAllocString(L"MACHINE/WEBROOT/APPHOST"); - BSTR bstr_element_name = SysAllocString(L"add"); - - HRESULT hresult = S_OK; - bool result = false; - do { - // Get section - hresult = manager->GetAdminSection(bstr_section_name, - bstr_config_path, &parent); - if (FAILED(hresult)) { - Log(EVENT_ERROR, "Unable to access modules configuration."); - break; - } else if (&parent == NULL) { - Log(EVENT_ERROR, "Unable to get modules configuration."); - break; - } - - // Get collection of - hresult = parent->get_Collection(&collection); - if (FAILED(hresult)) { - Log(EVENT_ERROR, "Unable to access modules child collection."); - break; - } else if (&collection == NULL) { - Log(EVENT_ERROR, "Unable to get modules child collection."); - break; - } - - // Try to detect old ModSecurity module. - if (!GetFromCollection(collection, L"name", kModuleName, &element)) { - Log(EVENT_ERROR, "Failed to try detect old modules."); - break; - } - - // No old ModSecurity module exists. - if (element == NULL) { - hresult = collection->CreateNewElement(bstr_element_name, &element); - if (FAILED(hresult)) { - Log(EVENT_ERROR, "Failed to create modules/add element."); - break; - } - - if (!SetProperty(element, L"name", kModuleName)) { - Log(EVENT_ERROR, "Failed to set name property."); - break; - } - - // Add the new element to collection - hresult = collection->AddElement(element); - if (FAILED(hresult)) { - Log(EVENT_ERROR, "Failed to add modules/add element."); - break; - } - } - - result = true; - } while (false); - - // Exiting / Unwinding - if (element != NULL) element->Release(); - if (collection != NULL) collection->Release(); - if (parent != NULL) parent->Release(); - - SysFreeString(bstr_section_name); - SysFreeString(bstr_config_path); - SysFreeString(bstr_element_name); - - return result; -} - -bool Iis7Config::RemoveFromCollection(IAppHostWritableAdminManager* manager, - BSTR section, BSTR property_name, BSTR property_value) { - IAppHostElement* parent = NULL; - IAppHostElementCollection* collection = NULL; - IAppHostElement* element = NULL; - IAppHostProperty* name_property = NULL; - - BSTR bstr_section_name = SysAllocString(section); - BSTR bstr_config_path = SysAllocString(L"MACHINE/WEBROOT/APPHOST"); - - HRESULT hresult = S_OK; - bool result = false; - do { - // Get section contains ModSecurityModule entry - hresult = manager->GetAdminSection(bstr_section_name, - bstr_config_path, &parent); - if (FAILED(hresult)) { - Log(EVENT_ERROR, "Unable to access section to remove module."); - break; - } else if (&parent == NULL) { - Log(EVENT_ERROR, "Unable to get section to remove module."); - break; - } - - // Get child collection of the section - hresult = parent->get_Collection(&collection); - if (FAILED(hresult)) { - Log(EVENT_ERROR, "Unable to access collection to remove module."); - break; - } else if (&collection == NULL) { - Log(EVENT_ERROR, "Unable to get collection to remove module."); - break; - } - - // Get number of children. - DWORD count; - hresult = collection->get_Count(&count); - if (FAILED(hresult)) { - Log(EVENT_ERROR, "Unable to get the count of collection."); - break; - } - - short sitemap_index; - if (!GetFromCollection(collection, property_name, property_value, &sitemap_index)) { - Log(EVENT_ERROR, "Failed to find ModSecurity module."); - break; - } - - if (sitemap_index != -1) { - VARIANT var_index; - var_index.vt = VT_I2; - var_index.iVal = sitemap_index; - - hresult = collection->DeleteElement(var_index); - if (FAILED(hresult)) { - Log(EVENT_ERROR, "Failed to remove ModSecurity module."); - } - } else { - Log(EVENT_IMPORTANT, "No ModSecurity module is found."); - } - - result = SUCCEEDED(hresult); - } while (false); - - // Exiting / Unwinding - if (name_property != NULL) name_property->Release(); - if (element != NULL) element->Release(); - if (collection != NULL) collection->Release(); - if (parent != NULL) parent->Release(); - - SysFreeString(bstr_section_name); - SysFreeString(bstr_config_path); - - return result; -} -/* -bool Iis7Config::LoadSite(IAppHostElement* element) { - std::string name, id, phys_path, log_path; - - // Get name. - VARIANT name_var; - if (!GetProperty(element, L"name", &name_var)) { - Log(EVENT_ERROR, "Failed to get name property value."); - return false; - } else if (name_var.vt != VT_BSTR) { - Log(EVENT_ERROR, "site name should be VT_BSTR"); - return false; - } else { - name = static_cast(bstr_t(name_var.bstrVal)); - } - - // Get id. - VARIANT id_var; - if (!GetProperty(element, L"id", &id_var)) { - Log(EVENT_ERROR, "Failed to get id value."); - return false; - } else if (id_var.vt == VT_I4) { - char buffer[16]; - itoa(id_var.intVal, buffer, 10); - id = buffer; - } else if (id_var.vt == VT_UI4) { - char buffer[16]; - itoa(id_var.uintVal, buffer, 10); - id = buffer; - } else if (id_var.vt == VT_BSTR) { - id = static_cast(bstr_t(id_var.bstrVal)); - } else { - Log(EVENT_ERROR, "site id should be VT_BSTR or VT_I4"); - } - - // Get logfile directory. - IAppHostElement* logfile_element = NULL; - HRESULT hresult = element->GetElementByName(L"logfile", &logfile_element); - if (FAILED(hresult)) { - Log(EVENT_ERROR, "Failed to get logfile element."); - } else { - VARIANT dir_var; - if (!GetProperty(logfile_element, L"directory", &dir_var)) { - Log(EVENT_ERROR, "Failed to get directory value."); - } else if (dir_var.vt == VT_BSTR) { - log_path = static_cast(bstr_t(dir_var.bstrVal)); - log_path.append("\\W3SVC").append(id); - } else { - Log(EVENT_ERROR, "directory should be VT_BSTR"); - } - } - - // Get pysical path. - IAppHostElementCollection* application_collection = NULL; - IAppHostElementCollection* virtualdir_collection = NULL; - IAppHostElement* application_element = NULL; - IAppHostElement* virtualdir_element = NULL; - - hresult = S_OK; - bool result = false; - do { - // Get collection in element - hresult = element->get_Collection(&application_collection); - if (FAILED(hresult)) { - Log(EVENT_ERROR, "Failed to get application collection."); - break; - } - - // Find element wiht path="/" - short root_app = -1; - if (!GetFromCollection(application_collection, L"path", L"/", &root_app)) { - Log(EVENT_ERROR, "Failed to get root application index."); - break; - } else if (root_app == -1) { - Log(EVENT_ERROR, "No root application defined."); - break; - } - - // Get the root element - VARIANT var_rootapp; - var_rootapp.vt = VT_I2; - var_rootapp.iVal = root_app; - hresult = application_collection->get_Item(var_rootapp, &application_element); - if (FAILED(hresult)) { - Log(EVENT_ERROR, "Failed to get root application element."); - break; - } - - // Get collection in element. - hresult = application_element->get_Collection(&virtualdir_collection); - if (FAILED(hresult)) { - Log(EVENT_ERROR, "Failed to get virtualdir collection."); - break; - } - - // Find element with path="/" - short root_dir = -1; - if (!GetFromCollection(virtualdir_collection, L"path", L"/", &root_dir)) { - Log(EVENT_ERROR, "Failed to get root virtualDirectory index."); - break; - } else if (root_dir == -1) { - Log(EVENT_ERROR, "No root virtualDirectory defined."); - break; - } - - // Get the root element. - VARIANT var_rootdir; - var_rootdir.vt = VT_I2; - var_rootdir.iVal = root_dir; - hresult = virtualdir_collection->get_Item(var_rootdir, &virtualdir_element); - if (FAILED(hresult)) { - Log(EVENT_ERROR, "Failed to get root virtualDirectory element."); - break; - } - - VARIANT var_path; - if (!GetProperty(virtualdir_element, L"physicalPath", &var_path)) { - Log(EVENT_ERROR, "Failed to get physicalPath property."); - break; - } else if (var_path.vt != VT_BSTR) { - Log(EVENT_ERROR, "physicalPath should be instance of VT_BSTR."); - break; - } - - phys_path = static_cast(bstr_t(var_path.bstrVal)); - result = true; - } while (false); - - if (logfile_element != NULL) logfile_element->Release(); - if (application_collection != NULL) application_collection->Release(); - if (virtualdir_collection != NULL) virtualdir_collection->Release(); - if (application_element != NULL) application_element->Release(); - if (virtualdir_element != NULL) virtualdir_element->Release(); - - // At last we store all the values. - if (result) { - site_ids_.push_back(id); - names_.push_back(name); - physical_paths_.push_back(phys_path); - log_paths_.push_back(log_path); - host_urls_.push_back(""); - } - - return result; -} -*/ -bool Iis7Config::GetFromCollection(IAppHostElementCollection* collection, - BSTR property_key, BSTR property_value, - short* index) { - IAppHostProperty* property = NULL; - IAppHostElement* element = NULL; - - HRESULT hresult = S_OK; - *index = -1; - do { - // Get number of children. - DWORD count; - hresult = collection->get_Count(&count); - if (FAILED(hresult)) { - Log(EVENT_ERROR, "Unable to get the count of collection."); - break; - } - - // Iterate every child to check whether it should be removed. - for (USHORT i = 0; i < count && SUCCEEDED(hresult); ++i) { - // Get item at index i. - VARIANT idx; - idx.vt = VT_I2; - idx.iVal = i; - hresult = collection->get_Item(idx, &element); - if (FAILED(hresult)) { - Log(EVENT_ERROR, "Unable to get item (%d).", i); - break; - } - - // Get name property of item i. - VARIANT var_value; - if (!GetProperty(element, property_key, &var_value)) { - Log(EVENT_ERROR, "Failed to get property value."); - hresult = S_FALSE; - break; - } - - // Check the property value - if (wcscmp(property_value, var_value.bstrVal) == 0) { - *index = static_cast(i); - break; - } - - element->Release(); - element = NULL; - } - } while (false); - - if (property != NULL) property->Release(); - if (element != NULL) element->Release(); - - return SUCCEEDED(hresult); -} - -bool Iis7Config::GetFromCollection(IAppHostElementCollection* collection, - BSTR property_key, BSTR property_value, - IAppHostElement** element) { - short idx; - if (!GetFromCollection(collection, property_key, property_value, &idx)) { - Log(EVENT_ERROR, "Failed to get child from collection."); - } - - if (idx != -1) { - VARIANT idx_var; - idx_var.vt = VT_I2; - idx_var.iVal = idx; - - HRESULT hresult = collection->get_Item(idx_var, element); - if (FAILED(hresult)) { - Log(EVENT_ERROR, "Failed to get element from collection."); - return false; - } else { - return true; - } - } else { - *element = NULL; - return true; - } -} - - -bool Iis7Config::SetProperty(IAppHostElement* element, BSTR name, BSTR value) { - IAppHostProperty* property = NULL; - BSTR bstr_name = SysAllocString(name); - BSTR bstr_value = SysAllocString(value); - - HRESULT hresult = S_OK; - do { - // Get the property by name. - hresult = element->GetPropertyByName(bstr_name, &property); - if (FAILED(hresult)) { - Log(EVENT_ERROR, "Failed to get property."); - break; - } - - // Set the property value. - VARIANT value_variant; - value_variant.vt = VT_BSTR; - value_variant.bstrVal = bstr_value; - hresult = property->put_Value(value_variant); - if (FAILED(hresult)) { - Log(EVENT_ERROR, "Failed to set property value."); - break; - } - } while (false); - - if (property != NULL) property->Release(); - SysFreeString(bstr_name); - SysFreeString(bstr_value); - - return SUCCEEDED(hresult); -} - -bool Iis7Config::GetProperty(IAppHostElement* element, BSTR name, VARIANT* value) { - IAppHostProperty* property = NULL; - BSTR bstr_name = SysAllocString(name); - - HRESULT hresult = S_OK; - do { - // Get the property by name. - hresult = element->GetPropertyByName(bstr_name, &property); - if (FAILED(hresult)) { - Log(EVENT_ERROR, "Failed to get property."); - break; - } - - // Get the property value. - hresult = property->get_Value(value); - if (FAILED(hresult)) { - Log(EVENT_ERROR, "Failed to get property value."); - break; - } - } while (false); - - if (property != NULL) property->Release(); - SysFreeString(bstr_name); - - return SUCCEEDED(hresult); -} - - -bool Iis7Config::IsSupported() { - HRESULT hr = CoInitializeEx(NULL, COINIT_MULTITHREADED); - if (FAILED(hr)) { - Log(EVENT_ERROR, "Failed to check IIS 7 compatibility. 0x%0x", hr); - return false; - } - - // Try with IIS 7.0... - IAppHostAdminManager* admin_manager = NULL; - hr = CoCreateInstance(__uuidof(AppHostAdminManager), NULL, - CLSCTX_INPROC_SERVER, __uuidof(IAppHostAdminManager), - reinterpret_cast(&admin_manager)); - if (SUCCEEDED(hr)) { - admin_manager->Release(); - } - - CoUninitialize(); - - return SUCCEEDED(hr); -} - -int Iis7Config::GetNativeSystemInfo(SYSTEM_INFO* system_info) { - HMODULE module = GetModuleHandle(L"Kernel32.dll"); - if (module == NULL) { - Log(EVENT_ERROR, "Failed to GetModuleHandle of Kernel32.dll. (%d)", - GetLastError()); - return -1; - } - - typedef void (WINAPI *Procedure)(LPSYSTEM_INFO); - Procedure proc = (Procedure) GetProcAddress(module, "GetNativeSystemInfo"); - if (proc == NULL) { - if (GetLastError() == ERROR_PROC_NOT_FOUND) { - return 0; - } else { - Log(EVENT_ERROR, "Failed to GetProcAddress (%d).", GetLastError()); - return -1; - } - return 0; - } else { - proc(system_info); - return 1; - } -} - -Iis7Config::AppMode Iis7Config::GetAppMode() { - SYSTEM_INFO sys_info; - if (Iis7Config::GetNativeSystemInfo(&sys_info) != 1) { - Log(EVENT_ERROR, "Failed to GetNativeSystemInfo for IIS7."); - return MODE_FAIL; - } - - if (sys_info.wProcessorArchitecture == PROCESSOR_ARCHITECTURE_INTEL) { - return MODE_X86; - } else if (sys_info.wProcessorArchitecture == PROCESSOR_ARCHITECTURE_AMD64) { - return MODE_X64; - } else { - return MODE_UNKNOWN; - } -} -/* -bool Iis7Config::InstallAdminConsole(const char* site_root, - const char* cgi_path) { - IAppHostWritableAdminManager* admin_manager = NULL; - bool result = false; - do { - // Initialize com - CHECK_HRESULT(CoInitializeEx(NULL, COINIT_MULTITHREADED), "Failed to intialize COM."); - - // Create a writable admin manager - CHECK_HRESULT(CoCreateInstance(__uuidof(AppHostWritableAdminManager), NULL, - CLSCTX_INPROC_SERVER, - __uuidof(IAppHostWritableAdminManager), - reinterpret_cast(&admin_manager)), - "Failed to create AppHostWritableAdminManager."); - - // set commit path - CHECK_HRESULT(admin_manager->put_CommitPath(L"MACHINE/WEBROOT/APPHOST"), - "Failed to put commit path."); - - - CHECK_BOOL(CreateAdminConsoleSite(admin_manager, bstr_t(site_root)), - "Failed to create AdminConsole Site."); - CHECK_BOOL(SetCGIRestriction(admin_manager, bstr_t(cgi_path)), - "Failed to set CGI restriction."); - CHECK_BOOL(CustomizeAdminConsole(admin_manager, bstr_t(cgi_path)), - "Failed to customize admin console."); - - // Save changes. - CHECK_HRESULT(admin_manager->CommitChanges(), - "Failed to save changes to install module."); - - Log(EVENT_CRITICAL, "Admin Console installed successfully."); - result = true; - } while (false); - - // Exiting / Unwinding - if (admin_manager != NULL) admin_manager->Release(); - - CoUninitialize(); - - return result; -} - -bool Iis7Config::UninstallAdminConsole(const char* site_root, - const char* cgi_path) { - IAppHostWritableAdminManager* admin_manager = NULL; - BSTR bstr_config_path = SysAllocString(L"MACHINE/WEBROOT/APPHOST"); - - bool result = false; - do { - // Initialize com - CHECK_HRESULT(CoInitializeEx(NULL, COINIT_MULTITHREADED), "Failed to intialize COM."); - - // Create a writable admin manager - CHECK_HRESULT(CoCreateInstance(__uuidof(AppHostWritableAdminManager), NULL, - CLSCTX_INPROC_SERVER, - __uuidof(IAppHostWritableAdminManager), - reinterpret_cast(&admin_manager)), - "Failed to create AppHostWritableAdminManager."); - - // set commit path - CHECK_HRESULT(admin_manager->put_CommitPath(L"MACHINE/WEBROOT/APPHOST"), - "Failed to put commit path."); - - CHECK_BOOL(RemoveFromCollection(admin_manager, L"system.applicationHost/sites", L"name", kSiteName), "Failed to remove Admin console site."); - CHECK_BOOL(RemoveFromCollection(admin_manager, L"system.webServer/security/isapiCgiRestriction", L"path", bstr_t(cgi_path)), - "Failed to remove CGI restriction."); - CHECK_BOOL(RemoveAdminConsoleCustomization(admin_manager), - "Failed to remove customization of admin console."); - - // Save changes. - CHECK_HRESULT(admin_manager->CommitChanges(), - "Failed to save changes to install module."); - - result = true; - } while (false); - - // Exiting / Unwinding - if (admin_manager != NULL) admin_manager->Release(); - - SysFreeString(bstr_config_path); - - CoUninitialize(); - - return result; -} - - -bool Iis7Config::SetCGIRestriction(IAppHostWritableAdminManager* manager, BSTR cgi_path) { - IAppHostElement* parent = NULL; - IAppHostElementCollection* collection = NULL; - IAppHostElement* element = NULL; - - BSTR bstr_section_name = SysAllocString(L"system.webServer/security/isapiCgiRestriction"); - BSTR bstr_config_path = SysAllocString(L"MACHINE/WEBROOT/APPHOST"); - BSTR bstr_element_name = SysAllocString(L"add"); - - HRESULT hresult = S_OK; - bool result = false; - do { - // Get section - hresult = manager->GetAdminSection(bstr_section_name, - bstr_config_path, &parent); - if (FAILED(hresult)) { - Log(EVENT_ERROR, "Unable to access isapiCgiRestriction configuration. (0x%0x)", hresult); - break; - } else if (&parent == NULL) { - Log(EVENT_ERROR, "Unable to get isapiCgiRestriction configuration."); - break; - } - - // Get collection of - hresult = parent->get_Collection(&collection); - if (FAILED(hresult)) { - Log(EVENT_ERROR, "Unable to access isapiCgiRestriction child collection. (0x%0x)", hresult); - break; - } else if (&collection == NULL) { - Log(EVENT_ERROR, "Unable to get isapiCgiRestriction child collection."); - break; - } - - // create a child element, like: - // - - // First to detect old cgi restriction. - if (!GetFromCollection(collection, L"path", cgi_path, &element)) { - Log(EVENT_ERROR, "Failed to try detect old cgi restriction."); - break; - } - - // No old cgi restriction, create one. - if (element == NULL) { - hresult = collection->CreateNewElement(bstr_element_name, &element); - if (FAILED(hresult)) { - Log(EVENT_ERROR, "Failed to create isapiCgiRestriction/add element. (0x%0x)", hresult); - break; - } - - if (!SetProperty(element, L"path", cgi_path)) { - Log(EVENT_ERROR, "Failed to set path property."); - break; - } - - if (!SetProperty(element, L"allowed", L"true")) { - Log(EVENT_ERROR, "Failed to set allowed property."); - break; - } - - // Add the new element to collection - hresult = collection->AddElement(element); - if (FAILED(hresult)) { - Log(EVENT_ERROR, "Failed to add isapiCgiRestriction/add element. (0x%0x)", hresult); - break; - } - } - - Log(EVENT_NORMAL, "CGIRestriction set properly."); - result = true; - } while (false); - - // Exiting / Unwinding - if (element != NULL) element->Release(); - if (collection != NULL) collection->Release(); - if (parent != NULL) parent->Release(); - - SysFreeString(bstr_section_name); - SysFreeString(bstr_config_path); - SysFreeString(bstr_element_name); - - return result; -} - - -bool Iis7Config::CreateAdminConsoleSite(IAppHostWritableAdminManager *manager, BSTR site_root) { - IAppHostElement* parent = NULL; - IAppHostElementCollection* collection = NULL; - IAppHostElement* element = NULL; - - BSTR bstr_section_name = SysAllocString(L"system.applicationHost/sites"); - BSTR bstr_config_path = SysAllocString(L"MACHINE/WEBROOT/APPHOST"); - - HRESULT hresult = S_OK; - bool result = false; - do { - // Get section - hresult = manager->GetAdminSection(bstr_section_name, - bstr_config_path, &parent); - if (FAILED(hresult)) { - Log(EVENT_ERROR, "Unable to access sites configuration. (0x%0x)", hresult); - break; - } else if (&parent == NULL) { - Log(EVENT_ERROR, "Unable to get sites configuration."); - break; - } - - // Get collection of - hresult = parent->get_Collection(&collection); - if (FAILED(hresult)) { - Log(EVENT_ERROR, "Unable to access sites child collection. (0x%0x)", hresult); - break; - } else if (&collection == NULL) { - Log(EVENT_ERROR, "Unable to get sites child collection."); - break; - } - - // create a element, like: - - // First to detect old site. - if (!GetFromCollection(collection, L"name", kSiteName, &element)) { - Log(EVENT_ERROR, "Failed to try detect old site."); - break; - } - if (element != NULL) { - Log(EVENT_CRITICAL, "Old Admin Console Site exists. Skip."); - result = true; - break; - } - - DWORD site_count; - CHECK_HRESULT(collection->get_Count(&site_count), - "Failed to get site count."); - char site_id[64]; - itoa(site_count + 466453, site_id, 10); - - CHECK_HRESULT(collection->CreateNewElement(L"site", &element), - "Failed to create site element."); - CHECK_BOOL(SetProperty(element, L"name", kSiteName), - "Failed to set site name property."); - CHECK_BOOL(SetProperty(element, L"id", bstr_t(site_id)), - "Failed to set site id property."); - CHECK_HRESULT(collection->AddElement(element), - "Failed to add site element."); - - // Create and set element. - IAppHostElementCollection* app_collection = NULL; - IAppHostElement* app_element = NULL; - CHECK_HRESULT(element->get_Collection(&app_collection), - "Failed to get app collection."); - CHECK_HRESULT(app_collection->CreateNewElement(L"application", &app_element), - "Failed to create application element."); - CHECK_BOOL(SetProperty(app_element, L"path", L"/"), - "Failed to set app path."); - // CHECK_BOOL(SetProperty(app_element, L"applicationPool", kSiteName), "Failed to set app applicationPool."); - CHECK_HRESULT(app_collection->AddElement(app_element), - "Failed to add application element."); - - // Create and set element. - IAppHostElementCollection* dir_collection = NULL; - IAppHostElement* dir_element = NULL; - CHECK_HRESULT(app_element->get_Collection(&dir_collection), - "Failed to get virtualDirectory collection."); - CHECK_HRESULT(dir_collection->CreateNewElement(L"virtualDirectory", &dir_element), - "Failed to create virtualDirectory."); - CHECK_BOOL(SetProperty(dir_element, L"path", L"/"), - "Failed to set dir path."); - CHECK_BOOL(SetProperty(dir_element, L"physicalPath", site_root), - "Failed to set dir physicalPath."); - CHECK_HRESULT(dir_collection->AddElement(dir_element), - "Failed to add virtualDirectory."); - - // Get element. - IAppHostElement* bindings_element = NULL; - CHECK_HRESULT(element->GetElementByName(L"bindings", &bindings_element), - "Failed to get bindings element."); - CHECK_BOOL((bindings_element != NULL), - "Failed to find bindings element."); - - // Create and set element. - IAppHostElementCollection* binding_collection = NULL; - IAppHostElement* binding_element = NULL; - CHECK_HRESULT(bindings_element->get_Collection(&binding_collection), - "Failed to get binding collection."); - CHECK_HRESULT(binding_collection->CreateNewElement(L"binding", &binding_element), - "Failed to create binding."); - CHECK_BOOL(SetProperty(binding_element, L"protocol", L"http"), - "Failed to set binding protocol."); - CHECK_BOOL(SetProperty(binding_element, L"bindingInformation", bstr_t(IisConfig::kAdminConsoleBinding)), - "Failed to set binding bindingInformation."); - CHECK_HRESULT(binding_collection->AddElement(binding_element), - "Failed to add binding element."); - - Log(EVENT_NORMAL, "Admin Console site created successfully."); - result = true; - } while (false); - - // Exiting / Unwinding - if (element != NULL) element->Release(); - if (collection != NULL) collection->Release(); - if (parent != NULL) parent->Release(); - - SysFreeString(bstr_section_name); - SysFreeString(bstr_config_path); - - return result; -} -*/ -bool Iis7Config::GetFromChildren(IAppHostChildElementCollection* children, - BSTR child_name, short* index) { - IAppHostElement* element = NULL; - - HRESULT hresult = S_OK; - *index = -1; - do { - // Get number of children. - DWORD count; - hresult = children->get_Count(&count); - if (FAILED(hresult)) { - Log(EVENT_ERROR, "Unable to get the count of children."); - break; - } - - // Iterate every child to check whether it should be removed. - for (USHORT i = 0; i < count && SUCCEEDED(hresult); ++i) { - // Get item at index i. - VARIANT idx; - idx.vt = VT_I2; - idx.iVal = i; - hresult = children->get_Item(idx, &element); - if (FAILED(hresult)) { - Log(EVENT_ERROR, "Unable to get item [%d]. (0x%0x)", i, hresult); - break; - } - - // Get name property of item i. - - BSTR name = NULL; - if (!element->get_Name(&name)) { - Log(EVENT_ERROR, "Failed to get property value."); - hresult = S_FALSE; - break; - } - - // Check the property value - if (wcscmp(child_name, name) == 0) { - *index = static_cast(i); - SysFreeString(name); - break; - } - - SysFreeString(name); - element->Release(); - element = NULL; - } - } while (false); - - - if (element != NULL) element->Release(); - - return SUCCEEDED(hresult); -} - -bool Iis7Config::GetFromChildren(IAppHostChildElementCollection* children, - BSTR child_name, IAppHostElement** element) { - short idx; - if (!GetFromChildren(children, child_name, &idx)) { - Log(EVENT_ERROR, "Failed to get element from children."); - } - - if (idx != -1) { - VARIANT idx_var; - idx_var.vt = VT_I2; - idx_var.iVal = idx; - - HRESULT hresult = children->get_Item(idx_var, element); - if (FAILED(hresult)) { - Log(EVENT_ERROR, "Failed to get element from children."); - return false; - } else { - return true; - } - } else { - *element = NULL; - return true; - } -} -/* -bool Iis7Config::CustomizeAdminConsole(IAppHostWritableAdminManager* manager, BSTR cgi_path) { - IAppHostConfigManager* config_manager = NULL; - IAppHostConfigFile * config_file = NULL; - IAppHostConfigLocationCollection* location_collection = NULL; - IAppHostConfigLocation* location = NULL; - IAppHostElement* handlers = NULL; - IAppHostElementCollection* handlers_collection = NULL; - IAppHostElement* remove_element = NULL; - IAppHostElement* add_element = NULL; - - bool result = false; - do { - CHECK_HRESULT(manager->get_ConfigManager(&config_manager), - "Failed to get config manager."); - CHECK_HRESULT(config_manager->GetConfigFile(L"MACHINE/WEBROOT/APPHOST", &config_file), - "Failed to get config file."); - CHECK_HRESULT(config_file->get_Locations(&location_collection), - "Failed to get location collection."); - - bool success = false; - do { - // Get number of children. - DWORD count; - CHECK_HRESULT(location_collection->get_Count(&count), "Unable to get the count of collection."); - - // Iterate every child to check whether it should be removed. - USHORT i = 0; - for (; i < count; ++i) { - // Get item at index i. - VARIANT idx; - idx.vt = VT_I2; - idx.iVal = i; - CHECK_HRESULT(location_collection->get_Item(idx, &location), "Unable to get item."); - - BSTR location_path; - CHECK_HRESULT(location->get_Path(&location_path), "Failed to get location path."); - if (wcscmp(location_path, kSiteName) == 0) { - success = true; - break; - } - - SysFreeString(location_path); - location->Release(); - location = NULL; - } - - if (i == count) success = true; - } while (false); - - if (!success) { - break; - } - - if (location != NULL) { - Log(EVENT_CRITICAL, "Location already exists. Skip."); - result = true; - break; - } - - CHECK_HRESULT(location_collection->AddLocation(kSiteName, &location), - "Failed to add location."); - CHECK_HRESULT(location->AddConfigSection(L"system.webServer/handlers", &handlers), - "Failed to add config section."); - CHECK_HRESULT(SetProperty(handlers, L"accessPolicy", L"Read, Execute, Script"), - "Failed to set accessPolicy."); - - CHECK_HRESULT(handlers->get_Collection(&handlers_collection), - "Failed to get handlers collection."); - CHECK_HRESULT(handlers_collection->CreateNewElement(L"remove", &remove_element), - "Failed to create remove element."); - CHECK_BOOL(SetProperty(remove_element, L"name", L"CGI-exe"), - "Failed to set name of remove element."); - CHECK_HRESULT(handlers_collection->AddElement(remove_element), - "Failed to add remove element."); - - CHECK_HRESULT(handlers_collection->CreateNewElement(L"add", &add_element), - "Failed to create add element."); - CHECK_BOOL(SetProperty(add_element, L"name", L"CGI-exe"), - "Failed to set name of add element."); - CHECK_BOOL(SetProperty(add_element, L"path", L"*.cgi"), - "Failed to set path of add element."); - CHECK_BOOL(SetProperty(add_element, L"verb", L"*"), - "Failed to set verb of element."); - CHECK_BOOL(SetProperty(add_element, L"modules", L"CgiModule"), - "Failed to set modules of add element."); - CHECK_BOOL(SetProperty(add_element, L"scriptProcessor", cgi_path), - "Failed to set scriptProcessor of add element."); - CHECK_BOOL(SetProperty(add_element, L"resourceType", L"File"), - "Failed to set resourceType of add element."); - CHECK_BOOL(SetProperty(add_element, L"requireAccess", L"Execute"), - "Failed to set requireAccess of add element."); - CHECK_BOOL(SetProperty(add_element, L"allowPathInfo", L"true"), - "Failed to set naallowPathInfome of add element."); - CHECK_HRESULT(handlers_collection->AddElement(add_element), - "Failed to add add element."); - - Log(EVENT_NORMAL, "Admin Console site customized successfully."); - result = true; - } while (false); - - return result; -} - - -bool Iis7Config::RemoveAdminConsoleCustomization(IAppHostWritableAdminManager* manager) { - IAppHostConfigManager* config_manager = NULL; - IAppHostConfigFile * config_file = NULL; - IAppHostConfigLocationCollection* location_collection = NULL; - IAppHostConfigLocation* location = NULL; - - bool result = false; - do { - CHECK_HRESULT(manager->get_ConfigManager(&config_manager), "Failed to get config manager."); - CHECK_HRESULT(config_manager->GetConfigFile(L"MACHINE/WEBROOT/APPHOST", &config_file), "Failed to get config file."); - CHECK_HRESULT(config_file->get_Locations(&location_collection), "Failed to get location collection."); - - bool success = false; - VARIANT idx; - do { - // Get number of children. - DWORD count; - CHECK_HRESULT(location_collection->get_Count(&count), "Unable to get the count of collection."); - - // Iterate every child to check whether it should be removed. - USHORT i = 0; - for (; i < count; ++i) { - // Get item at index i. - idx.vt = VT_I2; - idx.iVal = i; - CHECK_HRESULT(location_collection->get_Item(idx, &location), "Unable to get item."); - - BSTR location_path; - CHECK_HRESULT(location->get_Path(&location_path), "Failed to get location path."); - if (wcscmp(location_path, kSiteName) == 0) { - success = true; - break; - } - - SysFreeString(location_path); - location->Release(); - location = NULL; - } - - if (i == count) success = true; - } while (false); - - if (!success) { - break; - } - - if (location == NULL) { - Log(EVENT_CRITICAL, "No location exists. Skip."); - result = true; - break; - } - - CHECK_HRESULT(location_collection->DeleteLocation(idx), "Failed to remove location."); - - result = true; - } while (false); - - return result; -} -*/ - -void CopyBinaries(wchar_t *srcpath, wchar_t *dstpath) -{ - wchar_t *files[] = { L"libapr-1.dll", L"libapriconv-1.dll", L"libaprutil-1.dll", - L"libxml2.dll", L"lua5.1.dll", L"pcre.dll", L"zlib1.dll", L"ModSecurityIIS.dll" }; - - for(int i = 0; i < 8; i++) - { - wchar_t src[4096]; - wchar_t dst[4096]; - - wcsncpy(src,srcpath,4096); - wcsncat(src,files[i],4096); - wcsncpy(dst,dstpath,4096); - wcsncat(dst,files[i],4096); - - if(!CopyFile(src, dst, FALSE)) - { - Iis7Config::Log(EVENT_ERROR, L"Failed to copy binary: %s %s", src, dst); - } - } -} - -void fixpath(wchar_t *srcdir) -{ - int l = wcslen(srcdir); - - if(srcdir[l-1] != '\\') - { - srcdir[l] = '\\'; - srcdir[l + 1] = 0; - } -} - -int _tmain(int argc, _TCHAR* argv[]) -{ - if(argc < 2) - return -1; - - if(wcscmp(argv[1], L"uninstall") == 0) - { - Iis7Config::UninstallFilter(); - return 0; - } - - wchar_t srcdir[4096]; - - if(argv[1][0] == '"') - wcsncpy(srcdir, &argv[1][1], 4096); - else - wcsncpy(srcdir, argv[1], 4096); - - int l = wcslen(srcdir); - - if(srcdir[l-1] == '"') - srcdir[l-1] = 0; - - fixpath(srcdir); - - wchar_t windir[4096]; - - GetWindowsDirectory(windir, 4096); - - fixpath(windir); - - wchar_t crsdir[4096]; - - crsdir[0] = windir[0]; - crsdir[1] = windir[1]; - crsdir[2] = windir[2]; - crsdir[3] = 0; - - wcsncat(crsdir, L"inetpub", 4096); - - CreateDirectory(crsdir, NULL); - - wcsncat(crsdir, L"\\wwwroot", 4096); - - CreateDirectory(crsdir, NULL); - - wchar_t zipdir[4096]; - - wcsncpy(zipdir, srcdir, 4096); - wcsncat(zipdir, L"owasp_crs.zip", 4096); - - HZIP hzip = OpenZip(crsdir, zipdir, 0, ZIP_FILENAME); - - if(hzip != 0) - { - int z = 0; - ZIPENTRYW ze; - - while(GetZipItemW(hzip, z, &ze) == ZR_OK) - { - UnzipItem(hzip, z++, ze.name, 0, ZIP_FILENAME); - } - - CloseZip(hzip); - } - - wchar_t sys32[4096]; - wchar_t syswow[4096]; - wchar_t sysnat[4096]; - - wcsncpy(sys32, windir, 4096); - wcsncpy(syswow, windir, 4096); - wcsncpy(sysnat, windir, 4096); - - wcsncat(sys32, L"system32\\inetsrv\\", 4096); - wcsncat(syswow, L"SysWow64\\inetsrv\\", 4096); - wcsncat(sysnat, L"SysNative\\inetsrv\\", 4096); - - wchar_t src32[4096]; - wchar_t src64[4096]; - - wcsncpy(src32, srcdir, 4096); - wcsncpy(src64, srcdir, 4096); - wcsncat(src32, L"x86\\", 4096); - wcsncat(src64, L"amd64\\", 4096); - - wchar_t dstconf[4096]; - - if(Iis7Config::GetAppMode() == Iis7Config::MODE_X64) - { - CopyBinaries(src32, syswow); - CopyBinaries(src64, sysnat); - wcsncpy(dstconf, sysnat, 4096); - } - else - { - CopyBinaries(src32, sys32); - wcsncpy(dstconf, sys32, 4096); - } - - wcsncat(dstconf, L"config\\schema\\ModSecurity.xml", 4096); - - wcsncat(srcdir, L"ModSecurity.xml", 4096); - - if(!CopyFile(srcdir, dstconf, FALSE)) - { - Iis7Config::Log(EVENT_ERROR, L"Failed to copy config XML: %s %s", srcdir, dstconf); - } - - wcsncat(sys32, L"ModSecurityIIS.dll", 4096); - - Iis7Config::InstallFilter(sys32); - - return 0; -} diff --git a/iis/ModSecurityIIS/Installer/Installer.vcxproj b/iis/ModSecurityIIS/Installer/Installer.vcxproj deleted file mode 100644 index c584c349..00000000 --- a/iis/ModSecurityIIS/Installer/Installer.vcxproj +++ /dev/null @@ -1,96 +0,0 @@ - - - - - Debug - Win32 - - - Release - Win32 - - - - {990BB195-6716-4DE3-B5E4-DCFCB1BD7D9C} - Win32Proj - Installer - - - - Application - true - Unicode - - - Application - false - true - Unicode - Static - - - - - - - - - - - - - true - - - false - - - - Use - Level3 - Disabled - WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) - - - Console - true - - - - - Level3 - Use - MaxSpeed - true - true - WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) - - - Console - true - true - true - ole32.lib;oleaut32.lib;advapi32.lib - RequireAdministrator - - - - - - - - - - - - - - Create - Create - - - - - - - \ No newline at end of file diff --git a/iis/ModSecurityIIS/Installer/Installer.vcxproj.filters b/iis/ModSecurityIIS/Installer/Installer.vcxproj.filters deleted file mode 100644 index cc4e9ce4..00000000 --- a/iis/ModSecurityIIS/Installer/Installer.vcxproj.filters +++ /dev/null @@ -1,42 +0,0 @@ - - - - - {4FC737F1-C7A5-4376-A066-2A32D752A2FF} - cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx - - - {93995380-89BD-4b04-88EB-625FBE52EBFB} - h;hpp;hxx;hm;inl;inc;xsd - - - {67DA6AB6-F800-4c08-8B7A-83BB121AAD01} - rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms - - - - - - - - Header Files - - - Header Files - - - Header Files - - - - - Source Files - - - Source Files - - - Source Files - - - \ No newline at end of file diff --git a/iis/ModSecurityIIS/Installer/Installer.vcxproj.user b/iis/ModSecurityIIS/Installer/Installer.vcxproj.user deleted file mode 100644 index 6a61bbba..00000000 --- a/iis/ModSecurityIIS/Installer/Installer.vcxproj.user +++ /dev/null @@ -1,7 +0,0 @@ - - - - "c:\Program Files (x86)\ModSecurity IIS" - WindowsLocalDebugger - - \ No newline at end of file diff --git a/iis/ModSecurityIIS/Installer/ReadMe.txt b/iis/ModSecurityIIS/Installer/ReadMe.txt deleted file mode 100644 index 87d59aeb..00000000 --- a/iis/ModSecurityIIS/Installer/ReadMe.txt +++ /dev/null @@ -1,40 +0,0 @@ -======================================================================== - CONSOLE APPLICATION : Installer Project Overview -======================================================================== - -AppWizard has created this Installer application for you. - -This file contains a summary of what you will find in each of the files that -make up your Installer application. - - -Installer.vcxproj - This is the main project file for VC++ projects generated using an Application Wizard. - It contains information about the version of Visual C++ that generated the file, and - information about the platforms, configurations, and project features selected with the - Application Wizard. - -Installer.vcxproj.filters - This is the filters file for VC++ projects generated using an Application Wizard. - It contains information about the association between the files in your project - and the filters. This association is used in the IDE to show grouping of files with - similar extensions under a specific node (for e.g. ".cpp" files are associated with the - "Source Files" filter). - -Installer.cpp - This is the main application source file. - -///////////////////////////////////////////////////////////////////////////// -Other standard files: - -StdAfx.h, StdAfx.cpp - These files are used to build a precompiled header (PCH) file - named Installer.pch and a precompiled types file named StdAfx.obj. - -///////////////////////////////////////////////////////////////////////////// -Other notes: - -AppWizard uses "TODO:" comments to indicate parts of the source code you -should add to or customize. - -///////////////////////////////////////////////////////////////////////////// diff --git a/iis/ModSecurityIIS/Installer/XUnzip.cpp b/iis/ModSecurityIIS/Installer/XUnzip.cpp deleted file mode 100644 index bee1b85e..00000000 --- a/iis/ModSecurityIIS/Installer/XUnzip.cpp +++ /dev/null @@ -1,4386 +0,0 @@ -// XUnzip.cpp Version 1.3 -// -// Authors: Mark Adler et al. (see below) -// -// Modified by: Lucian Wischik -// lu@wischik.com -// -// Version 1.0 - Turned C files into just a single CPP file -// - Made them compile cleanly as C++ files -// - Gave them simpler APIs -// - Added the ability to zip/unzip directly in memory without -// any intermediate files -// -// Modified by: Hans Dietrich -// hdietrich@gmail.com -// -// Version 1.3: - Corrected size bug introduced by 1.2 -// -// Version 1.2: - Many bug fixes. See CodeProject article for list. -// -// Version 1.1: - Added Unicode support to CreateZip() and ZipAdd() -// - Changed file names to avoid conflicts with Lucian's files -// -/////////////////////////////////////////////////////////////////////////////// -// -// Lucian Wischik's comments: -// -------------------------- -// THIS FILE is almost entirely based upon code by Info-ZIP. -// It has been modified by Lucian Wischik. -// The original code may be found at http://www.info-zip.org -// The original copyright text follows. -// -/////////////////////////////////////////////////////////////////////////////// -// -// Original authors' comments: -// --------------------------- -// This is version 2002-Feb-16 of the Info-ZIP copyright and license. The -// definitive version of this document should be available at -// ftp://ftp.info-zip.org/pub/infozip/license.html indefinitely. -// -// Copyright (c) 1990-2002 Info-ZIP. All rights reserved. -// -// For the purposes of this copyright and license, "Info-ZIP" is defined as -// the following set of individuals: -// -// Mark Adler, John Bush, Karl Davis, Harald Denker, Jean-Michel Dubois, -// Jean-loup Gailly, Hunter Goatley, Ian Gorman, Chris Herborth, Dirk Haase, -// Greg Hartwig, Robert Heath, Jonathan Hudson, Paul Kienitz, -// David Kirschbaum, Johnny Lee, Onno van der Linden, Igor Mandrichenko, -// Steve P. Miller, Sergio Monesi, Keith Owens, George Petrov, Greg Roelofs, -// Kai Uwe Rommel, Steve Salisbury, Dave Smith, Christian Spieler, -// Antoine Verheijen, Paul von Behren, Rich Wales, Mike White -// -// This software is provided "as is", without warranty of any kind, express -// or implied. In no event shall Info-ZIP or its contributors be held liable -// for any direct, indirect, incidental, special or consequential damages -// arising out of the use of or inability to use this software. -// -// Permission is granted to anyone to use this software for any purpose, -// including commercial applications, and to alter it and redistribute it -// freely, subject to the following restrictions: -// -// 1. Redistributions of source code must retain the above copyright notice, -// definition, disclaimer, and this list of conditions. -// -// 2. Redistributions in binary form (compiled executables) must reproduce -// the above copyright notice, definition, disclaimer, and this list of -// conditions in documentation and/or other materials provided with the -// distribution. The sole exception to this condition is redistribution -// of a standard UnZipSFX binary as part of a self-extracting archive; -// that is permitted without inclusion of this license, as long as the -// normal UnZipSFX banner has not been removed from the binary or disabled. -// -// 3. Altered versions--including, but not limited to, ports to new -// operating systems, existing ports with new graphical interfaces, and -// dynamic, shared, or static library versions--must be plainly marked -// as such and must not be misrepresented as being the original source. -// Such altered versions also must not be misrepresented as being -// Info-ZIP releases--including, but not limited to, labeling of the -// altered versions with the names "Info-ZIP" (or any variation thereof, -// including, but not limited to, different capitalizations), -// "Pocket UnZip", "WiZ" or "MacZip" without the explicit permission of -// Info-ZIP. Such altered versions are further prohibited from -// misrepresentative use of the Zip-Bugs or Info-ZIP e-mail addresses or -// of the Info-ZIP URL(s). -// -// 4. Info-ZIP retains the right to use the names "Info-ZIP", "Zip", "UnZip", -// "UnZipSFX", "WiZ", "Pocket UnZip", "Pocket Zip", and "MacZip" for its -// own source and binary releases. -// -/////////////////////////////////////////////////////////////////////////////// - - -#define _USE_32BIT_TIME_T //+++1.2 - - -#define STRICT -#define WIN32_LEAN_AND_MEAN -#include "stdafx.h" -#include -#include -#include -#include -#include -#include -#include "XUnzip.h" - -#pragma warning(disable : 4996) // disable bogus deprecation warning - -// THIS FILE is almost entirely based upon code by Jean-loup Gailly -// and Mark Adler. It has been modified by Lucian Wischik. -// The original code may be found at http://www.gzip.org/zlib/ -// The original copyright text follows. -// -// -// -// zlib.h -- interface of the 'zlib' general purpose compression library -// version 1.1.3, July 9th, 1998 -// -// Copyright (C) 1995-1998 Jean-loup Gailly and Mark Adler -// -// This software is provided 'as-is', without any express or implied -// warranty. In no event will the authors be held liable for any damages -// arising from the use of this software. -// -// Permission is granted to anyone to use this software for any purpose, -// including commercial applications, and to alter it and redistribute it -// freely, subject to the following restrictions: -// -// 1. The origin of this software must not be misrepresented; you must not -// claim that you wrote the original software. If you use this software -// in a product, an acknowledgment in the product documentation would be -// appreciated but is not required. -// 2. Altered source versions must be plainly marked as such, and must not be -// misrepresented as being the original software. -// 3. This notice may not be removed or altered from any source distribution. -// -// Jean-loup Gailly Mark Adler -// jloup@gzip.org madler@alumni.caltech.edu -// -// -// The data format used by the zlib library is described by RFCs (Request for -// Comments) 1950 to 1952 in the files ftp://ds.internic.net/rfc/rfc1950.txt -// (zlib format), rfc1951.txt (deflate format) and rfc1952.txt (gzip format). -// -// -// The 'zlib' compression library provides in-memory compression and -// decompression functions, including integrity checks of the uncompressed -// data. This version of the library supports only one compression method -// (deflation) but other algorithms will be added later and will have the same -// stream interface. -// -// Compression can be done in a single step if the buffers are large -// enough (for example if an input file is mmap'ed), or can be done by -// repeated calls of the compression function. In the latter case, the -// application must provide more input and/or consume the output -// (providing more output space) before each call. -// -// The library also supports reading and writing files in gzip (.gz) format -// with an interface similar to that of stdio. -// -// The library does not install any signal handler. The decoder checks -// the consistency of the compressed data, so the library should never -// crash even in case of corrupted input. -// -// for more info about .ZIP format, see ftp://ftp.cdrom.com/pub/infozip/doc/appnote-970311-iz.zip -// PkWare has also a specification at ftp://ftp.pkware.com/probdesc.zip - -#define zmalloc(len) malloc(len) - -#define zfree(p) free(p) - -/* -void *zmalloc(unsigned int len) -{ char *buf = new char[len+32]; - for (int i=0; i<16; i++) - { buf[i]=i; - buf[len+31-i]=i; - } - *((unsigned int*)buf) = len; - char c[1000]; wsprintf(c,"malloc 0x%lx - %lu",buf+16,len); - OutputDebugString(c); - return buf+16; -} - -void zfree(void *buf) -{ char c[1000]; wsprintf(c,"free 0x%lx",buf); - OutputDebugString(c); - char *p = ((char*)buf)-16; - unsigned int len = *((unsigned int*)p); - bool blown=false; - for (int i=0; i<16; i++) - { char lo = p[i]; - char hi = p[len+31-i]; - if (hi!=i || (lo!=i && i>4)) blown=true; - } - if (blown) - { OutputDebugString("BLOWN!!!"); - } - delete[] p; -} -*/ - -#pragma warning(disable : 4702) // unreachable code - -static ZRESULT zopenerror = ZR_OK; //+++1.2 - -typedef struct tm_unz_s -{ unsigned int tm_sec; // seconds after the minute - [0,59] - unsigned int tm_min; // minutes after the hour - [0,59] - unsigned int tm_hour; // hours since midnight - [0,23] - unsigned int tm_mday; // day of the month - [1,31] - unsigned int tm_mon; // months since January - [0,11] - unsigned int tm_year; // years - [1980..2044] -} tm_unz; - - -// unz_global_info structure contain global data about the ZIPfile -typedef struct unz_global_info_s -{ unsigned long number_entry; // total number of entries in the central dir on this disk - unsigned long size_comment; // size of the global comment of the zipfile -} unz_global_info; - -// unz_file_info contain information about a file in the zipfile -typedef struct unz_file_info_s -{ unsigned long version; // version made by 2 bytes - unsigned long version_needed; // version needed to extract 2 bytes - unsigned long flag; // general purpose bit flag 2 bytes - unsigned long compression_method; // compression method 2 bytes - unsigned long dosDate; // last mod file date in Dos fmt 4 bytes - unsigned long crc; // crc-32 4 bytes - unsigned long compressed_size; // compressed size 4 bytes - unsigned long uncompressed_size; // uncompressed size 4 bytes - unsigned long size_filename; // filename length 2 bytes - unsigned long size_file_extra; // extra field length 2 bytes - unsigned long size_file_comment; // file comment length 2 bytes - unsigned long disk_num_start; // disk number start 2 bytes - unsigned long internal_fa; // internal file attributes 2 bytes - unsigned long external_fa; // external file attributes 4 bytes - tm_unz tmu_date; -} unz_file_info; - - -#define UNZ_OK (0) -#define UNZ_END_OF_LIST_OF_FILE (-100) -#define UNZ_ERRNO (Z_ERRNO) -#define UNZ_EOF (0) -#define UNZ_PARAMERROR (-102) -#define UNZ_BADZIPFILE (-103) -#define UNZ_INTERNALERROR (-104) -#define UNZ_CRCERROR (-105) - - - - - - - -#define ZLIB_VERSION "1.1.3" - - -// Allowed flush values; see deflate() for details -#define Z_NO_FLUSH 0 -#define Z_SYNC_FLUSH 2 -#define Z_FULL_FLUSH 3 -#define Z_FINISH 4 - - -// compression levels -#define Z_NO_COMPRESSION 0 -#define Z_BEST_SPEED 1 -#define Z_BEST_COMPRESSION 9 -#define Z_DEFAULT_COMPRESSION (-1) - -// compression strategy; see deflateInit2() for details -#define Z_FILTERED 1 -#define Z_HUFFMAN_ONLY 2 -#define Z_DEFAULT_STRATEGY 0 - -// Possible values of the data_type field -#define Z_BINARY 0 -#define Z_ASCII 1 -#define Z_UNKNOWN 2 - -// The deflate compression method (the only one supported in this version) -#define Z_DEFLATED 8 - -// for initializing zalloc, zfree, opaque -#define Z_NULL 0 - -// case sensitivity when searching for filenames -#define CASE_SENSITIVE 1 -#define CASE_INSENSITIVE 2 - - -// Return codes for the compression/decompression functions. Negative -// values are errors, positive values are used for special but normal events. -#define Z_OK 0 -#define Z_STREAM_END 1 -#define Z_NEED_DICT 2 -#define Z_ERRNO (-1) -#define Z_STREAM_ERROR (-2) -#define Z_DATA_ERROR (-3) -#define Z_MEM_ERROR (-4) -#define Z_BUF_ERROR (-5) -#define Z_VERSION_ERROR (-6) - - - -// Basic data types -typedef unsigned char Byte; // 8 bits -typedef unsigned int uInt; // 16 bits or more -typedef unsigned long uLong; // 32 bits or more -typedef void *voidpf; -typedef void *voidp; -typedef long z_off_t; - - - - - - - - - - - - -typedef voidpf (*alloc_func) (voidpf opaque, uInt items, uInt size); -typedef void (*free_func) (voidpf opaque, voidpf address); - -struct internal_state; - -typedef struct z_stream_s { - Byte *next_in; // next input byte - uInt avail_in; // number of bytes available at next_in - uLong total_in; // total nb of input bytes read so far - - Byte *next_out; // next output byte should be put there - uInt avail_out; // remaining free space at next_out - uLong total_out; // total nb of bytes output so far - - char *msg; // last error message, NULL if no error - struct internal_state *state; // not visible by applications - - alloc_func zalloc; // used to allocate the internal state - free_func zfree; // used to free the internal state - voidpf opaque; // private data object passed to zalloc and zfree - - int data_type; // best guess about the data type: ascii or binary - uLong adler; // adler32 value of the uncompressed data - uLong reserved; // reserved for future use -} z_stream; - -typedef z_stream *z_streamp; - - -// The application must update next_in and avail_in when avail_in has -// dropped to zero. It must update next_out and avail_out when avail_out -// has dropped to zero. The application must initialize zalloc, zfree and -// opaque before calling the init function. All other fields are set by the -// compression library and must not be updated by the application. -// -// The opaque value provided by the application will be passed as the first -// parameter for calls of zalloc and zfree. This can be useful for custom -// memory management. The compression library attaches no meaning to the -// opaque value. -// -// zalloc must return Z_NULL if there is not enough memory for the object. -// If zlib is used in a multi-threaded application, zalloc and zfree must be -// thread safe. -// -// The fields total_in and total_out can be used for statistics or -// progress reports. After compression, total_in holds the total size of -// the uncompressed data and may be saved for use in the decompressor -// (particularly if the decompressor wants to decompress everything in -// a single step). -// - - -// basic functions - -const char *zlibVersion (); -// The application can compare zlibVersion and ZLIB_VERSION for consistency. -// If the first character differs, the library code actually used is -// not compatible with the zlib.h header file used by the application. -// This check is automatically made by inflateInit. - - - - - - -int inflate (z_streamp strm, int flush); -// -// inflate decompresses as much data as possible, and stops when the input -// buffer becomes empty or the output buffer becomes full. It may some -// introduce some output latency (reading input without producing any output) -// except when forced to flush. -// -// The detailed semantics are as follows. inflate performs one or both of the -// following actions: -// -// - Decompress more input starting at next_in and update next_in and avail_in -// accordingly. If not all input can be processed (because there is not -// enough room in the output buffer), next_in is updated and processing -// will resume at this point for the next call of inflate(). -// -// - Provide more output starting at next_out and update next_out and avail_out -// accordingly. inflate() provides as much output as possible, until there -// is no more input data or no more space in the output buffer (see below -// about the flush parameter). -// -// Before the call of inflate(), the application should ensure that at least -// one of the actions is possible, by providing more input and/or consuming -// more output, and updating the next_* and avail_* values accordingly. -// The application can consume the uncompressed output when it wants, for -// example when the output buffer is full (avail_out == 0), or after each -// call of inflate(). If inflate returns Z_OK and with zero avail_out, it -// must be called again after making room in the output buffer because there -// might be more output pending. -// -// If the parameter flush is set to Z_SYNC_FLUSH, inflate flushes as much -// output as possible to the output buffer. The flushing behavior of inflate is -// not specified for values of the flush parameter other than Z_SYNC_FLUSH -// and Z_FINISH, but the current implementation actually flushes as much output -// as possible anyway. -// -// inflate() should normally be called until it returns Z_STREAM_END or an -// error. However if all decompression is to be performed in a single step -// (a single call of inflate), the parameter flush should be set to -// Z_FINISH. In this case all pending input is processed and all pending -// output is flushed; avail_out must be large enough to hold all the -// uncompressed data. (The size of the uncompressed data may have been saved -// by the compressor for this purpose.) The next operation on this stream must -// be inflateEnd to deallocate the decompression state. The use of Z_FINISH -// is never required, but can be used to inform inflate that a faster routine -// may be used for the single inflate() call. -// -// If a preset dictionary is needed at this point (see inflateSetDictionary -// below), inflate sets strm-adler to the adler32 checksum of the -// dictionary chosen by the compressor and returns Z_NEED_DICT; otherwise -// it sets strm->adler to the adler32 checksum of all output produced -// so far (that is, total_out bytes) and returns Z_OK, Z_STREAM_END or -// an error code as described below. At the end of the stream, inflate() -// checks that its computed adler32 checksum is equal to that saved by the -// compressor and returns Z_STREAM_END only if the checksum is correct. -// -// inflate() returns Z_OK if some progress has been made (more input processed -// or more output produced), Z_STREAM_END if the end of the compressed data has -// been reached and all uncompressed output has been produced, Z_NEED_DICT if a -// preset dictionary is needed at this point, Z_DATA_ERROR if the input data was -// corrupted (input stream not conforming to the zlib format or incorrect -// adler32 checksum), Z_STREAM_ERROR if the stream structure was inconsistent -// (for example if next_in or next_out was NULL), Z_MEM_ERROR if there was not -// enough memory, Z_BUF_ERROR if no progress is possible or if there was not -// enough room in the output buffer when Z_FINISH is used. In the Z_DATA_ERROR -// case, the application may then call inflateSync to look for a good -// compression block. -// - - -int inflateEnd (z_streamp strm); -// -// All dynamically allocated data structures for this stream are freed. -// This function discards any unprocessed input and does not flush any -// pending output. -// -// inflateEnd returns Z_OK if success, Z_STREAM_ERROR if the stream state -// was inconsistent. In the error case, msg may be set but then points to a -// static string (which must not be deallocated). - - // Advanced functions - -// The following functions are needed only in some special applications. - - - - - -int inflateSetDictionary (z_streamp strm, - const Byte *dictionary, - uInt dictLength); -// -// Initializes the decompression dictionary from the given uncompressed byte -// sequence. This function must be called immediately after a call of inflate -// if this call returned Z_NEED_DICT. The dictionary chosen by the compressor -// can be determined from the Adler32 value returned by this call of -// inflate. The compressor and decompressor must use exactly the same -// dictionary. -// -// inflateSetDictionary returns Z_OK if success, Z_STREAM_ERROR if a -// parameter is invalid (such as NULL dictionary) or the stream state is -// inconsistent, Z_DATA_ERROR if the given dictionary doesn't match the -// expected one (incorrect Adler32 value). inflateSetDictionary does not -// perform any decompression: this will be done by subsequent calls of -// inflate(). - - -int inflateSync (z_streamp strm); -// -// Skips invalid compressed data until a full flush point can be found, or until all -// available input is skipped. No output is provided. -// -// inflateSync returns Z_OK if a full flush point has been found, Z_BUF_ERROR -// if no more input was provided, Z_DATA_ERROR if no flush point has been found, -// or Z_STREAM_ERROR if the stream structure was inconsistent. In the success -// case, the application may save the current current value of total_in which -// indicates where valid compressed data was found. In the error case, the -// application may repeatedly call inflateSync, providing more input each time, -// until success or end of the input data. - - -int inflateReset (z_streamp strm); -// This function is equivalent to inflateEnd followed by inflateInit, -// but does not free and reallocate all the internal decompression state. -// The stream will keep attributes that may have been set by inflateInit2. -// -// inflateReset returns Z_OK if success, or Z_STREAM_ERROR if the source -// stream state was inconsistent (such as zalloc or state being NULL). -// - - - -// checksum functions -// These functions are not related to compression but are exported -// anyway because they might be useful in applications using the -// compression library. - -uLong adler32 (uLong adler, const Byte *buf, uInt len); -// Update a running Adler-32 checksum with the bytes buf[0..len-1] and -// return the updated checksum. If buf is NULL, this function returns -// the required initial value for the checksum. -// An Adler-32 checksum is almost as reliable as a CRC32 but can be computed -// much faster. Usage example: -// -// uLong adler = adler32(0L, Z_NULL, 0); -// -// while (read_buffer(buffer, length) != EOF) { -// adler = adler32(adler, buffer, length); -// } -// if (adler != original_adler) error(); - -uLong ucrc32 (uLong crc, const Byte *buf, uInt len); -// Update a running crc with the bytes buf[0..len-1] and return the updated -// crc. If buf is NULL, this function returns the required initial value -// for the crc. Pre- and post-conditioning (one's complement) is performed -// within this function so it shouldn't be done by the application. -// Usage example: -// -// uLong crc = crc32(0L, Z_NULL, 0); -// -// while (read_buffer(buffer, length) != EOF) { -// crc = crc32(crc, buffer, length); -// } -// if (crc != original_crc) error(); - - - - -const char *zError (int err); -int inflateSyncPoint (z_streamp z); -const uLong *get_crc_table (void); - - - -typedef unsigned char uch; -typedef uch uchf; -typedef unsigned short ush; -typedef ush ushf; -typedef unsigned long ulg; - - - -const char * const z_errmsg[10] = { // indexed by 2-zlib_error -"need dictionary", // Z_NEED_DICT 2 -"stream end", // Z_STREAM_END 1 -"", // Z_OK 0 -"file error", // Z_ERRNO (-1) -"stream error", // Z_STREAM_ERROR (-2) -"data error", // Z_DATA_ERROR (-3) -"insufficient memory", // Z_MEM_ERROR (-4) -"buffer error", // Z_BUF_ERROR (-5) -"incompatible version",// Z_VERSION_ERROR (-6) -""}; - - -#define ERR_MSG(err) z_errmsg[Z_NEED_DICT-(err)] - -#define ERR_RETURN(strm,err) \ - return (strm->msg = (char*)ERR_MSG(err), (err)) -// To be used only when the state is known to be valid - - // common constants - - -#define STORED_BLOCK 0 -#define STATIC_TREES 1 -#define DYN_TREES 2 -// The three kinds of block type - -#define MIN_MATCH 3 -#define MAX_MATCH 258 -// The minimum and maximum match lengths - -#define PRESET_DICT 0x20 // preset dictionary flag in zlib header - - // target dependencies - -#define OS_CODE 0x0b // Window 95 & Windows NT - - - - // functions - -#define zmemzero(dest, len) memset(dest, 0, len) - -// Diagnostic functions -#undef Assert -#undef Trace -#undef Tracev -#undef Tracevv -#undef Tracec -#undef Tracecv - -#ifdef DEBUG - - int z_verbose = 0; - void z_error (char *m) {fprintf(stderr, "%s\n", m); exit(1);} - -#define Assert(cond,msg) {if(!(cond)) z_error(msg);} -#define Trace(x) {if (z_verbose>=0) fprintf x ;} -#define Tracev(x) {if (z_verbose>0) fprintf x ;} -#define Tracevv(x) {if (z_verbose>1) fprintf x ;} -#define Tracec(c,x) {if (z_verbose>0 && (c)) fprintf x ;} -#define Tracecv(c,x) {if (z_verbose>1 && (c)) fprintf x ;} - -#else - -#ifndef __noop -#if _MSC_VER < 1300 -#define __noop ((void)0) -#endif -#endif - -#define Assert(cond,msg) __noop -#define Trace(x) __noop -#define Tracev(x) __noop -#define Tracevv(x) __noop -#define Tracec(c,x) __noop -#define Tracecv(c,x) __noop - -#endif - - -typedef uLong (*check_func) (uLong check, const Byte *buf, uInt len); -voidpf zcalloc (voidpf opaque, unsigned items, unsigned size); -void zcfree (voidpf opaque, voidpf ptr); - -#define ZALLOC(strm, items, size) \ - (*((strm)->zalloc))((strm)->opaque, (items), (size)) -#define ZFREE(strm, addr) (*((strm)->zfree))((strm)->opaque, (voidpf)(addr)) - -//void ZFREE(z_streamp strm,voidpf addr) -//{ *((strm)->zfree))((strm)->opaque, addr); -//} - -#define TRY_FREE(s, p) {if (p) ZFREE(s, p);} - - - - -// Huffman code lookup table entry--this entry is four bytes for machines -// that have 16-bit pointers (e.g. PC's in the small or medium model). - - -typedef struct inflate_huft_s inflate_huft; - -struct inflate_huft_s { - union { - struct { - Byte Exop; // number of extra bits or operation - Byte Bits; // number of bits in this code or subcode - } what; - uInt pad; // pad structure to a power of 2 (4 bytes for - } word; // 16-bit, 8 bytes for 32-bit int's) - uInt base; // literal, length base, distance base, or table offset -}; - -// Maximum size of dynamic tree. The maximum found in a long but non- -// exhaustive search was 1004 huft structures (850 for length/literals -// and 154 for distances, the latter actually the result of an -// exhaustive search). The actual maximum is not known, but the -// value below is more than safe. -#define MANY 1440 - -int inflate_trees_bits ( - uInt *, // 19 code lengths - uInt *, // bits tree desired/actual depth - inflate_huft * *, // bits tree result - inflate_huft *, // space for trees - z_streamp); // for messages - -int inflate_trees_dynamic ( - uInt, // number of literal/length codes - uInt, // number of distance codes - uInt *, // that many (total) code lengths - uInt *, // literal desired/actual bit depth - uInt *, // distance desired/actual bit depth - inflate_huft * *, // literal/length tree result - inflate_huft * *, // distance tree result - inflate_huft *, // space for trees - z_streamp); // for messages - -int inflate_trees_fixed ( - uInt *, // literal desired/actual bit depth - uInt *, // distance desired/actual bit depth - const inflate_huft * *, // literal/length tree result - const inflate_huft * *, // distance tree result - z_streamp); // for memory allocation - - - - - -struct inflate_blocks_state; -typedef struct inflate_blocks_state inflate_blocks_statef; - -inflate_blocks_statef * inflate_blocks_new ( - z_streamp z, - check_func c, // check function - uInt w); // window size - -int inflate_blocks ( - inflate_blocks_statef *, - z_streamp , - int); // initial return code - -void inflate_blocks_reset ( - inflate_blocks_statef *, - z_streamp , - uLong *); // check value on output - -int inflate_blocks_free ( - inflate_blocks_statef *, - z_streamp); - -void inflate_set_dictionary ( - inflate_blocks_statef *s, - const Byte *d, // dictionary - uInt n); // dictionary length - -int inflate_blocks_sync_point ( - inflate_blocks_statef *s); - - - - -struct inflate_codes_state; -typedef struct inflate_codes_state inflate_codes_statef; - -inflate_codes_statef *inflate_codes_new ( - uInt, uInt, - const inflate_huft *, const inflate_huft *, - z_streamp ); - -int inflate_codes ( - inflate_blocks_statef *, - z_streamp , - int); - -void inflate_codes_free ( - inflate_codes_statef *, - z_streamp ); - - - - -typedef enum { - IBM_TYPE, // get type bits (3, including end bit) - IBM_LENS, // get lengths for stored - IBM_STORED, // processing stored block - IBM_TABLE, // get table lengths - IBM_BTREE, // get bit lengths tree for a dynamic block - IBM_DTREE, // get length, distance trees for a dynamic block - IBM_CODES, // processing fixed or dynamic block - IBM_DRY, // output remaining window bytes - IBM_DONE, // finished last block, done - IBM_BAD} // got a data error--stuck here -inflate_block_mode; - -// inflate blocks semi-private state -struct inflate_blocks_state { - - // mode - inflate_block_mode mode; // current inflate_block mode - - // mode dependent information - union { - uInt left; // if STORED, bytes left to copy - struct { - uInt table; // table lengths (14 bits) - uInt index; // index into blens (or border) - uInt *blens; // bit lengths of codes - uInt bb; // bit length tree depth - inflate_huft *tb; // bit length decoding tree - } trees; // if DTREE, decoding info for trees - struct { - inflate_codes_statef - *codes; - } decode; // if CODES, current state - } sub; // submode - uInt last; // true if this block is the last block - - // mode independent information - uInt bitk; // bits in bit buffer - uLong bitb; // bit buffer - inflate_huft *hufts; // single malloc for tree space - Byte *window; // sliding window - Byte *end; // one byte after sliding window - Byte *read; // window read pointer - Byte *write; // window write pointer - check_func checkfn; // check function - uLong check; // check on output - -}; - - -// defines for inflate input/output -// update pointers and return -#define UPDBITS {s->bitb=b;s->bitk=k;} -#define UPDIN {z->avail_in=n;z->total_in+=(uLong)(p-z->next_in);z->next_in=p;} -#define UPDOUT {s->write=q;} -#define UPDATE {UPDBITS UPDIN UPDOUT} -#define LEAVE {UPDATE return inflate_flush(s,z,r);} -// get bytes and bits -#define LOADIN {p=z->next_in;n=z->avail_in;b=s->bitb;k=s->bitk;} -#define NEEDBYTE {if(n)r=Z_OK;else LEAVE} -#define NEXTBYTE (n--,*p++) -#define NEEDBITS(j) {while(k<(j)){NEEDBYTE;b|=((uLong)NEXTBYTE)<>=(j);k-=(j);} -// output bytes -#define WAVAIL (uInt)(qread?s->read-q-1:s->end-q) -#define LOADOUT {q=s->write;m=(uInt)WAVAIL;m;} -#define WRAP {if(q==s->end&&s->read!=s->window){q=s->window;m=(uInt)WAVAIL;}} -#define FLUSH {UPDOUT r=inflate_flush(s,z,r); LOADOUT} -#define NEEDOUT {if(m==0){WRAP if(m==0){FLUSH WRAP if(m==0) LEAVE}}r=Z_OK;} -#define OUTBYTE(a) {*q++=(Byte)(a);m--;} -// load local pointers -#define LOAD {LOADIN LOADOUT} - -// masks for lower bits (size given to avoid silly warnings with Visual C++) -// And'ing with mask[n] masks the lower n bits -const uInt inflate_mask[17] = { - 0x0000, - 0x0001, 0x0003, 0x0007, 0x000f, 0x001f, 0x003f, 0x007f, 0x00ff, - 0x01ff, 0x03ff, 0x07ff, 0x0fff, 0x1fff, 0x3fff, 0x7fff, 0xffff -}; - -// copy as much as possible from the sliding window to the output area -int inflate_flush (inflate_blocks_statef *, z_streamp, int); - -int inflate_fast (uInt, uInt, const inflate_huft *, const inflate_huft *, inflate_blocks_statef *, z_streamp ); - - - -const uInt fixed_bl = 9; -const uInt fixed_bd = 5; -const inflate_huft fixed_tl[] = { - {{{96,7}},256}, {{{0,8}},80}, {{{0,8}},16}, {{{84,8}},115}, - {{{82,7}},31}, {{{0,8}},112}, {{{0,8}},48}, {{{0,9}},192}, - {{{80,7}},10}, {{{0,8}},96}, {{{0,8}},32}, {{{0,9}},160}, - {{{0,8}},0}, {{{0,8}},128}, {{{0,8}},64}, {{{0,9}},224}, - {{{80,7}},6}, {{{0,8}},88}, {{{0,8}},24}, {{{0,9}},144}, - {{{83,7}},59}, {{{0,8}},120}, {{{0,8}},56}, {{{0,9}},208}, - {{{81,7}},17}, {{{0,8}},104}, {{{0,8}},40}, {{{0,9}},176}, - {{{0,8}},8}, {{{0,8}},136}, {{{0,8}},72}, {{{0,9}},240}, - {{{80,7}},4}, {{{0,8}},84}, {{{0,8}},20}, {{{85,8}},227}, - {{{83,7}},43}, {{{0,8}},116}, {{{0,8}},52}, {{{0,9}},200}, - {{{81,7}},13}, {{{0,8}},100}, {{{0,8}},36}, {{{0,9}},168}, - {{{0,8}},4}, {{{0,8}},132}, {{{0,8}},68}, {{{0,9}},232}, - {{{80,7}},8}, {{{0,8}},92}, {{{0,8}},28}, {{{0,9}},152}, - {{{84,7}},83}, {{{0,8}},124}, {{{0,8}},60}, {{{0,9}},216}, - {{{82,7}},23}, {{{0,8}},108}, {{{0,8}},44}, {{{0,9}},184}, - {{{0,8}},12}, {{{0,8}},140}, {{{0,8}},76}, {{{0,9}},248}, - {{{80,7}},3}, {{{0,8}},82}, {{{0,8}},18}, {{{85,8}},163}, - {{{83,7}},35}, {{{0,8}},114}, {{{0,8}},50}, {{{0,9}},196}, - {{{81,7}},11}, {{{0,8}},98}, {{{0,8}},34}, {{{0,9}},164}, - {{{0,8}},2}, {{{0,8}},130}, {{{0,8}},66}, {{{0,9}},228}, - {{{80,7}},7}, {{{0,8}},90}, {{{0,8}},26}, {{{0,9}},148}, - {{{84,7}},67}, {{{0,8}},122}, {{{0,8}},58}, {{{0,9}},212}, - {{{82,7}},19}, {{{0,8}},106}, {{{0,8}},42}, {{{0,9}},180}, - {{{0,8}},10}, {{{0,8}},138}, {{{0,8}},74}, {{{0,9}},244}, - {{{80,7}},5}, {{{0,8}},86}, {{{0,8}},22}, {{{192,8}},0}, - {{{83,7}},51}, {{{0,8}},118}, {{{0,8}},54}, {{{0,9}},204}, - {{{81,7}},15}, {{{0,8}},102}, {{{0,8}},38}, {{{0,9}},172}, - {{{0,8}},6}, {{{0,8}},134}, {{{0,8}},70}, {{{0,9}},236}, - {{{80,7}},9}, {{{0,8}},94}, {{{0,8}},30}, {{{0,9}},156}, - {{{84,7}},99}, {{{0,8}},126}, {{{0,8}},62}, {{{0,9}},220}, - {{{82,7}},27}, {{{0,8}},110}, {{{0,8}},46}, {{{0,9}},188}, - {{{0,8}},14}, {{{0,8}},142}, {{{0,8}},78}, {{{0,9}},252}, - {{{96,7}},256}, {{{0,8}},81}, {{{0,8}},17}, {{{85,8}},131}, - {{{82,7}},31}, {{{0,8}},113}, {{{0,8}},49}, {{{0,9}},194}, - {{{80,7}},10}, {{{0,8}},97}, {{{0,8}},33}, {{{0,9}},162}, - {{{0,8}},1}, {{{0,8}},129}, {{{0,8}},65}, {{{0,9}},226}, - {{{80,7}},6}, {{{0,8}},89}, {{{0,8}},25}, {{{0,9}},146}, - {{{83,7}},59}, {{{0,8}},121}, {{{0,8}},57}, {{{0,9}},210}, - {{{81,7}},17}, {{{0,8}},105}, {{{0,8}},41}, {{{0,9}},178}, - {{{0,8}},9}, {{{0,8}},137}, {{{0,8}},73}, {{{0,9}},242}, - {{{80,7}},4}, {{{0,8}},85}, {{{0,8}},21}, {{{80,8}},258}, - {{{83,7}},43}, {{{0,8}},117}, {{{0,8}},53}, {{{0,9}},202}, - {{{81,7}},13}, {{{0,8}},101}, {{{0,8}},37}, {{{0,9}},170}, - {{{0,8}},5}, {{{0,8}},133}, {{{0,8}},69}, {{{0,9}},234}, - {{{80,7}},8}, {{{0,8}},93}, {{{0,8}},29}, {{{0,9}},154}, - {{{84,7}},83}, {{{0,8}},125}, {{{0,8}},61}, {{{0,9}},218}, - {{{82,7}},23}, {{{0,8}},109}, {{{0,8}},45}, {{{0,9}},186}, - {{{0,8}},13}, {{{0,8}},141}, {{{0,8}},77}, {{{0,9}},250}, - {{{80,7}},3}, {{{0,8}},83}, {{{0,8}},19}, {{{85,8}},195}, - {{{83,7}},35}, {{{0,8}},115}, {{{0,8}},51}, {{{0,9}},198}, - {{{81,7}},11}, {{{0,8}},99}, {{{0,8}},35}, {{{0,9}},166}, - {{{0,8}},3}, {{{0,8}},131}, {{{0,8}},67}, {{{0,9}},230}, - {{{80,7}},7}, {{{0,8}},91}, {{{0,8}},27}, {{{0,9}},150}, - {{{84,7}},67}, {{{0,8}},123}, {{{0,8}},59}, {{{0,9}},214}, - {{{82,7}},19}, {{{0,8}},107}, {{{0,8}},43}, {{{0,9}},182}, - {{{0,8}},11}, {{{0,8}},139}, {{{0,8}},75}, {{{0,9}},246}, - {{{80,7}},5}, {{{0,8}},87}, {{{0,8}},23}, {{{192,8}},0}, - {{{83,7}},51}, {{{0,8}},119}, {{{0,8}},55}, {{{0,9}},206}, - {{{81,7}},15}, {{{0,8}},103}, {{{0,8}},39}, {{{0,9}},174}, - {{{0,8}},7}, {{{0,8}},135}, {{{0,8}},71}, {{{0,9}},238}, - {{{80,7}},9}, {{{0,8}},95}, {{{0,8}},31}, {{{0,9}},158}, - {{{84,7}},99}, {{{0,8}},127}, {{{0,8}},63}, {{{0,9}},222}, - {{{82,7}},27}, {{{0,8}},111}, {{{0,8}},47}, {{{0,9}},190}, - {{{0,8}},15}, {{{0,8}},143}, {{{0,8}},79}, {{{0,9}},254}, - {{{96,7}},256}, {{{0,8}},80}, {{{0,8}},16}, {{{84,8}},115}, - {{{82,7}},31}, {{{0,8}},112}, {{{0,8}},48}, {{{0,9}},193}, - {{{80,7}},10}, {{{0,8}},96}, {{{0,8}},32}, {{{0,9}},161}, - {{{0,8}},0}, {{{0,8}},128}, {{{0,8}},64}, {{{0,9}},225}, - {{{80,7}},6}, {{{0,8}},88}, {{{0,8}},24}, {{{0,9}},145}, - {{{83,7}},59}, {{{0,8}},120}, {{{0,8}},56}, {{{0,9}},209}, - {{{81,7}},17}, {{{0,8}},104}, {{{0,8}},40}, {{{0,9}},177}, - {{{0,8}},8}, {{{0,8}},136}, {{{0,8}},72}, {{{0,9}},241}, - {{{80,7}},4}, {{{0,8}},84}, {{{0,8}},20}, {{{85,8}},227}, - {{{83,7}},43}, {{{0,8}},116}, {{{0,8}},52}, {{{0,9}},201}, - {{{81,7}},13}, {{{0,8}},100}, {{{0,8}},36}, {{{0,9}},169}, - {{{0,8}},4}, {{{0,8}},132}, {{{0,8}},68}, {{{0,9}},233}, - {{{80,7}},8}, {{{0,8}},92}, {{{0,8}},28}, {{{0,9}},153}, - {{{84,7}},83}, {{{0,8}},124}, {{{0,8}},60}, {{{0,9}},217}, - {{{82,7}},23}, {{{0,8}},108}, {{{0,8}},44}, {{{0,9}},185}, - {{{0,8}},12}, {{{0,8}},140}, {{{0,8}},76}, {{{0,9}},249}, - {{{80,7}},3}, {{{0,8}},82}, {{{0,8}},18}, {{{85,8}},163}, - {{{83,7}},35}, {{{0,8}},114}, {{{0,8}},50}, {{{0,9}},197}, - {{{81,7}},11}, {{{0,8}},98}, {{{0,8}},34}, {{{0,9}},165}, - {{{0,8}},2}, {{{0,8}},130}, {{{0,8}},66}, {{{0,9}},229}, - {{{80,7}},7}, {{{0,8}},90}, {{{0,8}},26}, {{{0,9}},149}, - {{{84,7}},67}, {{{0,8}},122}, {{{0,8}},58}, {{{0,9}},213}, - {{{82,7}},19}, {{{0,8}},106}, {{{0,8}},42}, {{{0,9}},181}, - {{{0,8}},10}, {{{0,8}},138}, {{{0,8}},74}, {{{0,9}},245}, - {{{80,7}},5}, {{{0,8}},86}, {{{0,8}},22}, {{{192,8}},0}, - {{{83,7}},51}, {{{0,8}},118}, {{{0,8}},54}, {{{0,9}},205}, - {{{81,7}},15}, {{{0,8}},102}, {{{0,8}},38}, {{{0,9}},173}, - {{{0,8}},6}, {{{0,8}},134}, {{{0,8}},70}, {{{0,9}},237}, - {{{80,7}},9}, {{{0,8}},94}, {{{0,8}},30}, {{{0,9}},157}, - {{{84,7}},99}, {{{0,8}},126}, {{{0,8}},62}, {{{0,9}},221}, - {{{82,7}},27}, {{{0,8}},110}, {{{0,8}},46}, {{{0,9}},189}, - {{{0,8}},14}, {{{0,8}},142}, {{{0,8}},78}, {{{0,9}},253}, - {{{96,7}},256}, {{{0,8}},81}, {{{0,8}},17}, {{{85,8}},131}, - {{{82,7}},31}, {{{0,8}},113}, {{{0,8}},49}, {{{0,9}},195}, - {{{80,7}},10}, {{{0,8}},97}, {{{0,8}},33}, {{{0,9}},163}, - {{{0,8}},1}, {{{0,8}},129}, {{{0,8}},65}, {{{0,9}},227}, - {{{80,7}},6}, {{{0,8}},89}, {{{0,8}},25}, {{{0,9}},147}, - {{{83,7}},59}, {{{0,8}},121}, {{{0,8}},57}, {{{0,9}},211}, - {{{81,7}},17}, {{{0,8}},105}, {{{0,8}},41}, {{{0,9}},179}, - {{{0,8}},9}, {{{0,8}},137}, {{{0,8}},73}, {{{0,9}},243}, - {{{80,7}},4}, {{{0,8}},85}, {{{0,8}},21}, {{{80,8}},258}, - {{{83,7}},43}, {{{0,8}},117}, {{{0,8}},53}, {{{0,9}},203}, - {{{81,7}},13}, {{{0,8}},101}, {{{0,8}},37}, {{{0,9}},171}, - {{{0,8}},5}, {{{0,8}},133}, {{{0,8}},69}, {{{0,9}},235}, - {{{80,7}},8}, {{{0,8}},93}, {{{0,8}},29}, {{{0,9}},155}, - {{{84,7}},83}, {{{0,8}},125}, {{{0,8}},61}, {{{0,9}},219}, - {{{82,7}},23}, {{{0,8}},109}, {{{0,8}},45}, {{{0,9}},187}, - {{{0,8}},13}, {{{0,8}},141}, {{{0,8}},77}, {{{0,9}},251}, - {{{80,7}},3}, {{{0,8}},83}, {{{0,8}},19}, {{{85,8}},195}, - {{{83,7}},35}, {{{0,8}},115}, {{{0,8}},51}, {{{0,9}},199}, - {{{81,7}},11}, {{{0,8}},99}, {{{0,8}},35}, {{{0,9}},167}, - {{{0,8}},3}, {{{0,8}},131}, {{{0,8}},67}, {{{0,9}},231}, - {{{80,7}},7}, {{{0,8}},91}, {{{0,8}},27}, {{{0,9}},151}, - {{{84,7}},67}, {{{0,8}},123}, {{{0,8}},59}, {{{0,9}},215}, - {{{82,7}},19}, {{{0,8}},107}, {{{0,8}},43}, {{{0,9}},183}, - {{{0,8}},11}, {{{0,8}},139}, {{{0,8}},75}, {{{0,9}},247}, - {{{80,7}},5}, {{{0,8}},87}, {{{0,8}},23}, {{{192,8}},0}, - {{{83,7}},51}, {{{0,8}},119}, {{{0,8}},55}, {{{0,9}},207}, - {{{81,7}},15}, {{{0,8}},103}, {{{0,8}},39}, {{{0,9}},175}, - {{{0,8}},7}, {{{0,8}},135}, {{{0,8}},71}, {{{0,9}},239}, - {{{80,7}},9}, {{{0,8}},95}, {{{0,8}},31}, {{{0,9}},159}, - {{{84,7}},99}, {{{0,8}},127}, {{{0,8}},63}, {{{0,9}},223}, - {{{82,7}},27}, {{{0,8}},111}, {{{0,8}},47}, {{{0,9}},191}, - {{{0,8}},15}, {{{0,8}},143}, {{{0,8}},79}, {{{0,9}},255} - }; -const inflate_huft fixed_td[] = { - {{{80,5}},1}, {{{87,5}},257}, {{{83,5}},17}, {{{91,5}},4097}, - {{{81,5}},5}, {{{89,5}},1025}, {{{85,5}},65}, {{{93,5}},16385}, - {{{80,5}},3}, {{{88,5}},513}, {{{84,5}},33}, {{{92,5}},8193}, - {{{82,5}},9}, {{{90,5}},2049}, {{{86,5}},129}, {{{192,5}},24577}, - {{{80,5}},2}, {{{87,5}},385}, {{{83,5}},25}, {{{91,5}},6145}, - {{{81,5}},7}, {{{89,5}},1537}, {{{85,5}},97}, {{{93,5}},24577}, - {{{80,5}},4}, {{{88,5}},769}, {{{84,5}},49}, {{{92,5}},12289}, - {{{82,5}},13}, {{{90,5}},3073}, {{{86,5}},193}, {{{192,5}},24577} - }; - - - - - - - -// copy as much as possible from the sliding window to the output area -int inflate_flush(inflate_blocks_statef *s,z_streamp z,int r) -{ - uInt n; - Byte *p; - Byte *q; - - // local copies of source and destination pointers - p = z->next_out; - q = s->read; - - // compute number of bytes to copy as far as end of window - n = (uInt)((q <= s->write ? s->write : s->end) - q); - if (n > z->avail_out) n = z->avail_out; - if (n && r == Z_BUF_ERROR) r = Z_OK; - - // update counters - z->avail_out -= n; - z->total_out += n; - - // update check information - if (s->checkfn != Z_NULL) - z->adler = s->check = (*s->checkfn)(s->check, q, n); - - // copy as far as end of window - if (n!=0) // check for n!=0 to avoid waking up CodeGuard - { memcpy(p, q, n); - p += n; - q += n; - } - - // see if more to copy at beginning of window - if (q == s->end) - { - // wrap pointers - q = s->window; - if (s->write == s->end) - s->write = s->window; - - // compute bytes to copy - n = (uInt)(s->write - q); - if (n > z->avail_out) n = z->avail_out; - if (n && r == Z_BUF_ERROR) r = Z_OK; - - // update counters - z->avail_out -= n; - z->total_out += n; - - // update check information - if (s->checkfn != Z_NULL) - z->adler = s->check = (*s->checkfn)(s->check, q, n); - - // copy - memcpy(p, q, n); - p += n; - q += n; - } - - // update pointers - z->next_out = p; - s->read = q; - - // done - return r; -} - - - - - - -// simplify the use of the inflate_huft type with some defines -#define exop word.what.Exop -#define bits word.what.Bits - -typedef enum { // waiting for "i:"=input, "o:"=output, "x:"=nothing - START, // x: set up for LEN - LEN, // i: get length/literal/eob next - LENEXT, // i: getting length extra (have base) - DIST, // i: get distance next - DISTEXT, // i: getting distance extra - COPY, // o: copying bytes in window, waiting for space - LIT, // o: got literal, waiting for output space - WASH, // o: got eob, possibly still output waiting - END, // x: got eob and all data flushed - BADCODE} // x: got error -inflate_codes_mode; - -// inflate codes private state -struct inflate_codes_state { - - // mode - inflate_codes_mode mode; // current inflate_codes mode - - // mode dependent information - uInt len; - union { - struct { - const inflate_huft *tree; // pointer into tree - uInt need; // bits needed - } code; // if LEN or DIST, where in tree - uInt lit; // if LIT, literal - struct { - uInt get; // bits to get for extra - uInt dist; // distance back to copy from - } copy; // if EXT or COPY, where and how much - } sub; // submode - - // mode independent information - Byte lbits; // ltree bits decoded per branch - Byte dbits; // dtree bits decoder per branch - const inflate_huft *ltree; // literal/length/eob tree - const inflate_huft *dtree; // distance tree - -}; - - -inflate_codes_statef *inflate_codes_new( -uInt bl, uInt bd, -const inflate_huft *tl, -const inflate_huft *td, // need separate declaration for Borland C++ -z_streamp z) -{ - inflate_codes_statef *c; - - if ((c = (inflate_codes_statef *) - ZALLOC(z,1,sizeof(struct inflate_codes_state))) != Z_NULL) - { - c->mode = START; - c->lbits = (Byte)bl; - c->dbits = (Byte)bd; - c->ltree = tl; - c->dtree = td; - Tracev((stderr, "inflate: codes new\n")); - } - return c; -} - - -int inflate_codes(inflate_blocks_statef *s, z_streamp z, int r) -{ - uInt j; // temporary storage - const inflate_huft *t; // temporary pointer - uInt e; // extra bits or operation - uLong b; // bit buffer - uInt k; // bits in bit buffer - Byte *p; // input data pointer - uInt n; // bytes available there - Byte *q; // output window write pointer - uInt m; // bytes to end of window or read pointer - Byte *f; // pointer to copy strings from - inflate_codes_statef *c = s->sub.decode.codes; // codes state - - // copy input/output information to locals (UPDATE macro restores) - LOAD - - // process input and output based on current state - for(;;) switch (c->mode) - { // waiting for "i:"=input, "o:"=output, "x:"=nothing - case START: // x: set up for LEN -#ifndef SLOW - if (m >= 258 && n >= 10) - { - UPDATE - r = inflate_fast(c->lbits, c->dbits, c->ltree, c->dtree, s, z); - LOAD - if (r != Z_OK) - { - c->mode = r == Z_STREAM_END ? WASH : BADCODE; - break; - } - } -#endif // !SLOW - c->sub.code.need = c->lbits; - c->sub.code.tree = c->ltree; - c->mode = LEN; - case LEN: // i: get length/literal/eob next - j = c->sub.code.need; - NEEDBITS(j) - t = c->sub.code.tree + ((uInt)b & inflate_mask[j]); - DUMPBITS(t->bits) - e = (uInt)(t->exop); - if (e == 0) // literal - { - c->sub.lit = t->base; - Tracevv((stderr, t->base >= 0x20 && t->base < 0x7f ? - "inflate: literal '%c'\n" : - "inflate: literal 0x%02x\n", t->base)); - c->mode = LIT; - break; - } - if (e & 16) // length - { - c->sub.copy.get = e & 15; - c->len = t->base; - c->mode = LENEXT; - break; - } - if ((e & 64) == 0) // next table - { - c->sub.code.need = e; - c->sub.code.tree = t + t->base; - break; - } - if (e & 32) // end of block - { - Tracevv((stderr, "inflate: end of block\n")); - c->mode = WASH; - break; - } - c->mode = BADCODE; // invalid code - z->msg = (char*)"invalid literal/length code"; - r = Z_DATA_ERROR; - LEAVE - case LENEXT: // i: getting length extra (have base) - j = c->sub.copy.get; - NEEDBITS(j) - c->len += (uInt)b & inflate_mask[j]; - DUMPBITS(j) - c->sub.code.need = c->dbits; - c->sub.code.tree = c->dtree; - Tracevv((stderr, "inflate: length %u\n", c->len)); - c->mode = DIST; - case DIST: // i: get distance next - j = c->sub.code.need; - NEEDBITS(j) - t = c->sub.code.tree + ((uInt)b & inflate_mask[j]); - DUMPBITS(t->bits) - e = (uInt)(t->exop); - if (e & 16) // distance - { - c->sub.copy.get = e & 15; - c->sub.copy.dist = t->base; - c->mode = DISTEXT; - break; - } - if ((e & 64) == 0) // next table - { - c->sub.code.need = e; - c->sub.code.tree = t + t->base; - break; - } - c->mode = BADCODE; // invalid code - z->msg = (char*)"invalid distance code"; - r = Z_DATA_ERROR; - LEAVE - case DISTEXT: // i: getting distance extra - j = c->sub.copy.get; - NEEDBITS(j) - c->sub.copy.dist += (uInt)b & inflate_mask[j]; - DUMPBITS(j) - Tracevv((stderr, "inflate: distance %u\n", c->sub.copy.dist)); - c->mode = COPY; - case COPY: // o: copying bytes in window, waiting for space - f = (uInt)(q - s->window) < c->sub.copy.dist ? - s->end - (c->sub.copy.dist - (q - s->window)) : - q - c->sub.copy.dist; - while (c->len) - { - NEEDOUT - OUTBYTE(*f++) - if (f == s->end) - f = s->window; - c->len--; - } - c->mode = START; - break; - case LIT: // o: got literal, waiting for output space - NEEDOUT - OUTBYTE(c->sub.lit) - c->mode = START; - break; - case WASH: // o: got eob, possibly more output - if (k > 7) // return unused byte, if any - { - Assert(k < 16, "inflate_codes grabbed too many bytes"); - k -= 8; - n++; - p--; // can always return one - } - FLUSH - if (s->read != s->write) - LEAVE - c->mode = END; - case END: - r = Z_STREAM_END; - LEAVE - case BADCODE: // x: got error - r = Z_DATA_ERROR; - LEAVE - default: - r = Z_STREAM_ERROR; - LEAVE - } -} - - -void inflate_codes_free(inflate_codes_statef *c,z_streamp z) -{ ZFREE(z, c); - Tracev((stderr, "inflate: codes free\n")); -} - - - -// infblock.c -- interpret and process block types to last block -// Copyright (C) 1995-1998 Mark Adler -// For conditions of distribution and use, see copyright notice in zlib.h - -//struct inflate_codes_state {int dummy;}; // for buggy compilers - - - -// Table for deflate from PKZIP's appnote.txt. -const uInt border[] = { // Order of the bit length code lengths - 16, 17, 18, 0, 8, 7, 9, 6, 10, 5, 11, 4, 12, 3, 13, 2, 14, 1, 15}; - -// -// Notes beyond the 1.93a appnote.txt: -// -// 1. Distance pointers never point before the beginning of the output stream. -// 2. Distance pointers can point back across blocks, up to 32k away. -// 3. There is an implied maximum of 7 bits for the bit length table and -// 15 bits for the actual data. -// 4. If only one code exists, then it is encoded using one bit. (Zero -// would be more efficient, but perhaps a little confusing.) If two -// codes exist, they are coded using one bit each (0 and 1). -// 5. There is no way of sending zero distance codes--a dummy must be -// sent if there are none. (History: a pre 2.0 version of PKZIP would -// store blocks with no distance codes, but this was discovered to be -// too harsh a criterion.) Valid only for 1.93a. 2.04c does allow -// zero distance codes, which is sent as one code of zero bits in -// length. -// 6. There are up to 286 literal/length codes. Code 256 represents the -// end-of-block. Note however that the static length tree defines -// 288 codes just to fill out the Huffman codes. Codes 286 and 287 -// cannot be used though, since there is no length base or extra bits -// defined for them. Similarily, there are up to 30 distance codes. -// However, static trees define 32 codes (all 5 bits) to fill out the -// Huffman codes, but the last two had better not show up in the data. -// 7. Unzip can check dynamic Huffman blocks for complete code sets. -// The exception is that a single code would not be complete (see #4). -// 8. The five bits following the block type is really the number of -// literal codes sent minus 257. -// 9. Length codes 8,16,16 are interpreted as 13 length codes of 8 bits -// (1+6+6). Therefore, to output three times the length, you output -// three codes (1+1+1), whereas to output four times the same length, -// you only need two codes (1+3). Hmm. -//10. In the tree reconstruction algorithm, Code = Code + Increment -// only if BitLength(i) is not zero. (Pretty obvious.) -//11. Correction: 4 Bits: # of Bit Length codes - 4 (4 - 19) -//12. Note: length code 284 can represent 227-258, but length code 285 -// really is 258. The last length deserves its own, short code -// since it gets used a lot in very redundant files. The length -// 258 is special since 258 - 3 (the min match length) is 255. -//13. The literal/length and distance code bit lengths are read as a -// single stream of lengths. It is possible (and advantageous) for -// a repeat code (16, 17, or 18) to go across the boundary between -// the two sets of lengths. - - -void inflate_blocks_reset(inflate_blocks_statef *s, z_streamp z, uLong *c) -{ - if (c != Z_NULL) - *c = s->check; - if (s->mode == IBM_BTREE || s->mode == IBM_DTREE) - ZFREE(z, s->sub.trees.blens); - if (s->mode == IBM_CODES) - inflate_codes_free(s->sub.decode.codes, z); - s->mode = IBM_TYPE; - s->bitk = 0; - s->bitb = 0; - s->read = s->write = s->window; - if (s->checkfn != Z_NULL) - z->adler = s->check = (*s->checkfn)(0L, (const Byte *)Z_NULL, 0); - Tracev((stderr, "inflate: blocks reset\n")); -} - - -inflate_blocks_statef *inflate_blocks_new(z_streamp z, check_func c, uInt w) -{ - inflate_blocks_statef *s; - - if ((s = (inflate_blocks_statef *)ZALLOC - (z,1,sizeof(struct inflate_blocks_state))) == Z_NULL) - return s; - if ((s->hufts = - (inflate_huft *)ZALLOC(z, sizeof(inflate_huft), MANY)) == Z_NULL) - { - ZFREE(z, s); - return Z_NULL; - } - if ((s->window = (Byte *)ZALLOC(z, 1, w)) == Z_NULL) - { - ZFREE(z, s->hufts); - ZFREE(z, s); - return Z_NULL; - } - s->end = s->window + w; - s->checkfn = c; - s->mode = IBM_TYPE; - Tracev((stderr, "inflate: blocks allocated\n")); - inflate_blocks_reset(s, z, Z_NULL); - return s; -} - - -int inflate_blocks(inflate_blocks_statef *s, z_streamp z, int r) -{ - uInt t; // temporary storage - uLong b; // bit buffer - uInt k; // bits in bit buffer - Byte *p; // input data pointer - uInt n; // bytes available there - Byte *q; // output window write pointer - uInt m; // bytes to end of window or read pointer - - // copy input/output information to locals (UPDATE macro restores) - LOAD - - // process input based on current state - for(;;) switch (s->mode) - { - case IBM_TYPE: - NEEDBITS(3) - t = (uInt)b & 7; - s->last = t & 1; - switch (t >> 1) - { - case 0: // stored - Tracev((stderr, "inflate: stored block%s\n", - s->last ? " (last)" : "")); - DUMPBITS(3) - t = k & 7; // go to byte boundary - DUMPBITS(t) - s->mode = IBM_LENS; // get length of stored block - break; - case 1: // fixed - Tracev((stderr, "inflate: fixed codes block%s\n", - s->last ? " (last)" : "")); - { - uInt bl, bd; - const inflate_huft *tl, *td; - - inflate_trees_fixed(&bl, &bd, &tl, &td, z); - s->sub.decode.codes = inflate_codes_new(bl, bd, tl, td, z); - if (s->sub.decode.codes == Z_NULL) - { - r = Z_MEM_ERROR; - LEAVE - } - } - DUMPBITS(3) - s->mode = IBM_CODES; - break; - case 2: // dynamic - Tracev((stderr, "inflate: dynamic codes block%s\n", - s->last ? " (last)" : "")); - DUMPBITS(3) - s->mode = IBM_TABLE; - break; - case 3: // illegal - DUMPBITS(3) - s->mode = IBM_BAD; - z->msg = (char*)"invalid block type"; - r = Z_DATA_ERROR; - LEAVE - } - break; - case IBM_LENS: - NEEDBITS(32) - if ((((~b) >> 16) & 0xffff) != (b & 0xffff)) - { - s->mode = IBM_BAD; - z->msg = (char*)"invalid stored block lengths"; - r = Z_DATA_ERROR; - LEAVE - } - s->sub.left = (uInt)b & 0xffff; - b = k = 0; // dump bits - Tracev((stderr, "inflate: stored length %u\n", s->sub.left)); - s->mode = s->sub.left ? IBM_STORED : (s->last ? IBM_DRY : IBM_TYPE); - break; - case IBM_STORED: - if (n == 0) - LEAVE - NEEDOUT - t = s->sub.left; - if (t > n) t = n; - if (t > m) t = m; - memcpy(q, p, t); - p += t; n -= t; - q += t; m -= t; - if ((s->sub.left -= t) != 0) - break; - Tracev((stderr, "inflate: stored end, %lu total out\n", - z->total_out + (q >= s->read ? q - s->read : - (s->end - s->read) + (q - s->window)))); - s->mode = s->last ? IBM_DRY : IBM_TYPE; - break; - case IBM_TABLE: - NEEDBITS(14) - s->sub.trees.table = t = (uInt)b & 0x3fff; - // remove this section to workaround bug in pkzip - if ((t & 0x1f) > 29 || ((t >> 5) & 0x1f) > 29) - { - s->mode = IBM_BAD; - z->msg = (char*)"too many length or distance symbols"; - r = Z_DATA_ERROR; - LEAVE - } - // end remove - t = 258 + (t & 0x1f) + ((t >> 5) & 0x1f); - if ((s->sub.trees.blens = (uInt*)ZALLOC(z, t, sizeof(uInt))) == Z_NULL) - { - r = Z_MEM_ERROR; - LEAVE - } - DUMPBITS(14) - s->sub.trees.index = 0; - Tracev((stderr, "inflate: table sizes ok\n")); - s->mode = IBM_BTREE; - case IBM_BTREE: - while (s->sub.trees.index < 4 + (s->sub.trees.table >> 10)) - { - NEEDBITS(3) - s->sub.trees.blens[border[s->sub.trees.index++]] = (uInt)b & 7; - DUMPBITS(3) - } - while (s->sub.trees.index < 19) - s->sub.trees.blens[border[s->sub.trees.index++]] = 0; - s->sub.trees.bb = 7; - t = inflate_trees_bits(s->sub.trees.blens, &s->sub.trees.bb, - &s->sub.trees.tb, s->hufts, z); - if (t != Z_OK) - { - ZFREE(z, s->sub.trees.blens); - r = t; - if (r == Z_DATA_ERROR) - s->mode = IBM_BAD; - LEAVE - } - s->sub.trees.index = 0; - Tracev((stderr, "inflate: bits tree ok\n")); - s->mode = IBM_DTREE; - case IBM_DTREE: - while (t = s->sub.trees.table, - s->sub.trees.index < 258 + (t & 0x1f) + ((t >> 5) & 0x1f)) - { - inflate_huft *h; - uInt i, j, c; - - t = s->sub.trees.bb; - NEEDBITS(t) - h = s->sub.trees.tb + ((uInt)b & inflate_mask[t]); - t = h->bits; - c = h->base; - if (c < 16) - { - DUMPBITS(t) - s->sub.trees.blens[s->sub.trees.index++] = c; - } - else // c == 16..18 - { - i = c == 18 ? 7 : c - 14; - j = c == 18 ? 11 : 3; - NEEDBITS(t + i) - DUMPBITS(t) - j += (uInt)b & inflate_mask[i]; - DUMPBITS(i) - i = s->sub.trees.index; - t = s->sub.trees.table; - if (i + j > 258 + (t & 0x1f) + ((t >> 5) & 0x1f) || - (c == 16 && i < 1)) - { - ZFREE(z, s->sub.trees.blens); - s->mode = IBM_BAD; - z->msg = (char*)"invalid bit length repeat"; - r = Z_DATA_ERROR; - LEAVE - } - c = c == 16 ? s->sub.trees.blens[i - 1] : 0; - do { - s->sub.trees.blens[i++] = c; - } while (--j); - s->sub.trees.index = i; - } - } - s->sub.trees.tb = Z_NULL; - { - uInt bl, bd; - inflate_huft *tl, *td; - inflate_codes_statef *c; - - bl = 9; // must be <= 9 for lookahead assumptions - bd = 6; // must be <= 9 for lookahead assumptions - t = s->sub.trees.table; - t = inflate_trees_dynamic(257 + (t & 0x1f), 1 + ((t >> 5) & 0x1f), - s->sub.trees.blens, &bl, &bd, &tl, &td, - s->hufts, z); - ZFREE(z, s->sub.trees.blens); - if (t != Z_OK) - { - if (t == (uInt)Z_DATA_ERROR) - s->mode = IBM_BAD; - r = t; - LEAVE - } - Tracev((stderr, "inflate: trees ok\n")); - if ((c = inflate_codes_new(bl, bd, tl, td, z)) == Z_NULL) - { - r = Z_MEM_ERROR; - LEAVE - } - s->sub.decode.codes = c; - } - s->mode = IBM_CODES; - case IBM_CODES: - UPDATE - if ((r = inflate_codes(s, z, r)) != Z_STREAM_END) - return inflate_flush(s, z, r); - r = Z_OK; - inflate_codes_free(s->sub.decode.codes, z); - LOAD - Tracev((stderr, "inflate: codes end, %lu total out\n", - z->total_out + (q >= s->read ? q - s->read : - (s->end - s->read) + (q - s->window)))); - if (!s->last) - { - s->mode = IBM_TYPE; - break; - } - s->mode = IBM_DRY; - case IBM_DRY: - FLUSH - if (s->read != s->write) - LEAVE - s->mode = IBM_DONE; - case IBM_DONE: - r = Z_STREAM_END; - LEAVE - case IBM_BAD: - r = Z_DATA_ERROR; - LEAVE - default: - r = Z_STREAM_ERROR; - LEAVE - } -} - - -int inflate_blocks_free(inflate_blocks_statef *s, z_streamp z) -{ - inflate_blocks_reset(s, z, Z_NULL); - ZFREE(z, s->window); - ZFREE(z, s->hufts); - ZFREE(z, s); - Tracev((stderr, "inflate: blocks freed\n")); - return Z_OK; -} - - - -// inftrees.c -- generate Huffman trees for efficient decoding -// Copyright (C) 1995-1998 Mark Adler -// For conditions of distribution and use, see copyright notice in zlib.h -// - - - -extern const char inflate_copyright[] = - " ";//inflate 1.1.3 Copyright 1995-1998 Mark Adler "; -// If you use the zlib library in a product, an acknowledgment is welcome -// in the documentation of your product. If for some reason you cannot -// include such an acknowledgment, I would appreciate that you keep this -// copyright string in the executable of your product. - - - -int huft_build ( - uInt *, // code lengths in bits - uInt, // number of codes - uInt, // number of "simple" codes - const uInt *, // list of base values for non-simple codes - const uInt *, // list of extra bits for non-simple codes - inflate_huft **,// result: starting table - uInt *, // maximum lookup bits (returns actual) - inflate_huft *, // space for trees - uInt *, // hufts used in space - uInt * ); // space for values - -// Tables for deflate from PKZIP's appnote.txt. -const uInt cplens[31] = { // Copy lengths for literal codes 257..285 - 3, 4, 5, 6, 7, 8, 9, 10, 11, 13, 15, 17, 19, 23, 27, 31, - 35, 43, 51, 59, 67, 83, 99, 115, 131, 163, 195, 227, 258, 0, 0}; - // see note #13 above about 258 -const uInt cplext[31] = { // Extra bits for literal codes 257..285 - 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 2, 2, 2, 2, - 3, 3, 3, 3, 4, 4, 4, 4, 5, 5, 5, 5, 0, 112, 112}; // 112==invalid -const uInt cpdist[30] = { // Copy offsets for distance codes 0..29 - 1, 2, 3, 4, 5, 7, 9, 13, 17, 25, 33, 49, 65, 97, 129, 193, - 257, 385, 513, 769, 1025, 1537, 2049, 3073, 4097, 6145, - 8193, 12289, 16385, 24577}; -const uInt cpdext[30] = { // Extra bits for distance codes - 0, 0, 0, 0, 1, 1, 2, 2, 3, 3, 4, 4, 5, 5, 6, 6, - 7, 7, 8, 8, 9, 9, 10, 10, 11, 11, - 12, 12, 13, 13}; - -// -// Huffman code decoding is performed using a multi-level table lookup. -// The fastest way to decode is to simply build a lookup table whose -// size is determined by the longest code. However, the time it takes -// to build this table can also be a factor if the data being decoded -// is not very long. The most common codes are necessarily the -// shortest codes, so those codes dominate the decoding time, and hence -// the speed. The idea is you can have a shorter table that decodes the -// shorter, more probable codes, and then point to subsidiary tables for -// the longer codes. The time it costs to decode the longer codes is -// then traded against the time it takes to make longer tables. -// -// This results of this trade are in the variables lbits and dbits -// below. lbits is the number of bits the first level table for literal/ -// length codes can decode in one step, and dbits is the same thing for -// the distance codes. Subsequent tables are also less than or equal to -// those sizes. These values may be adjusted either when all of the -// codes are shorter than that, in which case the longest code length in -// bits is used, or when the shortest code is *longer* than the requested -// table size, in which case the length of the shortest code in bits is -// used. -// -// There are two different values for the two tables, since they code a -// different number of possibilities each. The literal/length table -// codes 286 possible values, or in a flat code, a little over eight -// bits. The distance table codes 30 possible values, or a little less -// than five bits, flat. The optimum values for speed end up being -// about one bit more than those, so lbits is 8+1 and dbits is 5+1. -// The optimum values may differ though from machine to machine, and -// possibly even between compilers. Your mileage may vary. -// - - -// If BMAX needs to be larger than 16, then h and x[] should be uLong. -#define BMAX 15 // maximum bit length of any code - -int huft_build( -uInt *b, // code lengths in bits (all assumed <= BMAX) -uInt n, // number of codes (assumed <= 288) -uInt s, // number of simple-valued codes (0..s-1) -const uInt *d, // list of base values for non-simple codes -const uInt *e, // list of extra bits for non-simple codes -inflate_huft * *t, // result: starting table -uInt *m, // maximum lookup bits, returns actual -inflate_huft *hp, // space for trees -uInt *hn, // hufts used in space -uInt *v) // working area: values in order of bit length -// Given a list of code lengths and a maximum table size, make a set of -// tables to decode that set of codes. Return Z_OK on success, Z_BUF_ERROR -// if the given code set is incomplete (the tables are still built in this -// case), Z_DATA_ERROR if the input is invalid (an over-subscribed set of -// lengths), or Z_MEM_ERROR if not enough memory. -{ - - uInt a; // counter for codes of length k - uInt c[BMAX+1]; // bit length count table - uInt f; // i repeats in table every f entries - int g; // maximum code length - int h; // table level - register uInt i; // counter, current code - register uInt j; // counter - register int k; // number of bits in current code - int l; // bits per table (returned in m) - uInt mask; // (1 << w) - 1, to avoid cc -O bug on HP - register uInt *p; // pointer into c[], b[], or v[] - inflate_huft *q; // points to current table - struct inflate_huft_s r; // table entry for structure assignment - inflate_huft *u[BMAX]; // table stack - register int w; // bits before this table == (l * h) - uInt x[BMAX+1]; // bit offsets, then code stack - uInt *xp; // pointer into x - int y; // number of dummy codes added - uInt z; // number of entries in current table - - - // Generate counts for each bit length - p = c; -#define C0 *p++ = 0; -#define C2 C0 C0 C0 C0 -#define C4 C2 C2 C2 C2 - C4; p; // clear c[]--assume BMAX+1 is 16 - p = b; i = n; - do { - c[*p++]++; // assume all entries <= BMAX - } while (--i); - if (c[0] == n) // null input--all zero length codes - { - *t = (inflate_huft *)Z_NULL; - *m = 0; - return Z_OK; - } - - - // Find minimum and maximum length, bound *m by those - l = *m; - for (j = 1; j <= BMAX; j++) - if (c[j]) - break; - k = j; // minimum code length - if ((uInt)l < j) - l = j; - for (i = BMAX; i; i--) - if (c[i]) - break; - g = i; // maximum code length - if ((uInt)l > i) - l = i; - *m = l; - - - // Adjust last length count to fill out codes, if needed - for (y = 1 << j; j < i; j++, y <<= 1) - if ((y -= c[j]) < 0) - return Z_DATA_ERROR; - if ((y -= c[i]) < 0) - return Z_DATA_ERROR; - c[i] += y; - - - // Generate starting offsets into the value table for each length - x[1] = j = 0; - p = c + 1; xp = x + 2; - while (--i) { // note that i == g from above - *xp++ = (j += *p++); - } - - - // Make a table of values in order of bit lengths - p = b; i = 0; - do { - if ((j = *p++) != 0) - v[x[j]++] = i; - } while (++i < n); - n = x[g]; // set n to length of v - - - // Generate the Huffman codes and for each, make the table entries - x[0] = i = 0; // first Huffman code is zero - p = v; // grab values in bit order - h = -1; // no tables yet--level -1 - w = -l; // bits decoded == (l * h) - u[0] = (inflate_huft *)Z_NULL; // just to keep compilers happy - q = (inflate_huft *)Z_NULL; // ditto - z = 0; // ditto - - // go through the bit lengths (k already is bits in shortest code) - for (; k <= g; k++) - { - a = c[k]; - while (a--) - { - // here i is the Huffman code of length k bits for value *p - // make tables up to required level - while (k > w + l) - { - h++; - w += l; // previous table always l bits - - // compute minimum size table less than or equal to l bits - z = g - w; - z = z > (uInt)l ? l : z; // table size upper limit - if ((f = 1 << (j = k - w)) > a + 1) // try a k-w bit table - { // too few codes for k-w bit table - f -= a + 1; // deduct codes from patterns left - xp = c + k; - if (j < z) - while (++j < z) // try smaller tables up to z bits - { - if ((f <<= 1) <= *++xp) - break; // enough codes to use up j bits - f -= *xp; // else deduct codes from patterns - } - } - z = 1 << j; // table entries for j-bit table - - // allocate new table - if (*hn + z > MANY) // (note: doesn't matter for fixed) - return Z_MEM_ERROR; // not enough memory - u[h] = q = hp + *hn; - *hn += z; - - // connect to last table, if there is one - if (h) - { - x[h] = i; // save pattern for backing up - r.bits = (Byte)l; // bits to dump before this table - r.exop = (Byte)j; // bits in this table - j = i >> (w - l); - r.base = (uInt)(q - u[h-1] - j); // offset to this table - u[h-1][j] = r; // connect to last table - } - else - *t = q; // first table is returned result - } - - // set up table entry in r - r.bits = (Byte)(k - w); - if (p >= v + n) - r.exop = 128 + 64; // out of values--invalid code - else if (*p < s) - { - r.exop = (Byte)(*p < 256 ? 0 : 32 + 64); // 256 is end-of-block - r.base = *p++; // simple code is just the value - } - else - { - r.exop = (Byte)(e[*p - s] + 16 + 64);// non-simple--look up in lists - r.base = d[*p++ - s]; - } - - // fill code-like entries with r - f = 1 << (k - w); - for (j = i >> w; j < z; j += f) - q[j] = r; - - // backwards increment the k-bit code i - for (j = 1 << (k - 1); i & j; j >>= 1) - i ^= j; - i ^= j; - - // backup over finished tables - mask = (1 << w) - 1; // needed on HP, cc -O bug - while ((i & mask) != x[h]) - { - h--; // don't need to update q - w -= l; - mask = (1 << w) - 1; - } - } - } - - - // Return Z_BUF_ERROR if we were given an incomplete table - return y != 0 && g != 1 ? Z_BUF_ERROR : Z_OK; -} - - -int inflate_trees_bits( -uInt *c, // 19 code lengths -uInt *bb, // bits tree desired/actual depth -inflate_huft * *tb, // bits tree result -inflate_huft *hp, // space for trees -z_streamp z) // for messages -{ - int r; - uInt hn = 0; // hufts used in space - uInt *v; // work area for huft_build - - if ((v = (uInt*)ZALLOC(z, 19, sizeof(uInt))) == Z_NULL) - return Z_MEM_ERROR; - r = huft_build(c, 19, 19, (uInt*)Z_NULL, (uInt*)Z_NULL, - tb, bb, hp, &hn, v); - if (r == Z_DATA_ERROR) - z->msg = (char*)"oversubscribed dynamic bit lengths tree"; - else if (r == Z_BUF_ERROR || *bb == 0) - { - z->msg = (char*)"incomplete dynamic bit lengths tree"; - r = Z_DATA_ERROR; - } - ZFREE(z, v); - return r; -} - - -int inflate_trees_dynamic( -uInt nl, // number of literal/length codes -uInt nd, // number of distance codes -uInt *c, // that many (total) code lengths -uInt *bl, // literal desired/actual bit depth -uInt *bd, // distance desired/actual bit depth -inflate_huft * *tl, // literal/length tree result -inflate_huft * *td, // distance tree result -inflate_huft *hp, // space for trees -z_streamp z) // for messages -{ - int r; - uInt hn = 0; // hufts used in space - uInt *v; // work area for huft_build - - // allocate work area - if ((v = (uInt*)ZALLOC(z, 288, sizeof(uInt))) == Z_NULL) - return Z_MEM_ERROR; - - // build literal/length tree - r = huft_build(c, nl, 257, cplens, cplext, tl, bl, hp, &hn, v); - if (r != Z_OK || *bl == 0) - { - if (r == Z_DATA_ERROR) - z->msg = (char*)"oversubscribed literal/length tree"; - else if (r != Z_MEM_ERROR) - { - z->msg = (char*)"incomplete literal/length tree"; - r = Z_DATA_ERROR; - } - ZFREE(z, v); - return r; - } - - // build distance tree - r = huft_build(c + nl, nd, 0, cpdist, cpdext, td, bd, hp, &hn, v); - if (r != Z_OK || (*bd == 0 && nl > 257)) - { - if (r == Z_DATA_ERROR) - z->msg = (char*)"oversubscribed distance tree"; - else if (r == Z_BUF_ERROR) { - z->msg = (char*)"incomplete distance tree"; - r = Z_DATA_ERROR; - } - else if (r != Z_MEM_ERROR) - { - z->msg = (char*)"empty distance tree with lengths"; - r = Z_DATA_ERROR; - } - ZFREE(z, v); - return r; - } - - // done - ZFREE(z, v); - return Z_OK; -} - - - - - -int inflate_trees_fixed( -uInt *bl, // literal desired/actual bit depth -uInt *bd, // distance desired/actual bit depth -const inflate_huft * * tl, // literal/length tree result -const inflate_huft * *td, // distance tree result -z_streamp ) // for memory allocation -{ - *bl = fixed_bl; - *bd = fixed_bd; - *tl = fixed_tl; - *td = fixed_td; - return Z_OK; -} - - -// inffast.c -- process literals and length/distance pairs fast -// Copyright (C) 1995-1998 Mark Adler -// For conditions of distribution and use, see copyright notice in zlib.h -// - - -//struct inflate_codes_state {int dummy;}; // for buggy compilers - - -// macros for bit input with no checking and for returning unused bytes -#define GRABBITS(j) {while(k<(j)){b|=((uLong)NEXTBYTE)<avail_in-n;c=(k>>3)>3:c;n+=c;p-=c;k-=c<<3;} - -// Called with number of bytes left to write in window at least 258 -// (the maximum string length) and number of input bytes available -// at least ten. The ten bytes are six bytes for the longest length/ -// distance pair plus four bytes for overloading the bit buffer. - -int inflate_fast( -uInt bl, uInt bd, -const inflate_huft *tl, -const inflate_huft *td, // need separate declaration for Borland C++ -inflate_blocks_statef *s, -z_streamp z) -{ - const inflate_huft *t; // temporary pointer - uInt e; // extra bits or operation - uLong b; // bit buffer - uInt k; // bits in bit buffer - Byte *p; // input data pointer - uInt n; // bytes available there - Byte *q; // output window write pointer - uInt m; // bytes to end of window or read pointer - uInt ml; // mask for literal/length tree - uInt md; // mask for distance tree - uInt c; // bytes to copy - uInt d; // distance back to copy from - Byte *r; // copy source pointer - - // load input, output, bit values - LOAD - - // initialize masks - ml = inflate_mask[bl]; - md = inflate_mask[bd]; - - // do until not enough input or output space for fast loop - do { // assume called with m >= 258 && n >= 10 - // get literal/length code - GRABBITS(20) // max bits for literal/length code - if ((e = (t = tl + ((uInt)b & ml))->exop) == 0) - { - DUMPBITS(t->bits) - Tracevv((stderr, t->base >= 0x20 && t->base < 0x7f ? - "inflate: * literal '%c'\n" : - "inflate: * literal 0x%02x\n", t->base)); - *q++ = (Byte)t->base; - m--; - continue; - } - for (;;) { - DUMPBITS(t->bits) - if (e & 16) - { - // get extra bits for length - e &= 15; - c = t->base + ((uInt)b & inflate_mask[e]); - DUMPBITS(e) - Tracevv((stderr, "inflate: * length %u\n", c)); - - // decode distance base of block to copy - GRABBITS(15); // max bits for distance code - e = (t = td + ((uInt)b & md))->exop; - for (;;) { - DUMPBITS(t->bits) - if (e & 16) - { - // get extra bits to add to distance base - e &= 15; - GRABBITS(e) // get extra bits (up to 13) - d = t->base + ((uInt)b & inflate_mask[e]); - DUMPBITS(e) - Tracevv((stderr, "inflate: * distance %u\n", d)); - - // do the copy - m -= c; - if ((uInt)(q - s->window) >= d) // offset before dest - { // just copy - r = q - d; - *q++ = *r++; c--; // minimum count is three, - *q++ = *r++; c--; // so unroll loop a little - } - else // else offset after destination - { - e = d - (uInt)(q - s->window); // bytes from offset to end - r = s->end - e; // pointer to offset - if (c > e) // if source crosses, - { - c -= e; // copy to end of window - do { - *q++ = *r++; - } while (--e); - r = s->window; // copy rest from start of window - } - } - do { // copy all or what's left - *q++ = *r++; - } while (--c); - break; - } - else if ((e & 64) == 0) - { - t += t->base; - e = (t += ((uInt)b & inflate_mask[e]))->exop; - } - else - { - z->msg = (char*)"invalid distance code"; - UNGRAB - UPDATE - return Z_DATA_ERROR; - } - }; - break; - } - if ((e & 64) == 0) - { - t += t->base; - if ((e = (t += ((uInt)b & inflate_mask[e]))->exop) == 0) - { - DUMPBITS(t->bits) - Tracevv((stderr, t->base >= 0x20 && t->base < 0x7f ? - "inflate: * literal '%c'\n" : - "inflate: * literal 0x%02x\n", t->base)); - *q++ = (Byte)t->base; - m--; - break; - } - } - else if (e & 32) - { - Tracevv((stderr, "inflate: * end of block\n")); - UNGRAB - UPDATE - return Z_STREAM_END; - } - else - { - z->msg = (char*)"invalid literal/length code"; - UNGRAB - UPDATE - return Z_DATA_ERROR; - } - }; - } while (m >= 258 && n >= 10); - - // not enough input or output--restore pointers and return - UNGRAB - UPDATE - return Z_OK; -} - - - - - - -// crc32.c -- compute the CRC-32 of a data stream -// Copyright (C) 1995-1998 Mark Adler -// For conditions of distribution and use, see copyright notice in zlib.h - -// @(#) $Id$ - - - - - - -// Table of CRC-32's of all single-byte values (made by make_crc_table) -const uLong crc_table[256] = { - 0x00000000L, 0x77073096L, 0xee0e612cL, 0x990951baL, 0x076dc419L, - 0x706af48fL, 0xe963a535L, 0x9e6495a3L, 0x0edb8832L, 0x79dcb8a4L, - 0xe0d5e91eL, 0x97d2d988L, 0x09b64c2bL, 0x7eb17cbdL, 0xe7b82d07L, - 0x90bf1d91L, 0x1db71064L, 0x6ab020f2L, 0xf3b97148L, 0x84be41deL, - 0x1adad47dL, 0x6ddde4ebL, 0xf4d4b551L, 0x83d385c7L, 0x136c9856L, - 0x646ba8c0L, 0xfd62f97aL, 0x8a65c9ecL, 0x14015c4fL, 0x63066cd9L, - 0xfa0f3d63L, 0x8d080df5L, 0x3b6e20c8L, 0x4c69105eL, 0xd56041e4L, - 0xa2677172L, 0x3c03e4d1L, 0x4b04d447L, 0xd20d85fdL, 0xa50ab56bL, - 0x35b5a8faL, 0x42b2986cL, 0xdbbbc9d6L, 0xacbcf940L, 0x32d86ce3L, - 0x45df5c75L, 0xdcd60dcfL, 0xabd13d59L, 0x26d930acL, 0x51de003aL, - 0xc8d75180L, 0xbfd06116L, 0x21b4f4b5L, 0x56b3c423L, 0xcfba9599L, - 0xb8bda50fL, 0x2802b89eL, 0x5f058808L, 0xc60cd9b2L, 0xb10be924L, - 0x2f6f7c87L, 0x58684c11L, 0xc1611dabL, 0xb6662d3dL, 0x76dc4190L, - 0x01db7106L, 0x98d220bcL, 0xefd5102aL, 0x71b18589L, 0x06b6b51fL, - 0x9fbfe4a5L, 0xe8b8d433L, 0x7807c9a2L, 0x0f00f934L, 0x9609a88eL, - 0xe10e9818L, 0x7f6a0dbbL, 0x086d3d2dL, 0x91646c97L, 0xe6635c01L, - 0x6b6b51f4L, 0x1c6c6162L, 0x856530d8L, 0xf262004eL, 0x6c0695edL, - 0x1b01a57bL, 0x8208f4c1L, 0xf50fc457L, 0x65b0d9c6L, 0x12b7e950L, - 0x8bbeb8eaL, 0xfcb9887cL, 0x62dd1ddfL, 0x15da2d49L, 0x8cd37cf3L, - 0xfbd44c65L, 0x4db26158L, 0x3ab551ceL, 0xa3bc0074L, 0xd4bb30e2L, - 0x4adfa541L, 0x3dd895d7L, 0xa4d1c46dL, 0xd3d6f4fbL, 0x4369e96aL, - 0x346ed9fcL, 0xad678846L, 0xda60b8d0L, 0x44042d73L, 0x33031de5L, - 0xaa0a4c5fL, 0xdd0d7cc9L, 0x5005713cL, 0x270241aaL, 0xbe0b1010L, - 0xc90c2086L, 0x5768b525L, 0x206f85b3L, 0xb966d409L, 0xce61e49fL, - 0x5edef90eL, 0x29d9c998L, 0xb0d09822L, 0xc7d7a8b4L, 0x59b33d17L, - 0x2eb40d81L, 0xb7bd5c3bL, 0xc0ba6cadL, 0xedb88320L, 0x9abfb3b6L, - 0x03b6e20cL, 0x74b1d29aL, 0xead54739L, 0x9dd277afL, 0x04db2615L, - 0x73dc1683L, 0xe3630b12L, 0x94643b84L, 0x0d6d6a3eL, 0x7a6a5aa8L, - 0xe40ecf0bL, 0x9309ff9dL, 0x0a00ae27L, 0x7d079eb1L, 0xf00f9344L, - 0x8708a3d2L, 0x1e01f268L, 0x6906c2feL, 0xf762575dL, 0x806567cbL, - 0x196c3671L, 0x6e6b06e7L, 0xfed41b76L, 0x89d32be0L, 0x10da7a5aL, - 0x67dd4accL, 0xf9b9df6fL, 0x8ebeeff9L, 0x17b7be43L, 0x60b08ed5L, - 0xd6d6a3e8L, 0xa1d1937eL, 0x38d8c2c4L, 0x4fdff252L, 0xd1bb67f1L, - 0xa6bc5767L, 0x3fb506ddL, 0x48b2364bL, 0xd80d2bdaL, 0xaf0a1b4cL, - 0x36034af6L, 0x41047a60L, 0xdf60efc3L, 0xa867df55L, 0x316e8eefL, - 0x4669be79L, 0xcb61b38cL, 0xbc66831aL, 0x256fd2a0L, 0x5268e236L, - 0xcc0c7795L, 0xbb0b4703L, 0x220216b9L, 0x5505262fL, 0xc5ba3bbeL, - 0xb2bd0b28L, 0x2bb45a92L, 0x5cb36a04L, 0xc2d7ffa7L, 0xb5d0cf31L, - 0x2cd99e8bL, 0x5bdeae1dL, 0x9b64c2b0L, 0xec63f226L, 0x756aa39cL, - 0x026d930aL, 0x9c0906a9L, 0xeb0e363fL, 0x72076785L, 0x05005713L, - 0x95bf4a82L, 0xe2b87a14L, 0x7bb12baeL, 0x0cb61b38L, 0x92d28e9bL, - 0xe5d5be0dL, 0x7cdcefb7L, 0x0bdbdf21L, 0x86d3d2d4L, 0xf1d4e242L, - 0x68ddb3f8L, 0x1fda836eL, 0x81be16cdL, 0xf6b9265bL, 0x6fb077e1L, - 0x18b74777L, 0x88085ae6L, 0xff0f6a70L, 0x66063bcaL, 0x11010b5cL, - 0x8f659effL, 0xf862ae69L, 0x616bffd3L, 0x166ccf45L, 0xa00ae278L, - 0xd70dd2eeL, 0x4e048354L, 0x3903b3c2L, 0xa7672661L, 0xd06016f7L, - 0x4969474dL, 0x3e6e77dbL, 0xaed16a4aL, 0xd9d65adcL, 0x40df0b66L, - 0x37d83bf0L, 0xa9bcae53L, 0xdebb9ec5L, 0x47b2cf7fL, 0x30b5ffe9L, - 0xbdbdf21cL, 0xcabac28aL, 0x53b39330L, 0x24b4a3a6L, 0xbad03605L, - 0xcdd70693L, 0x54de5729L, 0x23d967bfL, 0xb3667a2eL, 0xc4614ab8L, - 0x5d681b02L, 0x2a6f2b94L, 0xb40bbe37L, 0xc30c8ea1L, 0x5a05df1bL, - 0x2d02ef8dL -}; - -const uLong * get_crc_table() -{ return (const uLong *)crc_table; -} - -#define CRC_DO1(buf) crc = crc_table[((int)crc ^ (*buf++)) & 0xff] ^ (crc >> 8); -#define CRC_DO2(buf) CRC_DO1(buf); CRC_DO1(buf); -#define CRC_DO4(buf) CRC_DO2(buf); CRC_DO2(buf); -#define CRC_DO8(buf) CRC_DO4(buf); CRC_DO4(buf); - -uLong ucrc32(uLong crc, const Byte *buf, uInt len) -{ if (buf == Z_NULL) return 0L; - crc = crc ^ 0xffffffffL; - while (len >= 8) {CRC_DO8(buf); len -= 8;} - if (len) do {CRC_DO1(buf);} while (--len); - return crc ^ 0xffffffffL; -} - - -// adler32.c -- compute the Adler-32 checksum of a data stream -// Copyright (C) 1995-1998 Mark Adler -// For conditions of distribution and use, see copyright notice in zlib.h - -// @(#) $Id$ - - -#define BASE 65521L // largest prime smaller than 65536 -#define NMAX 5552 -// NMAX is the largest n such that 255n(n+1)/2 + (n+1)(BASE-1) <= 2^32-1 - -#define AD_DO1(buf,i) {s1 += buf[i]; s2 += s1;} -#define AD_DO2(buf,i) AD_DO1(buf,i); AD_DO1(buf,i+1); -#define AD_DO4(buf,i) AD_DO2(buf,i); AD_DO2(buf,i+2); -#define AD_DO8(buf,i) AD_DO4(buf,i); AD_DO4(buf,i+4); -#define AD_DO16(buf) AD_DO8(buf,0); AD_DO8(buf,8); - -// ========================================================================= -uLong adler32(uLong adler, const Byte *buf, uInt len) -{ - unsigned long s1 = adler & 0xffff; - unsigned long s2 = (adler >> 16) & 0xffff; - int k; - - if (buf == Z_NULL) return 1L; - - while (len > 0) { - k = len < NMAX ? len : NMAX; - len -= k; - while (k >= 16) { - AD_DO16(buf); - buf += 16; - k -= 16; - } - if (k != 0) do { - s1 += *buf++; - s2 += s1; - } while (--k); - s1 %= BASE; - s2 %= BASE; - } - return (s2 << 16) | s1; -} - - - -// zutil.c -- target dependent utility functions for the compression library -// Copyright (C) 1995-1998 Jean-loup Gailly. -// For conditions of distribution and use, see copyright notice in zlib.h -// @(#) $Id$ - - - - - - -const char * zlibVersion() -{ - return ZLIB_VERSION; -} - -// exported to allow conversion of error code to string for compress() and -// uncompress() -const char * zError(int err) -{ return ERR_MSG(err); -} - - - - -voidpf zcalloc (voidpf opaque, unsigned items, unsigned size) -{ - if (opaque) items += size - size; // make compiler happy - return (voidpf)calloc(items, size); -} - -void zcfree (voidpf opaque, voidpf ptr) -{ - zfree(ptr); - if (opaque) return; // make compiler happy -} - - - -// inflate.c -- zlib interface to inflate modules -// Copyright (C) 1995-1998 Mark Adler -// For conditions of distribution and use, see copyright notice in zlib.h - -//struct inflate_blocks_state {int dummy;}; // for buggy compilers - -typedef enum { - IM_METHOD, // waiting for method byte - IM_FLAG, // waiting for flag byte - IM_DICT4, // four dictionary check bytes to go - IM_DICT3, // three dictionary check bytes to go - IM_DICT2, // two dictionary check bytes to go - IM_DICT1, // one dictionary check byte to go - IM_DICT0, // waiting for inflateSetDictionary - IM_BLOCKS, // decompressing blocks - IM_CHECK4, // four check bytes to go - IM_CHECK3, // three check bytes to go - IM_CHECK2, // two check bytes to go - IM_CHECK1, // one check byte to go - IM_DONE, // finished check, done - IM_BAD} // got an error--stay here -inflate_mode; - -// inflate private state -struct internal_state { - - // mode - inflate_mode mode; // current inflate mode - - // mode dependent information - union { - uInt method; // if IM_FLAGS, method byte - struct { - uLong was; // computed check value - uLong need; // stream check value - } check; // if CHECK, check values to compare - uInt marker; // if IM_BAD, inflateSync's marker bytes count - } sub; // submode - - // mode independent information - int nowrap; // flag for no wrapper - uInt wbits; // log2(window size) (8..15, defaults to 15) - inflate_blocks_statef - *blocks; // current inflate_blocks state - -}; - -int inflateReset(z_streamp z) -{ - if (z == Z_NULL || z->state == Z_NULL) - return Z_STREAM_ERROR; - z->total_in = z->total_out = 0; - z->msg = Z_NULL; - z->state->mode = z->state->nowrap ? IM_BLOCKS : IM_METHOD; - inflate_blocks_reset(z->state->blocks, z, Z_NULL); - Tracev((stderr, "inflate: reset\n")); - return Z_OK; -} - -int inflateEnd(z_streamp z) -{ - if (z == Z_NULL || z->state == Z_NULL || z->zfree == Z_NULL) - return Z_STREAM_ERROR; - if (z->state->blocks != Z_NULL) - inflate_blocks_free(z->state->blocks, z); - ZFREE(z, z->state); - z->state = Z_NULL; - Tracev((stderr, "inflate: end\n")); - return Z_OK; -} - - -int inflateInit2(z_streamp z) -{ const char *version = ZLIB_VERSION; int stream_size = sizeof(z_stream); - if (version == Z_NULL || version[0] != ZLIB_VERSION[0] || stream_size != sizeof(z_stream)) return Z_VERSION_ERROR; - - int w = -15; // MAX_WBITS: 32K LZ77 window. - // Warning: reducing MAX_WBITS makes minigzip unable to extract .gz files created by gzip. - // The memory requirements for deflate are (in bytes): - // (1 << (windowBits+2)) + (1 << (memLevel+9)) - // that is: 128K for windowBits=15 + 128K for memLevel = 8 (default values) - // plus a few kilobytes for small objects. For example, if you want to reduce - // the default memory requirements from 256K to 128K, compile with - // make CFLAGS="-O -DMAX_WBITS=14 -DMAX_MEM_LEVEL=7" - // Of course this will generally degrade compression (there's no free lunch). - // - // The memory requirements for inflate are (in bytes) 1 << windowBits - // that is, 32K for windowBits=15 (default value) plus a few kilobytes - // for small objects. - - // initialize state - if (z == Z_NULL) return Z_STREAM_ERROR; - z->msg = Z_NULL; - if (z->zalloc == Z_NULL) - { - z->zalloc = zcalloc; - z->opaque = (voidpf)0; - } - if (z->zfree == Z_NULL) z->zfree = zcfree; - if ((z->state = (struct internal_state *) - ZALLOC(z,1,sizeof(struct internal_state))) == Z_NULL) - return Z_MEM_ERROR; - z->state->blocks = Z_NULL; - - // handle undocumented nowrap option (no zlib header or check) - z->state->nowrap = 0; - if (w < 0) - { - w = - w; - z->state->nowrap = 1; - } - - // set window size - if (w < 8 || w > 15) - { - inflateEnd(z); - return Z_STREAM_ERROR; - } - z->state->wbits = (uInt)w; - - // create inflate_blocks state - if ((z->state->blocks = - inflate_blocks_new(z, z->state->nowrap ? Z_NULL : adler32, (uInt)1 << w)) - == Z_NULL) - { - inflateEnd(z); - return Z_MEM_ERROR; - } - Tracev((stderr, "inflate: allocated\n")); - - // reset state - inflateReset(z); - return Z_OK; -} - - - -#define IM_NEEDBYTE {if(z->avail_in==0)return r;r=f;} -#define IM_NEXTBYTE (z->avail_in--,z->total_in++,*z->next_in++) - -int inflate(z_streamp z, int f) -{ - int r; - uInt b; - - if (z == Z_NULL || z->state == Z_NULL || z->next_in == Z_NULL) - return Z_STREAM_ERROR; - f = f == Z_FINISH ? Z_BUF_ERROR : Z_OK; - r = Z_BUF_ERROR; - for (;;) switch (z->state->mode) - { - case IM_METHOD: - IM_NEEDBYTE - if (((z->state->sub.method = IM_NEXTBYTE) & 0xf) != Z_DEFLATED) - { - z->state->mode = IM_BAD; - z->msg = (char*)"unknown compression method"; - z->state->sub.marker = 5; // can't try inflateSync - break; - } - if ((z->state->sub.method >> 4) + 8 > z->state->wbits) - { - z->state->mode = IM_BAD; - z->msg = (char*)"invalid window size"; - z->state->sub.marker = 5; // can't try inflateSync - break; - } - z->state->mode = IM_FLAG; - case IM_FLAG: - IM_NEEDBYTE - b = IM_NEXTBYTE; - if (((z->state->sub.method << 8) + b) % 31) - { - z->state->mode = IM_BAD; - z->msg = (char*)"incorrect header check"; - z->state->sub.marker = 5; // can't try inflateSync - break; - } - Tracev((stderr, "inflate: zlib header ok\n")); - if (!(b & PRESET_DICT)) - { - z->state->mode = IM_BLOCKS; - break; - } - z->state->mode = IM_DICT4; - case IM_DICT4: - IM_NEEDBYTE - z->state->sub.check.need = (uLong)IM_NEXTBYTE << 24; - z->state->mode = IM_DICT3; - case IM_DICT3: - IM_NEEDBYTE - z->state->sub.check.need += (uLong)IM_NEXTBYTE << 16; - z->state->mode = IM_DICT2; - case IM_DICT2: - IM_NEEDBYTE - z->state->sub.check.need += (uLong)IM_NEXTBYTE << 8; - z->state->mode = IM_DICT1; - case IM_DICT1: - IM_NEEDBYTE; r; - z->state->sub.check.need += (uLong)IM_NEXTBYTE; - z->adler = z->state->sub.check.need; - z->state->mode = IM_DICT0; - return Z_NEED_DICT; - case IM_DICT0: - z->state->mode = IM_BAD; - z->msg = (char*)"need dictionary"; - z->state->sub.marker = 0; // can try inflateSync - return Z_STREAM_ERROR; - case IM_BLOCKS: - r = inflate_blocks(z->state->blocks, z, r); - if (r == Z_DATA_ERROR) - { - z->state->mode = IM_BAD; - z->state->sub.marker = 0; // can try inflateSync - break; - } - if (r == Z_OK) - r = f; - if (r != Z_STREAM_END) - return r; - r = f; - inflate_blocks_reset(z->state->blocks, z, &z->state->sub.check.was); - if (z->state->nowrap) - { - z->state->mode = IM_DONE; - break; - } - z->state->mode = IM_CHECK4; - case IM_CHECK4: - IM_NEEDBYTE - z->state->sub.check.need = (uLong)IM_NEXTBYTE << 24; - z->state->mode = IM_CHECK3; - case IM_CHECK3: - IM_NEEDBYTE - z->state->sub.check.need += (uLong)IM_NEXTBYTE << 16; - z->state->mode = IM_CHECK2; - case IM_CHECK2: - IM_NEEDBYTE - z->state->sub.check.need += (uLong)IM_NEXTBYTE << 8; - z->state->mode = IM_CHECK1; - case IM_CHECK1: - IM_NEEDBYTE - z->state->sub.check.need += (uLong)IM_NEXTBYTE; - - if (z->state->sub.check.was != z->state->sub.check.need) - { - z->state->mode = IM_BAD; - z->msg = (char*)"incorrect data check"; - z->state->sub.marker = 5; // can't try inflateSync - break; - } - Tracev((stderr, "inflate: zlib check ok\n")); - z->state->mode = IM_DONE; - case IM_DONE: - return Z_STREAM_END; - case IM_BAD: - return Z_DATA_ERROR; - default: - return Z_STREAM_ERROR; - } -} - - - -#ifdef _UNICODE - -static int GetAnsiFileName(LPCWSTR name, char * buf, int nBufSize) -{ - memset(buf, 0, nBufSize); - - int n = WideCharToMultiByte(CP_ACP, // code page - 0, // performance and mapping flags - name, // wide-character string - -1, // number of chars in string - buf, // buffer for new string - nBufSize, // size of buffer - NULL, // default for unmappable chars - NULL); // set when default char used - return n; -} - -static int GetUnicodeFileName(const char * name, LPWSTR buf, int nBufSize) -{ - memset(buf, 0, nBufSize*sizeof(TCHAR)); - - int n = MultiByteToWideChar(CP_ACP, // code page - 0, // character-type options - name, // string to map - -1, // number of bytes in string - buf, // wide-character buffer - nBufSize); // size of buffer - - return n; -} - -#endif - - -// unzip.c -- IO on .zip files using zlib -// Version 0.15 beta, Mar 19th, 1998, -// Read unzip.h for more info - - - - -#define UNZ_BUFSIZE (16384) -#define UNZ_MAXFILENAMEINZIP (256) -#define SIZECENTRALDIRITEM (0x2e) -#define SIZEZIPLOCALHEADER (0x1e) - - - - -const char unz_copyright[] = " ";//unzip 0.15 Copyright 1998 Gilles Vollant "; - -// unz_file_info_interntal contain internal info about a file in zipfile -typedef struct unz_file_info_internal_s -{ - uLong offset_curfile;// relative offset of local header 4 bytes -} unz_file_info_internal; - - -typedef struct -{ bool is_handle; // either a handle or memory - bool canseek; - // for handles: - HANDLE h; bool herr; unsigned long initial_offset; - // for memory: - void *buf; unsigned int len,pos; // if it's a memory block -} LUFILE; - - -LUFILE *lufopen(void *z,unsigned int len,DWORD flags,ZRESULT *err) -{ - if (flags!=ZIP_HANDLE && flags!=ZIP_FILENAME && flags!=ZIP_MEMORY) - { - *err=ZR_ARGS; - return NULL; - } - // - HANDLE h=0; bool canseek=false; *err=ZR_OK; - if (flags==ZIP_HANDLE||flags==ZIP_FILENAME) - { - if (flags==ZIP_HANDLE) - { - HANDLE hf = z; - - BOOL res = DuplicateHandle(GetCurrentProcess(),hf,GetCurrentProcess(),&h,0,FALSE,DUPLICATE_SAME_ACCESS); - - if (!res) - { - *err=ZR_NODUPH; - return NULL; - } - } - else - { - h = CreateFile((const TCHAR *)z, GENERIC_READ, FILE_SHARE_READ, - NULL, OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, NULL); - - if (h == INVALID_HANDLE_VALUE) - { - *err = ZR_NOFILE; - return NULL; - } - } - DWORD type = GetFileType(h); - canseek = (type==FILE_TYPE_DISK); - } - LUFILE *lf = new LUFILE; - if (flags==ZIP_HANDLE||flags==ZIP_FILENAME) - { - lf->is_handle=true; - lf->canseek=canseek; - lf->h=h; lf->herr=false; - lf->initial_offset=0; - if (canseek) - lf->initial_offset = SetFilePointer(h,0,NULL,FILE_CURRENT); - } - else - { - lf->is_handle=false; - lf->canseek=true; - lf->buf=z; - lf->len=len; - lf->pos=0; - lf->initial_offset=0; - } - *err=ZR_OK; - return lf; -} - - -int lufclose(LUFILE *stream) -{ if (stream==NULL) return EOF; - if (stream->is_handle) CloseHandle(stream->h); - delete stream; - return 0; -} - -int luferror(LUFILE *stream) -{ if (stream->is_handle && stream->herr) return 1; - else return 0; -} - -long int luftell(LUFILE *stream) -{ if (stream->is_handle && stream->canseek) return SetFilePointer(stream->h,0,NULL,FILE_CURRENT)-stream->initial_offset; - else if (stream->is_handle) return 0; - else return stream->pos; -} - -int lufseek(LUFILE *stream, long offset, int whence) -{ if (stream->is_handle && stream->canseek) - { if (whence==SEEK_SET) SetFilePointer(stream->h,stream->initial_offset+offset,0,FILE_BEGIN); - else if (whence==SEEK_CUR) SetFilePointer(stream->h,offset,NULL,FILE_CURRENT); - else if (whence==SEEK_END) SetFilePointer(stream->h,offset,NULL,FILE_END); - else return 19; // EINVAL - return 0; - } - else if (stream->is_handle) return 29; // ESPIPE - else - { if (whence==SEEK_SET) stream->pos=offset; - else if (whence==SEEK_CUR) stream->pos+=offset; - else if (whence==SEEK_END) stream->pos=stream->len+offset; - return 0; - } -} - - -size_t lufread(void *ptr,size_t size,size_t n,LUFILE *stream) -{ unsigned int toread = (unsigned int)(size*n); - if (stream->is_handle) - { DWORD red; BOOL res = ReadFile(stream->h,ptr,toread,&red,NULL); - if (!res) stream->herr=true; - return red/size; - } - if (stream->pos+toread > stream->len) toread = stream->len-stream->pos; - memcpy(ptr, (char*)stream->buf + stream->pos, toread); DWORD red = toread; - stream->pos += red; - return red/size; -} - - - - -// file_in_zip_read_info_s contain internal information about a file in zipfile, -// when reading and decompress it -typedef struct -{ - char *read_buffer; // internal buffer for compressed data - z_stream stream; // zLib stream structure for inflate - - uLong pos_in_zipfile; // position in byte on the zipfile, for fseek - uLong stream_initialised; // flag set if stream structure is initialised - - uLong offset_local_extrafield;// offset of the local extra field - uInt size_local_extrafield;// size of the local extra field - uLong pos_local_extrafield; // position in the local extra field in read - - uLong crc32; // crc32 of all data uncompressed - uLong crc32_wait; // crc32 we must obtain after decompress all - uLong rest_read_compressed; // number of byte to be decompressed - uLong rest_read_uncompressed;//number of byte to be obtained after decomp - LUFILE* file; // io structore of the zipfile - uLong compression_method; // compression method (0==store) - uLong byte_before_the_zipfile;// byte before the zipfile, (>0 for sfx) -} file_in_zip_read_info_s; - - -// unz_s contain internal information about the zipfile -typedef struct -{ - LUFILE* file; // io structore of the zipfile - unz_global_info gi; // public global information - uLong byte_before_the_zipfile;// byte before the zipfile, (>0 for sfx) - uLong num_file; // number of the current file in the zipfile - uLong pos_in_central_dir; // pos of the current file in the central dir - uLong current_file_ok; // flag about the usability of the current file - uLong central_pos; // position of the beginning of the central dir - - uLong size_central_dir; // size of the central directory - uLong offset_central_dir; // offset of start of central directory with respect to the starting disk number - - unz_file_info cur_file_info; // public info about the current file in zip - unz_file_info_internal cur_file_info_internal; // private info about it - file_in_zip_read_info_s* pfile_in_zip_read; // structure about the current file if we are decompressing it -} unz_s, *unzFile; - - -int unzStringFileNameCompare (const char* fileName1,const char* fileName2,int iCaseSensitivity); -// Compare two filename (fileName1,fileName2). - -z_off_t unztell (unzFile file); -// Give the current position in uncompressed data - -int unzeof (unzFile file); -// return 1 if the end of file was reached, 0 elsewhere - -int unzGetLocalExtrafield (unzFile file, voidp buf, unsigned len); -// Read extra field from the current file (opened by unzOpenCurrentFile) -// This is the local-header version of the extra field (sometimes, there is -// more info in the local-header version than in the central-header) -// -// if buf==NULL, it return the size of the local extra field -// -// if buf!=NULL, len is the size of the buffer, the extra header is copied in -// buf. -// the return value is the number of bytes copied in buf, or (if <0) -// the error code - - - -// =========================================================================== -// Read a byte from a gz_stream; update next_in and avail_in. Return EOF -// for end of file. -// IN assertion: the stream s has been sucessfully opened for reading. - -int unzlocal_getByte(LUFILE *fin,int *pi) -{ unsigned char c; - int err = (int)lufread(&c, 1, 1, fin); - if (err==1) - { *pi = (int)c; - return UNZ_OK; - } - else - { if (luferror(fin)) return UNZ_ERRNO; - else return UNZ_EOF; - } -} - - -// =========================================================================== -// Reads a long in LSB order from the given gz_stream. Sets -int unzlocal_getShort (LUFILE *fin,uLong *pX) -{ - uLong x ; - int i; - int err; - - err = unzlocal_getByte(fin,&i); - x = (uLong)i; - - if (err==UNZ_OK) - err = unzlocal_getByte(fin,&i); - x += ((uLong)i)<<8; - - if (err==UNZ_OK) - *pX = x; - else - *pX = 0; - return err; -} - -int unzlocal_getLong (LUFILE *fin,uLong *pX) -{ - uLong x ; - int i; - int err; - - err = unzlocal_getByte(fin,&i); - x = (uLong)i; - - if (err==UNZ_OK) - err = unzlocal_getByte(fin,&i); - x += ((uLong)i)<<8; - - if (err==UNZ_OK) - err = unzlocal_getByte(fin,&i); - x += ((uLong)i)<<16; - - if (err==UNZ_OK) - err = unzlocal_getByte(fin,&i); - x += ((uLong)i)<<24; - - if (err==UNZ_OK) - *pX = x; - else - *pX = 0; - return err; -} - - -// My own strcmpi / strcasecmp -int strcmpcasenosensitive_internal (const char* fileName1,const char *fileName2) -{ - for (;;) - { - char c1=*(fileName1++); - char c2=*(fileName2++); - if ((c1>='a') && (c1<='z')) - c1 -= (char)0x20; - if ((c2>='a') && (c2<='z')) - c2 -= (char)0x20; - if (c1=='\0') - return ((c2=='\0') ? 0 : -1); - if (c2=='\0') - return 1; - if (c1c2) - return 1; - } -} - - - - -// -// Compare two filename (fileName1,fileName2). -// If iCaseSenisivity = 1, comparision is case sensitivity (like strcmp) -// If iCaseSenisivity = 2, comparision is not case sensitivity (like strcmpi or strcasecmp) -// -int unzStringFileNameCompare (const char*fileName1,const char*fileName2,int iCaseSensitivity) -{ if (iCaseSensitivity==1) return strcmp(fileName1,fileName2); - else return strcmpcasenosensitive_internal(fileName1,fileName2); -} - -#define BUFREADCOMMENT (0x400) - - -// Locate the Central directory of a zipfile (at the end, just before -// the global comment) -uLong unzlocal_SearchCentralDir(LUFILE *fin) -{ if (lufseek(fin,0,SEEK_END) != 0) return 0; - uLong uSizeFile = luftell(fin); - - uLong uMaxBack=0xffff; // maximum size of global comment - if (uMaxBack>uSizeFile) uMaxBack = uSizeFile; - - unsigned char *buf = (unsigned char*)zmalloc(BUFREADCOMMENT+4); - if (buf==NULL) return 0; - uLong uPosFound=0; - - uLong uBackRead = 4; - while (uBackReaduMaxBack) uBackRead = uMaxBack; - else uBackRead+=BUFREADCOMMENT; - uReadPos = uSizeFile-uBackRead ; - uReadSize = ((BUFREADCOMMENT+4) < (uSizeFile-uReadPos)) ? (BUFREADCOMMENT+4) : (uSizeFile-uReadPos); - if (lufseek(fin,uReadPos,SEEK_SET)!=0) break; - if (lufread(buf,(uInt)uReadSize,1,fin)!=1) break; - for (i=(int)uReadSize-3; (i--)>0;) - { if (((*(buf+i))==0x50) && ((*(buf+i+1))==0x4b) && ((*(buf+i+2))==0x05) && ((*(buf+i+3))==0x06)) - { uPosFound = uReadPos+i; break; - } - } - if (uPosFound!=0) break; - } - if (buf) zfree(buf); - return uPosFound; -} - - -int unzGoToFirstFile (unzFile file); -int unzCloseCurrentFile (unzFile file); - -// Open a Zip file. -// If the zipfile cannot be opened (file don't exist or in not valid), return NULL. -// Otherwise, the return value is a unzFile Handle, usable with other unzip functions -unzFile unzOpenInternal(LUFILE *fin) -{ - zopenerror = ZR_OK; //+++1.2 - if (fin==NULL) { zopenerror = ZR_ARGS; return NULL; } //+++1.2 - if (unz_copyright[0]!=' ') {lufclose(fin); zopenerror = ZR_CORRUPT; return NULL; } //+++1.2 - - int err=UNZ_OK; - unz_s us; - uLong central_pos,uL; - central_pos = unzlocal_SearchCentralDir(fin); - if (central_pos==0) err=UNZ_ERRNO; - if (lufseek(fin,central_pos,SEEK_SET)!=0) err=UNZ_ERRNO; - // the signature, already checked - if (unzlocal_getLong(fin,&uL)!=UNZ_OK) err=UNZ_ERRNO; - // number of this disk - uLong number_disk; // number of the current dist, used for spanning ZIP, unsupported, always 0 - if (unzlocal_getShort(fin,&number_disk)!=UNZ_OK) err=UNZ_ERRNO; - // number of the disk with the start of the central directory - uLong number_disk_with_CD; // number the the disk with central dir, used for spaning ZIP, unsupported, always 0 - if (unzlocal_getShort(fin,&number_disk_with_CD)!=UNZ_OK) err=UNZ_ERRNO; - // total number of entries in the central dir on this disk - if (unzlocal_getShort(fin,&us.gi.number_entry)!=UNZ_OK) err=UNZ_ERRNO; - // total number of entries in the central dir - uLong number_entry_CD; // total number of entries in the central dir (same than number_entry on nospan) - if (unzlocal_getShort(fin,&number_entry_CD)!=UNZ_OK) err=UNZ_ERRNO; - if ((number_entry_CD!=us.gi.number_entry) || (number_disk_with_CD!=0) || (number_disk!=0)) err=UNZ_BADZIPFILE; - // size of the central directory - if (unzlocal_getLong(fin,&us.size_central_dir)!=UNZ_OK) err=UNZ_ERRNO; - // offset of start of central directory with respect to the starting disk number - if (unzlocal_getLong(fin,&us.offset_central_dir)!=UNZ_OK) err=UNZ_ERRNO; - // zipfile comment length - if (unzlocal_getShort(fin,&us.gi.size_comment)!=UNZ_OK) err=UNZ_ERRNO; - if ((central_pos+fin->initial_offsetinitial_offset - (us.offset_central_dir+us.size_central_dir); - us.central_pos = central_pos; - us.pfile_in_zip_read = NULL; - fin->initial_offset = 0; // since the zipfile itself is expected to handle this - - unz_s *s = (unz_s*)zmalloc(sizeof(unz_s)); - *s=us; - unzGoToFirstFile((unzFile)s); - return (unzFile)s; -} - - - -// Close a ZipFile opened with unzipOpen. -// If there is files inside the .Zip opened with unzipOpenCurrentFile (see later), -// these files MUST be closed with unzipCloseCurrentFile before call unzipClose. -// return UNZ_OK if there is no problem. -int unzClose (unzFile file) -{ - unz_s* s; - if (file==NULL) - return UNZ_PARAMERROR; - s=(unz_s*)file; - - if (s->pfile_in_zip_read!=NULL) - unzCloseCurrentFile(file); - - lufclose(s->file); - if (s) zfree(s); // unused s=0; - return UNZ_OK; -} - - -// Write info about the ZipFile in the *pglobal_info structure. -// No preparation of the structure is needed -// return UNZ_OK if there is no problem. -int unzGetGlobalInfo (unzFile file,unz_global_info *pglobal_info) -{ - unz_s* s; - if (file==NULL) - return UNZ_PARAMERROR; - s=(unz_s*)file; - *pglobal_info=s->gi; - return UNZ_OK; -} - - -// Translate date/time from Dos format to tm_unz (readable more easilty) -void unzlocal_DosDateToTmuDate (uLong ulDosDate, tm_unz* ptm) -{ - uLong uDate; - uDate = (uLong)(ulDosDate>>16); - ptm->tm_mday = (uInt)(uDate&0x1f) ; - ptm->tm_mon = (uInt)((((uDate)&0x1E0)/0x20)-1) ; - ptm->tm_year = (uInt)(((uDate&0x0FE00)/0x0200)+1980) ; - - ptm->tm_hour = (uInt) ((ulDosDate &0xF800)/0x800); - ptm->tm_min = (uInt) ((ulDosDate&0x7E0)/0x20) ; - ptm->tm_sec = (uInt) (2*(ulDosDate&0x1f)) ; -} - -// Get Info about the current file in the zipfile, with internal only info -int unzlocal_GetCurrentFileInfoInternal (unzFile file, - unz_file_info *pfile_info, - unz_file_info_internal - *pfile_info_internal, - char *szFileName, - uLong fileNameBufferSize, - void *extraField, - uLong extraFieldBufferSize, - char *szComment, - uLong commentBufferSize); - -int unzlocal_GetCurrentFileInfoInternal (unzFile file, unz_file_info *pfile_info, - unz_file_info_internal *pfile_info_internal, char *szFileName, - uLong fileNameBufferSize, void *extraField, uLong extraFieldBufferSize, - char *szComment, uLong commentBufferSize) -{ - unz_s* s; - unz_file_info file_info; - unz_file_info_internal file_info_internal; - int err=UNZ_OK; - uLong uMagic; - long lSeek=0; - - if (file==NULL) - return UNZ_PARAMERROR; - s=(unz_s*)file; - if (lufseek(s->file,s->pos_in_central_dir+s->byte_before_the_zipfile,SEEK_SET)!=0) - err=UNZ_ERRNO; - - - // we check the magic - if (err==UNZ_OK) - if (unzlocal_getLong(s->file,&uMagic) != UNZ_OK) - err=UNZ_ERRNO; - else if (uMagic!=0x02014b50) - err=UNZ_BADZIPFILE; - - if (unzlocal_getShort(s->file,&file_info.version) != UNZ_OK) - err=UNZ_ERRNO; - - if (unzlocal_getShort(s->file,&file_info.version_needed) != UNZ_OK) - err=UNZ_ERRNO; - - if (unzlocal_getShort(s->file,&file_info.flag) != UNZ_OK) - err=UNZ_ERRNO; - - if (unzlocal_getShort(s->file,&file_info.compression_method) != UNZ_OK) - err=UNZ_ERRNO; - - if (unzlocal_getLong(s->file,&file_info.dosDate) != UNZ_OK) - err=UNZ_ERRNO; - - unzlocal_DosDateToTmuDate(file_info.dosDate,&file_info.tmu_date); - - if (unzlocal_getLong(s->file,&file_info.crc) != UNZ_OK) - err=UNZ_ERRNO; - - if (unzlocal_getLong(s->file,&file_info.compressed_size) != UNZ_OK) - err=UNZ_ERRNO; - - if (unzlocal_getLong(s->file,&file_info.uncompressed_size) != UNZ_OK) - err=UNZ_ERRNO; - - if (unzlocal_getShort(s->file,&file_info.size_filename) != UNZ_OK) - err=UNZ_ERRNO; - - if (unzlocal_getShort(s->file,&file_info.size_file_extra) != UNZ_OK) - err=UNZ_ERRNO; - - if (unzlocal_getShort(s->file,&file_info.size_file_comment) != UNZ_OK) - err=UNZ_ERRNO; - - if (unzlocal_getShort(s->file,&file_info.disk_num_start) != UNZ_OK) - err=UNZ_ERRNO; - - if (unzlocal_getShort(s->file,&file_info.internal_fa) != UNZ_OK) - err=UNZ_ERRNO; - - if (unzlocal_getLong(s->file,&file_info.external_fa) != UNZ_OK) - err=UNZ_ERRNO; - - if (unzlocal_getLong(s->file,&file_info_internal.offset_curfile) != UNZ_OK) - err=UNZ_ERRNO; - - lSeek+=file_info.size_filename; - if ((err==UNZ_OK) && (szFileName!=NULL)) - { - uLong uSizeRead ; - if (file_info.size_filename0) && (fileNameBufferSize>0)) - if (lufread(szFileName,(uInt)uSizeRead,1,s->file)!=1) - err=UNZ_ERRNO; - lSeek -= uSizeRead; - } - - - if ((err==UNZ_OK) && (extraField!=NULL)) - { - uLong uSizeRead ; - if (file_info.size_file_extrafile,lSeek,SEEK_CUR)==0) - lSeek=0; - else - err=UNZ_ERRNO; - if ((file_info.size_file_extra>0) && (extraFieldBufferSize>0)) - if (lufread(extraField,(uInt)uSizeRead,1,s->file)!=1) - err=UNZ_ERRNO; - lSeek += file_info.size_file_extra - uSizeRead; - } - else - lSeek+=file_info.size_file_extra; - - - if ((err==UNZ_OK) && (szComment!=NULL)) - { - uLong uSizeRead ; - if (file_info.size_file_commentfile,lSeek,SEEK_CUR)==0) - {} // unused lSeek=0; - else - err=UNZ_ERRNO; - if ((file_info.size_file_comment>0) && (commentBufferSize>0)) - if (lufread(szComment,(uInt)uSizeRead,1,s->file)!=1) - err=UNZ_ERRNO; - //unused lSeek+=file_info.size_file_comment - uSizeRead; - } - else {} //unused lSeek+=file_info.size_file_comment; - - if ((err==UNZ_OK) && (pfile_info!=NULL)) - *pfile_info=file_info; - - if ((err==UNZ_OK) && (pfile_info_internal!=NULL)) - *pfile_info_internal=file_info_internal; - - return err; -} - - - -// Write info about the ZipFile in the *pglobal_info structure. -// No preparation of the structure is needed -// return UNZ_OK if there is no problem. -int unzGetCurrentFileInfo (unzFile file, unz_file_info *pfile_info, - char *szFileName, uLong fileNameBufferSize, void *extraField, uLong extraFieldBufferSize, - char *szComment, uLong commentBufferSize) -{ return unzlocal_GetCurrentFileInfoInternal(file,pfile_info,NULL,szFileName,fileNameBufferSize, - extraField,extraFieldBufferSize, szComment,commentBufferSize); -} - - -// Set the current file of the zipfile to the first file. -// return UNZ_OK if there is no problem -int unzGoToFirstFile (unzFile file) -{ - int err; - unz_s* s; - if (file==NULL) return UNZ_PARAMERROR; - s=(unz_s*)file; - s->pos_in_central_dir=s->offset_central_dir; - s->num_file=0; - err=unzlocal_GetCurrentFileInfoInternal(file,&s->cur_file_info, - &s->cur_file_info_internal, - NULL,0,NULL,0,NULL,0); - s->current_file_ok = (err == UNZ_OK); - return err; -} - - -// Set the current file of the zipfile to the next file. -// return UNZ_OK if there is no problem -// return UNZ_END_OF_LIST_OF_FILE if the actual file was the latest. -int unzGoToNextFile (unzFile file) -{ - unz_s* s; - int err; - - if (file==NULL) - return UNZ_PARAMERROR; - s=(unz_s*)file; - if (!s->current_file_ok) - return UNZ_END_OF_LIST_OF_FILE; - if (s->num_file+1==s->gi.number_entry) - return UNZ_END_OF_LIST_OF_FILE; - - s->pos_in_central_dir += SIZECENTRALDIRITEM + s->cur_file_info.size_filename + - s->cur_file_info.size_file_extra + s->cur_file_info.size_file_comment ; - s->num_file++; - err = unzlocal_GetCurrentFileInfoInternal(file,&s->cur_file_info, - &s->cur_file_info_internal, - NULL,0,NULL,0,NULL,0); - s->current_file_ok = (err == UNZ_OK); - return err; -} - - -// Try locate the file szFileName in the zipfile. -// For the iCaseSensitivity signification, see unzStringFileNameCompare -// return value : -// UNZ_OK if the file is found. It becomes the current file. -// UNZ_END_OF_LIST_OF_FILE if the file is not found -int unzLocateFile (unzFile file, const TCHAR *szFileName, int iCaseSensitivity) -{ - unz_s* s; - int err; - - uLong num_fileSaved; - uLong pos_in_central_dirSaved; - - if (file==NULL) - return UNZ_PARAMERROR; - - if (_tcslen(szFileName)>=UNZ_MAXFILENAMEINZIP) - return UNZ_PARAMERROR; - - char szFileNameA[MAX_PATH]; - -#ifdef _UNICODE - GetAnsiFileName(szFileName, szFileNameA, MAX_PATH-1); -#else - strcpy(szFileNameA, szFileName); -#endif - - s=(unz_s*)file; - if (!s->current_file_ok) - return UNZ_END_OF_LIST_OF_FILE; - - num_fileSaved = s->num_file; - pos_in_central_dirSaved = s->pos_in_central_dir; - - err = unzGoToFirstFile(file); - - while (err == UNZ_OK) - { - char szCurrentFileName[UNZ_MAXFILENAMEINZIP+1]; - unzGetCurrentFileInfo(file,NULL, - szCurrentFileName,sizeof(szCurrentFileName)-1, - NULL,0,NULL,0); - if (unzStringFileNameCompare(szCurrentFileName,szFileNameA,iCaseSensitivity)==0) - return UNZ_OK; - err = unzGoToNextFile(file); - } - - s->num_file = num_fileSaved ; - s->pos_in_central_dir = pos_in_central_dirSaved ; - return err; -} - - -// Read the local header of the current zipfile -// Check the coherency of the local header and info in the end of central -// directory about this file -// store in *piSizeVar the size of extra info in local header -// (filename and size of extra field data) -int unzlocal_CheckCurrentFileCoherencyHeader (unz_s *s,uInt *piSizeVar, - uLong *poffset_local_extrafield, uInt *psize_local_extrafield) -{ - uLong uMagic,uData,uFlags; - uLong size_filename; - uLong size_extra_field; - int err=UNZ_OK; - - *piSizeVar = 0; - *poffset_local_extrafield = 0; - *psize_local_extrafield = 0; - - if (lufseek(s->file,s->cur_file_info_internal.offset_curfile + s->byte_before_the_zipfile,SEEK_SET)!=0) - return UNZ_ERRNO; - - - if (err==UNZ_OK) - if (unzlocal_getLong(s->file,&uMagic) != UNZ_OK) - err=UNZ_ERRNO; - else if (uMagic!=0x04034b50) - err=UNZ_BADZIPFILE; - - if (unzlocal_getShort(s->file,&uData) != UNZ_OK) - err=UNZ_ERRNO; -// else if ((err==UNZ_OK) && (uData!=s->cur_file_info.wVersion)) -// err=UNZ_BADZIPFILE; - if (unzlocal_getShort(s->file,&uFlags) != UNZ_OK) - err=UNZ_ERRNO; - - if (unzlocal_getShort(s->file,&uData) != UNZ_OK) - err=UNZ_ERRNO; - else if ((err==UNZ_OK) && (uData!=s->cur_file_info.compression_method)) - err=UNZ_BADZIPFILE; - - if ((err==UNZ_OK) && (s->cur_file_info.compression_method!=0) && - (s->cur_file_info.compression_method!=Z_DEFLATED)) - err=UNZ_BADZIPFILE; - - if (unzlocal_getLong(s->file,&uData) != UNZ_OK) // date/time - err=UNZ_ERRNO; - - if (unzlocal_getLong(s->file,&uData) != UNZ_OK) // crc - err=UNZ_ERRNO; - else if ((err==UNZ_OK) && (uData!=s->cur_file_info.crc) && - ((uFlags & 8)==0)) - err=UNZ_BADZIPFILE; - - if (unzlocal_getLong(s->file,&uData) != UNZ_OK) // size compr - err=UNZ_ERRNO; - else if ((err==UNZ_OK) && (uData!=s->cur_file_info.compressed_size) && - ((uFlags & 8)==0)) - err=UNZ_BADZIPFILE; - - if (unzlocal_getLong(s->file,&uData) != UNZ_OK) // size uncompr - err=UNZ_ERRNO; - else if ((err==UNZ_OK) && (uData!=s->cur_file_info.uncompressed_size) && - ((uFlags & 8)==0)) - err=UNZ_BADZIPFILE; - - - if (unzlocal_getShort(s->file,&size_filename) != UNZ_OK) - err=UNZ_ERRNO; - else if ((err==UNZ_OK) && (size_filename!=s->cur_file_info.size_filename)) - err=UNZ_BADZIPFILE; - - *piSizeVar += (uInt)size_filename; - - if (unzlocal_getShort(s->file,&size_extra_field) != UNZ_OK) - err=UNZ_ERRNO; - *poffset_local_extrafield= s->cur_file_info_internal.offset_curfile + - SIZEZIPLOCALHEADER + size_filename; - *psize_local_extrafield = (uInt)size_extra_field; - - *piSizeVar += (uInt)size_extra_field; - - return err; -} - - - - - -// Open for reading data the current file in the zipfile. -// If there is no error and the file is opened, the return value is UNZ_OK. -int unzOpenCurrentFile (unzFile file) -{ - int err; - int Store; - uInt iSizeVar; - unz_s* s; - file_in_zip_read_info_s* pfile_in_zip_read_info; - uLong offset_local_extrafield; // offset of the local extra field - uInt size_local_extrafield; // size of the local extra field - - if (file==NULL) - return UNZ_PARAMERROR; - s=(unz_s*)file; - if (!s->current_file_ok) - return UNZ_PARAMERROR; - - if (s->pfile_in_zip_read != NULL) - unzCloseCurrentFile(file); - - if (unzlocal_CheckCurrentFileCoherencyHeader(s,&iSizeVar, - &offset_local_extrafield,&size_local_extrafield)!=UNZ_OK) - return UNZ_BADZIPFILE; - - pfile_in_zip_read_info = (file_in_zip_read_info_s*)zmalloc(sizeof(file_in_zip_read_info_s)); - if (pfile_in_zip_read_info==NULL) - return UNZ_INTERNALERROR; - - pfile_in_zip_read_info->read_buffer=(char*)zmalloc(UNZ_BUFSIZE); - pfile_in_zip_read_info->offset_local_extrafield = offset_local_extrafield; - pfile_in_zip_read_info->size_local_extrafield = size_local_extrafield; - pfile_in_zip_read_info->pos_local_extrafield=0; - - if (pfile_in_zip_read_info->read_buffer==NULL) - { - if (pfile_in_zip_read_info!=0) zfree(pfile_in_zip_read_info); //unused pfile_in_zip_read_info=0; - return UNZ_INTERNALERROR; - } - - pfile_in_zip_read_info->stream_initialised=0; - - if ((s->cur_file_info.compression_method!=0) && (s->cur_file_info.compression_method!=Z_DEFLATED)) - { // unused err=UNZ_BADZIPFILE; - } - Store = s->cur_file_info.compression_method==0; - - pfile_in_zip_read_info->crc32_wait=s->cur_file_info.crc; - pfile_in_zip_read_info->crc32=0; - pfile_in_zip_read_info->compression_method = - s->cur_file_info.compression_method; - pfile_in_zip_read_info->file=s->file; - pfile_in_zip_read_info->byte_before_the_zipfile=s->byte_before_the_zipfile; - - pfile_in_zip_read_info->stream.total_out = 0; - - if (!Store) - { - pfile_in_zip_read_info->stream.zalloc = (alloc_func)0; - pfile_in_zip_read_info->stream.zfree = (free_func)0; - pfile_in_zip_read_info->stream.opaque = (voidpf)0; - - err=inflateInit2(&pfile_in_zip_read_info->stream); - if (err == Z_OK) - pfile_in_zip_read_info->stream_initialised=1; - // windowBits is passed < 0 to tell that there is no zlib header. - // Note that in this case inflate *requires* an extra "dummy" byte - // after the compressed stream in order to complete decompression and - // return Z_STREAM_END. - // In unzip, i don't wait absolutely Z_STREAM_END because I known the - // size of both compressed and uncompressed data - } - pfile_in_zip_read_info->rest_read_compressed = - s->cur_file_info.compressed_size ; - pfile_in_zip_read_info->rest_read_uncompressed = - s->cur_file_info.uncompressed_size ; - - - pfile_in_zip_read_info->pos_in_zipfile = - s->cur_file_info_internal.offset_curfile + SIZEZIPLOCALHEADER + - iSizeVar; - - pfile_in_zip_read_info->stream.avail_in = (uInt)0; - - - s->pfile_in_zip_read = pfile_in_zip_read_info; - return UNZ_OK; -} - - -// Read bytes from the current file. -// buf contain buffer where data must be copied -// len the size of buf. -// return the number of byte copied if somes bytes are copied -// return 0 if the end of file was reached -// return <0 with error code if there is an error -// (UNZ_ERRNO for IO error, or zLib error for uncompress error) -int unzReadCurrentFile (unzFile file, voidp buf, unsigned len) -{ int err=UNZ_OK; - uInt iRead = 0; - - unz_s *s = (unz_s*)file; - if (s==NULL) return UNZ_PARAMERROR; - - file_in_zip_read_info_s* pfile_in_zip_read_info = s->pfile_in_zip_read; - if (pfile_in_zip_read_info==NULL) return UNZ_PARAMERROR; - if ((pfile_in_zip_read_info->read_buffer == NULL)) return UNZ_END_OF_LIST_OF_FILE; - if (len==0) return 0; - - pfile_in_zip_read_info->stream.next_out = (Byte*)buf; - pfile_in_zip_read_info->stream.avail_out = (uInt)len; - - if (len>pfile_in_zip_read_info->rest_read_uncompressed) - { pfile_in_zip_read_info->stream.avail_out = (uInt)pfile_in_zip_read_info->rest_read_uncompressed; - } - - while (pfile_in_zip_read_info->stream.avail_out>0) - { if ((pfile_in_zip_read_info->stream.avail_in==0) && (pfile_in_zip_read_info->rest_read_compressed>0)) - { uInt uReadThis = UNZ_BUFSIZE; - if (pfile_in_zip_read_info->rest_read_compressedrest_read_compressed; - if (uReadThis == 0) return UNZ_EOF; - if (lufseek(pfile_in_zip_read_info->file, pfile_in_zip_read_info->pos_in_zipfile + pfile_in_zip_read_info->byte_before_the_zipfile,SEEK_SET)!=0) return UNZ_ERRNO; - if (lufread(pfile_in_zip_read_info->read_buffer,uReadThis,1,pfile_in_zip_read_info->file)!=1) return UNZ_ERRNO; - pfile_in_zip_read_info->pos_in_zipfile += uReadThis; - pfile_in_zip_read_info->rest_read_compressed-=uReadThis; - pfile_in_zip_read_info->stream.next_in = (Byte*)pfile_in_zip_read_info->read_buffer; - pfile_in_zip_read_info->stream.avail_in = (uInt)uReadThis; - } - - if (pfile_in_zip_read_info->compression_method==0) - { uInt uDoCopy,i ; - if (pfile_in_zip_read_info->stream.avail_out < pfile_in_zip_read_info->stream.avail_in) - { uDoCopy = pfile_in_zip_read_info->stream.avail_out ; - } - else - { uDoCopy = pfile_in_zip_read_info->stream.avail_in ; - } - for (i=0;istream.next_out+i) = *(pfile_in_zip_read_info->stream.next_in+i); - } - pfile_in_zip_read_info->crc32 = ucrc32(pfile_in_zip_read_info->crc32,pfile_in_zip_read_info->stream.next_out,uDoCopy); - pfile_in_zip_read_info->rest_read_uncompressed-=uDoCopy; - pfile_in_zip_read_info->stream.avail_in -= uDoCopy; - pfile_in_zip_read_info->stream.avail_out -= uDoCopy; - pfile_in_zip_read_info->stream.next_out += uDoCopy; - pfile_in_zip_read_info->stream.next_in += uDoCopy; - pfile_in_zip_read_info->stream.total_out += uDoCopy; - iRead += uDoCopy; - } - else - { uLong uTotalOutBefore,uTotalOutAfter; - const Byte *bufBefore; - uLong uOutThis; - int flush=Z_SYNC_FLUSH; - uTotalOutBefore = pfile_in_zip_read_info->stream.total_out; - bufBefore = pfile_in_zip_read_info->stream.next_out; - err=inflate(&pfile_in_zip_read_info->stream,flush); - uTotalOutAfter = pfile_in_zip_read_info->stream.total_out; - uOutThis = uTotalOutAfter-uTotalOutBefore; - pfile_in_zip_read_info->crc32 = ucrc32(pfile_in_zip_read_info->crc32,bufBefore,(uInt)(uOutThis)); - pfile_in_zip_read_info->rest_read_uncompressed -= uOutThis; - iRead += (uInt)(uTotalOutAfter - uTotalOutBefore); - if (err==Z_STREAM_END) return (iRead==0) ? UNZ_EOF : iRead; //+++1.3 - //if (err==Z_STREAM_END) return (iRead==len) ? UNZ_EOF : iRead; //+++1.2 - - if (err != Z_OK) break; - } - } - - if (err==Z_OK) return iRead; - - return iRead; -} - - -// Give the current position in uncompressed data -z_off_t unztell (unzFile file) -{ - unz_s* s; - file_in_zip_read_info_s* pfile_in_zip_read_info; - if (file==NULL) - return UNZ_PARAMERROR; - s=(unz_s*)file; - pfile_in_zip_read_info=s->pfile_in_zip_read; - - if (pfile_in_zip_read_info==NULL) - return UNZ_PARAMERROR; - - return (z_off_t)pfile_in_zip_read_info->stream.total_out; -} - - -// return 1 if the end of file was reached, 0 elsewhere -int unzeof (unzFile file) -{ - unz_s* s; - file_in_zip_read_info_s* pfile_in_zip_read_info; - if (file==NULL) - return UNZ_PARAMERROR; - s=(unz_s*)file; - pfile_in_zip_read_info=s->pfile_in_zip_read; - - if (pfile_in_zip_read_info==NULL) - return UNZ_PARAMERROR; - - if (pfile_in_zip_read_info->rest_read_uncompressed == 0) - return 1; - else - return 0; -} - - - -// Read extra field from the current file (opened by unzOpenCurrentFile) -// This is the local-header version of the extra field (sometimes, there is -// more info in the local-header version than in the central-header) -// if buf==NULL, it return the size of the local extra field that can be read -// if buf!=NULL, len is the size of the buffer, the extra header is copied in buf. -// the return value is the number of bytes copied in buf, or (if <0) the error code -int unzGetLocalExtrafield (unzFile file,voidp buf,unsigned len) -{ - unz_s* s; - file_in_zip_read_info_s* pfile_in_zip_read_info; - uInt read_now; - uLong size_to_read; - - if (file==NULL) - return UNZ_PARAMERROR; - s=(unz_s*)file; - pfile_in_zip_read_info=s->pfile_in_zip_read; - - if (pfile_in_zip_read_info==NULL) - return UNZ_PARAMERROR; - - size_to_read = (pfile_in_zip_read_info->size_local_extrafield - - pfile_in_zip_read_info->pos_local_extrafield); - - if (buf==NULL) - return (int)size_to_read; - - if (len>size_to_read) - read_now = (uInt)size_to_read; - else - read_now = (uInt)len ; - - if (read_now==0) - return 0; - - if (lufseek(pfile_in_zip_read_info->file, pfile_in_zip_read_info->offset_local_extrafield + pfile_in_zip_read_info->pos_local_extrafield,SEEK_SET)!=0) - return UNZ_ERRNO; - - if (lufread(buf,(uInt)size_to_read,1,pfile_in_zip_read_info->file)!=1) - return UNZ_ERRNO; - - return (int)read_now; -} - -// Close the file in zip opened with unzipOpenCurrentFile -// Return UNZ_CRCERROR if all the file was read but the CRC is not good -int unzCloseCurrentFile (unzFile file) -{ - int err=UNZ_OK; - - unz_s* s; - file_in_zip_read_info_s* pfile_in_zip_read_info; - if (file==NULL) - return UNZ_PARAMERROR; - s=(unz_s*)file; - pfile_in_zip_read_info=s->pfile_in_zip_read; - - if (pfile_in_zip_read_info==NULL) - return UNZ_PARAMERROR; - - - if (pfile_in_zip_read_info->rest_read_uncompressed == 0) - { - if (pfile_in_zip_read_info->crc32 != pfile_in_zip_read_info->crc32_wait) - err=UNZ_CRCERROR; - } - - - if (pfile_in_zip_read_info->read_buffer!=0) - { void *buf = pfile_in_zip_read_info->read_buffer; - zfree(buf); - pfile_in_zip_read_info->read_buffer=0; - } - pfile_in_zip_read_info->read_buffer = NULL; - if (pfile_in_zip_read_info->stream_initialised) - inflateEnd(&pfile_in_zip_read_info->stream); - - pfile_in_zip_read_info->stream_initialised = 0; - if (pfile_in_zip_read_info!=0) zfree(pfile_in_zip_read_info); // unused pfile_in_zip_read_info=0; - - s->pfile_in_zip_read=NULL; - - return err; -} - - -// Get the global comment string of the ZipFile, in the szComment buffer. -// uSizeBuf is the size of the szComment buffer. -// return the number of byte copied or an error code <0 -int unzGetGlobalComment (unzFile file, char *szComment, uLong uSizeBuf) -{ //int err=UNZ_OK; - unz_s* s; - uLong uReadThis ; - if (file==NULL) return UNZ_PARAMERROR; - s=(unz_s*)file; - uReadThis = uSizeBuf; - if (uReadThis>s->gi.size_comment) uReadThis = s->gi.size_comment; - if (lufseek(s->file,s->central_pos+22,SEEK_SET)!=0) return UNZ_ERRNO; - if (uReadThis>0) - { *szComment='\0'; - if (lufread(szComment,(uInt)uReadThis,1,s->file)!=1) return UNZ_ERRNO; - } - if ((szComment != NULL) && (uSizeBuf > s->gi.size_comment)) *(szComment+s->gi.size_comment)='\0'; - return (int)uReadThis; -} - - - - - -int unzOpenCurrentFile (unzFile file); -int unzReadCurrentFile (unzFile file, void *buf, unsigned len); -int unzCloseCurrentFile (unzFile file); - - -FILETIME timet2filetime(time_t timer) -{ - struct tm *tm = gmtime(&timer); - SYSTEMTIME st; - st.wYear = (WORD)(tm->tm_year+1900); - st.wMonth = (WORD)(tm->tm_mon+1); - st.wDay = (WORD)(tm->tm_mday); - st.wHour = (WORD)(tm->tm_hour); - st.wMinute = (WORD)(tm->tm_min); - st.wSecond = (WORD)(tm->tm_sec); - st.wMilliseconds=0; - FILETIME ft; - SystemTimeToFileTime(&st,&ft); - return ft; -} - -/////////////////////////////////////////////////////////////////////////////// -/////////////////////////////////////////////////////////////////////////////// -/////////////////////////////////////////////////////////////////////////////// -class TUnzip -{ public: - TUnzip() : uf(0), currentfile(-1), czei(-1) {} - - unzFile uf; int currentfile; ZIPENTRY cze; int czei; - TCHAR rootdir[MAX_PATH]; - - ZRESULT Open(void *rd, void *z,unsigned int len,DWORD flags); - ZRESULT Get(int index,ZIPENTRY *ze); - ZRESULT Find(const TCHAR *name,bool ic,int *index,ZIPENTRY *ze); - ZRESULT Unzip(int index,void *dst,unsigned int len,DWORD flags); - ZRESULT Close(); -}; - - -ZRESULT TUnzip::Open(void *rd, void *z,unsigned int len,DWORD flags) -{ - if (uf!=0 || currentfile!=-1) - return ZR_NOTINITED; - //GetCurrentDirectory(MAX_PATH,rootdir); - _tcscpy(rootdir, (const wchar_t *)rd); - _tcscat(rootdir,_T("\\")); - if (flags==ZIP_HANDLE) - { - DWORD type = GetFileType(z); - if (type!=FILE_TYPE_DISK) - return ZR_SEEK; - } - ZRESULT e; - LUFILE *f = lufopen(z,len,flags,&e); - if (f==NULL) - return e; - uf = unzOpenInternal(f); - //return ZR_OK; - return zopenerror; //+++1.2 -} - -ZRESULT TUnzip::Get(int index,ZIPENTRY *ze) -{ if (index<-1 || index>=(int)uf->gi.number_entry) - return ZR_ARGS; - if (currentfile!=-1) - unzCloseCurrentFile(uf); - currentfile=-1; - if (index==czei && index!=-1) {memcpy(ze,&cze,sizeof(ZIPENTRY)); return ZR_OK;} - if (index==-1) - { ze->index = uf->gi.number_entry; - ze->name[0]=0; - ze->attr=0; - ze->atime.dwLowDateTime=0; ze->atime.dwHighDateTime=0; - ze->ctime.dwLowDateTime=0; ze->ctime.dwHighDateTime=0; - ze->mtime.dwLowDateTime=0; ze->mtime.dwHighDateTime=0; - ze->comp_size=0; - ze->unc_size=0; - return ZR_OK; - } - if (index<(int)uf->num_file) unzGoToFirstFile(uf); - while ((int)uf->num_filefile,offset,SEEK_SET)!=0) return ZR_READ; - char *extra = new char[extralen]; - if (lufread(extra,1,(uInt)extralen,uf->file)!=extralen) {delete[] extra; return ZR_READ;} - // - ze->index=uf->num_file; - strcpy(ze->name,fn); - // zip has an 'attribute' 32bit value. Its lower half is windows stuff - // its upper half is standard unix attr. - unsigned long a = ufi.external_fa; - bool uisdir = (a&0x40000000)!=0; - //bool uwriteable= (a&0x08000000)!=0; - bool uwriteable= (a&0x00800000)!=0; // ***hd*** - //bool ureadable= (a&0x01000000)!=0; - //bool uexecutable=(a&0x00400000)!=0; - bool wreadonly= (a&0x00000001)!=0; - bool whidden= (a&0x00000002)!=0; - bool wsystem= (a&0x00000004)!=0; - bool wisdir= (a&0x00000010)!=0; - bool warchive= (a&0x00000020)!=0; - ze->attr=FILE_ATTRIBUTE_NORMAL; - if (uisdir || wisdir) ze->attr |= FILE_ATTRIBUTE_DIRECTORY; - if (warchive) ze->attr|=FILE_ATTRIBUTE_ARCHIVE; - if (whidden) ze->attr|=FILE_ATTRIBUTE_HIDDEN; - if (!uwriteable||wreadonly) ze->attr|=FILE_ATTRIBUTE_READONLY; - if (wsystem) ze->attr|=FILE_ATTRIBUTE_SYSTEM; - ze->comp_size = ufi.compressed_size; - ze->unc_size = ufi.uncompressed_size; - // - WORD dostime = (WORD)(ufi.dosDate&0xFFFF); - WORD dosdate = (WORD)((ufi.dosDate>>16)&0xFFFF); - FILETIME ft; - DosDateTimeToFileTime(dosdate,dostime,&ft); - ze->atime=ft; ze->ctime=ft; ze->mtime=ft; - // the zip will always have at least that dostime. But if it also has - // an extra header, then we'll instead get the info from that. - unsigned int epos=0; - while (epos+4mtime = timet2filetime(mtime); - } - if (hasatime) - { time_t atime = *(time_t*)(extra+epos); epos+=4; - ze->atime = timet2filetime(atime); - } - if (hasctime) - { time_t ctime = *(time_t*)(extra+epos); - ze->ctime = timet2filetime(ctime); - } - break; - } - // - if (extra!=0) delete[] extra; - memcpy(&cze,ze,sizeof(ZIPENTRY)); czei=index; - return ZR_OK; -} - -ZRESULT TUnzip::Find(const TCHAR *name, bool ic, int *index, ZIPENTRY *ze) -{ - int res = unzLocateFile(uf,name,ic?CASE_INSENSITIVE:CASE_SENSITIVE); - if (res!=UNZ_OK) - { - if (index!=0) - *index=-1; - if (ze!=NULL) - { - ZeroMemory(ze,sizeof(ZIPENTRY)); ze->index=-1; - } - return ZR_NOTFOUND; - } - if (currentfile!=-1) - unzCloseCurrentFile(uf); currentfile=-1; - int i = (int)uf->num_file; - if (index!=NULL) - *index=i; - if (ze!=NULL) - { - ZRESULT zres = Get(i,ze); - if (zres!=ZR_OK) - return zres; - } - return ZR_OK; -} - -void EnsureDirectory(const TCHAR *rootdir, const TCHAR *dir) -{ - if (dir==NULL || dir[0] == _T('\0')) - return; - const TCHAR *lastslash = dir, *c = lastslash; - while (*c != _T('\0')) - { - if (*c==_T('/') || *c==_T('\\')) - lastslash=c; - c++; - } - const TCHAR *name=lastslash; - if (lastslash!=dir) - { - TCHAR tmp[MAX_PATH]; - _tcsncpy(tmp, dir, lastslash-dir); - tmp[lastslash-dir] = _T('\0'); - EnsureDirectory(rootdir,tmp); - name++; - } - TCHAR cd[MAX_PATH]; - _tcscpy(cd,rootdir); - //_tcscat(cd,name); - _tcscat(cd,dir); //+++1.2 - CreateDirectory(cd,NULL); -} - -ZRESULT TUnzip::Unzip(int index,void *dst,unsigned int len,DWORD flags) -{ - if (flags!=ZIP_MEMORY && flags!=ZIP_FILENAME && flags!=ZIP_HANDLE) - return ZR_ARGS; - if (flags==ZIP_MEMORY) - { - if (index!=currentfile) - { - if (currentfile!=-1) - unzCloseCurrentFile(uf); - currentfile=-1; - if (index>=(int)uf->gi.number_entry) - return ZR_ARGS; - if (index<(int)uf->num_file) - unzGoToFirstFile(uf); - while ((int)uf->num_file0) - return ZR_MORE; - unzCloseCurrentFile(uf); - currentfile=-1; - if (res==0) - return ZR_OK; - else - return ZR_FLATE; - } - - // otherwise we're writing to a handle or a file - if (currentfile!=-1) - unzCloseCurrentFile(uf); - currentfile=-1; - if (index >= (int)uf->gi.number_entry) - return ZR_ARGS; - if (index < (int)uf->num_file) - unzGoToFirstFile(uf); - while ((int)uf->num_filelen) n=len-1; - strncpy(buf,msg,n); buf[n]=0; - return mlen; -} - - -typedef struct -{ DWORD flag; - TUnzip *unz; -} TUnzipHandleData; - -HZIP OpenZipU(void *rd, void *z,unsigned int len,DWORD flags) -{ - TUnzip *unz = new TUnzip(); - lasterrorU = unz->Open(rd, z,len,flags); - if (lasterrorU!=ZR_OK) - { - delete unz; - return 0; - } - TUnzipHandleData *han = new TUnzipHandleData; - han->flag=1; - han->unz=unz; - return (HZIP)han; -} - -ZRESULT GetZipItemA(HZIP hz, int index, ZIPENTRY *ze) -{ - if (hz==0) - { - lasterrorU=ZR_ARGS; - return ZR_ARGS; - } - TUnzipHandleData *han = (TUnzipHandleData*)hz; - if (han->flag!=1) - { - lasterrorU=ZR_ZMODE; - return ZR_ZMODE; - } - TUnzip *unz = han->unz; - lasterrorU = unz->Get(index,ze); - return lasterrorU; -} - -ZRESULT GetZipItemW(HZIP hz, int index, ZIPENTRYW *zew) -{ - if (hz==0) - { - lasterrorU=ZR_ARGS; - return ZR_ARGS; - } - TUnzipHandleData *han = (TUnzipHandleData*)hz; - if (han->flag!=1) - { - lasterrorU=ZR_ZMODE; - return ZR_ZMODE; - } - TUnzip *unz = han->unz; - ZIPENTRY ze; - lasterrorU = unz->Get(index,&ze); - if (lasterrorU == ZR_OK) - { - zew->index = ze.index; - zew->attr = ze.attr; - zew->atime = ze.atime; - zew->ctime = ze.ctime; - zew->mtime = ze.mtime; - zew->comp_size = ze.comp_size; - zew->unc_size = ze.unc_size; -#ifdef _UNICODE - GetUnicodeFileName(ze.name, zew->name, MAX_PATH-1); -#else - strcpy(zew->name, ze.name); -#endif - } - return lasterrorU; -} - -ZRESULT FindZipItemA(HZIP hz, const TCHAR *name, bool ic, int *index, ZIPENTRY *ze) -{ - if (hz==0) - { - lasterrorU=ZR_ARGS; - return ZR_ARGS; - } - TUnzipHandleData *han = (TUnzipHandleData*)hz; - if (han->flag!=1) - { - lasterrorU=ZR_ZMODE; - return ZR_ZMODE; - } - TUnzip *unz = han->unz; - lasterrorU = unz->Find(name,ic,index,ze); - return lasterrorU; -} - -ZRESULT FindZipItemW(HZIP hz, const TCHAR *name, bool ic, int *index, ZIPENTRYW *zew) -{ - if (hz==0) - { - lasterrorU=ZR_ARGS; - return ZR_ARGS; - } - TUnzipHandleData *han = (TUnzipHandleData*)hz; - if (han->flag!=1) - { - lasterrorU=ZR_ZMODE; - return ZR_ZMODE; - } - TUnzip *unz = han->unz; - ZIPENTRY ze; - lasterrorU = unz->Find(name,ic,index,&ze); - if (lasterrorU == ZR_OK) - { - zew->index = ze.index; - zew->attr = ze.attr; - zew->atime = ze.atime; - zew->ctime = ze.ctime; - zew->mtime = ze.mtime; - zew->comp_size = ze.comp_size; - zew->unc_size = ze.unc_size; -#ifdef _UNICODE - GetUnicodeFileName(ze.name, zew->name, MAX_PATH-1); -#else - strcpy(zew->name, ze.name); -#endif - } - - return lasterrorU; -} - -ZRESULT UnzipItem(HZIP hz, int index, void *dst, unsigned int len, DWORD flags) -{ - if (hz==0) - { - lasterrorU=ZR_ARGS; - return ZR_ARGS; - } - TUnzipHandleData *han = (TUnzipHandleData*)hz; - if (han->flag!=1) - { - lasterrorU=ZR_ZMODE; - return ZR_ZMODE; - } - TUnzip *unz = han->unz; - lasterrorU = unz->Unzip(index,dst,len,flags); - return lasterrorU; -} - -ZRESULT CloseZipU(HZIP hz) -{ if (hz==0) {lasterrorU=ZR_ARGS;return ZR_ARGS;} - TUnzipHandleData *han = (TUnzipHandleData*)hz; - if (han->flag!=1) {lasterrorU=ZR_ZMODE;return ZR_ZMODE;} - TUnzip *unz = han->unz; - lasterrorU = unz->Close(); - delete unz; - delete han; - return lasterrorU; -} - -bool IsZipHandleU(HZIP hz) -{ if (hz==0) return true; - TUnzipHandleData *han = (TUnzipHandleData*)hz; - return (han->flag==1); -} - - diff --git a/iis/ModSecurityIIS/Installer/XUnzip.h b/iis/ModSecurityIIS/Installer/XUnzip.h deleted file mode 100644 index baf5020c..00000000 --- a/iis/ModSecurityIIS/Installer/XUnzip.h +++ /dev/null @@ -1,382 +0,0 @@ -// XUnzip.h Version 1.3 -// -// Authors: Mark Adler et al. (see below) -// -// Modified by: Lucian Wischik -// lu@wischik.com -// -// Version 1.0 - Turned C files into just a single CPP file -// - Made them compile cleanly as C++ files -// - Gave them simpler APIs -// - Added the ability to zip/unzip directly in memory without -// any intermediate files -// -// Modified by: Hans Dietrich -// hdietrich@gmail.com -// -/////////////////////////////////////////////////////////////////////////////// -// -// Lucian Wischik's comments: -// -------------------------- -// THIS FILE is almost entirely based upon code by info-zip. -// It has been modified by Lucian Wischik. -// The original code may be found at http://www.info-zip.org -// The original copyright text follows. -// -/////////////////////////////////////////////////////////////////////////////// -// -// Original authors' comments: -// --------------------------- -// This is version 2002-Feb-16 of the Info-ZIP copyright and license. The -// definitive version of this document should be available at -// ftp://ftp.info-zip.org/pub/infozip/license.html indefinitely. -// -// Copyright (c) 1990-2002 Info-ZIP. All rights reserved. -// -// For the purposes of this copyright and license, "Info-ZIP" is defined as -// the following set of individuals: -// -// Mark Adler, John Bush, Karl Davis, Harald Denker, Jean-Michel Dubois, -// Jean-loup Gailly, Hunter Goatley, Ian Gorman, Chris Herborth, Dirk Haase, -// Greg Hartwig, Robert Heath, Jonathan Hudson, Paul Kienitz, -// David Kirschbaum, Johnny Lee, Onno van der Linden, Igor Mandrichenko, -// Steve P. Miller, Sergio Monesi, Keith Owens, George Petrov, Greg Roelofs, -// Kai Uwe Rommel, Steve Salisbury, Dave Smith, Christian Spieler, -// Antoine Verheijen, Paul von Behren, Rich Wales, Mike White -// -// This software is provided "as is", without warranty of any kind, express -// or implied. In no event shall Info-ZIP or its contributors be held liable -// for any direct, indirect, incidental, special or consequential damages -// arising out of the use of or inability to use this software. -// -// Permission is granted to anyone to use this software for any purpose, -// including commercial applications, and to alter it and redistribute it -// freely, subject to the following restrictions: -// -// 1. Redistributions of source code must retain the above copyright notice, -// definition, disclaimer, and this list of conditions. -// -// 2. Redistributions in binary form (compiled executables) must reproduce -// the above copyright notice, definition, disclaimer, and this list of -// conditions in documentation and/or other materials provided with the -// distribution. The sole exception to this condition is redistribution -// of a standard UnZipSFX binary as part of a self-extracting archive; -// that is permitted without inclusion of this license, as long as the -// normal UnZipSFX banner has not been removed from the binary or disabled. -// -// 3. Altered versions--including, but not limited to, ports to new -// operating systems, existing ports with new graphical interfaces, and -// dynamic, shared, or static library versions--must be plainly marked -// as such and must not be misrepresented as being the original source. -// Such altered versions also must not be misrepresented as being -// Info-ZIP releases--including, but not limited to, labeling of the -// altered versions with the names "Info-ZIP" (or any variation thereof, -// including, but not limited to, different capitalizations), -// "Pocket UnZip", "WiZ" or "MacZip" without the explicit permission of -// Info-ZIP. Such altered versions are further prohibited from -// misrepresentative use of the Zip-Bugs or Info-ZIP e-mail addresses or -// of the Info-ZIP URL(s). -// -// 4. Info-ZIP retains the right to use the names "Info-ZIP", "Zip", "UnZip", -// "UnZipSFX", "WiZ", "Pocket UnZip", "Pocket Zip", and "MacZip" for its -// own source and binary releases. -// -/////////////////////////////////////////////////////////////////////////////// - -#ifndef XUNZIP_H -#define XUNZIP_H - - -#ifndef XZIP_H -DECLARE_HANDLE(HZIP); // An HZIP identifies a zip file that has been opened -#endif - -typedef DWORD ZRESULT; -// return codes from any of the zip functions. Listed later. - -#define ZIP_HANDLE 1 -#define ZIP_FILENAME 2 -#define ZIP_MEMORY 3 - -typedef struct -{ int index; // index of this file within the zip - char name[MAX_PATH]; // filename within the zip - DWORD attr; // attributes, as in GetFileAttributes. - FILETIME atime,ctime,mtime;// access, create, modify filetimes - long comp_size; // sizes of item, compressed and uncompressed. These - long unc_size; // may be -1 if not yet known (e.g. being streamed in) -} ZIPENTRY; - -typedef struct -{ int index; // index of this file within the zip - TCHAR name[MAX_PATH]; // filename within the zip - DWORD attr; // attributes, as in GetFileAttributes. - FILETIME atime,ctime,mtime;// access, create, modify filetimes - long comp_size; // sizes of item, compressed and uncompressed. These - long unc_size; // may be -1 if not yet known (e.g. being streamed in) -} ZIPENTRYW; - - -/////////////////////////////////////////////////////////////////////////////// -// -// OpenZip() -// -// Purpose: Open an existing zip archive file -// -// Parameters: z - archive file name if flags is ZIP_FILENAME; for other -// uses see below -// len - for memory (ZIP_MEMORY) should be the buffer size; -// for other uses, should be 0 -// flags - indicates usage, see below; for files, this will be -// ZIP_FILENAME -// -// Returns: HZIP - non-zero if zip archive opened ok, otherwise 0 -// -HZIP OpenZip(void *rd, void *z, unsigned int len, DWORD flags); -// OpenZip - opens a zip file and returns a handle with which you can -// subsequently examine its contents. You can open a zip file from: -// from a pipe: OpenZip(hpipe_read,0, ZIP_HANDLE); -// from a file (by handle): OpenZip(hfile,0, ZIP_HANDLE); -// from a file (by name): OpenZip("c:\\test.zip",0, ZIP_FILENAME); -// from a memory block: OpenZip(bufstart, buflen, ZIP_MEMORY); -// If the file is opened through a pipe, then items may only be -// accessed in increasing order, and an item may only be unzipped once, -// although GetZipItem can be called immediately before and after unzipping -// it. If it's opened i n any other way, then full random access is possible. -// Note: pipe input is not yet implemented. - - -/////////////////////////////////////////////////////////////////////////////// -// -// GetZipItem() -// -// Purpose: Get information about an item in an open zip archive -// -// Parameters: hz - handle of open zip archive -// index - index number (0 based) of item in zip -// ze - pointer to a ZIPENTRY (if ANSI) or ZIPENTRYW struct -// (if Unicode) -// -// Returns: ZRESULT - ZR_OK if success, otherwise some other value -// - -#ifdef _UNICODE -#define GetZipItem GetZipItemW -#else -#define GetZipItem GetZipItemA -#endif - -ZRESULT GetZipItemA(HZIP hz, int index, ZIPENTRY *ze); -ZRESULT GetZipItemW(HZIP hz, int index, ZIPENTRYW *ze); -// GetZipItem - call this to get information about an item in the zip. -// If index is -1 and the file wasn't opened through a pipe, -// then it returns information about the whole zipfile -// (and in particular ze.index returns the number of index items). -// Note: the item might be a directory (ze.attr & FILE_ATTRIBUTE_DIRECTORY) -// See below for notes on what happens when you unzip such an item. -// Note: if you are opening the zip through a pipe, then random access -// is not possible and GetZipItem(-1) fails and you can't discover the number -// of items except by calling GetZipItem on each one of them in turn, -// starting at 0, until eventually the call fails. Also, in the event that -// you are opening through a pipe and the zip was itself created into a pipe, -// then then comp_size and sometimes unc_size as well may not be known until -// after the item has been unzipped. - - -/////////////////////////////////////////////////////////////////////////////// -// -// FindZipItem() -// -// Purpose: Find item by name and return information about it -// -// Parameters: hz - handle of open zip archive -// name - name of file to look for inside zip archive -// ic - TRUE = case insensitive -// index - pointer to index number returned, or -1 -// ze - pointer to a ZIPENTRY (if ANSI) or ZIPENTRYW struct -// (if Unicode) -// -// Returns: ZRESULT - ZR_OK if success, otherwise some other value -// - -#ifdef _UNICODE -#define FindZipItem FindZipItemW -#else -#define FindZipItem FindZipItemA -#endif - -ZRESULT FindZipItemA(HZIP hz, const TCHAR *name, bool ic, int *index, ZIPENTRY *ze); -ZRESULT FindZipItemW(HZIP hz, const TCHAR *name, bool ic, int *index, ZIPENTRYW *ze); -// FindZipItem - finds an item by name. ic means 'insensitive to case'. -// It returns the index of the item, and returns information about it. -// If nothing was found, then index is set to -1 and the function returns -// an error code. - - -/////////////////////////////////////////////////////////////////////////////// -// -// UnzipItem() -// -// Purpose: Find item by index and unzip it -// -// Parameters: hz - handle of open zip archive -// index - index number of file to unzip -// dst - target file name of unzipped file -// len - for memory (ZIP_MEMORY. length of buffer; -// otherwise 0 -// flags - indicates usage, see below; for files, this will be -// ZIP_FILENAME -// -// Returns: ZRESULT - ZR_OK if success, otherwise some other value -// - -ZRESULT UnzipItem(HZIP hz, int index, void *dst, unsigned int len, DWORD flags); -// UnzipItem - given an index to an item, unzips it. You can unzip to: -// to a pipe: UnzipItem(hz,i, hpipe_write,0,ZIP_HANDLE); -// to a file (by handle): UnzipItem(hz,i, hfile,0,ZIP_HANDLE); -// to a file (by name): UnzipItem(hz,i, ze.name,0,ZIP_FILENAME); -// to a memory block: UnzipItem(hz,i, buf,buflen,ZIP_MEMORY); -// In the final case, if the buffer isn't large enough to hold it all, -// then the return code indicates that more is yet to come. If it was -// large enough, and you want to know precisely how big, GetZipItem. -// Note: zip files are normally stored with relative pathnames. If you -// unzip with ZIP_FILENAME a relative pathname then the item gets created -// relative to the current directory - it first ensures that all necessary -// subdirectories have been created. Also, the item may itself be a directory. -// If you unzip a directory with ZIP_FILENAME, then the directory gets created. -// If you unzip it to a handle or a memory block, then nothing gets created -// and it emits 0 bytes. - - -/////////////////////////////////////////////////////////////////////////////// -// -// CloseZip() -// -// Purpose: Close an open zip archive -// -// Parameters: hz - handle to an open zip archive -// -// Returns: ZRESULT - ZR_OK if success, otherwise some other value -// -ZRESULT CloseZip(HZIP hz); -// CloseZip - the zip handle must be closed with this function. - -unsigned int FormatZipMessage(ZRESULT code, char *buf,unsigned int len); -// FormatZipMessage - given an error code, formats it as a string. -// It returns the length of the error message. If buf/len points -// to a real buffer, then it also writes as much as possible into there. - - -// These are the result codes: -#define ZR_OK 0x00000000 // nb. the pseudo-code zr-recent is never returned, -#define ZR_RECENT 0x00000001 // but can be passed to FormatZipMessage. -// The following come from general system stuff (e.g. files not openable) -#define ZR_GENMASK 0x0000FF00 -#define ZR_NODUPH 0x00000100 // couldn't duplicate the handle -#define ZR_NOFILE 0x00000200 // couldn't create/open the file -#define ZR_NOALLOC 0x00000300 // failed to allocate some resource -#define ZR_WRITE 0x00000400 // a general error writing to the file -#define ZR_NOTFOUND 0x00000500 // couldn't find that file in the zip -#define ZR_MORE 0x00000600 // there's still more data to be unzipped -#define ZR_CORRUPT 0x00000700 // the zipfile is corrupt or not a zipfile -#define ZR_READ 0x00000800 // a general error reading the file -// The following come from mistakes on the part of the caller -#define ZR_CALLERMASK 0x00FF0000 -#define ZR_ARGS 0x00010000 // general mistake with the arguments -#define ZR_NOTMMAP 0x00020000 // tried to ZipGetMemory, but that only works on mmap zipfiles, which yours wasn't -#define ZR_MEMSIZE 0x00030000 // the memory size is too small -#define ZR_FAILED 0x00040000 // the thing was already failed when you called this function -#define ZR_ENDED 0x00050000 // the zip creation has already been closed -#define ZR_MISSIZE 0x00060000 // the indicated input file size turned out mistaken -#define ZR_PARTIALUNZ 0x00070000 // the file had already been partially unzipped -#define ZR_ZMODE 0x00080000 // tried to mix creating/opening a zip -// The following come from bugs within the zip library itself -#define ZR_BUGMASK 0xFF000000 -#define ZR_NOTINITED 0x01000000 // initialisation didn't work -#define ZR_SEEK 0x02000000 // trying to seek in an unseekable file -#define ZR_NOCHANGE 0x04000000 // changed its mind on storage, but not allowed -#define ZR_FLATE 0x05000000 // an internal error in the de/inflation code - - - - - -// e.g. -// -// SetCurrentDirectory("c:\\docs\\stuff"); -// HZIP hz = OpenZip("c:\\stuff.zip",0,ZIP_FILENAME); -// ZIPENTRY ze; GetZipItem(hz,-1,&ze); int numitems=ze.index; -// for (int i=0; i -#include - - - -// TODO: reference additional headers your program requires here diff --git a/iis/ModSecurityIIS/Installer/targetver.h b/iis/ModSecurityIIS/Installer/targetver.h deleted file mode 100644 index 90e767bf..00000000 --- a/iis/ModSecurityIIS/Installer/targetver.h +++ /dev/null @@ -1,8 +0,0 @@ -#pragma once - -// Including SDKDDKVer.h defines the highest available Windows platform. - -// If you wish to build your application for a previous Windows platform, include WinSDKVer.h and -// set the _WIN32_WINNT macro to the platform you wish to support before including SDKDDKVer.h. - -#include diff --git a/iis/build_dependencies.bat b/iis/build_dependencies.bat new file mode 100644 index 00000000..ef0ac23f --- /dev/null +++ b/iis/build_dependencies.bat @@ -0,0 +1,115 @@ +:: Those variable should be edited as needed. +:: Use full paths. + +:: General paths +@set WORK_DIR=%cd%\dependencies\build_dir +@set OUTPUT_DIR=%cd%\dependencies\release_files +@set SOURCE_DIR=%USERPROFILE%\Downloads + +:: Aditional paths. +@set PATH=%PATH%;c:\work\cmake-2.8.7-win32-x86\bin;"c:\program files\7-zip" + +@set PCRE=pcre-8.33.zip +@set ZLIB=zlib-1.2.8.tar.gz +@set LIBXML2=libxml2-2.9.1.tar.gz +@set LUA=lua-5.1.5.tar.gz +@set CURL=curl-7.33.0.zip +@set APACHE_SRC=httpd-2.4.6.tar.gz +@set APACHE_BIN32=httpd-2.4.6-win32-VC11.zip +@set APACHE_BIN64=httpd-2.4.6-win64-VC11.zip + +:: @set VCARGS32="C:\Program Files (x86)\Microsoft Visual Studio 12.0\VC\bin\vcvars32.bat" +:: @set VCARGS64="C:\Program Files (x86)\Microsoft Visual Studio 12.0\VC\bin\x86_amd64\vcvarsx86_amd64.bat" + + +:: Do not edit bellow this line. +@set CURRENT_DIR=%cd% + +@echo Cleaning directories... +if EXIST "%WORK_DIR%" @rmdir /s /q "%WORK_DIR%" +if EXIST "%OUTPUT_DIR%" @rmdir /s /q "%OUTPUT_DIR%" +@mkdir "%WORK_DIR%" +@if NOT (%ERRORLEVEL%) == (0) goto failed_to_cleanup +@mkdir "%OUTPUT_DIR%" +@if NOT (%ERRORLEVEL%) == (0) goto failed_to_cleanup + +@echo Checking for vcargs... %1 +@if NOT (%1) == "" call %1 +@if (%ERRORLEVEL%) == (1) goto build_wrong_vcargs + +set APACHE_BIN=%APACHE_BIN32% +call cl 2>&1 | findstr /C:"x64" +@if (%ERRORLEVEL%) == (0) set APACHE_BIN=%APACHE_BIN64% + +@echo Starting with the depdendencies... +@echo # Apache - %HTTPD%/%APACHE24_ZIP% +@call dependencies/build_apache.bat +@if NOT (%ERRORLEVEL%) == (0) goto build_failed_apache +@cd "%CURRENT_DIR%" +echo "c" +@echo # pcre. - %PCRE% +@call dependencies/build_pcre.bat +@if NOT (%ERRORLEVEL%) == (0) goto build_failed_pcre +@cd "%CURRENT_DIR%" +echo "b" + +@echo # zlib - %ZLIB% +@call dependencies/build_zlib.bat +@if NOT (%ERRORLEVEL%) == (0) goto build_failed_zlib +@cd "%CURRENT_DIR%" + +@echo # libxml2 - %LIBXML2% +@call dependencies/build_libxml2.bat +@if NOT (%ERRORLEVEL%) == (0) goto build_failed_libxml2 +@cd "%CURRENT_DIR%" + +@echo # lua - %LUA% +@call dependencies/build_lua.bat +@if NOT (%ERRORLEVEL%) == (0) goto build_failed_lua +@cd "%CURRENT_DIR%" + +@echo # curl - %CURL% +@call dependencies/build_curl.bat +@if NOT (%ERRORLEVEL%) == (0) goto build_failed_curl +@cd "%CURRENT_DIR%" + +@echo All dependencies were built successfully. +@cd "%CURRENT_DIR%" +@exit /B 0 + +:failed_to_cleanup +@echo Failed to cleanup +@goto failed + +:build_wrong_vcargs +@echo Please specify a valid vcargs +@goto failed + +:build_failed_apache +@echo Failed to setup %HTTPD%/%APACHE24_ZIP%... +@goto failed + +:build_failed_pcre +@echo Failed to setup %PCRE%... +@goto failed + +:build_failed_zlib +@echo Failed to setup %ZLIB%... +@goto failed + +:build_failed_libxml2 +@echo Failed to setup %LIBXML2%... +@goto failed + +:build_failed_lua +@echo Failed to setup %LUA%... +@goto failed + +:build_failed_curl +@echo Failed to setup %CURL%... +@goto failed + +:failed +@cd %CURRENT_DIR% +@exit /B 1 + diff --git a/iis/build_modsecurity.bat b/iis/build_modsecurity.bat new file mode 100644 index 00000000..c4874bb8 --- /dev/null +++ b/iis/build_modsecurity.bat @@ -0,0 +1,55 @@ + +set DEPENDENCIES_DIR=dependencies\build_dir +set OUTPUT_DIR=dependencies\release_files + +set CURRENT_DIR=%cd% + +@echo Checking for vcargs... %1 +@if NOT (%1) == "" call %1 +@if (%ERRORLEVEL%) == (1) goto build_wrong_vcarg + +@echo Deleting old stuff... +@del *.obj *.dll *.lib + +@echo apache2... +cd ..\apache2 +del *.obj *.dll *.lib +del libinjection\*.obj libinjection\*.dll libinjection\*.lib +NMAKE -f Makefile.win APACHE=..\iis\%DEPENDENCIES_DIR%\Apache24 PCRE=..\iis\%DEPENDENCIES_DIR%\pcre LIBXML2=..\iis\%DEPENDENCIES_DIR%\libxml2 LUA=..\iis\%DEPENDENCIES_DIR%\lua\src VERSION=VERSION_IIS +@if NOT (%ERRORLEVEL%) == (0) goto build_failed + +@echo mlogc... +cd ..\mlogc +del *.obj *.dll *.lib +nmake -f Makefile.win clean +nmake -f Makefile.win APACHE=..\iis\%DEPENDENCIES_DIR%\Apache24 PCRE=..\iis\%DEPENDENCIES_DIR%\pcre CURL=..\iis\%DEPENDENCIES_DIR%\curl VERSION=VERSION_IIS +@if NOT (%ERRORLEVEL%) == (0) goto build_failed + +@echo iis... +cd ..\iis +del *.obj *.dll *.lib +nmake -f Makefile.win clean +NMAKE -f Makefile.win APACHE=..\iis\%DEPENDENCIES_DIR%\Apache24 PCRE=..\iis\%DEPENDENCIES_DIR%\pcre LIBXML2=..\iis\%DEPENDENCIES_DIR%\libxml2 LUA=..\iis\%DEPENDENCIES_DIR%\lua\src VERSION=VERSION_IIS +@if NOT (%ERRORLEVEL%) == (0) goto build_failed + +cd %CURRENT_DIR% + +@echo Copy... +copy /y ..\mlogc\mlogc.exe %OUTPUT_DIR% +copy /y ..\iis\modsecurityiis.dll %OUTPUT_DIR% +copy /y ..\iis\modsecurityiis.pdb %OUTPUT_DIR% + +exit /B 0 + +:build_wrong_vcargs +@echo Please specify a valid vcargs +@goto failed + +:build_failed +@echo Problems during the building phase +@goto failed + +:failed +@cd %CURRENT_DIR% +@exit /B 1 + diff --git a/iis/build_msi.bat b/iis/build_msi.bat new file mode 100644 index 00000000..10d1b295 --- /dev/null +++ b/iis/build_msi.bat @@ -0,0 +1,29 @@ + + +set PATH="%PATH%;C:\Program Files (x86)\WiX Toolset v3.8\bin;C:\Program Files (x86)\WiX Toolset v3.7\bin;" +set CURRENT_DIR=%cd% + +del installer.wix* + +"candle.exe" -ext WixUtilExtension -ext WixUIExtension "%CURRENT_DIR%\installer.wxs" -out "%CURRENT_DIR%\installer.wixobj" -dPlatform="x64" +@if NOT (%ERRORLEVEL%) == (0) goto build_failed + +"light.exe" -ext WixUtilExtension -ext WixUIExtension "%CURRENT_DIR%\installer.wixobj" -out "%CURRENT_DIR%\installer-64.msi" -dPlatform="x64" +@if NOT (%ERRORLEVEL%) == (0) goto build_failed + +"candle.exe" -ext WixUtilExtension -ext WixUIExtension "%CURRENT_DIR%\installer.wxs" -out "%CURRENT_DIR%\installer.wixobj" -dPlatform="x86" +@if NOT (%ERRORLEVEL%) == (0) goto build_failed + +"light.exe" -ext WixUtilExtension -ext WixUIExtension "%CURRENT_DIR%\installer.wixobj" -out "%CURRENT_DIR%\installer-32.msi" -dPlatform="x86" +@if NOT (%ERRORLEVEL%) == (0) goto build_failed + +exit /B 0 + +:build_failed +@echo Problems during the building phase +@goto failed + +:failed +@cd %CURRENT_DIR% +@exit /B 1 + diff --git a/iis/build_release.bat b/iis/build_release.bat new file mode 100644 index 00000000..bf85182b --- /dev/null +++ b/iis/build_release.bat @@ -0,0 +1,69 @@ + +echo "Building release..." + +set RELEASE_DIR=release +set OUTPUT_DIR=%cd%\dependencies\release_files +set CURRENT_DIR=%cd% + +set AMD64=%RELEASE_DIR%\amd64 +set X86=%RELEASE_DIR%\x86 + +mkdir "%RELEASE_DIR%" + +mkdir "%AMD64%" + +mkdir "%X86%" + +set VCARGS32="C:\Program Files (x86)\Microsoft Visual Studio 12.0\VC\bin\vcvars32.bat" +set VCARGS64="C:\Program Files (x86)\Microsoft Visual Studio 12.0\VC\bin\x86_amd64\vcvarsx86_amd64.bat" + +call build_dependencies.bat %VCARGS64% +@if NOT (%ERRORLEVEL%) == (0) goto build_failed +call build_modsecurity.bat %VCARGS64% +@if NOT (%ERRORLEVEL%) == (0) goto build_failed + +copy "%OUTPUT_DIR%\libapr-1.dll" "%AMD64%" +copy "%OUTPUT_DIR%\libapriconv-1.dll" "%AMD64%" +copy "%OUTPUT_DIR%\libaprutil-1.dll" "%AMD64%" +copy "%OUTPUT_DIR%\libcurl.dll" "%AMD64%" +copy "%OUTPUT_DIR%\libxml2.dll" "%AMD64%" +copy "%OUTPUT_DIR%\lua5.1.dll" "%AMD64%" +copy "%OUTPUT_DIR%\mlogc.exe" "%AMD64%" +copy "%OUTPUT_DIR%\ModSecurityIIS.dll" "%AMD64%" +copy "%OUTPUT_DIR%\pcre.dll" "%AMD64%" +copy "%OUTPUT_DIR%\zlib1.dll" "%AMD64%" + + +call build_dependencies.bat %VCARGS32% +@if NOT (%ERRORLEVEL%) == (0) goto build_failed +call build_modsecurity.bat %VCARGS32% +@if NOT (%ERRORLEVEL%) == (0) goto build_failed + +copy "%OUTPUT_DIR%\libapr-1.dll" "%X86%" +copy "%OUTPUT_DIR%\libapriconv-1.dll" "%X86%" +copy "%OUTPUT_DIR%\libaprutil-1.dll" "%X86%" +copy "%OUTPUT_DIR%\libcurl.dll" "%X86%" +copy "%OUTPUT_DIR%\libxml2.dll" "%X86%" +copy "%OUTPUT_DIR%\lua5.1.dll" "%X86%" +copy "%OUTPUT_DIR%\mlogc.exe" "%X86%" +copy "%OUTPUT_DIR%\ModSecurityIIS.dll" "%X86%" +copy %OUTPUT_DIR%\pcre.dll "%X86%" +copy %OUTPUT_DIR%\zlib1.dll "%X86%" + + +:: copy %OUTPUT_DIR%\Installer.exe %RELEASE_DIR% +:: copy %OUTPUT_DIR%\ModSecurity.xml %RELEASE_DIR% +:: copy %OUTPUT_DIR%\owasp_csr.zip %RELEASE_DIR% +:: copy %OUTPUT_DIR%\README.txt %RELEASE_DIR% + + +exit /B 0 + +:build_failed +@echo Problems during the building phase +@goto failed + +:failed +@cd %CURRENT_DIR% +@exit /B 1 + diff --git a/iis/dependencies/build_apache.bat b/iis/dependencies/build_apache.bat new file mode 100644 index 00000000..085a5919 --- /dev/null +++ b/iis/dependencies/build_apache.bat @@ -0,0 +1,47 @@ +@cd "%WORK_DIR%" +@set APACHE=%WORK_DIR%\Apache24 + +@if NOT EXIST "%SOURCE_DIR%\%APACHE_BIN%" goto file_not_found_bin +@if NOT EXIST "%SOURCE_DIR%\%APACHE_SRC%" goto file_not_found_src + +@7z.exe x "%SOURCE_DIR%\%APACHE_BIN%" +@if NOT (%ERRORLEVEL%) == (0) goto something_went_wrong + +@7z.exe x "%SOURCE_DIR%\%APACHE_SRC%" -so | 7z.exe x -aoa -si -ttar +@if NOT (%ERRORLEVEL%) == (0) goto something_went_wrong + +:: Missing: %APACHE%\bin\libapr-1.pdb %APACHE%\bin\libapr-1.lib ? +copy /y "%APACHE%\bin\libapr-1.dll" "%OUTPUT_DIR%" +@if NOT (%ERRORLEVEL%) == (0) goto something_went_wrong_copy + +:: Missing: %APACHE%\bin\libapriconv-1.pdb %APACHE%\lib\libapriconv-1.lib ? +copy /y "%APACHE%\bin\libapriconv-1.dll" "%OUTPUT_DIR%" +@if NOT (%ERRORLEVEL%) == (0) goto something_went_wrong_copy + +:: Missing: %APACHE%\bin\libaprutil-1.pdb %APACHE%\lib\libaprutil-1.lib ? +copy /y "%APACHE%\bin\libaprutil-1.dll" "%OUTPUT_DIR%" +@if NOT (%ERRORLEVEL%) == (0) goto something_went_wrong_copy + +@cd "%WORK_DIR%" + +@exit /B 0 + +:something_went_wrong_copy +@echo Something went wrong while trying to copy Apache binaries files. +@goto failed + +:file_not_found_bin +@echo File not found: %SOURCE_DIR%\%APACHE_BIN% +@goto failed + +:file_not_found_src +@echo File not found: %SOURCE_DIR%\%APACHE_SRC% +@goto failed + +:something_went_wrong +@echo Something went wrong while unzip Apache files. +@goto failed + +:failed +@exit /B 1 + diff --git a/iis/dependencies/build_curl.bat b/iis/dependencies/build_curl.bat new file mode 100644 index 00000000..2a9c0616 --- /dev/null +++ b/iis/dependencies/build_curl.bat @@ -0,0 +1,39 @@ +cd "%WORK_DIR%" + +@if NOT EXIST "%SOURCE_DIR%\%CURL%" goto file_not_found_bin +echo "7z..." +7z.exe x "%SOURCE_DIR%\%CURL%" +echo "Timeout..." +timeout 5 +echo "Curl..." +set CURL_DIR=%CURL:~0,-4% +echo "Move..." +move "%CURL_DIR%" "curl" +echo "Cd..." +:: copy /y CMakeLists.txt "curl" +CD "curl" +echo "Cmake..." +CMAKE -G "NMake Makefiles" -DCMAKE_BUILD_TYPE=RelWithDebInfo -DBUILD_SHARED_LIBS=True -DCURL_ZLIB=True +@if NOT (%ERRORLEVEL%) == (0) goto build_failed +:: "%WORK_DIR%\fart.exe" -r -C "%WORK_DIR%\curl\include\curl\curlbuild.h" LLU ULL +NMAKE +@if NOT (%ERRORLEVEL%) == (0) goto build_failed +cd "%WORK_DIR%" + +copy /y "%WORK_DIR%\curl\lib\libcurl.dll" "%OUTPUT_DIR%" +copy /y "%WORK_DIR%\curl\lib\libcurl.pdb" "%OUTPUT_DIR%" +copy /y "%WORK_DIR%\curl\lib\libcurl_imp.lib" "%OUTPUT_DIR%" + +exit /B 0 + +:file_not_found_bin +@echo File not found: "%SOURCE_DIR%\%CURL%" +@goto failed + +:build_failed +@echo Problems during the building phase +@goto failed + +:failed +@exit /B 1 + diff --git a/iis/dependencies/build_libxml2.bat b/iis/dependencies/build_libxml2.bat new file mode 100644 index 00000000..f2581d89 --- /dev/null +++ b/iis/dependencies/build_libxml2.bat @@ -0,0 +1,35 @@ +cd "%WORK_DIR%" + +@if NOT EXIST "%SOURCE_DIR%\%LIBXML2%" goto file_not_found_bin + +@7z.exe x "%SOURCE_DIR%\%LIBXML2%" -so | 7z.exe x -aoa -si -ttar + +set LIBXML2_DIR=%LIBXML2:~0,-7% + +move "%LIBXML2_DIR%" "libxml2" + +:: fart.exe -r -i -C "%WORK_DIR%\%LIBXML2_DIR%\win32\*.*" \x2Fopt:nowin98 " " +cd "libxml2\win32" +CSCRIPT configure.js iconv=no vcmanifest=yes zlib=yes +@if NOT (%ERRORLEVEL%) == (0) goto build_failed +NMAKE -f Makefile.msvc +@if NOT (%ERRORLEVEL%) == (0) goto build_failed + +cd "%WORK%" + +copy /y "%WORK_DIR%\libxml2\win32\bin.msvc\libxml2.dll" "%OUTPUT_DIR%" +copy /y "%WORK_DIR%\libxml2\win32\bin.msvc\libxml2.lib" "%OUTPUT_DIR%" + +@exit /B 0 + +:file_not_found_bin +@echo File not found: "%SOURCE_DIR%\%LIBXML2%" +@goto failed + +:build_failed +@echo Problems during the building phase +@goto failed + +:failed +@exit /B 1 + diff --git a/iis/dependencies/build_lua.bat b/iis/dependencies/build_lua.bat new file mode 100644 index 00000000..dda0e4d0 --- /dev/null +++ b/iis/dependencies/build_lua.bat @@ -0,0 +1,39 @@ +cd "%WORK_DIR%" + +@if NOT EXIST "%SOURCE_DIR%\%LUA%" goto file_not_found_bin + +@7z.exe x "%SOURCE_DIR%\%LUA%" -so | 7z.exe x -aoa -si -ttar + +set LUA_DIR=%LUA:~0,-7% + +move "%LUA_DIR%" "lua" + +cd "lua\src" + +CL /Ox /arch:SSE2 /GF /GL /Gy /FD /EHsc /MD /Zi /TC /wd4005 /D "_MBCS" /D "LUA_CORE" /D "LUA_BUILD_AS_DLL" /D "_CRT_SECURE_NO_WARNINGS" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_WIN32" /D "_WINDLL" /c *.c +@if NOT (%ERRORLEVEL%) == (0) goto build_failed +DEL lua.obj luac.obj +LINK /DLL /LTCG /DEBUG /OUT:lua5.1.dll *.obj +@if NOT (%ERRORLEVEL%) == (0) goto build_failed +IF EXIST lua5.1.dll.manifest MT -manifest lua5.1.dll.manifest -outputresource:lua5.1.dll;2 +@if NOT (%ERRORLEVEL%) == (0) goto build_failed + +cd "%WORK_DIR%" + +copy /y "%WORK_DIR%\lua\src\lua5.1.dll" "%OUTPUT_DIR%" +copy /y "%WORK_DIR%\lua\src\lua5.1.pdb" "%OUTPUT_DIR%" +copy /y "%WORK_DIR%\lua\src\lua5.1.lib" "%OUTPUT_DIR%" + +@exit /B 0 + +:file_not_found_bin +@echo File not found: "%SOURCE_DIR%\%LUA%" +@goto failed + +:build_failed +@echo Problems during the building phase +@goto failed + +:failed +@exit /B 1 + diff --git a/iis/dependencies/build_pcre.bat b/iis/dependencies/build_pcre.bat new file mode 100644 index 00000000..9d728a40 --- /dev/null +++ b/iis/dependencies/build_pcre.bat @@ -0,0 +1,32 @@ +cd "%WORK_DIR%" + +@if NOT EXIST "%SOURCE_DIR%\%APACHE_BIN%" goto file_not_found_bin + +7z.exe x "%SOURCE_DIR%\%PCRE%" +set PCRE_DIR=%PCRE:~0,-4% + +move "%PCRE_DIR%" "pcre" + +cd "pcre" +CMAKE -G "NMake Makefiles" -DCMAKE_BUILD_TYPE=RelWithDebInfo -DBUILD_SHARED_LIBS=True +@if NOT (%ERRORLEVEL%) == (0) goto build_failed +NMAKE +@if NOT (%ERRORLEVEL%) == (0) goto build_failed +cd "%WORK%" + +copy /y "%WORK_DIR%\pcre\pcre.dll" "%OUTPUT_DIR%" +copy /y "%WORK_DIR%\pcre\pcre.pdb" "%OUTPUT_DIR%" +copy /y "%WORK_DIR%\pcre\pcre.lib" "%OUTPUT_DIR%" +echo "a" +@exit /B 0 + +:file_not_found_bin +@echo File not found: "%SOURCE_DIR%\%PCRE%" +@goto failed + +:build_failed +@echo Problems during the building phase +@goto failed + +:failed +@exit /B 1 diff --git a/iis/dependencies/build_zlib.bat b/iis/dependencies/build_zlib.bat new file mode 100644 index 00000000..af0281a6 --- /dev/null +++ b/iis/dependencies/build_zlib.bat @@ -0,0 +1,34 @@ +cd "%WORK_DIR%" + +@if NOT EXIST "%SOURCE_DIR%\%ZLIB%" goto file_not_found_bin + + +@7z.exe x "%SOURCE_DIR%\%ZLIB%" -so | 7z.exe x -aoa -si -ttar + +set ZLIB_DIR=%ZLIB:~0,-7% + +move "%ZLIB_DIR%" "zlib" + +cd "zlib" +nmake -f win32\Makefile.msc +@if NOT (%ERRORLEVEL%) == (0) goto build_failed +SET INCLUDE=%INCLUDE%;%WORK_DIR%\zlib +SET LIB=%LIB%;%WORK_DIR%\zlib +cd "%WORK_DIR%" + +copy /y "%WORK_DIR%\zlib\zlib1.dll" "%OUTPUT_DIR%" +copy /y "%WORK_DIR%\zlib\zlib1.pdb" "%OUTPUT_DIR%" +copy /y "%WORK_DIR%\zlib\zdll.lib" "%OUTPUT_DIR%" + +@exit /B 0 + +:file_not_found_bin +@echo File not found: "%SOURCE_DIR%\%ZLIB%" +@goto failed + +:build_failed +@echo Problems during the building phase +@goto failed + +:failed +@exit /B 1 diff --git a/iis/winbuild/howto.txt b/iis/dependencies/howto.txt similarity index 97% rename from iis/winbuild/howto.txt rename to iis/dependencies/howto.txt index e5b034cd..1505a5f9 100644 --- a/iis/winbuild/howto.txt +++ b/iis/dependencies/howto.txt @@ -1,44 +1,44 @@ -WARNING! - -Building ModSecurityIIS on Windows is a relatively complicated process. Understanding it requires advanced knowledge of Windows and Unix environments. -Using the same versions of libraries as listed below is strongly recommended. - --------------------------------------- -Tested on: - -Windows 7 x64 -Vistual Studio 2010 Ultimate SP1 -IIS enabled/installed - -cmake 2.8.7 -curl 7.24.0 -apache 2.2.22 or apache 2.4.3 -libxml2 2.7.7 -lua 5.1.5 -pcre 8.30 -zlib 1.2.7 -7-Zip --------------------------------------- - -1. Create working directory c:\work and drop directory c:\drop -2. Sync SVN ModSecurity branch to c:\work\mod_security -3. Copy files from c:\work\mod_security\iis\winbuild to c:\work -4. Download and install cmake (unpack to c:\work\cmake-2.8.7-win32-x86) -5. Download and install 7-Zip -6. Adjust paths in c:\work\init.bat accordingly if needed -7. Download curl, apache, libxml2, lua, pcre and zlib, place them in zip files in c:\work - -curl-7.24.0.zip -httpd-2.2.22-win32-src.zip or (httpd-2.4.3.zip (source) and httpd-2.4.3-win32.zip + httpd-2.4.3-win64.zip (binaries)) -libxml2-2.7.7.zip -lua-5.1.5.zip -pcre-8.30.zip -zlib-1.2.7.zip - -Modify c:\work\build.bat accordingly (if other versions were used) - -8. Open cmd.exe window, go to c:\work and run buildall.bat -9. When done, the binaries, lib and pdb files should appear under c:\drop\x86 (32-bit) and c:\drop\amd64 (64-bit) -10. Open the VS ModSecurity IIS installer project -11. Copy new binaries to the installer's x86 and amd64 directories -12. Build installer from within VS +WARNING! + +Building ModSecurityIIS on Windows is a relatively complicated process. Understanding it requires advanced knowledge of Windows and Unix environments. +Using the same versions of libraries as listed below is strongly recommended. + +-------------------------------------- +Tested on: + +Windows 7 x64 +Vistual Studio 2010 Ultimate SP1 +IIS enabled/installed + +cmake 2.8.7 +curl 7.24.0 +apache 2.2.22 or apache 2.4.3 +libxml2 2.7.7 +lua 5.1.5 +pcre 8.30 +zlib 1.2.7 +7-Zip +-------------------------------------- + +1. Create working directory c:\work and drop directory c:\drop +2. Sync SVN ModSecurity branch to c:\work\mod_security +3. Copy files from c:\work\mod_security\iis\winbuild to c:\work +4. Download and install cmake (unpack to c:\work\cmake-2.8.7-win32-x86) +5. Download and install 7-Zip +6. Adjust paths in c:\work\init.bat accordingly if needed +7. Download curl, apache, libxml2, lua, pcre and zlib, place them in zip files in c:\work + +curl-7.24.0.zip +httpd-2.2.22-win32-src.zip or (httpd-2.4.3.zip (source) and httpd-2.4.3-win32.zip + httpd-2.4.3-win64.zip (binaries)) +libxml2-2.7.7.zip +lua-5.1.5.zip +pcre-8.30.zip +zlib-1.2.7.zip + +Modify c:\work\build.bat accordingly (if other versions were used) + +8. Open cmd.exe window, go to c:\work and run buildall.bat +9. When done, the binaries, lib and pdb files should appear under c:\drop\x86 (32-bit) and c:\drop\amd64 (64-bit) +10. Open the VS ModSecurity IIS installer project +11. Copy new binaries to the installer's x86 and amd64 directories +12. Build installer from within VS diff --git a/iis/installer.wxs b/iis/installer.wxs new file mode 100644 index 00000000..747f80f0 --- /dev/null +++ b/iis/installer.wxs @@ -0,0 +1,750 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/iis/readme.htm b/iis/readme.htm deleted file mode 100644 index 02cb92f8..00000000 --- a/iis/readme.htm +++ /dev/null @@ -1,320 +0,0 @@ - - - - Creating a Native Module for IIS7 - - -

- Creating a Native Module for IIS7

-

- To extend the server, IIS7 provides a new (C++) native core server API, which replaces - ISAPI filter and extension API from previous IIS releases. The new API features - object-oriented development with an intuitive object model, provides more control - over request processing, and uses simpler design patterns to help you write robust - code. Please visit Developing a Native Module for IIS7 for more information about this sample.
-
- NOTE: The IIS7 native (C++) server API is declared in the Platform - SDK httpserv.h header file.  You must obtain this SDK - and register it with Visual Studio in order to compile this module.

-

- A native module is a Windows DLL that contains an the following:

-
    -
  1. RegisterModule exported function.  This function is responsible - for creating a module factory, and registering the module for one or more server - events.
    -
    - - This function is implemented in main.cpp.
    -     -
    2. -
  2. Implementation of the module class inheriting from the CHttpModule - base class.  This class is provides the main functionality of your module. -
    -
    - - This class is declared in mymodule.h, with method implementations - in mymodule.cpp.
    -     -
    3. -
  3. Implementation of the module factory class implementing the IHttpModuleFactory - interface.  The class is responsible for creating instances of your module.
    -
    - - This class is declared and implemented in mymodulefactory.h.
-

- 0. Prerequisites

-

- In order to compile - the module, you will need to install the Windows Platform SDK that contains the - required IIS header files.  -
-
- After installing the SDK, you will need to register - the SDK with Visual Studio 2005.  You - can do this via Start > Programs > Microsoft - Windows SDK > Visual Studio Registration > Register Windows SDK Directories - with Visual Studio.

-

- 1. Implement RegisterModule entrypoint

-

- A native module must export the RegisterModule function.  This function will - be invoked by the server when the module DLL is loaded, so that your DLL can register - for the required server events, and provide a mechanism for the server to create - instances of your module class.
-
- __stdcall -
- HRESULT RegisterModule( DWORD dwServerVersion, IHttpModuleRegistrationInfo - * pModuleInfo, IHttpServer * pHttpServer );
- -
- This function is implemented for you in the main.cpp source file.  - -
-
- It does the following:

-
    -
  1. Create module factory.  This is an instance - of your CMyModuleFactory class that implements - the IHttpModuleFactory inteface:
    -
    - - // step 2: create module factory
    - pFactory = new CMyHttpModuleFactory();
    -
    2. -
  2. Register module factory for desired server events.  This registers - the module factory for one or more server events that occur during request processing.  - The server will use the factory to create an instance of your module class for each - request, and call the appropriate event handler method on your module instance for - each of the requested events:
    -
    - - - // step 3: register for server events -
    - // TODO: register for more server events here -
    -     hr = pModuleInfo->SetRequestNotifications( pFactory,     - /* module factory */ -
    -                           -                      RQ_ACQUIRE_REQUEST_STATE, - /* server event mask */
    -                         -                    0 - /* server post event mask */ );
    -
    - - The server event mask is a bit mask of one or more request processing event names - declared in -     - httpserv.h:
    -
    -     // -
    - // Request deterministic notifications -
    - // -
    -
    - // request is beginning     -
    - #define RQ_BEGIN_REQUEST 0x00000001 -
    - // request is being authenticated -
    -     #define RQ_AUTHENTICATE_REQUEST 0x00000002 -
    - // request is being authorized -
    - #define RQ_AUTHORIZE_REQUEST 0x00000004 -
    - // satisfy request from cache -
    - #define RQ_RESOLVE_REQUEST_CACHE 0x00000008 -
    - // map handler for request -
    - #define RQ_MAP_REQUEST_HANDLER 0x00000010 -
    - // acquire request state -
    - #define RQ_ACQUIRE_REQUEST_STATE 0x00000020 -
    - // pre-execute handler -
    - #define RQ_PRE_EXECUTE_REQUEST_HANDLER 0x00000040 -
    - // execute handler -
    - #define RQ_EXECUTE_REQUEST_HANDLER 0x00000080 -
    - // release request state -
    - #define RQ_RELEASE_REQUEST_STATE 0x00000100 -
    - // update cache -
    - #define RQ_UPDATE_REQUEST_CACHE 0x00000200 -
    - // log request -
    - #define RQ_LOG_REQUEST 0x00000400 -
    - // end request -
    - #define RQ_END_REQUEST 0x00000800 -
    -
    - // -
    - // Request non-deterministic notifications -
    - //     -
    -
    - // custom notification -
    - #define RQ_CUSTOM_NOTIFICATION 0x10000000 -
    - // send response -
    - #define RQ_SEND_RESPONSE 0x20000000 -
    - // read entity -
    - #define RQ_READ_ENTITY 0x40000000 -
    - // map a url to a physical path -
    - #define RQ_MAP_PATH 0x80000000
    -
    - - The post event mask is a bit mask of the same events, allowing to subscribe - to the post events for each of the specified events.
    -     -     -
    3. -
-

-

-

- 2. Implement module factory class

-

- The server requires a module factory class in order to obtain instances of your - module.  The factory class must implement the IHttpModuleFactory interface - declared in the httpserv.h Windows SDK header file.
-
- This factory is implemented for you in the mymodulefactory.h header - file.
-
- The GetHttpModule method of the factory class is called at the beginning of - each request in order to obtain an instance of your module.  The typical implementation - simply returns a new instance of your module class:
-
- class CMyHttpModuleFactory : public IHttpModuleFactory -
- { -
- public: -
-     virtual HRESULT GetHttpModule( OUT CHttpModule **ppModule, IN IModuleAllocator - * ) -
-     { 
-         ...
-         pModule = new CMyHttpModule(); 
-         ...
-         *ppModule = pModule; 
-         ...
-     } 
-
-     virtual void Terminate() { }
- }

-

- The Terminate method of the factory class is called during the - shutdown of the worker process, before your module DLL is unloaded.  It typically - releases any resources you may have initialized inside the RegisterModule - function.

-

- 3. Implement module class

-

- The module class inherits from the CHttpModule base class, which - defines an event handler method for each of the server events discussed earlier.  - When the server executes each event during the processing of a request, it will - invoke the associated event handler method on each of the module instances that - have registered for that event. 
-
- This class is declared in the mymodule.h header file, and its event - handler methods are implemented in the mymodule.cpp source file.
-
- In order to provide processing for each server event, the module class MUST override - the corresponding method.  The signature of each event handler method is the - following:
-
- REQUEST_NOTIFICATION_STATUS - On<EVENT NAME>( - IN IHttpContext * pHttpContext, - IN OUT IHttpEventProvider * pProvider - ); -
- -
- - Where <EVENT NAME> is one of the server events we listed earlier.  For - example, the module in this project initially overrides only the OnAcquireRequestState method since we register only for the RQ_ACQUIRE_REQUEST_STATE event:
-
- class CMyHttpModule : public - CHttpModule -
- { -
- public: -
-
-     // Implementation of the AcquireRequestState - event handler method. -
-     REQUEST_NOTIFICATION_STATUS OnAcquireRequestState( IN IHttpContext - * pHttpContext, IN OUT IHttpEventProvider * pProvider ); -
-
-     // TODO: override additional event handler - methods below. -
- };
-
- The implementation of this method provides the module functionality desired for - processing the request in the appropriate pipeline stage.  This project provides - a dummy implementation in the mymodule.cpp source file.

-

- 4. Deploy the module to the server

-

- After you have compiled your module, you need to deploy it on the server.  - You can do that by compiling the module, and then copying IIS7NativeModule.dll - (and the IIS7NativeModule.pdb debugging symbols file if desired) - to any location on the machine running IIS7.
-
- You can install your module on the server by running the following command from an Elevated command line prompt:
-
- %systemroot%\system32\inetsrv\APPCMD.EXE install module /name:MyModule /image:<FULL - PATH TO DLL>
-
- Where <FULL_PATH_TO_DLL> is the full path to the module DLL - file.
-
- You can also install your module using the IIS7 Administration Tool. After installation, - your module will be loaded and enabled in all application pools on the server.  - To learn ore about installing modules, and selecting modules to execute on your - server and for specific applications, please visit www.iis.net.

-

- Congratulations!

-

- You have succesfully built and deployed your own IIS7 module.  To learn more - about building IIS7 modules, and to download sample modules, be sure to visit www.iis.net.

- - \ No newline at end of file diff --git a/iis/winbuild/CMakeLists.txt b/iis/winbuild/CMakeLists.txt deleted file mode 100644 index bfb037f5..00000000 --- a/iis/winbuild/CMakeLists.txt +++ /dev/null @@ -1,863 +0,0 @@ -# cURL/libcurl CMake script -# by Tetetest and Sukender (Benoit Neil) - -# TODO: -# The output .so file lacks the soname number which we currently have within the lib/Makefile.am file -# Add full (4 or 5 libs) SSL support -# Add INSTALL target (EXTRA_DIST variables in Makefile.am may be moved to Makefile.inc so that CMake/CPack is aware of what's to include). -# Add CTests(?) -# Check on all possible platforms -# Test with as many configurations possible (With or without any option) -# Create scripts that help keeping the CMake build system up to date (to reduce maintenance). According to Tetetest: -# - lists of headers that 'configure' checks for; -# - curl-specific tests (the ones that are in m4/curl-*.m4 files); -# - (most obvious thing:) curl version numbers. -# Add documentation subproject -# -# To check: -# (From Daniel Stenberg) The cmake build selected to run gcc with -fPIC on my box while the plain configure script did not. -# (From Daniel Stenberg) The gcc command line use neither -g nor any -O options. As a developer, I also treasure our configure scripts's --enable-debug option that sets a long range of "picky" compiler options. -cmake_minimum_required(VERSION 2.6.2 FATAL_ERROR) -set(CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/CMake;${CMAKE_MODULE_PATH}") -include(Utilities) - -project( CURL C ) - -file (READ ${CURL_SOURCE_DIR}/include/curl/curlver.h CURL_VERSION_H_CONTENTS) -string (REGEX MATCH "LIBCURL_VERSION_MAJOR[ \t]+([0-9]+)" - LIBCURL_VERSION_MJ ${CURL_VERSION_H_CONTENTS}) -string (REGEX MATCH "([0-9]+)" - LIBCURL_VERSION_MJ ${LIBCURL_VERSION_MJ}) -string (REGEX MATCH - "LIBCURL_VERSION_MINOR[ \t]+([0-9]+)" - LIBCURL_VERSION_MI ${CURL_VERSION_H_CONTENTS}) -string (REGEX MATCH "([0-9]+)" LIBCURL_VERSION_MI ${LIBCURL_VERSION_MI}) -string (REGEX MATCH - "LIBCURL_VERSION_PATCH[ \t]+([0-9]+)" - LIBCURL_VERSION_PT ${CURL_VERSION_H_CONTENTS}) -string (REGEX MATCH "([0-9]+)" LIBCURL_VERSION_PT ${LIBCURL_VERSION_PT}) -set (CURL_MAJOR_VERSION ${LIBCURL_VERSION_MJ}) -set (CURL_MINOR_VERSION ${LIBCURL_VERSION_MI}) -set (CURL_PATCH_VERSION ${LIBCURL_VERSION_PT}) - -include_regular_expression("^.*$") # Sukender: Is it necessary? - -# Setup package meta-data -# SET(PACKAGE "curl") -set(CURL_VERSION ${CURL_MAJOR_VERSION}.${CURL_MINOR_VERSION}.${CURL_PATCH_VERSION}) -message(STATUS "curl version=[${CURL_VERSION}]") -# SET(PACKAGE_TARNAME "curl") -# SET(PACKAGE_NAME "curl") -# SET(PACKAGE_VERSION "-") -# SET(PACKAGE_STRING "curl-") -# SET(PACKAGE_BUGREPORT "a suitable curl mailing list => http://curl.haxx.se/mail/") -set(OPERATING_SYSTEM "${CMAKE_SYSTEM_NAME}") -set(OS "\"${CMAKE_SYSTEM_NAME}\"") - -include_directories(${PROJECT_BINARY_DIR}/include/curl) -include_directories( ${CURL_SOURCE_DIR}/include ) - -if(WIN32) - set(NATIVE_WINDOWS ON) -endif() - -option(BUILD_CURL_EXE "Set to ON to build cURL executable." ON) -option(BUILD_CURL_TESTS "Set to ON to build cURL tests." ON) -option(CURL_STATICLIB "Set to ON to build libcurl with static linking." OFF) -option(CURL_USE_ARES "Set to ON to enable c-ares support" OFF) -# initialize CURL_LIBS -set(CURL_LIBS "") - -if(CURL_USE_ARES) - set(USE_ARES ${CURL_USE_ARES}) - find_package(CARES REQUIRED) - list(APPEND CURL_LIBS ${CARES_LIBRARY} ) - set(CURL_LIBS ${CURL_LIBS} ${CARES_LIBRARY}) -endif() - -option(BUILD_DASHBOARD_REPORTS "Set to ON to activate reporting of cURL builds here http://www.cdash.org/CDashPublic/index.php?project=CURL" OFF) -if(BUILD_DASHBOARD_REPORTS) - #INCLUDE(Dart) - include(CTest) -endif(BUILD_DASHBOARD_REPORTS) - -if(MSVC) - option(BUILD_RELEASE_DEBUG_DIRS "Set OFF to build each configuration to a separate directory" OFF) - mark_as_advanced(BUILD_RELEASE_DEBUG_DIRS) -endif() - -option(CURL_HIDDEN_SYMBOLS "Set to ON to hide libcurl internal symbols (=hide all symbols that aren't officially external)." ON) -mark_as_advanced(CURL_HIDDEN_SYMBOLS) - -# IF(WIN32) -# OPTION(CURL_WINDOWS_SSPI "Use windows libraries to allow NTLM authentication without openssl" ON) -# MARK_AS_ADVANCED(CURL_WINDOWS_SSPI) -# ENDIF() - -option(HTTP_ONLY "disables all protocols except HTTP (This overrides all CURL_DISABLE_* options)" OFF) -mark_as_advanced(HTTP_ONLY) -option(CURL_DISABLE_FTP "disables FTP" OFF) -mark_as_advanced(CURL_DISABLE_FTP) -option(CURL_DISABLE_LDAP "disables LDAP" OFF) -mark_as_advanced(CURL_DISABLE_LDAP) -option(CURL_DISABLE_TELNET "disables Telnet" OFF) -mark_as_advanced(CURL_DISABLE_TELNET) -option(CURL_DISABLE_DICT "disables DICT" OFF) -mark_as_advanced(CURL_DISABLE_DICT) -option(CURL_DISABLE_FILE "disables FILE" OFF) -mark_as_advanced(CURL_DISABLE_FILE) -option(CURL_DISABLE_TFTP "disables TFTP" OFF) -mark_as_advanced(CURL_DISABLE_TFTP) -option(CURL_DISABLE_HTTP "disables HTTP" OFF) -mark_as_advanced(CURL_DISABLE_HTTP) - -option(CURL_DISABLE_LDAPS "to disable LDAPS" OFF) -mark_as_advanced(CURL_DISABLE_LDAPS) -if(WIN32) - set(CURL_DEFAULT_DISABLE_LDAP OFF) - # some windows compilers do not have wldap32 - if( NOT HAVE_WLDAP32) - set(CURL_DISABLE_LDAP ON CACHE BOOL "" FORCE) - message(STATUS "wldap32 not found CURL_DISABLE_LDAP set ON") - option(CURL_LDAP_WIN "Use Windows LDAP implementation" OFF) - else() - option(CURL_LDAP_WIN "Use Windows LDAP implementation" ON) - endif() - mark_as_advanced(CURL_LDAP_WIN) -endif() - -if(HTTP_ONLY) - set(CURL_DISABLE_FTP ON) - set(CURL_DISABLE_LDAP ON) - set(CURL_DISABLE_TELNET ON) - set(CURL_DISABLE_DICT ON) - set(CURL_DISABLE_FILE ON) - set(CURL_DISABLE_TFTP ON) -endif() - -option(CURL_DISABLE_COOKIES "to disable cookies support" OFF) -mark_as_advanced(CURL_DISABLE_COOKIES) - -option(CURL_DISABLE_CRYPTO_AUTH "to disable cryptographic authentication" OFF) -mark_as_advanced(CURL_DISABLE_CRYPTO_AUTH) -option(CURL_DISABLE_VERBOSE_STRINGS "to disable verbose strings" OFF) -mark_as_advanced(CURL_DISABLE_VERBOSE_STRINGS) -option(DISABLED_THREADSAFE "Set to explicitly specify we don't want to use thread-safe functions" OFF) -mark_as_advanced(DISABLED_THREADSAFE) -option(ENABLE_IPV6 "Define if you want to enable IPv6 support" OFF) -mark_as_advanced(ENABLE_IPV6) - -if(WIN32) - list_spaces_append_once(CMAKE_C_STANDARD_LIBRARIES wsock32.lib ws2_32.lib) # bufferoverflowu.lib - if(CURL_DISABLE_LDAP) - # Remove wldap32.lib from space-separated list - string(REPLACE " " ";" _LIST ${CMAKE_C_STANDARD_LIBRARIES}) - list(REMOVE_ITEM _LIST "wldap32.lib") - to_list_spaces(_LIST CMAKE_C_STANDARD_LIBRARIES) - else() - # Append wldap32.lib - list_spaces_append_once(CMAKE_C_STANDARD_LIBRARIES wldap32.lib) - endif() - set(CMAKE_C_STANDARD_LIBRARIES "${CMAKE_C_STANDARD_LIBRARIES}" CACHE STRING "" FORCE) -endif() - - -# We need ansi c-flags, especially on HP -set(CMAKE_C_FLAGS "${CMAKE_ANSI_CFLAGS} ${CMAKE_C_FLAGS}") -set(CMAKE_REQUIRED_FLAGS ${CMAKE_ANSI_CFLAGS}) - -# Disable warnings on Borland to avoid changing 3rd party code. -if(BORLAND) - set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -w-") -endif(BORLAND) - -# If we are on AIX, do the _ALL_SOURCE magic -if(${CMAKE_SYSTEM_NAME} MATCHES AIX) - set(_ALL_SOURCE 1) -endif(${CMAKE_SYSTEM_NAME} MATCHES AIX) - -# Include all the necessary files for macros -include (CheckFunctionExists) -include (CheckIncludeFile) -include (CheckIncludeFiles) -include (CheckLibraryExists) -include (CheckSymbolExists) -include (CheckTypeSize) - -# On windows preload settings -if(WIN32) - include(${CMAKE_CURRENT_SOURCE_DIR}/CMake/Platforms/WindowsCache.cmake) -endif(WIN32) - -# This macro checks if the symbol exists in the library and if it -# does, it prepends library to the list. -macro(CHECK_LIBRARY_EXISTS_CONCAT LIBRARY SYMBOL VARIABLE) - check_library_exists("${LIBRARY};${CURL_LIBS}" ${SYMBOL} "${CMAKE_LIBRARY_PATH}" - ${VARIABLE}) - if(${VARIABLE}) - set(CURL_LIBS ${LIBRARY} ${CURL_LIBS}) - endif(${VARIABLE}) -endmacro(CHECK_LIBRARY_EXISTS_CONCAT) - -# Check for all needed libraries -check_library_exists_concat("dl" dlopen HAVE_LIBDL) -check_library_exists_concat("socket" connect HAVE_LIBSOCKET) -check_library_exists("c" gethostbyname "" NOT_NEED_LIBNSL) - -# Yellowtab Zeta needs different libraries than BeOS 5. -if(BEOS) - set(NOT_NEED_LIBNSL 1) - check_library_exists_concat("bind" gethostbyname HAVE_LIBBIND) - check_library_exists_concat("bnetapi" closesocket HAVE_LIBBNETAPI) -endif(BEOS) - -if(NOT NOT_NEED_LIBNSL) - check_library_exists_concat("nsl" gethostbyname HAVE_LIBNSL) -endif(NOT NOT_NEED_LIBNSL) - -check_library_exists_concat("ws2_32" getch HAVE_LIBWS2_32) -check_library_exists_concat("winmm" getch HAVE_LIBWINMM) -check_library_exists("wldap32" cldap_open "" HAVE_WLDAP32) - -# IF(NOT CURL_SPECIAL_LIBZ) -# CHECK_LIBRARY_EXISTS_CONCAT("z" inflateEnd HAVE_LIBZ) -# ENDIF(NOT CURL_SPECIAL_LIBZ) - -# Check for idn -check_library_exists_concat("idn" idna_to_ascii_lz HAVE_LIBIDN) - -# Check for LDAP -check_library_exists_concat("ldap" ldap_init HAVE_LIBLDAP) -# if(NOT HAVE_LIBLDAP) -# SET(CURL_DISABLE_LDAP ON) -# endif(NOT HAVE_LIBLDAP) - -# Check for symbol dlopen (same as HAVE_LIBDL) -check_library_exists("${CURL_LIBS}" dlopen "" HAVE_DLOPEN) - -# For other tests to use the same libraries -set(CMAKE_REQUIRED_LIBRARIES ${CURL_LIBS}) - -option(CURL_ZLIB "Set to ON to enable building cURL with zlib support." ON) -set(HAVE_LIBZ OFF) -set(HAVE_ZLIB_H OFF) -set(HAVE_ZLIB OFF) -if(CURL_ZLIB) # AND CURL_CONFIG_HAS_BEEN_RUN_BEFORE - find_package(ZLIB QUIET) - if(ZLIB_FOUND) - set(HAVE_ZLIB_H ON) - set(HAVE_ZLIB ON) - set(HAVE_LIBZ ON) - endif() -endif() - -option(CMAKE_USE_OPENSSL "Use OpenSSL code. Experimental" ON) -mark_as_advanced(CMAKE_USE_OPENSSL) -if(CMAKE_USE_OPENSSL) - if(WIN32) - find_package(OpenSSL) - if(OPENSSL_FOUND) - set(USE_SSLEAY TRUE) - set(USE_OPENSSL TRUE) - list(APPEND CURL_LIBS ${OPENSSL_LIBRARIES} ) - else() - set(CMAKE_USE_OPENSSL FALSE) - message(STATUS "OpenSSL NOT Found, disabling CMAKE_USE_OPENSSL") - endif() - else(WIN32) - check_library_exists_concat("crypto" CRYPTO_lock HAVE_LIBCRYPTO) - check_library_exists_concat("ssl" SSL_connect HAVE_LIBSSL) - endif(WIN32) -endif(CMAKE_USE_OPENSSL) - -# If we have features.h, then do the _BSD_SOURCE magic -check_include_file("features.h" HAVE_FEATURES_H) - -# Check if header file exists and add it to the list. -macro(CHECK_INCLUDE_FILE_CONCAT FILE VARIABLE) - check_include_files("${CURL_INCLUDES};${FILE}" ${VARIABLE}) - if(${VARIABLE}) - set(CURL_INCLUDES ${CURL_INCLUDES} ${FILE}) - set(CURL_TEST_DEFINES "${CURL_TEST_DEFINES} -D${VARIABLE}") - endif(${VARIABLE}) -endmacro(CHECK_INCLUDE_FILE_CONCAT) - - -# Check for header files -if(NOT UNIX) - check_include_file_concat("ws2tcpip.h" HAVE_WS2TCPIP_H) - check_include_file_concat("winsock2.h" HAVE_WINSOCK2_H) -endif(NOT UNIX) -check_include_file_concat("stdio.h" HAVE_STDIO_H) -if(NOT UNIX) - check_include_file_concat("windows.h" HAVE_WINDOWS_H) - check_include_file_concat("winsock.h" HAVE_WINSOCK_H) -endif(NOT UNIX) - -check_include_file_concat("inttypes.h" HAVE_INTTYPES_H) -check_include_file_concat("sys/filio.h" HAVE_SYS_FILIO_H) -check_include_file_concat("sys/ioctl.h" HAVE_SYS_IOCTL_H) -check_include_file_concat("sys/param.h" HAVE_SYS_PARAM_H) -check_include_file_concat("sys/poll.h" HAVE_SYS_POLL_H) -check_include_file_concat("sys/resource.h" HAVE_SYS_RESOURCE_H) -check_include_file_concat("sys/select.h" HAVE_SYS_SELECT_H) -check_include_file_concat("sys/socket.h" HAVE_SYS_SOCKET_H) -check_include_file_concat("sys/sockio.h" HAVE_SYS_SOCKIO_H) -check_include_file_concat("sys/stat.h" HAVE_SYS_STAT_H) -check_include_file_concat("sys/time.h" HAVE_SYS_TIME_H) -check_include_file_concat("sys/types.h" HAVE_SYS_TYPES_H) -check_include_file_concat("sys/uio.h" HAVE_SYS_UIO_H) -check_include_file_concat("sys/un.h" HAVE_SYS_UN_H) -check_include_file_concat("sys/utime.h" HAVE_SYS_UTIME_H) -check_include_file_concat("alloca.h" HAVE_ALLOCA_H) -check_include_file_concat("arpa/inet.h" HAVE_ARPA_INET_H) -check_include_file_concat("arpa/tftp.h" HAVE_ARPA_TFTP_H) -check_include_file_concat("assert.h" HAVE_ASSERT_H) -check_include_file_concat("crypto.h" HAVE_CRYPTO_H) -check_include_file_concat("des.h" HAVE_DES_H) -check_include_file_concat("err.h" HAVE_ERR_H) -check_include_file_concat("errno.h" HAVE_ERRNO_H) -check_include_file_concat("fcntl.h" HAVE_FCNTL_H) -check_include_file_concat("gssapi/gssapi.h" HAVE_GSSAPI_GSSAPI_H) -check_include_file_concat("gssapi/gssapi_generic.h" HAVE_GSSAPI_GSSAPI_GENERIC_H) -check_include_file_concat("gssapi/gssapi_krb5.h" HAVE_GSSAPI_GSSAPI_KRB5_H) -check_include_file_concat("idn-free.h" HAVE_IDN_FREE_H) -check_include_file_concat("ifaddrs.h" HAVE_IFADDRS_H) -check_include_file_concat("io.h" HAVE_IO_H) -check_include_file_concat("krb.h" HAVE_KRB_H) -check_include_file_concat("libgen.h" HAVE_LIBGEN_H) -check_include_file_concat("libssh2.h" HAVE_LIBSSH2_H) -check_include_file_concat("limits.h" HAVE_LIMITS_H) -check_include_file_concat("locale.h" HAVE_LOCALE_H) -check_include_file_concat("net/if.h" HAVE_NET_IF_H) -check_include_file_concat("netdb.h" HAVE_NETDB_H) -check_include_file_concat("netinet/in.h" HAVE_NETINET_IN_H) -check_include_file_concat("netinet/tcp.h" HAVE_NETINET_TCP_H) -check_include_file_concat("openssl/crypto.h" HAVE_OPENSSL_CRYPTO_H) -check_include_file_concat("openssl/engine.h" HAVE_OPENSSL_ENGINE_H) -check_include_file_concat("openssl/err.h" HAVE_OPENSSL_ERR_H) -check_include_file_concat("openssl/pem.h" HAVE_OPENSSL_PEM_H) -check_include_file_concat("openssl/pkcs12.h" HAVE_OPENSSL_PKCS12_H) -check_include_file_concat("openssl/rsa.h" HAVE_OPENSSL_RSA_H) -check_include_file_concat("openssl/ssl.h" HAVE_OPENSSL_SSL_H) -check_include_file_concat("openssl/x509.h" HAVE_OPENSSL_X509_H) -check_include_file_concat("pem.h" HAVE_PEM_H) -check_include_file_concat("poll.h" HAVE_POLL_H) -check_include_file_concat("pwd.h" HAVE_PWD_H) -check_include_file_concat("rsa.h" HAVE_RSA_H) -check_include_file_concat("setjmp.h" HAVE_SETJMP_H) -check_include_file_concat("sgtty.h" HAVE_SGTTY_H) -check_include_file_concat("signal.h" HAVE_SIGNAL_H) -check_include_file_concat("ssl.h" HAVE_SSL_H) -check_include_file_concat("stdbool.h" HAVE_STDBOOL_H) -check_include_file_concat("stdint.h" HAVE_STDINT_H) -check_include_file_concat("stdio.h" HAVE_STDIO_H) -check_include_file_concat("stdlib.h" HAVE_STDLIB_H) -check_include_file_concat("string.h" HAVE_STRING_H) -check_include_file_concat("strings.h" HAVE_STRINGS_H) -check_include_file_concat("stropts.h" HAVE_STROPTS_H) -check_include_file_concat("termio.h" HAVE_TERMIO_H) -check_include_file_concat("termios.h" HAVE_TERMIOS_H) -check_include_file_concat("time.h" HAVE_TIME_H) -check_include_file_concat("tld.h" HAVE_TLD_H) -check_include_file_concat("unistd.h" HAVE_UNISTD_H) -check_include_file_concat("utime.h" HAVE_UTIME_H) -check_include_file_concat("x509.h" HAVE_X509_H) - -check_include_file_concat("process.h" HAVE_PROCESS_H) -check_include_file_concat("stddef.h" HAVE_STDDEF_H) -check_include_file_concat("dlfcn.h" HAVE_DLFCN_H) -check_include_file_concat("malloc.h" HAVE_MALLOC_H) -check_include_file_concat("memory.h" HAVE_MEMORY_H) -check_include_file_concat("ldap.h" HAVE_LDAP_H) -check_include_file_concat("netinet/if_ether.h" HAVE_NETINET_IF_ETHER_H) -check_include_file_concat("stdint.h" HAVE_STDINT_H) -check_include_file_concat("sockio.h" HAVE_SOCKIO_H) -check_include_file_concat("sys/utsname.h" HAVE_SYS_UTSNAME_H) -check_include_file_concat("idna.h" HAVE_IDNA_H) - -if(CMAKE_USE_OPENSSL) - check_include_file_concat("openssl/rand.h" HAVE_OPENSSL_RAND_H) -endif(CMAKE_USE_OPENSSL) - -if(NOT HAVE_LDAP_H) - message(STATUS "LDAP_H not found CURL_DISABLE_LDAP set ON") - set(CURL_DISABLE_LDAP ON CACHE BOOL "" FORCE) -endif() - - -check_type_size(size_t SIZEOF_SIZE_T) -check_type_size(ssize_t SIZEOF_SSIZE_T) -check_type_size("long long" SIZEOF_LONG_LONG) -check_type_size("long" SIZEOF_LONG) -check_type_size("short" SIZEOF_SHORT) -check_type_size("int" SIZEOF_INT) -check_type_size("__int64" SIZEOF___INT64) -check_type_size("long double" SIZEOF_LONG_DOUBLE) -check_type_size("time_t" SIZEOF_TIME_T) -if(NOT HAVE_SIZEOF_SSIZE_T) - if(SIZEOF_LONG EQUAL SIZEOF_SIZE_T) - set(ssize_t long) - endif(SIZEOF_LONG EQUAL SIZEOF_SIZE_T) - if(NOT ssize_t AND SIZEOF___INT64 EQUAL SIZEOF_SIZE_T) - set(ssize_t __int64) - endif(NOT ssize_t AND SIZEOF___INT64 EQUAL SIZEOF_SIZE_T) -endif(NOT HAVE_SIZEOF_SSIZE_T) - -# Different sizeofs, etc. - -# define CURL_SIZEOF_LONG 4 -# define CURL_TYPEOF_CURL_OFF_T long long -# define CURL_FORMAT_CURL_OFF_T "lld" -# define CURL_FORMAT_CURL_OFF_TU "llu" -# define CURL_FORMAT_OFF_T "%lld" -# define CURL_SIZEOF_CURL_OFF_T 8 -# define CURL_SUFFIX_CURL_OFF_T LL -# define CURL_SUFFIX_CURL_OFF_TU ULL - -set(CURL_SIZEOF_LONG ${SIZEOF_LONG}) - -if(SIZEOF_LONG EQUAL 8) - set(CURL_TYPEOF_CURL_OFF_T long) - set(CURL_SIZEOF_CURL_OFF_T 8) - set(CURL_FORMAT_CURL_OFF_T "ld") - set(CURL_FORMAT_CURL_OFF_TU "lu") - set(CURL_FORMAT_OFF_T "%ld") - set(CURL_SUFFIX_CURL_OFF_T L) - set(CURL_SUFFIX_CURL_OFF_TU LU) -endif(SIZEOF_LONG EQUAL 8) - -if(SIZEOF_LONG_LONG EQUAL 8) - set(CURL_TYPEOF_CURL_OFF_T "long long") - set(CURL_SIZEOF_CURL_OFF_T 8) - set(CURL_FORMAT_CURL_OFF_T "lld") - set(CURL_FORMAT_CURL_OFF_TU "llu") - set(CURL_FORMAT_OFF_T "%lld") - set(CURL_SUFFIX_CURL_OFF_T LL) - set(CURL_SUFFIX_CURL_OFF_TU LLU) -endif(SIZEOF_LONG_LONG EQUAL 8) - -if(NOT CURL_TYPEOF_CURL_OFF_T) - set(CURL_TYPEOF_CURL_OFF_T ${ssize_t}) - set(CURL_SIZEOF_CURL_OFF_T ${SIZEOF_SSIZE_T}) - # TODO: need adjustment here. - set(CURL_FORMAT_CURL_OFF_T "ld") - set(CURL_FORMAT_CURL_OFF_TU "lu") - set(CURL_FORMAT_OFF_T "%ld") - set(CURL_SUFFIX_CURL_OFF_T L) - set(CURL_SUFFIX_CURL_OFF_TU LU) -endif(NOT CURL_TYPEOF_CURL_OFF_T) - -if(HAVE_SIZEOF_LONG_LONG) - set(HAVE_LONGLONG 1) - set(HAVE_LL 1) -endif(HAVE_SIZEOF_LONG_LONG) - -find_file(RANDOM_FILE urandom /dev) -mark_as_advanced(RANDOM_FILE) - -# Check for some functions that are used -check_symbol_exists(basename "${CURL_INCLUDES}" HAVE_BASENAME) -check_symbol_exists(socket "${CURL_INCLUDES}" HAVE_SOCKET) -check_symbol_exists(poll "${CURL_INCLUDES}" HAVE_POLL) -check_symbol_exists(select "${CURL_INCLUDES}" HAVE_SELECT) -check_symbol_exists(strdup "${CURL_INCLUDES}" HAVE_STRDUP) -check_symbol_exists(strstr "${CURL_INCLUDES}" HAVE_STRSTR) -check_symbol_exists(strtok_r "${CURL_INCLUDES}" HAVE_STRTOK_R) -check_symbol_exists(strftime "${CURL_INCLUDES}" HAVE_STRFTIME) -check_symbol_exists(uname "${CURL_INCLUDES}" HAVE_UNAME) -check_symbol_exists(strcasecmp "${CURL_INCLUDES}" HAVE_STRCASECMP) -check_symbol_exists(stricmp "${CURL_INCLUDES}" HAVE_STRICMP) -check_symbol_exists(strcmpi "${CURL_INCLUDES}" HAVE_STRCMPI) -check_symbol_exists(strncmpi "${CURL_INCLUDES}" HAVE_STRNCMPI) -check_symbol_exists(alarm "${CURL_INCLUDES}" HAVE_ALARM) -if(NOT HAVE_STRNCMPI) - set(HAVE_STRCMPI) -endif(NOT HAVE_STRNCMPI) -check_symbol_exists(gethostbyaddr "${CURL_INCLUDES}" HAVE_GETHOSTBYADDR) -check_symbol_exists(gethostbyaddr_r "${CURL_INCLUDES}" HAVE_GETHOSTBYADDR_R) -check_symbol_exists(gettimeofday "${CURL_INCLUDES}" HAVE_GETTIMEOFDAY) -check_symbol_exists(inet_addr "${CURL_INCLUDES}" HAVE_INET_ADDR) -check_symbol_exists(inet_ntoa "${CURL_INCLUDES}" HAVE_INET_NTOA) -check_symbol_exists(inet_ntoa_r "${CURL_INCLUDES}" HAVE_INET_NTOA_R) -check_symbol_exists(tcsetattr "${CURL_INCLUDES}" HAVE_TCSETATTR) -check_symbol_exists(tcgetattr "${CURL_INCLUDES}" HAVE_TCGETATTR) -check_symbol_exists(perror "${CURL_INCLUDES}" HAVE_PERROR) -check_symbol_exists(closesocket "${CURL_INCLUDES}" HAVE_CLOSESOCKET) -check_symbol_exists(setvbuf "${CURL_INCLUDES}" HAVE_SETVBUF) -check_symbol_exists(sigsetjmp "${CURL_INCLUDES}" HAVE_SIGSETJMP) -check_symbol_exists(getpass_r "${CURL_INCLUDES}" HAVE_GETPASS_R) -check_symbol_exists(strlcat "${CURL_INCLUDES}" HAVE_STRLCAT) -check_symbol_exists(getpwuid "${CURL_INCLUDES}" HAVE_GETPWUID) -check_symbol_exists(geteuid "${CURL_INCLUDES}" HAVE_GETEUID) -check_symbol_exists(utime "${CURL_INCLUDES}" HAVE_UTIME) -if(CMAKE_USE_OPENSSL) - check_symbol_exists(RAND_status "${CURL_INCLUDES}" HAVE_RAND_STATUS) - check_symbol_exists(RAND_screen "${CURL_INCLUDES}" HAVE_RAND_SCREEN) - check_symbol_exists(RAND_egd "${CURL_INCLUDES}" HAVE_RAND_EGD) - check_symbol_exists(CRYPTO_cleanup_all_ex_data "${CURL_INCLUDES}" - HAVE_CRYPTO_CLEANUP_ALL_EX_DATA) - if(HAVE_LIBCRYPTO AND HAVE_LIBSSL) - set(USE_OPENSSL 1) - set(USE_SSLEAY 1) - endif(HAVE_LIBCRYPTO AND HAVE_LIBSSL) -endif(CMAKE_USE_OPENSSL) -check_symbol_exists(gmtime_r "${CURL_INCLUDES}" HAVE_GMTIME_R) -check_symbol_exists(localtime_r "${CURL_INCLUDES}" HAVE_LOCALTIME_R) - -check_symbol_exists(gethostbyname "${CURL_INCLUDES}" HAVE_GETHOSTBYNAME) -check_symbol_exists(gethostbyname_r "${CURL_INCLUDES}" HAVE_GETHOSTBYNAME_R) - -check_symbol_exists(signal "${CURL_INCLUDES}" HAVE_SIGNAL_FUNC) -check_symbol_exists(SIGALRM "${CURL_INCLUDES}" HAVE_SIGNAL_MACRO) -if(HAVE_SIGNAL_FUNC AND HAVE_SIGNAL_MACRO) - set(HAVE_SIGNAL 1) -endif(HAVE_SIGNAL_FUNC AND HAVE_SIGNAL_MACRO) -check_symbol_exists(uname "${CURL_INCLUDES}" HAVE_UNAME) -check_symbol_exists(strtoll "${CURL_INCLUDES}" HAVE_STRTOLL) -check_symbol_exists(_strtoi64 "${CURL_INCLUDES}" HAVE__STRTOI64) -check_symbol_exists(strerror_r "${CURL_INCLUDES}" HAVE_STRERROR_R) -check_symbol_exists(siginterrupt "${CURL_INCLUDES}" HAVE_SIGINTERRUPT) -check_symbol_exists(perror "${CURL_INCLUDES}" HAVE_PERROR) -check_symbol_exists(fork "${CURL_INCLUDES}" HAVE_FORK) -check_symbol_exists(freeaddrinfo "${CURL_INCLUDES}" HAVE_FREEADDRINFO) -check_symbol_exists(freeifaddrs "${CURL_INCLUDES}" HAVE_FREEIFADDRS) -check_symbol_exists(pipe "${CURL_INCLUDES}" HAVE_PIPE) -check_symbol_exists(ftruncate "${CURL_INCLUDES}" HAVE_FTRUNCATE) -check_symbol_exists(getprotobyname "${CURL_INCLUDES}" HAVE_GETPROTOBYNAME) -check_symbol_exists(getrlimit "${CURL_INCLUDES}" HAVE_GETRLIMIT) -check_symbol_exists(idn_free "${CURL_INCLUDES}" HAVE_IDN_FREE) -check_symbol_exists(idna_strerror "${CURL_INCLUDES}" HAVE_IDNA_STRERROR) -check_symbol_exists(tld_strerror "${CURL_INCLUDES}" HAVE_TLD_STRERROR) -check_symbol_exists(setlocale "${CURL_INCLUDES}" HAVE_SETLOCALE) -check_symbol_exists(setrlimit "${CURL_INCLUDES}" HAVE_SETRLIMIT) -check_symbol_exists(fcntl "${CURL_INCLUDES}" HAVE_FCNTL) -check_symbol_exists(ioctl "${CURL_INCLUDES}" HAVE_IOCTL) -check_symbol_exists(setsockopt "${CURL_INCLUDES}" HAVE_SETSOCKOPT) - -# symbol exists in win32, but function does not. -check_function_exists(inet_pton HAVE_INET_PTON) - -# sigaction and sigsetjmp are special. Use special mechanism for -# detecting those, but only if previous attempt failed. -if(HAVE_SIGNAL_H) - check_symbol_exists(sigaction "signal.h" HAVE_SIGACTION) -endif(HAVE_SIGNAL_H) - -if(NOT HAVE_SIGSETJMP) - if(HAVE_SETJMP_H) - check_symbol_exists(sigsetjmp "setjmp.h" HAVE_MACRO_SIGSETJMP) - if(HAVE_MACRO_SIGSETJMP) - set(HAVE_SIGSETJMP 1) - endif(HAVE_MACRO_SIGSETJMP) - endif(HAVE_SETJMP_H) -endif(NOT HAVE_SIGSETJMP) - -# If there is no stricmp(), do not allow LDAP to parse URLs -if(NOT HAVE_STRICMP) - set(HAVE_LDAP_URL_PARSE 1) -endif(NOT HAVE_STRICMP) - -# For other curl specific tests, use this macro. -macro(CURL_INTERNAL_TEST CURL_TEST) - if("${CURL_TEST}" MATCHES "^${CURL_TEST}$") - set(MACRO_CHECK_FUNCTION_DEFINITIONS - "-D${CURL_TEST} ${CURL_TEST_DEFINES} ${CMAKE_REQUIRED_FLAGS}") - if(CMAKE_REQUIRED_LIBRARIES) - set(CURL_TEST_ADD_LIBRARIES - "-DLINK_LIBRARIES:STRING=${CMAKE_REQUIRED_LIBRARIES}") - endif(CMAKE_REQUIRED_LIBRARIES) - - message(STATUS "Performing Curl Test ${CURL_TEST}") - try_compile(${CURL_TEST} - ${CMAKE_BINARY_DIR} - ${CMAKE_CURRENT_SOURCE_DIR}/CMake/CurlTests.c - CMAKE_FLAGS -DCOMPILE_DEFINITIONS:STRING=${MACRO_CHECK_FUNCTION_DEFINITIONS} - "${CURL_TEST_ADD_LIBRARIES}" - OUTPUT_VARIABLE OUTPUT) - if(${CURL_TEST}) - set(${CURL_TEST} 1 CACHE INTERNAL "Curl test ${FUNCTION}") - message(STATUS "Performing Curl Test ${CURL_TEST} - Success") - file(APPEND ${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeOutput.log - "Performing Curl Test ${CURL_TEST} passed with the following output:\n" - "${OUTPUT}\n") - else(${CURL_TEST}) - message(STATUS "Performing Curl Test ${CURL_TEST} - Failed") - set(${CURL_TEST} "" CACHE INTERNAL "Curl test ${FUNCTION}") - file(APPEND ${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeError.log - "Performing Curl Test ${CURL_TEST} failed with the following output:\n" - "${OUTPUT}\n") - endif(${CURL_TEST}) - endif("${CURL_TEST}" MATCHES "^${CURL_TEST}$") -endmacro(CURL_INTERNAL_TEST) - -macro(CURL_INTERNAL_TEST_RUN CURL_TEST) - if("${CURL_TEST}_COMPILE" MATCHES "^${CURL_TEST}_COMPILE$") - set(MACRO_CHECK_FUNCTION_DEFINITIONS - "-D${CURL_TEST} ${CMAKE_REQUIRED_FLAGS}") - if(CMAKE_REQUIRED_LIBRARIES) - set(CURL_TEST_ADD_LIBRARIES - "-DLINK_LIBRARIES:STRING=${CMAKE_REQUIRED_LIBRARIES}") - endif(CMAKE_REQUIRED_LIBRARIES) - - message(STATUS "Performing Curl Test ${CURL_TEST}") - try_run(${CURL_TEST} ${CURL_TEST}_COMPILE - ${CMAKE_BINARY_DIR} - ${CMAKE_CURRENT_SOURCE_DIR}/CMake/CurlTests.c - CMAKE_FLAGS -DCOMPILE_DEFINITIONS:STRING=${MACRO_CHECK_FUNCTION_DEFINITIONS} - "${CURL_TEST_ADD_LIBRARIES}" - OUTPUT_VARIABLE OUTPUT) - if(${CURL_TEST}_COMPILE AND NOT ${CURL_TEST}) - set(${CURL_TEST} 1 CACHE INTERNAL "Curl test ${FUNCTION}") - message(STATUS "Performing Curl Test ${CURL_TEST} - Success") - else(${CURL_TEST}_COMPILE AND NOT ${CURL_TEST}) - message(STATUS "Performing Curl Test ${CURL_TEST} - Failed") - set(${CURL_TEST} "" CACHE INTERNAL "Curl test ${FUNCTION}") - file(APPEND "${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeError.log" - "Performing Curl Test ${CURL_TEST} failed with the following output:\n" - "${OUTPUT}") - if(${CURL_TEST}_COMPILE) - file(APPEND - "${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeError.log" - "There was a problem running this test\n") - endif(${CURL_TEST}_COMPILE) - file(APPEND "${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeError.log" - "\n\n") - endif(${CURL_TEST}_COMPILE AND NOT ${CURL_TEST}) - endif("${CURL_TEST}_COMPILE" MATCHES "^${CURL_TEST}_COMPILE$") -endmacro(CURL_INTERNAL_TEST_RUN) - -# Do curl specific tests -foreach(CURL_TEST - HAVE_FCNTL_O_NONBLOCK - HAVE_IOCTLSOCKET - HAVE_IOCTLSOCKET_CAMEL - HAVE_IOCTLSOCKET_CAMEL_FIONBIO - HAVE_IOCTLSOCKET_FIONBIO - HAVE_IOCTL_FIONBIO - HAVE_IOCTL_SIOCGIFADDR - HAVE_SETSOCKOPT_SO_NONBLOCK - HAVE_SOCKADDR_IN6_SIN6_SCOPE_ID - TIME_WITH_SYS_TIME - HAVE_O_NONBLOCK - HAVE_GETHOSTBYADDR_R_5 - HAVE_GETHOSTBYADDR_R_7 - HAVE_GETHOSTBYADDR_R_8 - HAVE_GETHOSTBYADDR_R_5_REENTRANT - HAVE_GETHOSTBYADDR_R_7_REENTRANT - HAVE_GETHOSTBYADDR_R_8_REENTRANT - HAVE_GETHOSTBYNAME_R_3 - HAVE_GETHOSTBYNAME_R_5 - HAVE_GETHOSTBYNAME_R_6 - HAVE_GETHOSTBYNAME_R_3_REENTRANT - HAVE_GETHOSTBYNAME_R_5_REENTRANT - HAVE_GETHOSTBYNAME_R_6_REENTRANT - HAVE_SOCKLEN_T - HAVE_IN_ADDR_T - HAVE_BOOL_T - STDC_HEADERS - RETSIGTYPE_TEST - HAVE_INET_NTOA_R_DECL - HAVE_INET_NTOA_R_DECL_REENTRANT - HAVE_GETADDRINFO - HAVE_FILE_OFFSET_BITS - ) - curl_internal_test(${CURL_TEST}) -endforeach(CURL_TEST) -if(HAVE_FILE_OFFSET_BITS) - set(_FILE_OFFSET_BITS 64) -endif(HAVE_FILE_OFFSET_BITS) -foreach(CURL_TEST - HAVE_GLIBC_STRERROR_R - HAVE_POSIX_STRERROR_R - ) - curl_internal_test_run(${CURL_TEST}) -endforeach(CURL_TEST) - -# Check for reentrant -foreach(CURL_TEST - HAVE_GETHOSTBYADDR_R_5 - HAVE_GETHOSTBYADDR_R_7 - HAVE_GETHOSTBYADDR_R_8 - HAVE_GETHOSTBYNAME_R_3 - HAVE_GETHOSTBYNAME_R_5 - HAVE_GETHOSTBYNAME_R_6 - HAVE_INET_NTOA_R_DECL_REENTRANT) - if(NOT ${CURL_TEST}) - if(${CURL_TEST}_REENTRANT) - set(NEED_REENTRANT 1) - endif(${CURL_TEST}_REENTRANT) - endif(NOT ${CURL_TEST}) -endforeach(CURL_TEST) - -if(NEED_REENTRANT) - foreach(CURL_TEST - HAVE_GETHOSTBYADDR_R_5 - HAVE_GETHOSTBYADDR_R_7 - HAVE_GETHOSTBYADDR_R_8 - HAVE_GETHOSTBYNAME_R_3 - HAVE_GETHOSTBYNAME_R_5 - HAVE_GETHOSTBYNAME_R_6) - set(${CURL_TEST} 0) - if(${CURL_TEST}_REENTRANT) - set(${CURL_TEST} 1) - endif(${CURL_TEST}_REENTRANT) - endforeach(CURL_TEST) -endif(NEED_REENTRANT) - -if(HAVE_INET_NTOA_R_DECL_REENTRANT) - set(HAVE_INET_NTOA_R_DECL 1) - set(NEED_REENTRANT 1) -endif(HAVE_INET_NTOA_R_DECL_REENTRANT) - -# Some other minor tests - -if(NOT HAVE_IN_ADDR_T) - set(in_addr_t "unsigned long") -endif(NOT HAVE_IN_ADDR_T) - -# Fix libz / zlib.h - -if(NOT CURL_SPECIAL_LIBZ) - if(NOT HAVE_LIBZ) - set(HAVE_ZLIB_H 0) - endif(NOT HAVE_LIBZ) - - if(NOT HAVE_ZLIB_H) - set(HAVE_LIBZ 0) - endif(NOT HAVE_ZLIB_H) -endif(NOT CURL_SPECIAL_LIBZ) - -if(_FILE_OFFSET_BITS) - set(_FILE_OFFSET_BITS 64) -endif(_FILE_OFFSET_BITS) -set(CMAKE_REQUIRED_FLAGS "-D_FILE_OFFSET_BITS=64") -set(CMAKE_EXTRA_INCLUDE_FILES "${CMAKE_CURRENT_SOURCE_DIR}/curl/curl.h") -check_type_size("curl_off_t" SIZEOF_CURL_OFF_T) -set(CMAKE_EXTRA_INCLUDE_FILES) -set(CMAKE_REQUIRED_FLAGS) - - -# Check for nonblocking -set(HAVE_DISABLED_NONBLOCKING 1) -if(HAVE_FIONBIO OR - HAVE_IOCTLSOCKET OR - HAVE_IOCTLSOCKET_CASE OR - HAVE_O_NONBLOCK) - set(HAVE_DISABLED_NONBLOCKING) -endif(HAVE_FIONBIO OR - HAVE_IOCTLSOCKET OR - HAVE_IOCTLSOCKET_CASE OR - HAVE_O_NONBLOCK) - -if(RETSIGTYPE_TEST) - set(RETSIGTYPE void) -else(RETSIGTYPE_TEST) - set(RETSIGTYPE int) -endif(RETSIGTYPE_TEST) - -if(CMAKE_COMPILER_IS_GNUCC AND APPLE) - include(CheckCCompilerFlag) - check_c_compiler_flag(-Wno-long-double HAVE_C_FLAG_Wno_long_double) - if(HAVE_C_FLAG_Wno_long_double) - # The Mac version of GCC warns about use of long double. Disable it. - get_source_file_property(MPRINTF_COMPILE_FLAGS mprintf.c COMPILE_FLAGS) - if(MPRINTF_COMPILE_FLAGS) - set(MPRINTF_COMPILE_FLAGS "${MPRINTF_COMPILE_FLAGS} -Wno-long-double") - else(MPRINTF_COMPILE_FLAGS) - set(MPRINTF_COMPILE_FLAGS "-Wno-long-double") - endif(MPRINTF_COMPILE_FLAGS) - set_source_files_properties(mprintf.c PROPERTIES - COMPILE_FLAGS ${MPRINTF_COMPILE_FLAGS}) - endif(HAVE_C_FLAG_Wno_long_double) -endif(CMAKE_COMPILER_IS_GNUCC AND APPLE) - -if(HAVE_SOCKLEN_T) - set(CURL_TYPEOF_CURL_SOCKLEN_T "socklen_t") - if(WIN32) - set(CMAKE_EXTRA_INCLUDE_FILES "winsock2.h;ws2tcpip.h") - elseif(HAVE_SYS_SOCKET_H) - set(CMAKE_EXTRA_INCLUDE_FILES "sys/socket.h") - endif() - check_type_size("socklen_t" CURL_SIZEOF_CURL_SOCKLEN_T) - set(CMAKE_EXTRA_INCLUDE_FILES) - if(NOT HAVE_CURL_SIZEOF_CURL_SOCKLEN_T) - message(FATAL_ERROR - "Check for sizeof socklen_t failed, see CMakeFiles/CMakerror.log") - endif() -else() - set(CURL_TYPEOF_CURL_SOCKLEN_T int) - set(CURL_SIZEOF_CURL_SOCKLEN_T ${SIZEOF_INT}) -endif() - -include(CMake/OtherTests.cmake) - -add_definitions(-DHAVE_CONFIG_H) - -# For windows, do not allow the compiler to use default target (Vista). -if(WIN32) - add_definitions(-D_WIN32_WINNT=0x0501) -endif(WIN32) - -if(MSVC) - add_definitions(-D_CRT_SECURE_NO_DEPRECATE -D_CRT_NONSTDC_NO_DEPRECATE) -endif(MSVC) - -# Sets up the dependencies (zlib, OpenSSL, etc.) of a cURL subproject according to options. -# TODO This is far to be complete! -function(SETUP_CURL_DEPENDENCIES TARGET_NAME) - if(CURL_ZLIB AND ZLIB_FOUND) - include_directories(${ZLIB_INCLUDE_DIR}) - endif() - if(CURL_ZLIB AND ZLIB_FOUND) - target_link_libraries(${TARGET_NAME} ${ZLIB_LIBRARIES}) - #ADD_DEFINITIONS( -DHAVE_ZLIB_H -DHAVE_ZLIB -DHAVE_LIBZ ) - endif() - - if(CMAKE_USE_OPENSSL AND OPENSSL_FOUND) - include_directories(${OPENSSL_INCLUDE_DIR}) - endif() - if(CMAKE_USE_OPENSSL AND CURL_CONFIG_HAS_BEEN_RUN_BEFORE) - target_link_libraries(${TARGET_NAME} ${OPENSSL_LIBRARIES}) - #ADD_DEFINITIONS( -DUSE_SSLEAY ) - endif() -endfunction() - -# Ugly (but functional) way to include "Makefile.inc" by transforming it (= regenerate it). -function(TRANSFORM_MAKEFILE_INC INPUT_FILE OUTPUT_FILE) - file(READ ${INPUT_FILE} MAKEFILE_INC_TEXT) - string(REPLACE "$(top_srcdir)" "\${CURL_SOURCE_DIR}" MAKEFILE_INC_TEXT ${MAKEFILE_INC_TEXT}) - string(REPLACE "$(top_builddir)" "\${CURL_BINARY_DIR}" MAKEFILE_INC_TEXT ${MAKEFILE_INC_TEXT}) - - string(REGEX REPLACE "\\\\\n" "§!§" MAKEFILE_INC_TEXT ${MAKEFILE_INC_TEXT}) - string(REGEX REPLACE "([a-zA-Z_][a-zA-Z0-9_]*)[\t ]*=[\t ]*([^\n]*)" "SET(\\1 \\2)" MAKEFILE_INC_TEXT ${MAKEFILE_INC_TEXT}) - string(REPLACE "§!§" "\n" MAKEFILE_INC_TEXT ${MAKEFILE_INC_TEXT}) - - string(REGEX REPLACE "\\$\\(([a-zA-Z_][a-zA-Z0-9_]*)\\)" "\${\\1}" MAKEFILE_INC_TEXT ${MAKEFILE_INC_TEXT}) # Replace $() with ${} - string(REGEX REPLACE "@([a-zA-Z_][a-zA-Z0-9_]*)@" "\${\\1}" MAKEFILE_INC_TEXT ${MAKEFILE_INC_TEXT}) # Replace @@ with ${}, even if that may not be read by CMake scripts. - file(WRITE ${OUTPUT_FILE} ${MAKEFILE_INC_TEXT}) - -endfunction() - -add_subdirectory(lib) -if(BUILD_CURL_EXE) - add_subdirectory(src) -endif() -if(BUILD_CURL_TESTS) - add_subdirectory(tests) -endif() - -# This needs to be run very last so other parts of the scripts can take advantage of this. -if(NOT CURL_CONFIG_HAS_BEEN_RUN_BEFORE) - set(CURL_CONFIG_HAS_BEEN_RUN_BEFORE 1 CACHE INTERNAL "Flag to track whether this is the first time running CMake or if CMake has been configured before") -endif() - -# Installation. -# First, install generated curlbuild.h -install(FILES "${CMAKE_CURRENT_BINARY_DIR}/include/curl/curlbuild.h" - DESTINATION include/curl ) -# Next, install other headers excluding curlbuild.h -install(DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/include/curl" - DESTINATION include - FILES_MATCHING PATTERN "*.h" - PATTERN "curlbuild.h" EXCLUDE) diff --git a/iis/winbuild/Makefile.win b/iis/winbuild/Makefile.win deleted file mode 100644 index 0352c52d..00000000 --- a/iis/winbuild/Makefile.win +++ /dev/null @@ -1,57 +0,0 @@ -########################################################################### -### You Will need to modify the following variables for your system -########################################################################### -########################################################################### - -# Path to Apache httpd installation -BASE = %APACHE% - -# Paths to required libraries -PCRE = %PCRE% -CURL = %CURL% - -# Linking libraries -LIBS = $(BASE)\lib\libapr-1.lib \ - $(BASE)\lib\libaprutil-1.lib \ - $(PCRE)\pcre.lib \ - $(CURL)\libcurl_imp.lib \ - wsock32.lib - -########################################################################### -########################################################################### - -CC = cL - -MT = mt - -DEFS = /nologo /O2 /W3 -DWIN32 -DWINNT -Dinline=APR_INLINE -D_CONSOLE -D$(VERSION) - -EXE = mlogc.exe - -INCLUDES = -I. -I..\apache2 \ - -I$(PCRE)\include -I$(PCRE) \ - -I$(CURL)\include -I$(CURL) \ - -I$(BASE)\include - -CFLAGS= -MT $(INCLUDES) $(DEFS) - -LDFLAGS = - -OBJS = mlogc.obj - -all: $(EXE) - -.c.obj: - $(CC) $(CFLAGS) -c $< -Fo$@ - -.cpp.obj: - $(CC) $(CFLAGS) -c $< -Fo$@ - -$(EXE): $(OBJS) - $(CC) $(CFLAGS) $(LDFLAGS) $(OBJS) $(LIBS) /link /NODEFAULTLIB:MSVCRT.lib /subsystem:console - -install: $(EXE) - copy $(EXE) $(BASE)\bin - -clean: - del $(OBJS) $(EXE) *.dll *.lib *.pdb *.idb *.ilk *.exp *.res *.rc *.bin *.manifest diff --git a/iis/winbuild/VCVarsQueryRegistry.bat b/iis/winbuild/VCVarsQueryRegistry.bat deleted file mode 100644 index c925743b..00000000 --- a/iis/winbuild/VCVarsQueryRegistry.bat +++ /dev/null @@ -1,224 +0,0 @@ -@call :GetWindowsSdkDir -@call :GetVSInstallDir -@call :GetVCInstallDir -@call :GetFSharpInstallDir -@if "%1"=="32bit" ( - @call :GetFrameworkDir32 - @call :GetFrameworkVer32 -) -@if "%2"=="64bit" ( - @call :GetFrameworkDir64 - @call :GetFrameworkVer64 -) -@SET Framework35Version=v3.5 - -@goto end - -@REM ----------------------------------------------------------------------- -:GetWindowsSdkDir -@set WindowsSdkDir= -@call :GetWindowsSdkDirHelper HKLM > nul 2>&1 -@if errorlevel 1 call :GetWindowsSdkDirHelper HKCU > nul 2>&1 -@if errorlevel 1 set WindowsSdkDir=%VCINSTALLDIR%\PlatformSDK\ -@exit /B 0 - -:GetWindowsSdkDirHelper -@for /F "tokens=1,2*" %%i in ('reg query "%1\SOFTWARE\Microsoft\Microsoft SDKs\Windows\v7.0A" /v "InstallationFolder"') DO ( - @if "%%i"=="InstallationFolder" ( - @SET "WindowsSdkDir=%%k" - ) -) -@if "%WindowsSdkDir%"=="" exit /B 1 -@exit /B 0 - -@REM ----------------------------------------------------------------------- -:GetVSInstallDir -@set VSINSTALLDIR= -@call :GetVSInstallDirHelper32 HKLM > nul 2>&1 -@if errorlevel 1 call :GetVSInstallDirHelper32 HKCU > nul 2>&1 -@if errorlevel 1 call :GetVSInstallDirHelper64 HKLM > nul 2>&1 -@if errorlevel 1 call :GetVSInstallDirHelper64 HKCU > nul 2>&1 -@exit /B 0 - -:GetVSInstallDirHelper32 -@for /F "tokens=1,2*" %%i in ('reg query "%1\SOFTWARE\Microsoft\VisualStudio\SxS\VS7" /v "10.0"') DO ( - @if "%%i"=="10.0" ( - @SET "VSINSTALLDIR=%%k" - ) -) -@if "%VSINSTALLDIR%"=="" exit /B 1 -@exit /B 0 - -:GetVSInstallDirHelper64 -@for /F "tokens=1,2*" %%i in ('reg query "%1\SOFTWARE\Wow6432Node\Microsoft\VisualStudio\SxS\VS7" /v "10.0"') DO ( - @if "%%i"=="10.0" ( - @SET "VSINSTALLDIR=%%k" - ) -) -@if "%VSINSTALLDIR%"=="" exit /B 1 -@exit /B 0 - -@REM ----------------------------------------------------------------------- -:GetVCInstallDir -@set VCINSTALLDIR= -@call :GetVCInstallDirHelper32 HKLM > nul 2>&1 -@if errorlevel 1 call :GetVCInstallDirHelper32 HKCU > nul 2>&1 -@if errorlevel 1 call :GetVCInstallDirHelper64 HKLM > nul 2>&1 -@if errorlevel 1 call :GetVCInstallDirHelper64 HKCU > nul 2>&1 -@exit /B 0 - -:GetVCInstallDirHelper32 -@for /F "tokens=1,2*" %%i in ('reg query "%1\SOFTWARE\Microsoft\VisualStudio\SxS\VC7" /v "10.0"') DO ( - @if "%%i"=="10.0" ( - @SET "VCINSTALLDIR=%%k" - ) -) -@if "%VCINSTALLDIR%"=="" exit /B 1 -@exit /B 0 - -:GetVCInstallDirHelper64 -@for /F "tokens=1,2*" %%i in ('reg query "%1\SOFTWARE\Wow6432Node\Microsoft\VisualStudio\SxS\VC7" /v "10.0"') DO ( - @if "%%i"=="10.0" ( - @SET "VCINSTALLDIR=%%k" - ) -) -@if "%VCINSTALLDIR%"=="" exit /B 1 -@exit /B 0 - -@REM ----------------------------------------------------------------------- -:GetFSharpInstallDir -@set FSHARPINSTALLDIR= -@call :GetFSharpInstallDirHelper32 HKLM > nul 2>&1 -@if errorlevel 1 call :GetFSharpInstallDirHelper32 HKCU > nul 2>&1 -@if errorlevel 1 call :GetFSharpInstallDirHelper64 HKLM > nul 2>&1 -@if errorlevel 1 call :GetFSharpInstallDirHelper64 HKCU > nul 2>&1 -@exit /B 0 - -:GetFSharpInstallDirHelper32 -@for /F "tokens=1,2*" %%i in ('reg query "%1\SOFTWARE\Microsoft\VisualStudio\10.0\Setup\F#" /v "ProductDir"') DO ( - @if "%%i"=="ProductDir" ( - @SET "FSHARPINSTALLDIR=%%k" - ) -) -@if "%FSHARPINSTALLDIR%"=="" exit /B 1 -@exit /B 0 - -:GetFSharpInstallDirHelper64 -@for /F "tokens=1,2*" %%i in ('reg query "%1\SOFTWARE\Wow6432Node\Microsoft\VisualStudio\10.0\Setup\F#" /v "ProductDir"') DO ( - @if "%%i"=="ProductDir" ( - @SET "FSHARPINSTALLDIR=%%k" - ) -) -@if "%FSHARPINSTALLDIR%"=="" exit /B 1 -@exit /B 0 - -@REM ----------------------------------------------------------------------- -:GetFrameworkDir32 -@set FrameworkDir32= -@call :GetFrameworkDir32Helper32 HKLM > nul 2>&1 -@if errorlevel 1 call :GetFrameworkDir32Helper32 HKCU > nul 2>&1 -@if errorlevel 1 call :GetFrameworkDir32Helper64 HKLM > nul 2>&1 -@if errorlevel 1 call :GetFrameworkDir32Helper64 HKCU > nul 2>&1 -@exit /B 0 - -:GetFrameworkDir32Helper32 -@for /F "tokens=1,2*" %%i in ('reg query "%1\SOFTWARE\Microsoft\VisualStudio\SxS\VC7" /v "FrameworkDir32"') DO ( - @if "%%i"=="FrameworkDir32" ( - @SET "FrameworkDIR32=%%k" - ) -) -@if "%FrameworkDir32%"=="" exit /B 1 -@exit /B 0 - -:GetFrameworkDir32Helper64 -@for /F "tokens=1,2*" %%i in ('reg query "%1\SOFTWARE\Wow6432Node\Microsoft\VisualStudio\SxS\VC7" /v "FrameworkDir32"') DO ( - @if "%%i"=="FrameworkDir32" ( - @SET "FrameworkDIR32=%%k" - ) -) -@if "%FrameworkDIR32%"=="" exit /B 1 -@exit /B 0 - -@REM ----------------------------------------------------------------------- -:GetFrameworkDir64 -@set FrameworkDir64= -@call :GetFrameworkDir64Helper32 HKLM > nul 2>&1 -@if errorlevel 1 call :GetFrameworkDir64Helper32 HKCU > nul 2>&1 -@if errorlevel 1 call :GetFrameworkDir64Helper64 HKLM > nul 2>&1 -@if errorlevel 1 call :GetFrameworkDir64Helper64 HKCU > nul 2>&1 -@exit /B 0 - -:GetFrameworkDir64Helper32 -@for /F "tokens=1,2*" %%i in ('reg query "%1\SOFTWARE\Microsoft\VisualStudio\SxS\VC7" /v "FrameworkDir64"') DO ( - @if "%%i"=="FrameworkDir64" ( - @SET "FrameworkDIR64=%%k" - ) -) -@if "%FrameworkDIR64%"=="" exit /B 1 -@exit /B 0 - -:GetFrameworkDir64Helper64 -@for /F "tokens=1,2*" %%i in ('reg query "%1\SOFTWARE\Wow6432Node\Microsoft\VisualStudio\SxS\VC7" /v "FrameworkDir64"') DO ( - @if "%%i"=="FrameworkDir64" ( - @SET "FrameworkDIR64=%%k" - ) -) -@if "%FrameworkDIR64%"=="" exit /B 1 -@exit /B 0 - -@REM ----------------------------------------------------------------------- -:GetFrameworkVer32 -@set FrameworkVer32= -@call :GetFrameworkVer32Helper32 HKLM > nul 2>&1 -@if errorlevel 1 call :GetFrameworkVer32Helper32 HKCU > nul 2>&1 -@if errorlevel 1 call :GetFrameworkVer32Helper64 HKLM > nul 2>&1 -@if errorlevel 1 call :GetFrameworkVer32Helper64 HKCU > nul 2>&1 -@exit /B 0 - -:GetFrameworkVer32Helper32 -@for /F "tokens=1,2*" %%i in ('reg query "%1\SOFTWARE\Microsoft\VisualStudio\SxS\VC7" /v "FrameworkVer32"') DO ( - @if "%%i"=="FrameworkVer32" ( - @SET "FrameworkVersion32=%%k" - ) -) -@if "%FrameworkVersion32%"=="" exit /B 1 -@exit /B 0 - -:GetFrameworkVer32Helper64 -@for /F "tokens=1,2*" %%i in ('reg query "%1\SOFTWARE\Wow6432Node\Microsoft\VisualStudio\SxS\VC7" /v "FrameworkVer32"') DO ( - @if "%%i"=="FrameworkVer32" ( - @SET "FrameworkVersion32=%%k" - ) -) -@if "%FrameworkVersion32%"=="" exit /B 1 -@exit /B 0 - -@REM ----------------------------------------------------------------------- -:GetFrameworkVer64 -@set FrameworkVer64= -@call :GetFrameworkVer64Helper32 HKLM > nul 2>&1 -@if errorlevel 1 call :GetFrameworkVer64Helper32 HKCU > nul 2>&1 -@if errorlevel 1 call :GetFrameworkVer64Helper64 HKLM > nul 2>&1 -@if errorlevel 1 call :GetFrameworkVer64Helper64 HKCU > nul 2>&1 -@exit /B 0 - -:GetFrameworkVer64Helper32 -@for /F "tokens=1,2*" %%i in ('reg query "%1\SOFTWARE\Microsoft\VisualStudio\SxS\VC7" /v "FrameworkVer64"') DO ( - @if "%%i"=="FrameworkVer64" ( - @SET "FrameworkVersion64=%%k" - ) -) -@if "%FrameworkVersion64%"=="" exit /B 1 -@exit /B 0 - -:GetFrameworkVer64Helper64 -@for /F "tokens=1,2*" %%i in ('reg query "%1\SOFTWARE\Wow6432Node\Microsoft\VisualStudio\SxS\VC7" /v "FrameworkVer64"') DO ( - @if "%%i"=="FrameworkVer64" ( - @SET "FrameworkVersion64=%%k" - ) -) -@if "%FrameworkVersion64%"=="" exit /B 1 -@exit /B 0 - -@REM ----------------------------------------------------------------------- -:end diff --git a/iis/winbuild/apr.mak b/iis/winbuild/apr.mak deleted file mode 100644 index e8de5690..00000000 --- a/iis/winbuild/apr.mak +++ /dev/null @@ -1,1779 +0,0 @@ -# Microsoft Developer Studio Generated NMAKE File, Based on apr.dsp -!IF "$(CFG)" == "" -CFG=apr - Win32 Release -!MESSAGE No configuration specified. Defaulting to apr - Win32 Release. -!ENDIF - -!IF "$(CFG)" != "apr - Win32 Release" && "$(CFG)" != "apr - Win32 Debug" && "$(CFG)" != "apr - Win32 Release9x" && "$(CFG)" != "apr - Win32 Debug9x" && "$(CFG)" != "apr - x64 Release" && "$(CFG)" != "apr - x64 Debug" -!MESSAGE Invalid configuration "$(CFG)" specified. -!MESSAGE You can specify a configuration when running NMAKE -!MESSAGE by defining the macro CFG on the command line. For example: -!MESSAGE -!MESSAGE NMAKE /f "apr.mak" CFG="apr - Win32 Release" -!MESSAGE -!MESSAGE Possible choices for configuration are: -!MESSAGE -!MESSAGE "apr - Win32 Release" (based on "Win32 (x86) Static Library") -!MESSAGE "apr - Win32 Debug" (based on "Win32 (x86) Static Library") -!MESSAGE "apr - Win32 Release9x" (based on "Win32 (x86) Static Library") -!MESSAGE "apr - Win32 Debug9x" (based on "Win32 (x86) Static Library") -!MESSAGE "apr - x64 Release" (based on "Win32 (x86) Static Library") -!MESSAGE "apr - x64 Debug" (based on "Win32 (x86) Static Library") -!MESSAGE -!ERROR An invalid configuration is specified. -!ENDIF - -!IF "$(OS)" == "Windows_NT" -NULL= -!ELSE -NULL=nul -!ENDIF - -!IF "$(CFG)" == "apr - Win32 Release" - -OUTDIR=.\LibR -INTDIR=.\LibR -# Begin Custom Macros -OutDir=.\LibR -# End Custom Macros - -ALL : "$(OUTDIR)\apr-1.lib" - - -CLEAN : - -@erase "$(INTDIR)\apr-1.idb" - -@erase "$(INTDIR)\apr-1.pdb" - -@erase "$(INTDIR)\apr_atomic.obj" - -@erase "$(INTDIR)\apr_cpystrn.obj" - -@erase "$(INTDIR)\apr_fnmatch.obj" - -@erase "$(INTDIR)\apr_getpass.obj" - -@erase "$(INTDIR)\apr_hash.obj" - -@erase "$(INTDIR)\apr_pools.obj" - -@erase "$(INTDIR)\apr_random.obj" - -@erase "$(INTDIR)\apr_snprintf.obj" - -@erase "$(INTDIR)\apr_strings.obj" - -@erase "$(INTDIR)\apr_strnatcmp.obj" - -@erase "$(INTDIR)\apr_strtok.obj" - -@erase "$(INTDIR)\apr_tables.obj" - -@erase "$(INTDIR)\buffer.obj" - -@erase "$(INTDIR)\charset.obj" - -@erase "$(INTDIR)\common.obj" - -@erase "$(INTDIR)\copy.obj" - -@erase "$(INTDIR)\dir.obj" - -@erase "$(INTDIR)\dso.obj" - -@erase "$(INTDIR)\env.obj" - -@erase "$(INTDIR)\errorcodes.obj" - -@erase "$(INTDIR)\fileacc.obj" - -@erase "$(INTDIR)\filedup.obj" - -@erase "$(INTDIR)\filepath.obj" - -@erase "$(INTDIR)\filepath_util.obj" - -@erase "$(INTDIR)\filestat.obj" - -@erase "$(INTDIR)\filesys.obj" - -@erase "$(INTDIR)\flock.obj" - -@erase "$(INTDIR)\fullrw.obj" - -@erase "$(INTDIR)\getopt.obj" - -@erase "$(INTDIR)\groupinfo.obj" - -@erase "$(INTDIR)\inet_ntop.obj" - -@erase "$(INTDIR)\inet_pton.obj" - -@erase "$(INTDIR)\internal.obj" - -@erase "$(INTDIR)\misc.obj" - -@erase "$(INTDIR)\mktemp.obj" - -@erase "$(INTDIR)\mmap.obj" - -@erase "$(INTDIR)\multicast.obj" - -@erase "$(INTDIR)\open.obj" - -@erase "$(INTDIR)\otherchild.obj" - -@erase "$(INTDIR)\pipe.obj" - -@erase "$(INTDIR)\poll.obj" - -@erase "$(INTDIR)\pollcb.obj" - -@erase "$(INTDIR)\pollset.obj" - -@erase "$(INTDIR)\proc.obj" - -@erase "$(INTDIR)\proc_mutex.obj" - -@erase "$(INTDIR)\rand.obj" - -@erase "$(INTDIR)\readwrite.obj" - -@erase "$(INTDIR)\seek.obj" - -@erase "$(INTDIR)\select.obj" - -@erase "$(INTDIR)\sendrecv.obj" - -@erase "$(INTDIR)\sha2.obj" - -@erase "$(INTDIR)\sha2_glue.obj" - -@erase "$(INTDIR)\shm.obj" - -@erase "$(INTDIR)\signals.obj" - -@erase "$(INTDIR)\sockaddr.obj" - -@erase "$(INTDIR)\socket_util.obj" - -@erase "$(INTDIR)\sockets.obj" - -@erase "$(INTDIR)\sockopt.obj" - -@erase "$(INTDIR)\start.obj" - -@erase "$(INTDIR)\tempdir.obj" - -@erase "$(INTDIR)\thread.obj" - -@erase "$(INTDIR)\thread_cond.obj" - -@erase "$(INTDIR)\thread_mutex.obj" - -@erase "$(INTDIR)\thread_rwlock.obj" - -@erase "$(INTDIR)\threadpriv.obj" - -@erase "$(INTDIR)\time.obj" - -@erase "$(INTDIR)\timestr.obj" - -@erase "$(INTDIR)\userinfo.obj" - -@erase "$(INTDIR)\utf8.obj" - -@erase "$(INTDIR)\version.obj" - -@erase "$(OUTDIR)\apr-1.lib" - -"$(OUTDIR)" : - if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)" - -CPP=cl.exe -CPP_PROJ=/nologo /MD /W3 /Zi /O2 /Oy- /I "./include" /I "./include/arch" /I "./include/arch/win32" /I "./include/arch/unix" /D "NDEBUG" /D "APR_DECLARE_STATIC" /D "WIN32" /D "WINNT" /D "_WINDOWS" /Fo"$(INTDIR)\\" /Fd"$(OUTDIR)\apr-1" /FD /c - -.c{$(INTDIR)}.obj:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - -.cpp{$(INTDIR)}.obj:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - -.cxx{$(INTDIR)}.obj:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - -.c{$(INTDIR)}.sbr:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - -.cpp{$(INTDIR)}.sbr:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - -.cxx{$(INTDIR)}.sbr:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - -RSC=rc.exe -BSC32=bscmake.exe -BSC32_FLAGS=/nologo /o"$(OUTDIR)\apr.bsc" -BSC32_SBRS= \ - -LIB32=link.exe -lib -LIB32_FLAGS=/nologo /out:"$(OUTDIR)\apr-1.lib" -LIB32_OBJS= \ - "$(INTDIR)\apr_atomic.obj" \ - "$(INTDIR)\dso.obj" \ - "$(INTDIR)\buffer.obj" \ - "$(INTDIR)\copy.obj" \ - "$(INTDIR)\dir.obj" \ - "$(INTDIR)\fileacc.obj" \ - "$(INTDIR)\filedup.obj" \ - "$(INTDIR)\filepath.obj" \ - "$(INTDIR)\filepath_util.obj" \ - "$(INTDIR)\filestat.obj" \ - "$(INTDIR)\filesys.obj" \ - "$(INTDIR)\flock.obj" \ - "$(INTDIR)\fullrw.obj" \ - "$(INTDIR)\mktemp.obj" \ - "$(INTDIR)\open.obj" \ - "$(INTDIR)\pipe.obj" \ - "$(INTDIR)\readwrite.obj" \ - "$(INTDIR)\seek.obj" \ - "$(INTDIR)\tempdir.obj" \ - "$(INTDIR)\proc_mutex.obj" \ - "$(INTDIR)\thread_cond.obj" \ - "$(INTDIR)\thread_mutex.obj" \ - "$(INTDIR)\thread_rwlock.obj" \ - "$(INTDIR)\apr_pools.obj" \ - "$(INTDIR)\charset.obj" \ - "$(INTDIR)\env.obj" \ - "$(INTDIR)\errorcodes.obj" \ - "$(INTDIR)\getopt.obj" \ - "$(INTDIR)\internal.obj" \ - "$(INTDIR)\misc.obj" \ - "$(INTDIR)\otherchild.obj" \ - "$(INTDIR)\rand.obj" \ - "$(INTDIR)\start.obj" \ - "$(INTDIR)\utf8.obj" \ - "$(INTDIR)\version.obj" \ - "$(INTDIR)\common.obj" \ - "$(INTDIR)\mmap.obj" \ - "$(INTDIR)\inet_ntop.obj" \ - "$(INTDIR)\inet_pton.obj" \ - "$(INTDIR)\multicast.obj" \ - "$(INTDIR)\sendrecv.obj" \ - "$(INTDIR)\sockaddr.obj" \ - "$(INTDIR)\sockets.obj" \ - "$(INTDIR)\socket_util.obj" \ - "$(INTDIR)\sockopt.obj" \ - "$(INTDIR)\apr_getpass.obj" \ - "$(INTDIR)\poll.obj" \ - "$(INTDIR)\pollcb.obj" \ - "$(INTDIR)\pollset.obj" \ - "$(INTDIR)\select.obj" \ - "$(INTDIR)\apr_random.obj" \ - "$(INTDIR)\sha2.obj" \ - "$(INTDIR)\sha2_glue.obj" \ - "$(INTDIR)\shm.obj" \ - "$(INTDIR)\apr_cpystrn.obj" \ - "$(INTDIR)\apr_fnmatch.obj" \ - "$(INTDIR)\apr_snprintf.obj" \ - "$(INTDIR)\apr_strings.obj" \ - "$(INTDIR)\apr_strnatcmp.obj" \ - "$(INTDIR)\apr_strtok.obj" \ - "$(INTDIR)\apr_hash.obj" \ - "$(INTDIR)\apr_tables.obj" \ - "$(INTDIR)\proc.obj" \ - "$(INTDIR)\signals.obj" \ - "$(INTDIR)\thread.obj" \ - "$(INTDIR)\threadpriv.obj" \ - "$(INTDIR)\time.obj" \ - "$(INTDIR)\timestr.obj" \ - "$(INTDIR)\groupinfo.obj" \ - "$(INTDIR)\userinfo.obj" - -"$(OUTDIR)\apr-1.lib" : "$(OUTDIR)" $(DEF_FILE) $(LIB32_OBJS) - $(LIB32) @<< - $(LIB32_FLAGS) $(DEF_FLAGS) $(LIB32_OBJS) -<< - -!ELSEIF "$(CFG)" == "apr - Win32 Debug" - -OUTDIR=.\LibD -INTDIR=.\LibD -# Begin Custom Macros -OutDir=.\LibD -# End Custom Macros - -ALL : ".\include\apr.h" "$(OUTDIR)\apr-1.lib" - - -CLEAN : - -@erase "$(INTDIR)\apr-1.idb" - -@erase "$(INTDIR)\apr-1.pdb" - -@erase "$(INTDIR)\apr_atomic.obj" - -@erase "$(INTDIR)\apr_cpystrn.obj" - -@erase "$(INTDIR)\apr_fnmatch.obj" - -@erase "$(INTDIR)\apr_getpass.obj" - -@erase "$(INTDIR)\apr_hash.obj" - -@erase "$(INTDIR)\apr_pools.obj" - -@erase "$(INTDIR)\apr_random.obj" - -@erase "$(INTDIR)\apr_snprintf.obj" - -@erase "$(INTDIR)\apr_strings.obj" - -@erase "$(INTDIR)\apr_strnatcmp.obj" - -@erase "$(INTDIR)\apr_strtok.obj" - -@erase "$(INTDIR)\apr_tables.obj" - -@erase "$(INTDIR)\buffer.obj" - -@erase "$(INTDIR)\charset.obj" - -@erase "$(INTDIR)\common.obj" - -@erase "$(INTDIR)\copy.obj" - -@erase "$(INTDIR)\dir.obj" - -@erase "$(INTDIR)\dso.obj" - -@erase "$(INTDIR)\env.obj" - -@erase "$(INTDIR)\errorcodes.obj" - -@erase "$(INTDIR)\fileacc.obj" - -@erase "$(INTDIR)\filedup.obj" - -@erase "$(INTDIR)\filepath.obj" - -@erase "$(INTDIR)\filepath_util.obj" - -@erase "$(INTDIR)\filestat.obj" - -@erase "$(INTDIR)\filesys.obj" - -@erase "$(INTDIR)\flock.obj" - -@erase "$(INTDIR)\fullrw.obj" - -@erase "$(INTDIR)\getopt.obj" - -@erase "$(INTDIR)\groupinfo.obj" - -@erase "$(INTDIR)\inet_ntop.obj" - -@erase "$(INTDIR)\inet_pton.obj" - -@erase "$(INTDIR)\internal.obj" - -@erase "$(INTDIR)\misc.obj" - -@erase "$(INTDIR)\mktemp.obj" - -@erase "$(INTDIR)\mmap.obj" - -@erase "$(INTDIR)\multicast.obj" - -@erase "$(INTDIR)\open.obj" - -@erase "$(INTDIR)\otherchild.obj" - -@erase "$(INTDIR)\pipe.obj" - -@erase "$(INTDIR)\poll.obj" - -@erase "$(INTDIR)\pollcb.obj" - -@erase "$(INTDIR)\pollset.obj" - -@erase "$(INTDIR)\proc.obj" - -@erase "$(INTDIR)\proc_mutex.obj" - -@erase "$(INTDIR)\rand.obj" - -@erase "$(INTDIR)\readwrite.obj" - -@erase "$(INTDIR)\seek.obj" - -@erase "$(INTDIR)\select.obj" - -@erase "$(INTDIR)\sendrecv.obj" - -@erase "$(INTDIR)\sha2.obj" - -@erase "$(INTDIR)\sha2_glue.obj" - -@erase "$(INTDIR)\shm.obj" - -@erase "$(INTDIR)\signals.obj" - -@erase "$(INTDIR)\sockaddr.obj" - -@erase "$(INTDIR)\socket_util.obj" - -@erase "$(INTDIR)\sockets.obj" - -@erase "$(INTDIR)\sockopt.obj" - -@erase "$(INTDIR)\start.obj" - -@erase "$(INTDIR)\tempdir.obj" - -@erase "$(INTDIR)\thread.obj" - -@erase "$(INTDIR)\thread_cond.obj" - -@erase "$(INTDIR)\thread_mutex.obj" - -@erase "$(INTDIR)\thread_rwlock.obj" - -@erase "$(INTDIR)\threadpriv.obj" - -@erase "$(INTDIR)\time.obj" - -@erase "$(INTDIR)\timestr.obj" - -@erase "$(INTDIR)\userinfo.obj" - -@erase "$(INTDIR)\utf8.obj" - -@erase "$(INTDIR)\version.obj" - -@erase "$(OUTDIR)\apr-1.lib" - -@erase ".\include\apr.h" - -"$(OUTDIR)" : - if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)" - -CPP=cl.exe -CPP_PROJ=/nologo /MDd /W3 /Zi /Od /I "./include" /I "./include/arch" /I "./include/arch/win32" /I "./include/arch/unix" /D "_DEBUG" /D "APR_DECLARE_STATIC" /D "WIN32" /D "WINNT" /D "_WINDOWS" /Fo"$(INTDIR)\\" /Fd"$(OUTDIR)\apr-1" /FD /EHsc /c - -.c{$(INTDIR)}.obj:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - -.cpp{$(INTDIR)}.obj:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - -.cxx{$(INTDIR)}.obj:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - -.c{$(INTDIR)}.sbr:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - -.cpp{$(INTDIR)}.sbr:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - -.cxx{$(INTDIR)}.sbr:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - -RSC=rc.exe -BSC32=bscmake.exe -BSC32_FLAGS=/nologo /o"$(OUTDIR)\apr.bsc" -BSC32_SBRS= \ - -LIB32=link.exe -lib -LIB32_FLAGS=/nologo /out:"$(OUTDIR)\apr-1.lib" -LIB32_OBJS= \ - "$(INTDIR)\apr_atomic.obj" \ - "$(INTDIR)\dso.obj" \ - "$(INTDIR)\buffer.obj" \ - "$(INTDIR)\copy.obj" \ - "$(INTDIR)\dir.obj" \ - "$(INTDIR)\fileacc.obj" \ - "$(INTDIR)\filedup.obj" \ - "$(INTDIR)\filepath.obj" \ - "$(INTDIR)\filepath_util.obj" \ - "$(INTDIR)\filestat.obj" \ - "$(INTDIR)\filesys.obj" \ - "$(INTDIR)\flock.obj" \ - "$(INTDIR)\fullrw.obj" \ - "$(INTDIR)\mktemp.obj" \ - "$(INTDIR)\open.obj" \ - "$(INTDIR)\pipe.obj" \ - "$(INTDIR)\readwrite.obj" \ - "$(INTDIR)\seek.obj" \ - "$(INTDIR)\tempdir.obj" \ - "$(INTDIR)\proc_mutex.obj" \ - "$(INTDIR)\thread_cond.obj" \ - "$(INTDIR)\thread_mutex.obj" \ - "$(INTDIR)\thread_rwlock.obj" \ - "$(INTDIR)\apr_pools.obj" \ - "$(INTDIR)\charset.obj" \ - "$(INTDIR)\env.obj" \ - "$(INTDIR)\errorcodes.obj" \ - "$(INTDIR)\getopt.obj" \ - "$(INTDIR)\internal.obj" \ - "$(INTDIR)\misc.obj" \ - "$(INTDIR)\otherchild.obj" \ - "$(INTDIR)\rand.obj" \ - "$(INTDIR)\start.obj" \ - "$(INTDIR)\utf8.obj" \ - "$(INTDIR)\version.obj" \ - "$(INTDIR)\common.obj" \ - "$(INTDIR)\mmap.obj" \ - "$(INTDIR)\inet_ntop.obj" \ - "$(INTDIR)\inet_pton.obj" \ - "$(INTDIR)\multicast.obj" \ - "$(INTDIR)\sendrecv.obj" \ - "$(INTDIR)\sockaddr.obj" \ - "$(INTDIR)\sockets.obj" \ - "$(INTDIR)\socket_util.obj" \ - "$(INTDIR)\sockopt.obj" \ - "$(INTDIR)\apr_getpass.obj" \ - "$(INTDIR)\poll.obj" \ - "$(INTDIR)\pollcb.obj" \ - "$(INTDIR)\pollset.obj" \ - "$(INTDIR)\select.obj" \ - "$(INTDIR)\apr_random.obj" \ - "$(INTDIR)\sha2.obj" \ - "$(INTDIR)\sha2_glue.obj" \ - "$(INTDIR)\shm.obj" \ - "$(INTDIR)\apr_cpystrn.obj" \ - "$(INTDIR)\apr_fnmatch.obj" \ - "$(INTDIR)\apr_snprintf.obj" \ - "$(INTDIR)\apr_strings.obj" \ - "$(INTDIR)\apr_strnatcmp.obj" \ - "$(INTDIR)\apr_strtok.obj" \ - "$(INTDIR)\apr_hash.obj" \ - "$(INTDIR)\apr_tables.obj" \ - "$(INTDIR)\proc.obj" \ - "$(INTDIR)\signals.obj" \ - "$(INTDIR)\thread.obj" \ - "$(INTDIR)\threadpriv.obj" \ - "$(INTDIR)\time.obj" \ - "$(INTDIR)\timestr.obj" \ - "$(INTDIR)\groupinfo.obj" \ - "$(INTDIR)\userinfo.obj" - -"$(OUTDIR)\apr-1.lib" : "$(OUTDIR)" $(DEF_FILE) $(LIB32_OBJS) - $(LIB32) @<< - $(LIB32_FLAGS) $(DEF_FLAGS) $(LIB32_OBJS) -<< - -!ELSEIF "$(CFG)" == "apr - Win32 Release9x" - -OUTDIR=.\9x\LibR -INTDIR=.\9x\LibR -# Begin Custom Macros -OutDir=.\9x\LibR -# End Custom Macros - -ALL : ".\include\apr.h" "$(OUTDIR)\apr-1.lib" - - -CLEAN : - -@erase "$(INTDIR)\apr-1.idb" - -@erase "$(INTDIR)\apr-1.pdb" - -@erase "$(INTDIR)\apr_atomic.obj" - -@erase "$(INTDIR)\apr_cpystrn.obj" - -@erase "$(INTDIR)\apr_fnmatch.obj" - -@erase "$(INTDIR)\apr_getpass.obj" - -@erase "$(INTDIR)\apr_hash.obj" - -@erase "$(INTDIR)\apr_pools.obj" - -@erase "$(INTDIR)\apr_random.obj" - -@erase "$(INTDIR)\apr_snprintf.obj" - -@erase "$(INTDIR)\apr_strings.obj" - -@erase "$(INTDIR)\apr_strnatcmp.obj" - -@erase "$(INTDIR)\apr_strtok.obj" - -@erase "$(INTDIR)\apr_tables.obj" - -@erase "$(INTDIR)\buffer.obj" - -@erase "$(INTDIR)\charset.obj" - -@erase "$(INTDIR)\common.obj" - -@erase "$(INTDIR)\copy.obj" - -@erase "$(INTDIR)\dir.obj" - -@erase "$(INTDIR)\dso.obj" - -@erase "$(INTDIR)\env.obj" - -@erase "$(INTDIR)\errorcodes.obj" - -@erase "$(INTDIR)\fileacc.obj" - -@erase "$(INTDIR)\filedup.obj" - -@erase "$(INTDIR)\filepath.obj" - -@erase "$(INTDIR)\filepath_util.obj" - -@erase "$(INTDIR)\filestat.obj" - -@erase "$(INTDIR)\filesys.obj" - -@erase "$(INTDIR)\flock.obj" - -@erase "$(INTDIR)\fullrw.obj" - -@erase "$(INTDIR)\getopt.obj" - -@erase "$(INTDIR)\groupinfo.obj" - -@erase "$(INTDIR)\inet_ntop.obj" - -@erase "$(INTDIR)\inet_pton.obj" - -@erase "$(INTDIR)\internal.obj" - -@erase "$(INTDIR)\misc.obj" - -@erase "$(INTDIR)\mktemp.obj" - -@erase "$(INTDIR)\mmap.obj" - -@erase "$(INTDIR)\multicast.obj" - -@erase "$(INTDIR)\open.obj" - -@erase "$(INTDIR)\otherchild.obj" - -@erase "$(INTDIR)\pipe.obj" - -@erase "$(INTDIR)\poll.obj" - -@erase "$(INTDIR)\pollcb.obj" - -@erase "$(INTDIR)\pollset.obj" - -@erase "$(INTDIR)\proc.obj" - -@erase "$(INTDIR)\proc_mutex.obj" - -@erase "$(INTDIR)\rand.obj" - -@erase "$(INTDIR)\readwrite.obj" - -@erase "$(INTDIR)\seek.obj" - -@erase "$(INTDIR)\select.obj" - -@erase "$(INTDIR)\sendrecv.obj" - -@erase "$(INTDIR)\sha2.obj" - -@erase "$(INTDIR)\sha2_glue.obj" - -@erase "$(INTDIR)\shm.obj" - -@erase "$(INTDIR)\signals.obj" - -@erase "$(INTDIR)\sockaddr.obj" - -@erase "$(INTDIR)\socket_util.obj" - -@erase "$(INTDIR)\sockets.obj" - -@erase "$(INTDIR)\sockopt.obj" - -@erase "$(INTDIR)\start.obj" - -@erase "$(INTDIR)\tempdir.obj" - -@erase "$(INTDIR)\thread.obj" - -@erase "$(INTDIR)\thread_cond.obj" - -@erase "$(INTDIR)\thread_mutex.obj" - -@erase "$(INTDIR)\thread_rwlock.obj" - -@erase "$(INTDIR)\threadpriv.obj" - -@erase "$(INTDIR)\time.obj" - -@erase "$(INTDIR)\timestr.obj" - -@erase "$(INTDIR)\userinfo.obj" - -@erase "$(INTDIR)\utf8.obj" - -@erase "$(INTDIR)\version.obj" - -@erase "$(OUTDIR)\apr-1.lib" - -@erase ".\include\apr.h" - -"$(OUTDIR)" : - if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)" - -CPP=cl.exe -CPP_PROJ=/nologo /MD /W3 /Zi /O2 /Oy- /I "./include" /I "./include/arch" /I "./include/arch/win32" /I "./include/arch/unix" /D "NDEBUG" /D "APR_DECLARE_STATIC" /D "WIN32" /D "_WINDOWS" /Fo"$(INTDIR)\\" /Fd"$(OUTDIR)\apr-1" /FD /c - -.c{$(INTDIR)}.obj:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - -.cpp{$(INTDIR)}.obj:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - -.cxx{$(INTDIR)}.obj:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - -.c{$(INTDIR)}.sbr:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - -.cpp{$(INTDIR)}.sbr:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - -.cxx{$(INTDIR)}.sbr:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - -RSC=rc.exe -BSC32=bscmake.exe -BSC32_FLAGS=/nologo /o"$(OUTDIR)\apr.bsc" -BSC32_SBRS= \ - -LIB32=link.exe -lib -LIB32_FLAGS=/nologo /out:"$(OUTDIR)\apr-1.lib" -LIB32_OBJS= \ - "$(INTDIR)\apr_atomic.obj" \ - "$(INTDIR)\dso.obj" \ - "$(INTDIR)\buffer.obj" \ - "$(INTDIR)\copy.obj" \ - "$(INTDIR)\dir.obj" \ - "$(INTDIR)\fileacc.obj" \ - "$(INTDIR)\filedup.obj" \ - "$(INTDIR)\filepath.obj" \ - "$(INTDIR)\filepath_util.obj" \ - "$(INTDIR)\filestat.obj" \ - "$(INTDIR)\filesys.obj" \ - "$(INTDIR)\flock.obj" \ - "$(INTDIR)\fullrw.obj" \ - "$(INTDIR)\mktemp.obj" \ - "$(INTDIR)\open.obj" \ - "$(INTDIR)\pipe.obj" \ - "$(INTDIR)\readwrite.obj" \ - "$(INTDIR)\seek.obj" \ - "$(INTDIR)\tempdir.obj" \ - "$(INTDIR)\proc_mutex.obj" \ - "$(INTDIR)\thread_cond.obj" \ - "$(INTDIR)\thread_mutex.obj" \ - "$(INTDIR)\thread_rwlock.obj" \ - "$(INTDIR)\apr_pools.obj" \ - "$(INTDIR)\charset.obj" \ - "$(INTDIR)\env.obj" \ - "$(INTDIR)\errorcodes.obj" \ - "$(INTDIR)\getopt.obj" \ - "$(INTDIR)\internal.obj" \ - "$(INTDIR)\misc.obj" \ - "$(INTDIR)\otherchild.obj" \ - "$(INTDIR)\rand.obj" \ - "$(INTDIR)\start.obj" \ - "$(INTDIR)\utf8.obj" \ - "$(INTDIR)\version.obj" \ - "$(INTDIR)\common.obj" \ - "$(INTDIR)\mmap.obj" \ - "$(INTDIR)\inet_ntop.obj" \ - "$(INTDIR)\inet_pton.obj" \ - "$(INTDIR)\multicast.obj" \ - "$(INTDIR)\sendrecv.obj" \ - "$(INTDIR)\sockaddr.obj" \ - "$(INTDIR)\sockets.obj" \ - "$(INTDIR)\socket_util.obj" \ - "$(INTDIR)\sockopt.obj" \ - "$(INTDIR)\apr_getpass.obj" \ - "$(INTDIR)\poll.obj" \ - "$(INTDIR)\pollcb.obj" \ - "$(INTDIR)\pollset.obj" \ - "$(INTDIR)\select.obj" \ - "$(INTDIR)\apr_random.obj" \ - "$(INTDIR)\sha2.obj" \ - "$(INTDIR)\sha2_glue.obj" \ - "$(INTDIR)\shm.obj" \ - "$(INTDIR)\apr_cpystrn.obj" \ - "$(INTDIR)\apr_fnmatch.obj" \ - "$(INTDIR)\apr_snprintf.obj" \ - "$(INTDIR)\apr_strings.obj" \ - "$(INTDIR)\apr_strnatcmp.obj" \ - "$(INTDIR)\apr_strtok.obj" \ - "$(INTDIR)\apr_hash.obj" \ - "$(INTDIR)\apr_tables.obj" \ - "$(INTDIR)\proc.obj" \ - "$(INTDIR)\signals.obj" \ - "$(INTDIR)\thread.obj" \ - "$(INTDIR)\threadpriv.obj" \ - "$(INTDIR)\time.obj" \ - "$(INTDIR)\timestr.obj" \ - "$(INTDIR)\groupinfo.obj" \ - "$(INTDIR)\userinfo.obj" - -"$(OUTDIR)\apr-1.lib" : "$(OUTDIR)" $(DEF_FILE) $(LIB32_OBJS) - $(LIB32) @<< - $(LIB32_FLAGS) $(DEF_FLAGS) $(LIB32_OBJS) -<< - -!ELSEIF "$(CFG)" == "apr - Win32 Debug9x" - -OUTDIR=.\9x\LibD -INTDIR=.\9x\LibD -# Begin Custom Macros -OutDir=.\9x\LibD -# End Custom Macros - -ALL : ".\include\apr.h" "$(OUTDIR)\apr-1.lib" - - -CLEAN : - -@erase "$(INTDIR)\apr-1.idb" - -@erase "$(INTDIR)\apr-1.pdb" - -@erase "$(INTDIR)\apr_atomic.obj" - -@erase "$(INTDIR)\apr_cpystrn.obj" - -@erase "$(INTDIR)\apr_fnmatch.obj" - -@erase "$(INTDIR)\apr_getpass.obj" - -@erase "$(INTDIR)\apr_hash.obj" - -@erase "$(INTDIR)\apr_pools.obj" - -@erase "$(INTDIR)\apr_random.obj" - -@erase "$(INTDIR)\apr_snprintf.obj" - -@erase "$(INTDIR)\apr_strings.obj" - -@erase "$(INTDIR)\apr_strnatcmp.obj" - -@erase "$(INTDIR)\apr_strtok.obj" - -@erase "$(INTDIR)\apr_tables.obj" - -@erase "$(INTDIR)\buffer.obj" - -@erase "$(INTDIR)\charset.obj" - -@erase "$(INTDIR)\common.obj" - -@erase "$(INTDIR)\copy.obj" - -@erase "$(INTDIR)\dir.obj" - -@erase "$(INTDIR)\dso.obj" - -@erase "$(INTDIR)\env.obj" - -@erase "$(INTDIR)\errorcodes.obj" - -@erase "$(INTDIR)\fileacc.obj" - -@erase "$(INTDIR)\filedup.obj" - -@erase "$(INTDIR)\filepath.obj" - -@erase "$(INTDIR)\filepath_util.obj" - -@erase "$(INTDIR)\filestat.obj" - -@erase "$(INTDIR)\filesys.obj" - -@erase "$(INTDIR)\flock.obj" - -@erase "$(INTDIR)\fullrw.obj" - -@erase "$(INTDIR)\getopt.obj" - -@erase "$(INTDIR)\groupinfo.obj" - -@erase "$(INTDIR)\inet_ntop.obj" - -@erase "$(INTDIR)\inet_pton.obj" - -@erase "$(INTDIR)\internal.obj" - -@erase "$(INTDIR)\misc.obj" - -@erase "$(INTDIR)\mktemp.obj" - -@erase "$(INTDIR)\mmap.obj" - -@erase "$(INTDIR)\multicast.obj" - -@erase "$(INTDIR)\open.obj" - -@erase "$(INTDIR)\otherchild.obj" - -@erase "$(INTDIR)\pipe.obj" - -@erase "$(INTDIR)\poll.obj" - -@erase "$(INTDIR)\pollcb.obj" - -@erase "$(INTDIR)\pollset.obj" - -@erase "$(INTDIR)\proc.obj" - -@erase "$(INTDIR)\proc_mutex.obj" - -@erase "$(INTDIR)\rand.obj" - -@erase "$(INTDIR)\readwrite.obj" - -@erase "$(INTDIR)\seek.obj" - -@erase "$(INTDIR)\select.obj" - -@erase "$(INTDIR)\sendrecv.obj" - -@erase "$(INTDIR)\sha2.obj" - -@erase "$(INTDIR)\sha2_glue.obj" - -@erase "$(INTDIR)\shm.obj" - -@erase "$(INTDIR)\signals.obj" - -@erase "$(INTDIR)\sockaddr.obj" - -@erase "$(INTDIR)\socket_util.obj" - -@erase "$(INTDIR)\sockets.obj" - -@erase "$(INTDIR)\sockopt.obj" - -@erase "$(INTDIR)\start.obj" - -@erase "$(INTDIR)\tempdir.obj" - -@erase "$(INTDIR)\thread.obj" - -@erase "$(INTDIR)\thread_cond.obj" - -@erase "$(INTDIR)\thread_mutex.obj" - -@erase "$(INTDIR)\thread_rwlock.obj" - -@erase "$(INTDIR)\threadpriv.obj" - -@erase "$(INTDIR)\time.obj" - -@erase "$(INTDIR)\timestr.obj" - -@erase "$(INTDIR)\userinfo.obj" - -@erase "$(INTDIR)\utf8.obj" - -@erase "$(INTDIR)\version.obj" - -@erase "$(OUTDIR)\apr-1.lib" - -@erase ".\include\apr.h" - -"$(OUTDIR)" : - if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)" - -CPP=cl.exe -CPP_PROJ=/nologo /MDd /W3 /Zi /Od /I "./include" /I "./include/arch" /I "./include/arch/win32" /I "./include/arch/unix" /D "_DEBUG" /D "APR_DECLARE_STATIC" /D "WIN32" /D "_WINDOWS" /Fo"$(INTDIR)\\" /Fd"$(OUTDIR)\apr-1" /FD /EHsc /c - -.c{$(INTDIR)}.obj:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - -.cpp{$(INTDIR)}.obj:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - -.cxx{$(INTDIR)}.obj:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - -.c{$(INTDIR)}.sbr:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - -.cpp{$(INTDIR)}.sbr:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - -.cxx{$(INTDIR)}.sbr:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - -RSC=rc.exe -BSC32=bscmake.exe -BSC32_FLAGS=/nologo /o"$(OUTDIR)\apr.bsc" -BSC32_SBRS= \ - -LIB32=link.exe -lib -LIB32_FLAGS=/nologo /out:"$(OUTDIR)\apr-1.lib" -LIB32_OBJS= \ - "$(INTDIR)\apr_atomic.obj" \ - "$(INTDIR)\dso.obj" \ - "$(INTDIR)\buffer.obj" \ - "$(INTDIR)\copy.obj" \ - "$(INTDIR)\dir.obj" \ - "$(INTDIR)\fileacc.obj" \ - "$(INTDIR)\filedup.obj" \ - "$(INTDIR)\filepath.obj" \ - "$(INTDIR)\filepath_util.obj" \ - "$(INTDIR)\filestat.obj" \ - "$(INTDIR)\filesys.obj" \ - "$(INTDIR)\flock.obj" \ - "$(INTDIR)\fullrw.obj" \ - "$(INTDIR)\mktemp.obj" \ - "$(INTDIR)\open.obj" \ - "$(INTDIR)\pipe.obj" \ - "$(INTDIR)\readwrite.obj" \ - "$(INTDIR)\seek.obj" \ - "$(INTDIR)\tempdir.obj" \ - "$(INTDIR)\proc_mutex.obj" \ - "$(INTDIR)\thread_cond.obj" \ - "$(INTDIR)\thread_mutex.obj" \ - "$(INTDIR)\thread_rwlock.obj" \ - "$(INTDIR)\apr_pools.obj" \ - "$(INTDIR)\charset.obj" \ - "$(INTDIR)\env.obj" \ - "$(INTDIR)\errorcodes.obj" \ - "$(INTDIR)\getopt.obj" \ - "$(INTDIR)\internal.obj" \ - "$(INTDIR)\misc.obj" \ - "$(INTDIR)\otherchild.obj" \ - "$(INTDIR)\rand.obj" \ - "$(INTDIR)\start.obj" \ - "$(INTDIR)\utf8.obj" \ - "$(INTDIR)\version.obj" \ - "$(INTDIR)\common.obj" \ - "$(INTDIR)\mmap.obj" \ - "$(INTDIR)\inet_ntop.obj" \ - "$(INTDIR)\inet_pton.obj" \ - "$(INTDIR)\multicast.obj" \ - "$(INTDIR)\sendrecv.obj" \ - "$(INTDIR)\sockaddr.obj" \ - "$(INTDIR)\sockets.obj" \ - "$(INTDIR)\socket_util.obj" \ - "$(INTDIR)\sockopt.obj" \ - "$(INTDIR)\apr_getpass.obj" \ - "$(INTDIR)\poll.obj" \ - "$(INTDIR)\pollcb.obj" \ - "$(INTDIR)\pollset.obj" \ - "$(INTDIR)\select.obj" \ - "$(INTDIR)\apr_random.obj" \ - "$(INTDIR)\sha2.obj" \ - "$(INTDIR)\sha2_glue.obj" \ - "$(INTDIR)\shm.obj" \ - "$(INTDIR)\apr_cpystrn.obj" \ - "$(INTDIR)\apr_fnmatch.obj" \ - "$(INTDIR)\apr_snprintf.obj" \ - "$(INTDIR)\apr_strings.obj" \ - "$(INTDIR)\apr_strnatcmp.obj" \ - "$(INTDIR)\apr_strtok.obj" \ - "$(INTDIR)\apr_hash.obj" \ - "$(INTDIR)\apr_tables.obj" \ - "$(INTDIR)\proc.obj" \ - "$(INTDIR)\signals.obj" \ - "$(INTDIR)\thread.obj" \ - "$(INTDIR)\threadpriv.obj" \ - "$(INTDIR)\time.obj" \ - "$(INTDIR)\timestr.obj" \ - "$(INTDIR)\groupinfo.obj" \ - "$(INTDIR)\userinfo.obj" - -"$(OUTDIR)\apr-1.lib" : "$(OUTDIR)" $(DEF_FILE) $(LIB32_OBJS) - $(LIB32) @<< - $(LIB32_FLAGS) $(DEF_FLAGS) $(LIB32_OBJS) -<< - -!ELSEIF "$(CFG)" == "apr - x64 Release" - -OUTDIR=.\x64\LibR -INTDIR=.\x64\LibR -# Begin Custom Macros -OutDir=.\x64\LibR -# End Custom Macros - -ALL : ".\include\apr.h" "$(OUTDIR)\apr-1.lib" - - -CLEAN : - -@erase "$(INTDIR)\apr-1.idb" - -@erase "$(INTDIR)\apr-1.pdb" - -@erase "$(INTDIR)\apr_atomic.obj" - -@erase "$(INTDIR)\apr_cpystrn.obj" - -@erase "$(INTDIR)\apr_fnmatch.obj" - -@erase "$(INTDIR)\apr_getpass.obj" - -@erase "$(INTDIR)\apr_hash.obj" - -@erase "$(INTDIR)\apr_pools.obj" - -@erase "$(INTDIR)\apr_random.obj" - -@erase "$(INTDIR)\apr_snprintf.obj" - -@erase "$(INTDIR)\apr_strings.obj" - -@erase "$(INTDIR)\apr_strnatcmp.obj" - -@erase "$(INTDIR)\apr_strtok.obj" - -@erase "$(INTDIR)\apr_tables.obj" - -@erase "$(INTDIR)\buffer.obj" - -@erase "$(INTDIR)\charset.obj" - -@erase "$(INTDIR)\common.obj" - -@erase "$(INTDIR)\copy.obj" - -@erase "$(INTDIR)\dir.obj" - -@erase "$(INTDIR)\dso.obj" - -@erase "$(INTDIR)\env.obj" - -@erase "$(INTDIR)\errorcodes.obj" - -@erase "$(INTDIR)\fileacc.obj" - -@erase "$(INTDIR)\filedup.obj" - -@erase "$(INTDIR)\filepath.obj" - -@erase "$(INTDIR)\filepath_util.obj" - -@erase "$(INTDIR)\filestat.obj" - -@erase "$(INTDIR)\filesys.obj" - -@erase "$(INTDIR)\flock.obj" - -@erase "$(INTDIR)\fullrw.obj" - -@erase "$(INTDIR)\getopt.obj" - -@erase "$(INTDIR)\groupinfo.obj" - -@erase "$(INTDIR)\inet_ntop.obj" - -@erase "$(INTDIR)\inet_pton.obj" - -@erase "$(INTDIR)\internal.obj" - -@erase "$(INTDIR)\misc.obj" - -@erase "$(INTDIR)\mktemp.obj" - -@erase "$(INTDIR)\mmap.obj" - -@erase "$(INTDIR)\multicast.obj" - -@erase "$(INTDIR)\open.obj" - -@erase "$(INTDIR)\otherchild.obj" - -@erase "$(INTDIR)\pipe.obj" - -@erase "$(INTDIR)\poll.obj" - -@erase "$(INTDIR)\pollcb.obj" - -@erase "$(INTDIR)\pollset.obj" - -@erase "$(INTDIR)\proc.obj" - -@erase "$(INTDIR)\proc_mutex.obj" - -@erase "$(INTDIR)\rand.obj" - -@erase "$(INTDIR)\readwrite.obj" - -@erase "$(INTDIR)\seek.obj" - -@erase "$(INTDIR)\select.obj" - -@erase "$(INTDIR)\sendrecv.obj" - -@erase "$(INTDIR)\sha2.obj" - -@erase "$(INTDIR)\sha2_glue.obj" - -@erase "$(INTDIR)\shm.obj" - -@erase "$(INTDIR)\signals.obj" - -@erase "$(INTDIR)\sockaddr.obj" - -@erase "$(INTDIR)\socket_util.obj" - -@erase "$(INTDIR)\sockets.obj" - -@erase "$(INTDIR)\sockopt.obj" - -@erase "$(INTDIR)\start.obj" - -@erase "$(INTDIR)\tempdir.obj" - -@erase "$(INTDIR)\thread.obj" - -@erase "$(INTDIR)\thread_cond.obj" - -@erase "$(INTDIR)\thread_mutex.obj" - -@erase "$(INTDIR)\thread_rwlock.obj" - -@erase "$(INTDIR)\threadpriv.obj" - -@erase "$(INTDIR)\time.obj" - -@erase "$(INTDIR)\timestr.obj" - -@erase "$(INTDIR)\userinfo.obj" - -@erase "$(INTDIR)\utf8.obj" - -@erase "$(INTDIR)\version.obj" - -@erase "$(OUTDIR)\apr-1.lib" - -@erase ".\include\apr.h" - -"$(OUTDIR)" : - if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)" - -CPP=cl.exe -CPP_PROJ=/nologo /MD /W3 /Zi /O2 /Oy- /I "./include" /I "./include/arch" /I "./include/arch/win32" /I "./include/arch/unix" /D "NDEBUG" /D "APR_DECLARE_STATIC" /D "WIN32" /D "WINNT" /D "_WINDOWS" /D "WIN64" /D "_WIN64" /Fo"$(INTDIR)\\" /Fd"$(OUTDIR)\apr-1" /FD /c - -.c{$(INTDIR)}.obj:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - -.cpp{$(INTDIR)}.obj:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - -.cxx{$(INTDIR)}.obj:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - -.c{$(INTDIR)}.sbr:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - -.cpp{$(INTDIR)}.sbr:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - -.cxx{$(INTDIR)}.sbr:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - -RSC=rc.exe -BSC32=bscmake.exe -BSC32_FLAGS=/nologo /o"$(OUTDIR)\apr.bsc" -BSC32_SBRS= \ - -LIB32=link.exe -lib -LIB32_FLAGS=/nologo /out:"$(OUTDIR)\apr-1.lib" -LIB32_OBJS= \ - "$(INTDIR)\apr_atomic.obj" \ - "$(INTDIR)\dso.obj" \ - "$(INTDIR)\buffer.obj" \ - "$(INTDIR)\copy.obj" \ - "$(INTDIR)\dir.obj" \ - "$(INTDIR)\fileacc.obj" \ - "$(INTDIR)\filedup.obj" \ - "$(INTDIR)\filepath.obj" \ - "$(INTDIR)\filepath_util.obj" \ - "$(INTDIR)\filestat.obj" \ - "$(INTDIR)\filesys.obj" \ - "$(INTDIR)\flock.obj" \ - "$(INTDIR)\fullrw.obj" \ - "$(INTDIR)\mktemp.obj" \ - "$(INTDIR)\open.obj" \ - "$(INTDIR)\pipe.obj" \ - "$(INTDIR)\readwrite.obj" \ - "$(INTDIR)\seek.obj" \ - "$(INTDIR)\tempdir.obj" \ - "$(INTDIR)\proc_mutex.obj" \ - "$(INTDIR)\thread_cond.obj" \ - "$(INTDIR)\thread_mutex.obj" \ - "$(INTDIR)\thread_rwlock.obj" \ - "$(INTDIR)\apr_pools.obj" \ - "$(INTDIR)\charset.obj" \ - "$(INTDIR)\env.obj" \ - "$(INTDIR)\errorcodes.obj" \ - "$(INTDIR)\getopt.obj" \ - "$(INTDIR)\internal.obj" \ - "$(INTDIR)\misc.obj" \ - "$(INTDIR)\otherchild.obj" \ - "$(INTDIR)\rand.obj" \ - "$(INTDIR)\start.obj" \ - "$(INTDIR)\utf8.obj" \ - "$(INTDIR)\version.obj" \ - "$(INTDIR)\common.obj" \ - "$(INTDIR)\mmap.obj" \ - "$(INTDIR)\inet_ntop.obj" \ - "$(INTDIR)\inet_pton.obj" \ - "$(INTDIR)\multicast.obj" \ - "$(INTDIR)\sendrecv.obj" \ - "$(INTDIR)\sockaddr.obj" \ - "$(INTDIR)\sockets.obj" \ - "$(INTDIR)\socket_util.obj" \ - "$(INTDIR)\sockopt.obj" \ - "$(INTDIR)\apr_getpass.obj" \ - "$(INTDIR)\poll.obj" \ - "$(INTDIR)\pollcb.obj" \ - "$(INTDIR)\pollset.obj" \ - "$(INTDIR)\select.obj" \ - "$(INTDIR)\apr_random.obj" \ - "$(INTDIR)\sha2.obj" \ - "$(INTDIR)\sha2_glue.obj" \ - "$(INTDIR)\shm.obj" \ - "$(INTDIR)\apr_cpystrn.obj" \ - "$(INTDIR)\apr_fnmatch.obj" \ - "$(INTDIR)\apr_snprintf.obj" \ - "$(INTDIR)\apr_strings.obj" \ - "$(INTDIR)\apr_strnatcmp.obj" \ - "$(INTDIR)\apr_strtok.obj" \ - "$(INTDIR)\apr_hash.obj" \ - "$(INTDIR)\apr_tables.obj" \ - "$(INTDIR)\proc.obj" \ - "$(INTDIR)\signals.obj" \ - "$(INTDIR)\thread.obj" \ - "$(INTDIR)\threadpriv.obj" \ - "$(INTDIR)\time.obj" \ - "$(INTDIR)\timestr.obj" \ - "$(INTDIR)\groupinfo.obj" \ - "$(INTDIR)\userinfo.obj" - -"$(OUTDIR)\apr-1.lib" : "$(OUTDIR)" $(DEF_FILE) $(LIB32_OBJS) - $(LIB32) @<< - $(LIB32_FLAGS) $(DEF_FLAGS) $(LIB32_OBJS) -<< - -!ELSEIF "$(CFG)" == "apr - x64 Debug" - -OUTDIR=.\x64\LibD -INTDIR=.\x64\LibD -# Begin Custom Macros -OutDir=.\x64\LibD -# End Custom Macros - -ALL : ".\include\apr.h" "$(OUTDIR)\apr-1.lib" - - -CLEAN : - -@erase "$(INTDIR)\apr-1.idb" - -@erase "$(INTDIR)\apr-1.pdb" - -@erase "$(INTDIR)\apr_atomic.obj" - -@erase "$(INTDIR)\apr_cpystrn.obj" - -@erase "$(INTDIR)\apr_fnmatch.obj" - -@erase "$(INTDIR)\apr_getpass.obj" - -@erase "$(INTDIR)\apr_hash.obj" - -@erase "$(INTDIR)\apr_pools.obj" - -@erase "$(INTDIR)\apr_random.obj" - -@erase "$(INTDIR)\apr_snprintf.obj" - -@erase "$(INTDIR)\apr_strings.obj" - -@erase "$(INTDIR)\apr_strnatcmp.obj" - -@erase "$(INTDIR)\apr_strtok.obj" - -@erase "$(INTDIR)\apr_tables.obj" - -@erase "$(INTDIR)\buffer.obj" - -@erase "$(INTDIR)\charset.obj" - -@erase "$(INTDIR)\common.obj" - -@erase "$(INTDIR)\copy.obj" - -@erase "$(INTDIR)\dir.obj" - -@erase "$(INTDIR)\dso.obj" - -@erase "$(INTDIR)\env.obj" - -@erase "$(INTDIR)\errorcodes.obj" - -@erase "$(INTDIR)\fileacc.obj" - -@erase "$(INTDIR)\filedup.obj" - -@erase "$(INTDIR)\filepath.obj" - -@erase "$(INTDIR)\filepath_util.obj" - -@erase "$(INTDIR)\filestat.obj" - -@erase "$(INTDIR)\filesys.obj" - -@erase "$(INTDIR)\flock.obj" - -@erase "$(INTDIR)\fullrw.obj" - -@erase "$(INTDIR)\getopt.obj" - -@erase "$(INTDIR)\groupinfo.obj" - -@erase "$(INTDIR)\inet_ntop.obj" - -@erase "$(INTDIR)\inet_pton.obj" - -@erase "$(INTDIR)\internal.obj" - -@erase "$(INTDIR)\misc.obj" - -@erase "$(INTDIR)\mktemp.obj" - -@erase "$(INTDIR)\mmap.obj" - -@erase "$(INTDIR)\multicast.obj" - -@erase "$(INTDIR)\open.obj" - -@erase "$(INTDIR)\otherchild.obj" - -@erase "$(INTDIR)\pipe.obj" - -@erase "$(INTDIR)\poll.obj" - -@erase "$(INTDIR)\pollcb.obj" - -@erase "$(INTDIR)\pollset.obj" - -@erase "$(INTDIR)\proc.obj" - -@erase "$(INTDIR)\proc_mutex.obj" - -@erase "$(INTDIR)\rand.obj" - -@erase "$(INTDIR)\readwrite.obj" - -@erase "$(INTDIR)\seek.obj" - -@erase "$(INTDIR)\select.obj" - -@erase "$(INTDIR)\sendrecv.obj" - -@erase "$(INTDIR)\sha2.obj" - -@erase "$(INTDIR)\sha2_glue.obj" - -@erase "$(INTDIR)\shm.obj" - -@erase "$(INTDIR)\signals.obj" - -@erase "$(INTDIR)\sockaddr.obj" - -@erase "$(INTDIR)\socket_util.obj" - -@erase "$(INTDIR)\sockets.obj" - -@erase "$(INTDIR)\sockopt.obj" - -@erase "$(INTDIR)\start.obj" - -@erase "$(INTDIR)\tempdir.obj" - -@erase "$(INTDIR)\thread.obj" - -@erase "$(INTDIR)\thread_cond.obj" - -@erase "$(INTDIR)\thread_mutex.obj" - -@erase "$(INTDIR)\thread_rwlock.obj" - -@erase "$(INTDIR)\threadpriv.obj" - -@erase "$(INTDIR)\time.obj" - -@erase "$(INTDIR)\timestr.obj" - -@erase "$(INTDIR)\userinfo.obj" - -@erase "$(INTDIR)\utf8.obj" - -@erase "$(INTDIR)\version.obj" - -@erase "$(OUTDIR)\apr-1.lib" - -@erase ".\include\apr.h" - -"$(OUTDIR)" : - if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)" - -CPP=cl.exe -CPP_PROJ=/nologo /MDd /W3 /Zi /Od /I "./include" /I "./include/arch" /I "./include/arch/win32" /I "./include/arch/unix" /D "_DEBUG" /D "APR_DECLARE_STATIC" /D "WIN32" /D "WINNT" /D "_WINDOWS" /D "WIN64" /D "_WIN64" /Fo"$(INTDIR)\\" /Fd"$(OUTDIR)\apr-1" /FD /EHsc /c - -.c{$(INTDIR)}.obj:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - -.cpp{$(INTDIR)}.obj:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - -.cxx{$(INTDIR)}.obj:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - -.c{$(INTDIR)}.sbr:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - -.cpp{$(INTDIR)}.sbr:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - -.cxx{$(INTDIR)}.sbr:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - -RSC=rc.exe -BSC32=bscmake.exe -BSC32_FLAGS=/nologo /o"$(OUTDIR)\apr.bsc" -BSC32_SBRS= \ - -LIB32=link.exe -lib -LIB32_FLAGS=/nologo /out:"$(OUTDIR)\apr-1.lib" -LIB32_OBJS= \ - "$(INTDIR)\apr_atomic.obj" \ - "$(INTDIR)\dso.obj" \ - "$(INTDIR)\buffer.obj" \ - "$(INTDIR)\copy.obj" \ - "$(INTDIR)\dir.obj" \ - "$(INTDIR)\fileacc.obj" \ - "$(INTDIR)\filedup.obj" \ - "$(INTDIR)\filepath.obj" \ - "$(INTDIR)\filepath_util.obj" \ - "$(INTDIR)\filestat.obj" \ - "$(INTDIR)\filesys.obj" \ - "$(INTDIR)\flock.obj" \ - "$(INTDIR)\fullrw.obj" \ - "$(INTDIR)\mktemp.obj" \ - "$(INTDIR)\open.obj" \ - "$(INTDIR)\pipe.obj" \ - "$(INTDIR)\readwrite.obj" \ - "$(INTDIR)\seek.obj" \ - "$(INTDIR)\tempdir.obj" \ - "$(INTDIR)\proc_mutex.obj" \ - "$(INTDIR)\thread_cond.obj" \ - "$(INTDIR)\thread_mutex.obj" \ - "$(INTDIR)\thread_rwlock.obj" \ - "$(INTDIR)\apr_pools.obj" \ - "$(INTDIR)\charset.obj" \ - "$(INTDIR)\env.obj" \ - "$(INTDIR)\errorcodes.obj" \ - "$(INTDIR)\getopt.obj" \ - "$(INTDIR)\internal.obj" \ - "$(INTDIR)\misc.obj" \ - "$(INTDIR)\otherchild.obj" \ - "$(INTDIR)\rand.obj" \ - "$(INTDIR)\start.obj" \ - "$(INTDIR)\utf8.obj" \ - "$(INTDIR)\version.obj" \ - "$(INTDIR)\common.obj" \ - "$(INTDIR)\mmap.obj" \ - "$(INTDIR)\inet_ntop.obj" \ - "$(INTDIR)\inet_pton.obj" \ - "$(INTDIR)\multicast.obj" \ - "$(INTDIR)\sendrecv.obj" \ - "$(INTDIR)\sockaddr.obj" \ - "$(INTDIR)\sockets.obj" \ - "$(INTDIR)\socket_util.obj" \ - "$(INTDIR)\sockopt.obj" \ - "$(INTDIR)\apr_getpass.obj" \ - "$(INTDIR)\poll.obj" \ - "$(INTDIR)\pollcb.obj" \ - "$(INTDIR)\pollset.obj" \ - "$(INTDIR)\select.obj" \ - "$(INTDIR)\apr_random.obj" \ - "$(INTDIR)\sha2.obj" \ - "$(INTDIR)\sha2_glue.obj" \ - "$(INTDIR)\shm.obj" \ - "$(INTDIR)\apr_cpystrn.obj" \ - "$(INTDIR)\apr_fnmatch.obj" \ - "$(INTDIR)\apr_snprintf.obj" \ - "$(INTDIR)\apr_strings.obj" \ - "$(INTDIR)\apr_strnatcmp.obj" \ - "$(INTDIR)\apr_strtok.obj" \ - "$(INTDIR)\apr_hash.obj" \ - "$(INTDIR)\apr_tables.obj" \ - "$(INTDIR)\proc.obj" \ - "$(INTDIR)\signals.obj" \ - "$(INTDIR)\thread.obj" \ - "$(INTDIR)\threadpriv.obj" \ - "$(INTDIR)\time.obj" \ - "$(INTDIR)\timestr.obj" \ - "$(INTDIR)\groupinfo.obj" \ - "$(INTDIR)\userinfo.obj" - -"$(OUTDIR)\apr-1.lib" : "$(OUTDIR)" $(DEF_FILE) $(LIB32_OBJS) - $(LIB32) @<< - $(LIB32_FLAGS) $(DEF_FLAGS) $(LIB32_OBJS) -<< - -!ENDIF - - -!IF "$(NO_EXTERNAL_DEPS)" != "1" -!IF EXISTS("apr.dep") -!INCLUDE "apr.dep" -!ELSE -!MESSAGE Warning: cannot find "apr.dep" -!ENDIF -!ENDIF - - -!IF "$(CFG)" == "apr - Win32 Release" || "$(CFG)" == "apr - Win32 Debug" || "$(CFG)" == "apr - Win32 Release9x" || "$(CFG)" == "apr - Win32 Debug9x" || "$(CFG)" == "apr - x64 Release" || "$(CFG)" == "apr - x64 Debug" -SOURCE=.\atomic\win32\apr_atomic.c - -"$(INTDIR)\apr_atomic.obj" : $(SOURCE) "$(INTDIR)" ".\include\apr.h" - $(CPP) $(CPP_PROJ) $(SOURCE) - - -SOURCE=.\dso\win32\dso.c - -"$(INTDIR)\dso.obj" : $(SOURCE) "$(INTDIR)" ".\include\apr.h" - $(CPP) $(CPP_PROJ) $(SOURCE) - - -SOURCE=.\file_io\win32\buffer.c - -"$(INTDIR)\buffer.obj" : $(SOURCE) "$(INTDIR)" ".\include\apr.h" - $(CPP) $(CPP_PROJ) $(SOURCE) - - -SOURCE=.\file_io\unix\copy.c - -"$(INTDIR)\copy.obj" : $(SOURCE) "$(INTDIR)" ".\include\apr.h" - $(CPP) $(CPP_PROJ) $(SOURCE) - - -SOURCE=.\file_io\win32\dir.c - -"$(INTDIR)\dir.obj" : $(SOURCE) "$(INTDIR)" ".\include\apr.h" - $(CPP) $(CPP_PROJ) $(SOURCE) - - -SOURCE=.\file_io\unix\fileacc.c - -"$(INTDIR)\fileacc.obj" : $(SOURCE) "$(INTDIR)" ".\include\apr.h" - $(CPP) $(CPP_PROJ) $(SOURCE) - - -SOURCE=.\file_io\win32\filedup.c - -"$(INTDIR)\filedup.obj" : $(SOURCE) "$(INTDIR)" ".\include\apr.h" - $(CPP) $(CPP_PROJ) $(SOURCE) - - -SOURCE=.\file_io\win32\filepath.c - -"$(INTDIR)\filepath.obj" : $(SOURCE) "$(INTDIR)" ".\include\apr.h" - $(CPP) $(CPP_PROJ) $(SOURCE) - - -SOURCE=.\file_io\unix\filepath_util.c - -"$(INTDIR)\filepath_util.obj" : $(SOURCE) "$(INTDIR)" ".\include\apr.h" - $(CPP) $(CPP_PROJ) $(SOURCE) - - -SOURCE=.\file_io\win32\filestat.c - -"$(INTDIR)\filestat.obj" : $(SOURCE) "$(INTDIR)" ".\include\apr.h" - $(CPP) $(CPP_PROJ) $(SOURCE) - - -SOURCE=.\file_io\win32\filesys.c - -"$(INTDIR)\filesys.obj" : $(SOURCE) "$(INTDIR)" ".\include\apr.h" - $(CPP) $(CPP_PROJ) $(SOURCE) - - -SOURCE=.\file_io\win32\flock.c - -"$(INTDIR)\flock.obj" : $(SOURCE) "$(INTDIR)" ".\include\apr.h" - $(CPP) $(CPP_PROJ) $(SOURCE) - - -SOURCE=.\file_io\unix\fullrw.c - -"$(INTDIR)\fullrw.obj" : $(SOURCE) "$(INTDIR)" ".\include\apr.h" - $(CPP) $(CPP_PROJ) $(SOURCE) - - -SOURCE=.\file_io\unix\mktemp.c - -"$(INTDIR)\mktemp.obj" : $(SOURCE) "$(INTDIR)" ".\include\apr.h" - $(CPP) $(CPP_PROJ) $(SOURCE) - - -SOURCE=.\file_io\win32\open.c - -"$(INTDIR)\open.obj" : $(SOURCE) "$(INTDIR)" ".\include\apr.h" - $(CPP) $(CPP_PROJ) $(SOURCE) - - -SOURCE=.\file_io\win32\pipe.c - -"$(INTDIR)\pipe.obj" : $(SOURCE) "$(INTDIR)" ".\include\apr.h" - $(CPP) $(CPP_PROJ) $(SOURCE) - - -SOURCE=.\file_io\win32\readwrite.c - -"$(INTDIR)\readwrite.obj" : $(SOURCE) "$(INTDIR)" ".\include\apr.h" - $(CPP) $(CPP_PROJ) $(SOURCE) - - -SOURCE=.\file_io\win32\seek.c - -"$(INTDIR)\seek.obj" : $(SOURCE) "$(INTDIR)" ".\include\apr.h" - $(CPP) $(CPP_PROJ) $(SOURCE) - - -SOURCE=.\file_io\unix\tempdir.c - -"$(INTDIR)\tempdir.obj" : $(SOURCE) "$(INTDIR)" ".\include\apr.h" - $(CPP) $(CPP_PROJ) $(SOURCE) - - -SOURCE=.\locks\win32\proc_mutex.c - -"$(INTDIR)\proc_mutex.obj" : $(SOURCE) "$(INTDIR)" ".\include\apr.h" - $(CPP) $(CPP_PROJ) $(SOURCE) - - -SOURCE=.\locks\win32\thread_cond.c - -"$(INTDIR)\thread_cond.obj" : $(SOURCE) "$(INTDIR)" ".\include\apr.h" - $(CPP) $(CPP_PROJ) $(SOURCE) - - -SOURCE=.\locks\win32\thread_mutex.c - -"$(INTDIR)\thread_mutex.obj" : $(SOURCE) "$(INTDIR)" ".\include\apr.h" - $(CPP) $(CPP_PROJ) $(SOURCE) - - -SOURCE=.\locks\win32\thread_rwlock.c - -"$(INTDIR)\thread_rwlock.obj" : $(SOURCE) "$(INTDIR)" ".\include\apr.h" - $(CPP) $(CPP_PROJ) $(SOURCE) - - -SOURCE=.\memory\unix\apr_pools.c - -"$(INTDIR)\apr_pools.obj" : $(SOURCE) "$(INTDIR)" ".\include\apr.h" - $(CPP) $(CPP_PROJ) $(SOURCE) - - -SOURCE=.\misc\win32\apr_app.c -SOURCE=.\misc\win32\charset.c - -"$(INTDIR)\charset.obj" : $(SOURCE) "$(INTDIR)" ".\include\apr.h" - $(CPP) $(CPP_PROJ) $(SOURCE) - - -SOURCE=.\misc\win32\env.c - -"$(INTDIR)\env.obj" : $(SOURCE) "$(INTDIR)" ".\include\apr.h" - $(CPP) $(CPP_PROJ) $(SOURCE) - - -SOURCE=.\misc\unix\errorcodes.c - -"$(INTDIR)\errorcodes.obj" : $(SOURCE) "$(INTDIR)" ".\include\apr.h" - $(CPP) $(CPP_PROJ) $(SOURCE) - - -SOURCE=.\misc\unix\getopt.c - -"$(INTDIR)\getopt.obj" : $(SOURCE) "$(INTDIR)" ".\include\apr.h" - $(CPP) $(CPP_PROJ) $(SOURCE) - - -SOURCE=.\misc\win32\internal.c - -"$(INTDIR)\internal.obj" : $(SOURCE) "$(INTDIR)" ".\include\apr.h" - $(CPP) $(CPP_PROJ) $(SOURCE) - - -SOURCE=.\misc\win32\misc.c - -"$(INTDIR)\misc.obj" : $(SOURCE) "$(INTDIR)" ".\include\apr.h" - $(CPP) $(CPP_PROJ) $(SOURCE) - - -SOURCE=.\misc\unix\otherchild.c - -"$(INTDIR)\otherchild.obj" : $(SOURCE) "$(INTDIR)" ".\include\apr.h" - $(CPP) $(CPP_PROJ) $(SOURCE) - - -SOURCE=.\misc\win32\rand.c - -"$(INTDIR)\rand.obj" : $(SOURCE) "$(INTDIR)" ".\include\apr.h" - $(CPP) $(CPP_PROJ) $(SOURCE) - - -SOURCE=.\misc\win32\start.c - -"$(INTDIR)\start.obj" : $(SOURCE) "$(INTDIR)" ".\include\apr.h" - $(CPP) $(CPP_PROJ) $(SOURCE) - - -SOURCE=.\misc\win32\utf8.c - -"$(INTDIR)\utf8.obj" : $(SOURCE) "$(INTDIR)" ".\include\apr.h" - $(CPP) $(CPP_PROJ) $(SOURCE) - - -SOURCE=.\misc\unix\version.c - -"$(INTDIR)\version.obj" : $(SOURCE) "$(INTDIR)" ".\include\apr.h" - $(CPP) $(CPP_PROJ) $(SOURCE) - - -SOURCE=.\mmap\unix\common.c - -"$(INTDIR)\common.obj" : $(SOURCE) "$(INTDIR)" ".\include\apr.h" - $(CPP) $(CPP_PROJ) $(SOURCE) - - -SOURCE=.\mmap\win32\mmap.c - -"$(INTDIR)\mmap.obj" : $(SOURCE) "$(INTDIR)" ".\include\apr.h" - $(CPP) $(CPP_PROJ) $(SOURCE) - - -SOURCE=.\network_io\unix\inet_ntop.c - -"$(INTDIR)\inet_ntop.obj" : $(SOURCE) "$(INTDIR)" ".\include\apr.h" - $(CPP) $(CPP_PROJ) $(SOURCE) - - -SOURCE=.\network_io\unix\inet_pton.c - -"$(INTDIR)\inet_pton.obj" : $(SOURCE) "$(INTDIR)" ".\include\apr.h" - $(CPP) $(CPP_PROJ) $(SOURCE) - - -SOURCE=.\network_io\unix\multicast.c - -"$(INTDIR)\multicast.obj" : $(SOURCE) "$(INTDIR)" ".\include\apr.h" - $(CPP) $(CPP_PROJ) $(SOURCE) - - -SOURCE=.\network_io\win32\sendrecv.c - -"$(INTDIR)\sendrecv.obj" : $(SOURCE) "$(INTDIR)" ".\include\apr.h" - $(CPP) $(CPP_PROJ) $(SOURCE) - - -SOURCE=.\network_io\unix\sockaddr.c - -"$(INTDIR)\sockaddr.obj" : $(SOURCE) "$(INTDIR)" ".\include\apr.h" - $(CPP) $(CPP_PROJ) $(SOURCE) - - -SOURCE=.\network_io\unix\socket_util.c - -"$(INTDIR)\socket_util.obj" : $(SOURCE) "$(INTDIR)" ".\include\apr.h" - $(CPP) $(CPP_PROJ) $(SOURCE) - - -SOURCE=.\network_io\win32\sockets.c - -"$(INTDIR)\sockets.obj" : $(SOURCE) "$(INTDIR)" ".\include\apr.h" - $(CPP) $(CPP_PROJ) $(SOURCE) - - -SOURCE=.\network_io\win32\sockopt.c - -"$(INTDIR)\sockopt.obj" : $(SOURCE) "$(INTDIR)" ".\include\apr.h" - $(CPP) $(CPP_PROJ) $(SOURCE) - - -SOURCE=.\passwd\apr_getpass.c - -"$(INTDIR)\apr_getpass.obj" : $(SOURCE) "$(INTDIR)" ".\include\apr.h" - $(CPP) $(CPP_PROJ) $(SOURCE) - - -SOURCE=.\poll\unix\poll.c - -"$(INTDIR)\poll.obj" : $(SOURCE) "$(INTDIR)" ".\include\apr.h" - $(CPP) $(CPP_PROJ) $(SOURCE) - - -SOURCE=.\poll\unix\pollcb.c - -"$(INTDIR)\pollcb.obj" : $(SOURCE) "$(INTDIR)" ".\include\apr.h" - $(CPP) $(CPP_PROJ) $(SOURCE) - - -SOURCE=.\poll\unix\pollset.c - -"$(INTDIR)\pollset.obj" : $(SOURCE) "$(INTDIR)" ".\include\apr.h" - $(CPP) $(CPP_PROJ) $(SOURCE) - - -SOURCE=.\poll\unix\select.c - -"$(INTDIR)\select.obj" : $(SOURCE) "$(INTDIR)" ".\include\apr.h" - $(CPP) $(CPP_PROJ) $(SOURCE) - - -SOURCE=.\random\unix\apr_random.c - -"$(INTDIR)\apr_random.obj" : $(SOURCE) "$(INTDIR)" ".\include\apr.h" - $(CPP) $(CPP_PROJ) $(SOURCE) - - -SOURCE=.\random\unix\sha2.c - -"$(INTDIR)\sha2.obj" : $(SOURCE) "$(INTDIR)" ".\include\apr.h" - $(CPP) $(CPP_PROJ) $(SOURCE) - - -SOURCE=.\random\unix\sha2_glue.c - -"$(INTDIR)\sha2_glue.obj" : $(SOURCE) "$(INTDIR)" ".\include\apr.h" - $(CPP) $(CPP_PROJ) $(SOURCE) - - -SOURCE=.\shmem\win32\shm.c - -"$(INTDIR)\shm.obj" : $(SOURCE) "$(INTDIR)" ".\include\apr.h" - $(CPP) $(CPP_PROJ) $(SOURCE) - - -SOURCE=.\strings\apr_cpystrn.c - -"$(INTDIR)\apr_cpystrn.obj" : $(SOURCE) "$(INTDIR)" ".\include\apr.h" - $(CPP) $(CPP_PROJ) $(SOURCE) - - -SOURCE=.\strings\apr_fnmatch.c - -"$(INTDIR)\apr_fnmatch.obj" : $(SOURCE) "$(INTDIR)" ".\include\apr.h" - $(CPP) $(CPP_PROJ) $(SOURCE) - - -SOURCE=.\strings\apr_snprintf.c - -"$(INTDIR)\apr_snprintf.obj" : $(SOURCE) "$(INTDIR)" ".\include\apr.h" - $(CPP) $(CPP_PROJ) $(SOURCE) - - -SOURCE=.\strings\apr_strings.c - -"$(INTDIR)\apr_strings.obj" : $(SOURCE) "$(INTDIR)" ".\include\apr.h" - $(CPP) $(CPP_PROJ) $(SOURCE) - - -SOURCE=.\strings\apr_strnatcmp.c - -"$(INTDIR)\apr_strnatcmp.obj" : $(SOURCE) "$(INTDIR)" ".\include\apr.h" - $(CPP) $(CPP_PROJ) $(SOURCE) - - -SOURCE=.\strings\apr_strtok.c - -"$(INTDIR)\apr_strtok.obj" : $(SOURCE) "$(INTDIR)" ".\include\apr.h" - $(CPP) $(CPP_PROJ) $(SOURCE) - - -SOURCE=.\tables\apr_hash.c - -"$(INTDIR)\apr_hash.obj" : $(SOURCE) "$(INTDIR)" ".\include\apr.h" - $(CPP) $(CPP_PROJ) $(SOURCE) - - -SOURCE=.\tables\apr_tables.c - -"$(INTDIR)\apr_tables.obj" : $(SOURCE) "$(INTDIR)" ".\include\apr.h" - $(CPP) $(CPP_PROJ) $(SOURCE) - - -SOURCE=.\threadproc\win32\proc.c - -"$(INTDIR)\proc.obj" : $(SOURCE) "$(INTDIR)" ".\include\apr.h" - $(CPP) $(CPP_PROJ) $(SOURCE) - - -SOURCE=.\threadproc\win32\signals.c - -"$(INTDIR)\signals.obj" : $(SOURCE) "$(INTDIR)" ".\include\apr.h" - $(CPP) $(CPP_PROJ) $(SOURCE) - - -SOURCE=.\threadproc\win32\thread.c - -"$(INTDIR)\thread.obj" : $(SOURCE) "$(INTDIR)" ".\include\apr.h" - $(CPP) $(CPP_PROJ) $(SOURCE) - - -SOURCE=.\threadproc\win32\threadpriv.c - -"$(INTDIR)\threadpriv.obj" : $(SOURCE) "$(INTDIR)" ".\include\apr.h" - $(CPP) $(CPP_PROJ) $(SOURCE) - - -SOURCE=.\time\win32\time.c - -"$(INTDIR)\time.obj" : $(SOURCE) "$(INTDIR)" ".\include\apr.h" - $(CPP) $(CPP_PROJ) $(SOURCE) - - -SOURCE=.\time\win32\timestr.c - -"$(INTDIR)\timestr.obj" : $(SOURCE) "$(INTDIR)" ".\include\apr.h" - $(CPP) $(CPP_PROJ) $(SOURCE) - - -SOURCE=.\user\win32\groupinfo.c - -"$(INTDIR)\groupinfo.obj" : $(SOURCE) "$(INTDIR)" ".\include\apr.h" - $(CPP) $(CPP_PROJ) $(SOURCE) - - -SOURCE=.\user\win32\userinfo.c - -"$(INTDIR)\userinfo.obj" : $(SOURCE) "$(INTDIR)" ".\include\apr.h" - $(CPP) $(CPP_PROJ) $(SOURCE) - - -SOURCE=.\include\apr.hw - -!IF "$(CFG)" == "apr - Win32 Release" - -InputPath=.\include\apr.hw - -".\include\apr.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" - < .\include\apr.h -<< - - -!ELSEIF "$(CFG)" == "apr - Win32 Debug" - -InputPath=.\include\apr.hw - -".\include\apr.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" - < .\include\apr.h -<< - - -!ELSEIF "$(CFG)" == "apr - Win32 Release9x" - -InputPath=.\include\apr.hw - -".\include\apr.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" - < .\include\apr.h -<< - - -!ELSEIF "$(CFG)" == "apr - Win32 Debug9x" - -InputPath=.\include\apr.hw - -".\include\apr.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" - < .\include\apr.h -<< - - -!ELSEIF "$(CFG)" == "apr - x64 Release" - -InputPath=.\include\apr.hw - -".\include\apr.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" - < .\include\apr.h -<< - - -!ELSEIF "$(CFG)" == "apr - x64 Debug" - -InputPath=.\include\apr.hw - -".\include\apr.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" - < .\include\apr.h -<< - - -!ENDIF - - -!ENDIF - diff --git a/iis/winbuild/aprutil.mak b/iis/winbuild/aprutil.mak deleted file mode 100644 index e14c0725..00000000 --- a/iis/winbuild/aprutil.mak +++ /dev/null @@ -1,1472 +0,0 @@ -# Microsoft Developer Studio Generated NMAKE File, Based on aprutil.dsp -!IF "$(CFG)" == "" -CFG=aprutil - Win32 Release -!MESSAGE No configuration specified. Defaulting to aprutil - Win32 Release. -!ENDIF - -!IF "$(CFG)" != "aprutil - Win32 Release" && "$(CFG)" != "aprutil - Win32 Debug" && "$(CFG)" != "aprutil - x64 Release" && "$(CFG)" != "aprutil - x64 Debug" -!MESSAGE Invalid configuration "$(CFG)" specified. -!MESSAGE You can specify a configuration when running NMAKE -!MESSAGE by defining the macro CFG on the command line. For example: -!MESSAGE -!MESSAGE NMAKE /f "aprutil.mak" CFG="aprutil - Win32 Release" -!MESSAGE -!MESSAGE Possible choices for configuration are: -!MESSAGE -!MESSAGE "aprutil - Win32 Release" (based on "Win32 (x86) Static Library") -!MESSAGE "aprutil - Win32 Debug" (based on "Win32 (x86) Static Library") -!MESSAGE "aprutil - x64 Release" (based on "Win32 (x86) Static Library") -!MESSAGE "aprutil - x64 Debug" (based on "Win32 (x86) Static Library") -!MESSAGE -!ERROR An invalid configuration is specified. -!ENDIF - -!IF "$(OS)" == "Windows_NT" -NULL= -!ELSE -NULL=nul -!ENDIF - -!IF "$(CFG)" == "aprutil - Win32 Release" - -OUTDIR=.\LibR -INTDIR=.\LibR -# Begin Custom Macros -OutDir=.\LibR -# End Custom Macros - -!IF "$(RECURSE)" == "0" - -ALL : "$(OUTDIR)\aprutil-1.lib" - -!ELSE - -ALL : "xml - Win32 Release" "apriconv - Win32 Release" "$(OUTDIR)\aprutil-1.lib" - -!ENDIF - -!IF "$(RECURSE)" == "1" -CLEAN :"apriconv - Win32 ReleaseCLEAN" "xml - Win32 ReleaseCLEAN" -!ELSE -CLEAN : -!ENDIF - -@erase "$(INTDIR)\apr_base64.obj" - -@erase "$(INTDIR)\apr_brigade.obj" - -@erase "$(INTDIR)\apr_buckets.obj" - -@erase "$(INTDIR)\apr_buckets_alloc.obj" - -@erase "$(INTDIR)\apr_buckets_eos.obj" - -@erase "$(INTDIR)\apr_buckets_file.obj" - -@erase "$(INTDIR)\apr_buckets_flush.obj" - -@erase "$(INTDIR)\apr_buckets_heap.obj" - -@erase "$(INTDIR)\apr_buckets_mmap.obj" - -@erase "$(INTDIR)\apr_buckets_pipe.obj" - -@erase "$(INTDIR)\apr_buckets_pool.obj" - -@erase "$(INTDIR)\apr_buckets_refcount.obj" - -@erase "$(INTDIR)\apr_buckets_simple.obj" - -@erase "$(INTDIR)\apr_buckets_socket.obj" - -@erase "$(INTDIR)\apr_crypto.obj" - -@erase "$(INTDIR)\apr_date.obj" - -@erase "$(INTDIR)\apr_dbd.obj" - -@erase "$(INTDIR)\apr_dbd_freetds.obj" - -@erase "$(INTDIR)\apr_dbd_mysql.obj" - -@erase "$(INTDIR)\apr_dbd_odbc.obj" - -@erase "$(INTDIR)\apr_dbd_oracle.obj" - -@erase "$(INTDIR)\apr_dbd_pgsql.obj" - -@erase "$(INTDIR)\apr_dbd_sqlite2.obj" - -@erase "$(INTDIR)\apr_dbd_sqlite3.obj" - -@erase "$(INTDIR)\apr_dbm.obj" - -@erase "$(INTDIR)\apr_dbm_berkeleydb.obj" - -@erase "$(INTDIR)\apr_dbm_gdbm.obj" - -@erase "$(INTDIR)\apr_dbm_sdbm.obj" - -@erase "$(INTDIR)\apr_hooks.obj" - -@erase "$(INTDIR)\apr_ldap_init.obj" - -@erase "$(INTDIR)\apr_ldap_option.obj" - -@erase "$(INTDIR)\apr_ldap_rebind.obj" - -@erase "$(INTDIR)\apr_ldap_stub.obj" - -@erase "$(INTDIR)\apr_ldap_url.obj" - -@erase "$(INTDIR)\apr_md4.obj" - -@erase "$(INTDIR)\apr_md5.obj" - -@erase "$(INTDIR)\apr_memcache.obj" - -@erase "$(INTDIR)\apr_queue.obj" - -@erase "$(INTDIR)\apr_reslist.obj" - -@erase "$(INTDIR)\apr_rmm.obj" - -@erase "$(INTDIR)\apr_sha1.obj" - -@erase "$(INTDIR)\apr_strmatch.obj" - -@erase "$(INTDIR)\apr_thread_pool.obj" - -@erase "$(INTDIR)\apr_uri.obj" - -@erase "$(INTDIR)\apr_xml.obj" - -@erase "$(INTDIR)\aprutil-1.idb" - -@erase "$(INTDIR)\aprutil-1.pdb" - -@erase "$(INTDIR)\apu_dso.obj" - -@erase "$(INTDIR)\apu_version.obj" - -@erase "$(INTDIR)\getuuid.obj" - -@erase "$(INTDIR)\sdbm.obj" - -@erase "$(INTDIR)\sdbm_hash.obj" - -@erase "$(INTDIR)\sdbm_lock.obj" - -@erase "$(INTDIR)\sdbm_pair.obj" - -@erase "$(INTDIR)\uuid.obj" - -@erase "$(INTDIR)\xlate.obj" - -@erase "$(OUTDIR)\aprutil-1.lib" - -"$(OUTDIR)" : - if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)" - -CPP=cl.exe -CPP_PROJ=/nologo /MD /W3 /Zi /O2 /Oy- /I "./include" /I "../apr/include" /I "./include/private" /I "../apr-iconv/include" /I "./dbm/sdbm" /I "./xml/expat/lib" /D "NDEBUG" /D "APR_DECLARE_STATIC" /D "APU_DECLARE_STATIC" /D "API_DECLARE_STATIC" /D "APU_USE_SDBM" /D "HAVE_SQL_H" /D "XML_STATIC" /D "WIN32" /D "_WINDOWS" /Fo"$(INTDIR)\\" /Fd"$(OUTDIR)\aprutil-1" /FD /c - -.c{$(INTDIR)}.obj:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - -.cpp{$(INTDIR)}.obj:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - -.cxx{$(INTDIR)}.obj:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - -.c{$(INTDIR)}.sbr:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - -.cpp{$(INTDIR)}.sbr:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - -.cxx{$(INTDIR)}.sbr:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - -RSC=rc.exe -BSC32=bscmake.exe -BSC32_FLAGS=/nologo /o"$(OUTDIR)\aprutil.bsc" -BSC32_SBRS= \ - -LIB32=link.exe -lib -LIB32_FLAGS=/nologo /out:"$(OUTDIR)\aprutil-1.lib" -LIB32_OBJS= \ - "$(INTDIR)\apr_brigade.obj" \ - "$(INTDIR)\apr_buckets.obj" \ - "$(INTDIR)\apr_buckets_alloc.obj" \ - "$(INTDIR)\apr_buckets_eos.obj" \ - "$(INTDIR)\apr_buckets_file.obj" \ - "$(INTDIR)\apr_buckets_flush.obj" \ - "$(INTDIR)\apr_buckets_heap.obj" \ - "$(INTDIR)\apr_buckets_mmap.obj" \ - "$(INTDIR)\apr_buckets_pipe.obj" \ - "$(INTDIR)\apr_buckets_pool.obj" \ - "$(INTDIR)\apr_buckets_refcount.obj" \ - "$(INTDIR)\apr_buckets_simple.obj" \ - "$(INTDIR)\apr_buckets_socket.obj" \ - "$(INTDIR)\apr_crypto.obj" \ - "$(INTDIR)\apr_md4.obj" \ - "$(INTDIR)\apr_md5.obj" \ - "$(INTDIR)\apr_sha1.obj" \ - "$(INTDIR)\getuuid.obj" \ - "$(INTDIR)\uuid.obj" \ - "$(INTDIR)\apr_dbd.obj" \ - "$(INTDIR)\apr_dbd_freetds.obj" \ - "$(INTDIR)\apr_dbd_mysql.obj" \ - "$(INTDIR)\apr_dbd_odbc.obj" \ - "$(INTDIR)\apr_dbd_oracle.obj" \ - "$(INTDIR)\apr_dbd_pgsql.obj" \ - "$(INTDIR)\apr_dbd_sqlite2.obj" \ - "$(INTDIR)\apr_dbd_sqlite3.obj" \ - "$(INTDIR)\apr_dbm.obj" \ - "$(INTDIR)\apr_dbm_berkeleydb.obj" \ - "$(INTDIR)\apr_dbm_gdbm.obj" \ - "$(INTDIR)\apr_dbm_sdbm.obj" \ - "$(INTDIR)\apr_base64.obj" \ - "$(INTDIR)\apr_hooks.obj" \ - "$(INTDIR)\apr_ldap_init.obj" \ - "$(INTDIR)\apr_ldap_option.obj" \ - "$(INTDIR)\apr_ldap_rebind.obj" \ - "$(INTDIR)\apr_ldap_stub.obj" \ - "$(INTDIR)\apr_ldap_url.obj" \ - "$(INTDIR)\apr_memcache.obj" \ - "$(INTDIR)\apr_date.obj" \ - "$(INTDIR)\apu_dso.obj" \ - "$(INTDIR)\apr_queue.obj" \ - "$(INTDIR)\apr_reslist.obj" \ - "$(INTDIR)\apr_rmm.obj" \ - "$(INTDIR)\apr_thread_pool.obj" \ - "$(INTDIR)\apu_version.obj" \ - "$(INTDIR)\sdbm.obj" \ - "$(INTDIR)\sdbm_hash.obj" \ - "$(INTDIR)\sdbm_lock.obj" \ - "$(INTDIR)\sdbm_pair.obj" \ - "$(INTDIR)\apr_strmatch.obj" \ - "$(INTDIR)\apr_uri.obj" \ - "$(INTDIR)\xlate.obj" \ - "$(INTDIR)\apr_xml.obj" \ - "..\apr-iconv\LibR\apriconv-1.lib" \ - ".\xml\expat\lib\LibR\xml.lib" - -"$(OUTDIR)\aprutil-1.lib" : "$(OUTDIR)" $(DEF_FILE) $(LIB32_OBJS) - $(LIB32) @<< - $(LIB32_FLAGS) $(DEF_FLAGS) $(LIB32_OBJS) -<< - -!ELSEIF "$(CFG)" == "aprutil - Win32 Debug" - -OUTDIR=.\LibD -INTDIR=.\LibD -# Begin Custom Macros -OutDir=.\LibD -# End Custom Macros - -!IF "$(RECURSE)" == "0" - -ALL : ".\include\private\apu_select_dbm.h" ".\include\private\apu_config.h" ".\include\apu_want.h" ".\include\apu.h" ".\include\apr_ldap.h" "$(OUTDIR)\aprutil-1.lib" - -!ELSE - -ALL : "xml - Win32 Debug" "apriconv - Win32 Debug" ".\include\private\apu_select_dbm.h" ".\include\private\apu_config.h" ".\include\apu_want.h" ".\include\apu.h" ".\include\apr_ldap.h" "$(OUTDIR)\aprutil-1.lib" - -!ENDIF - -!IF "$(RECURSE)" == "1" -CLEAN :"apriconv - Win32 DebugCLEAN" "xml - Win32 DebugCLEAN" -!ELSE -CLEAN : -!ENDIF - -@erase "$(INTDIR)\apr_base64.obj" - -@erase "$(INTDIR)\apr_brigade.obj" - -@erase "$(INTDIR)\apr_buckets.obj" - -@erase "$(INTDIR)\apr_buckets_alloc.obj" - -@erase "$(INTDIR)\apr_buckets_eos.obj" - -@erase "$(INTDIR)\apr_buckets_file.obj" - -@erase "$(INTDIR)\apr_buckets_flush.obj" - -@erase "$(INTDIR)\apr_buckets_heap.obj" - -@erase "$(INTDIR)\apr_buckets_mmap.obj" - -@erase "$(INTDIR)\apr_buckets_pipe.obj" - -@erase "$(INTDIR)\apr_buckets_pool.obj" - -@erase "$(INTDIR)\apr_buckets_refcount.obj" - -@erase "$(INTDIR)\apr_buckets_simple.obj" - -@erase "$(INTDIR)\apr_buckets_socket.obj" - -@erase "$(INTDIR)\apr_crypto.obj" - -@erase "$(INTDIR)\apr_date.obj" - -@erase "$(INTDIR)\apr_dbd.obj" - -@erase "$(INTDIR)\apr_dbd_freetds.obj" - -@erase "$(INTDIR)\apr_dbd_mysql.obj" - -@erase "$(INTDIR)\apr_dbd_odbc.obj" - -@erase "$(INTDIR)\apr_dbd_oracle.obj" - -@erase "$(INTDIR)\apr_dbd_pgsql.obj" - -@erase "$(INTDIR)\apr_dbd_sqlite2.obj" - -@erase "$(INTDIR)\apr_dbd_sqlite3.obj" - -@erase "$(INTDIR)\apr_dbm.obj" - -@erase "$(INTDIR)\apr_dbm_berkeleydb.obj" - -@erase "$(INTDIR)\apr_dbm_gdbm.obj" - -@erase "$(INTDIR)\apr_dbm_sdbm.obj" - -@erase "$(INTDIR)\apr_hooks.obj" - -@erase "$(INTDIR)\apr_ldap_init.obj" - -@erase "$(INTDIR)\apr_ldap_option.obj" - -@erase "$(INTDIR)\apr_ldap_rebind.obj" - -@erase "$(INTDIR)\apr_ldap_stub.obj" - -@erase "$(INTDIR)\apr_ldap_url.obj" - -@erase "$(INTDIR)\apr_md4.obj" - -@erase "$(INTDIR)\apr_md5.obj" - -@erase "$(INTDIR)\apr_memcache.obj" - -@erase "$(INTDIR)\apr_queue.obj" - -@erase "$(INTDIR)\apr_reslist.obj" - -@erase "$(INTDIR)\apr_rmm.obj" - -@erase "$(INTDIR)\apr_sha1.obj" - -@erase "$(INTDIR)\apr_strmatch.obj" - -@erase "$(INTDIR)\apr_thread_pool.obj" - -@erase "$(INTDIR)\apr_uri.obj" - -@erase "$(INTDIR)\apr_xml.obj" - -@erase "$(INTDIR)\aprutil-1.idb" - -@erase "$(INTDIR)\aprutil-1.pdb" - -@erase "$(INTDIR)\apu_dso.obj" - -@erase "$(INTDIR)\apu_version.obj" - -@erase "$(INTDIR)\getuuid.obj" - -@erase "$(INTDIR)\sdbm.obj" - -@erase "$(INTDIR)\sdbm_hash.obj" - -@erase "$(INTDIR)\sdbm_lock.obj" - -@erase "$(INTDIR)\sdbm_pair.obj" - -@erase "$(INTDIR)\uuid.obj" - -@erase "$(INTDIR)\xlate.obj" - -@erase "$(OUTDIR)\aprutil-1.lib" - -@erase ".\include\apr_ldap.h" - -@erase ".\include\apu.h" - -@erase ".\include\apu_want.h" - -@erase ".\include\private\apu_config.h" - -@erase ".\include\private\apu_select_dbm.h" - -"$(OUTDIR)" : - if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)" - -CPP=cl.exe -CPP_PROJ=/nologo /MDd /W3 /Zi /Od /I "./include" /I "../apr/include" /I "./include/private" /I "../apr-iconv/include" /I "./dbm/sdbm" /I "./xml/expat/lib" /D "_DEBUG" /D "APR_DECLARE_STATIC" /D "APU_DECLARE_STATIC" /D "API_DECLARE_STATIC" /D "APU_USE_SDBM" /D "HAVE_SQL_H" /D "XML_STATIC" /D "WIN32" /D "_WINDOWS" /Fo"$(INTDIR)\\" /Fd"$(OUTDIR)\aprutil-1" /FD /EHsc /c - -.c{$(INTDIR)}.obj:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - -.cpp{$(INTDIR)}.obj:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - -.cxx{$(INTDIR)}.obj:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - -.c{$(INTDIR)}.sbr:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - -.cpp{$(INTDIR)}.sbr:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - -.cxx{$(INTDIR)}.sbr:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - -RSC=rc.exe -BSC32=bscmake.exe -BSC32_FLAGS=/nologo /o"$(OUTDIR)\aprutil.bsc" -BSC32_SBRS= \ - -LIB32=link.exe -lib -LIB32_FLAGS=/nologo /out:"$(OUTDIR)\aprutil-1.lib" -LIB32_OBJS= \ - "$(INTDIR)\apr_brigade.obj" \ - "$(INTDIR)\apr_buckets.obj" \ - "$(INTDIR)\apr_buckets_alloc.obj" \ - "$(INTDIR)\apr_buckets_eos.obj" \ - "$(INTDIR)\apr_buckets_file.obj" \ - "$(INTDIR)\apr_buckets_flush.obj" \ - "$(INTDIR)\apr_buckets_heap.obj" \ - "$(INTDIR)\apr_buckets_mmap.obj" \ - "$(INTDIR)\apr_buckets_pipe.obj" \ - "$(INTDIR)\apr_buckets_pool.obj" \ - "$(INTDIR)\apr_buckets_refcount.obj" \ - "$(INTDIR)\apr_buckets_simple.obj" \ - "$(INTDIR)\apr_buckets_socket.obj" \ - "$(INTDIR)\apr_crypto.obj" \ - "$(INTDIR)\apr_md4.obj" \ - "$(INTDIR)\apr_md5.obj" \ - "$(INTDIR)\apr_sha1.obj" \ - "$(INTDIR)\getuuid.obj" \ - "$(INTDIR)\uuid.obj" \ - "$(INTDIR)\apr_dbd.obj" \ - "$(INTDIR)\apr_dbd_freetds.obj" \ - "$(INTDIR)\apr_dbd_mysql.obj" \ - "$(INTDIR)\apr_dbd_odbc.obj" \ - "$(INTDIR)\apr_dbd_oracle.obj" \ - "$(INTDIR)\apr_dbd_pgsql.obj" \ - "$(INTDIR)\apr_dbd_sqlite2.obj" \ - "$(INTDIR)\apr_dbd_sqlite3.obj" \ - "$(INTDIR)\apr_dbm.obj" \ - "$(INTDIR)\apr_dbm_berkeleydb.obj" \ - "$(INTDIR)\apr_dbm_gdbm.obj" \ - "$(INTDIR)\apr_dbm_sdbm.obj" \ - "$(INTDIR)\apr_base64.obj" \ - "$(INTDIR)\apr_hooks.obj" \ - "$(INTDIR)\apr_ldap_init.obj" \ - "$(INTDIR)\apr_ldap_option.obj" \ - "$(INTDIR)\apr_ldap_rebind.obj" \ - "$(INTDIR)\apr_ldap_stub.obj" \ - "$(INTDIR)\apr_ldap_url.obj" \ - "$(INTDIR)\apr_memcache.obj" \ - "$(INTDIR)\apr_date.obj" \ - "$(INTDIR)\apu_dso.obj" \ - "$(INTDIR)\apr_queue.obj" \ - "$(INTDIR)\apr_reslist.obj" \ - "$(INTDIR)\apr_rmm.obj" \ - "$(INTDIR)\apr_thread_pool.obj" \ - "$(INTDIR)\apu_version.obj" \ - "$(INTDIR)\sdbm.obj" \ - "$(INTDIR)\sdbm_hash.obj" \ - "$(INTDIR)\sdbm_lock.obj" \ - "$(INTDIR)\sdbm_pair.obj" \ - "$(INTDIR)\apr_strmatch.obj" \ - "$(INTDIR)\apr_uri.obj" \ - "$(INTDIR)\xlate.obj" \ - "$(INTDIR)\apr_xml.obj" \ - "..\apr-iconv\LibD\apriconv-1.lib" \ - ".\xml\expat\lib\LibD\xml.lib" - -"$(OUTDIR)\aprutil-1.lib" : "$(OUTDIR)" $(DEF_FILE) $(LIB32_OBJS) - $(LIB32) @<< - $(LIB32_FLAGS) $(DEF_FLAGS) $(LIB32_OBJS) -<< - -!ELSEIF "$(CFG)" == "aprutil - x64 Release" - -OUTDIR=.\x64\LibR -INTDIR=.\x64\LibR -# Begin Custom Macros -OutDir=.\x64\LibR -# End Custom Macros - -!IF "$(RECURSE)" == "0" - -ALL : ".\include\private\apu_select_dbm.h" ".\include\private\apu_config.h" ".\include\apu_want.h" ".\include\apu.h" ".\include\apr_ldap.h" "$(OUTDIR)\aprutil-1.lib" - -!ELSE - -ALL : "xml - x64 Release" "apriconv - x64 Release" ".\include\private\apu_select_dbm.h" ".\include\private\apu_config.h" ".\include\apu_want.h" ".\include\apu.h" ".\include\apr_ldap.h" "$(OUTDIR)\aprutil-1.lib" - -!ENDIF - -!IF "$(RECURSE)" == "1" -CLEAN :"apriconv - x64 ReleaseCLEAN" "xml - x64 ReleaseCLEAN" -!ELSE -CLEAN : -!ENDIF - -@erase "$(INTDIR)\apr_base64.obj" - -@erase "$(INTDIR)\apr_brigade.obj" - -@erase "$(INTDIR)\apr_buckets.obj" - -@erase "$(INTDIR)\apr_buckets_alloc.obj" - -@erase "$(INTDIR)\apr_buckets_eos.obj" - -@erase "$(INTDIR)\apr_buckets_file.obj" - -@erase "$(INTDIR)\apr_buckets_flush.obj" - -@erase "$(INTDIR)\apr_buckets_heap.obj" - -@erase "$(INTDIR)\apr_buckets_mmap.obj" - -@erase "$(INTDIR)\apr_buckets_pipe.obj" - -@erase "$(INTDIR)\apr_buckets_pool.obj" - -@erase "$(INTDIR)\apr_buckets_refcount.obj" - -@erase "$(INTDIR)\apr_buckets_simple.obj" - -@erase "$(INTDIR)\apr_buckets_socket.obj" - -@erase "$(INTDIR)\apr_crypto.obj" - -@erase "$(INTDIR)\apr_date.obj" - -@erase "$(INTDIR)\apr_dbd.obj" - -@erase "$(INTDIR)\apr_dbd_freetds.obj" - -@erase "$(INTDIR)\apr_dbd_mysql.obj" - -@erase "$(INTDIR)\apr_dbd_odbc.obj" - -@erase "$(INTDIR)\apr_dbd_oracle.obj" - -@erase "$(INTDIR)\apr_dbd_pgsql.obj" - -@erase "$(INTDIR)\apr_dbd_sqlite2.obj" - -@erase "$(INTDIR)\apr_dbd_sqlite3.obj" - -@erase "$(INTDIR)\apr_dbm.obj" - -@erase "$(INTDIR)\apr_dbm_berkeleydb.obj" - -@erase "$(INTDIR)\apr_dbm_gdbm.obj" - -@erase "$(INTDIR)\apr_dbm_sdbm.obj" - -@erase "$(INTDIR)\apr_hooks.obj" - -@erase "$(INTDIR)\apr_ldap_init.obj" - -@erase "$(INTDIR)\apr_ldap_option.obj" - -@erase "$(INTDIR)\apr_ldap_rebind.obj" - -@erase "$(INTDIR)\apr_ldap_stub.obj" - -@erase "$(INTDIR)\apr_ldap_url.obj" - -@erase "$(INTDIR)\apr_md4.obj" - -@erase "$(INTDIR)\apr_md5.obj" - -@erase "$(INTDIR)\apr_memcache.obj" - -@erase "$(INTDIR)\apr_queue.obj" - -@erase "$(INTDIR)\apr_reslist.obj" - -@erase "$(INTDIR)\apr_rmm.obj" - -@erase "$(INTDIR)\apr_sha1.obj" - -@erase "$(INTDIR)\apr_strmatch.obj" - -@erase "$(INTDIR)\apr_thread_pool.obj" - -@erase "$(INTDIR)\apr_uri.obj" - -@erase "$(INTDIR)\apr_xml.obj" - -@erase "$(INTDIR)\aprutil-1.idb" - -@erase "$(INTDIR)\aprutil-1.pdb" - -@erase "$(INTDIR)\apu_dso.obj" - -@erase "$(INTDIR)\apu_version.obj" - -@erase "$(INTDIR)\getuuid.obj" - -@erase "$(INTDIR)\sdbm.obj" - -@erase "$(INTDIR)\sdbm_hash.obj" - -@erase "$(INTDIR)\sdbm_lock.obj" - -@erase "$(INTDIR)\sdbm_pair.obj" - -@erase "$(INTDIR)\uuid.obj" - -@erase "$(INTDIR)\xlate.obj" - -@erase "$(OUTDIR)\aprutil-1.lib" - -@erase ".\include\apr_ldap.h" - -@erase ".\include\apu.h" - -@erase ".\include\apu_want.h" - -@erase ".\include\private\apu_config.h" - -@erase ".\include\private\apu_select_dbm.h" - -"$(OUTDIR)" : - if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)" - -CPP=cl.exe -CPP_PROJ=/nologo /MD /W3 /Zi /O2 /Oy- /I "./include" /I "../apr/include" /I "./include/private" /I "../apr-iconv/include" /I "./dbm/sdbm" /I "./xml/expat/lib" /D "NDEBUG" /D "APR_DECLARE_STATIC" /D "APU_DECLARE_STATIC" /D "API_DECLARE_STATIC" /D "APU_USE_SDBM" /D "HAVE_SQL_H" /D "XML_STATIC" /D "WIN32" /D "_WINDOWS" /Fo"$(INTDIR)\\" /Fd"$(OUTDIR)\aprutil-1" /FD /c - -.c{$(INTDIR)}.obj:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - -.cpp{$(INTDIR)}.obj:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - -.cxx{$(INTDIR)}.obj:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - -.c{$(INTDIR)}.sbr:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - -.cpp{$(INTDIR)}.sbr:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - -.cxx{$(INTDIR)}.sbr:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - -RSC=rc.exe -BSC32=bscmake.exe -BSC32_FLAGS=/nologo /o"$(OUTDIR)\aprutil.bsc" -BSC32_SBRS= \ - -LIB32=link.exe -lib -LIB32_FLAGS=/nologo /out:"$(OUTDIR)\aprutil-1.lib" -LIB32_OBJS= \ - "$(INTDIR)\apr_brigade.obj" \ - "$(INTDIR)\apr_buckets.obj" \ - "$(INTDIR)\apr_buckets_alloc.obj" \ - "$(INTDIR)\apr_buckets_eos.obj" \ - "$(INTDIR)\apr_buckets_file.obj" \ - "$(INTDIR)\apr_buckets_flush.obj" \ - "$(INTDIR)\apr_buckets_heap.obj" \ - "$(INTDIR)\apr_buckets_mmap.obj" \ - "$(INTDIR)\apr_buckets_pipe.obj" \ - "$(INTDIR)\apr_buckets_pool.obj" \ - "$(INTDIR)\apr_buckets_refcount.obj" \ - "$(INTDIR)\apr_buckets_simple.obj" \ - "$(INTDIR)\apr_buckets_socket.obj" \ - "$(INTDIR)\apr_crypto.obj" \ - "$(INTDIR)\apr_md4.obj" \ - "$(INTDIR)\apr_md5.obj" \ - "$(INTDIR)\apr_sha1.obj" \ - "$(INTDIR)\getuuid.obj" \ - "$(INTDIR)\uuid.obj" \ - "$(INTDIR)\apr_dbd.obj" \ - "$(INTDIR)\apr_dbd_freetds.obj" \ - "$(INTDIR)\apr_dbd_mysql.obj" \ - "$(INTDIR)\apr_dbd_odbc.obj" \ - "$(INTDIR)\apr_dbd_oracle.obj" \ - "$(INTDIR)\apr_dbd_pgsql.obj" \ - "$(INTDIR)\apr_dbd_sqlite2.obj" \ - "$(INTDIR)\apr_dbd_sqlite3.obj" \ - "$(INTDIR)\apr_dbm.obj" \ - "$(INTDIR)\apr_dbm_berkeleydb.obj" \ - "$(INTDIR)\apr_dbm_gdbm.obj" \ - "$(INTDIR)\apr_dbm_sdbm.obj" \ - "$(INTDIR)\apr_base64.obj" \ - "$(INTDIR)\apr_hooks.obj" \ - "$(INTDIR)\apr_ldap_init.obj" \ - "$(INTDIR)\apr_ldap_option.obj" \ - "$(INTDIR)\apr_ldap_rebind.obj" \ - "$(INTDIR)\apr_ldap_stub.obj" \ - "$(INTDIR)\apr_ldap_url.obj" \ - "$(INTDIR)\apr_memcache.obj" \ - "$(INTDIR)\apr_date.obj" \ - "$(INTDIR)\apu_dso.obj" \ - "$(INTDIR)\apr_queue.obj" \ - "$(INTDIR)\apr_reslist.obj" \ - "$(INTDIR)\apr_rmm.obj" \ - "$(INTDIR)\apr_thread_pool.obj" \ - "$(INTDIR)\apu_version.obj" \ - "$(INTDIR)\sdbm.obj" \ - "$(INTDIR)\sdbm_hash.obj" \ - "$(INTDIR)\sdbm_lock.obj" \ - "$(INTDIR)\sdbm_pair.obj" \ - "$(INTDIR)\apr_strmatch.obj" \ - "$(INTDIR)\apr_uri.obj" \ - "$(INTDIR)\xlate.obj" \ - "$(INTDIR)\apr_xml.obj" \ - "..\apr-iconv\x64\LibR\apriconv-1.lib" \ - ".\xml\expat\lib\x64\LibR\xml.lib" - -"$(OUTDIR)\aprutil-1.lib" : "$(OUTDIR)" $(DEF_FILE) $(LIB32_OBJS) - $(LIB32) @<< - $(LIB32_FLAGS) $(DEF_FLAGS) $(LIB32_OBJS) -<< - -!ELSEIF "$(CFG)" == "aprutil - x64 Debug" - -OUTDIR=.\x64\LibD -INTDIR=.\x64\LibD -# Begin Custom Macros -OutDir=.\x64\LibD -# End Custom Macros - -!IF "$(RECURSE)" == "0" - -ALL : ".\include\private\apu_select_dbm.h" ".\include\private\apu_config.h" ".\include\apu_want.h" ".\include\apu.h" ".\include\apr_ldap.h" "$(OUTDIR)\aprutil-1.lib" - -!ELSE - -ALL : "xml - x64 Debug" "apriconv - x64 Debug" ".\include\private\apu_select_dbm.h" ".\include\private\apu_config.h" ".\include\apu_want.h" ".\include\apu.h" ".\include\apr_ldap.h" "$(OUTDIR)\aprutil-1.lib" - -!ENDIF - -!IF "$(RECURSE)" == "1" -CLEAN :"apriconv - x64 DebugCLEAN" "xml - x64 DebugCLEAN" -!ELSE -CLEAN : -!ENDIF - -@erase "$(INTDIR)\apr_base64.obj" - -@erase "$(INTDIR)\apr_brigade.obj" - -@erase "$(INTDIR)\apr_buckets.obj" - -@erase "$(INTDIR)\apr_buckets_alloc.obj" - -@erase "$(INTDIR)\apr_buckets_eos.obj" - -@erase "$(INTDIR)\apr_buckets_file.obj" - -@erase "$(INTDIR)\apr_buckets_flush.obj" - -@erase "$(INTDIR)\apr_buckets_heap.obj" - -@erase "$(INTDIR)\apr_buckets_mmap.obj" - -@erase "$(INTDIR)\apr_buckets_pipe.obj" - -@erase "$(INTDIR)\apr_buckets_pool.obj" - -@erase "$(INTDIR)\apr_buckets_refcount.obj" - -@erase "$(INTDIR)\apr_buckets_simple.obj" - -@erase "$(INTDIR)\apr_buckets_socket.obj" - -@erase "$(INTDIR)\apr_crypto.obj" - -@erase "$(INTDIR)\apr_date.obj" - -@erase "$(INTDIR)\apr_dbd.obj" - -@erase "$(INTDIR)\apr_dbd_freetds.obj" - -@erase "$(INTDIR)\apr_dbd_mysql.obj" - -@erase "$(INTDIR)\apr_dbd_odbc.obj" - -@erase "$(INTDIR)\apr_dbd_oracle.obj" - -@erase "$(INTDIR)\apr_dbd_pgsql.obj" - -@erase "$(INTDIR)\apr_dbd_sqlite2.obj" - -@erase "$(INTDIR)\apr_dbd_sqlite3.obj" - -@erase "$(INTDIR)\apr_dbm.obj" - -@erase "$(INTDIR)\apr_dbm_berkeleydb.obj" - -@erase "$(INTDIR)\apr_dbm_gdbm.obj" - -@erase "$(INTDIR)\apr_dbm_sdbm.obj" - -@erase "$(INTDIR)\apr_hooks.obj" - -@erase "$(INTDIR)\apr_ldap_init.obj" - -@erase "$(INTDIR)\apr_ldap_option.obj" - -@erase "$(INTDIR)\apr_ldap_rebind.obj" - -@erase "$(INTDIR)\apr_ldap_stub.obj" - -@erase "$(INTDIR)\apr_ldap_url.obj" - -@erase "$(INTDIR)\apr_md4.obj" - -@erase "$(INTDIR)\apr_md5.obj" - -@erase "$(INTDIR)\apr_memcache.obj" - -@erase "$(INTDIR)\apr_queue.obj" - -@erase "$(INTDIR)\apr_reslist.obj" - -@erase "$(INTDIR)\apr_rmm.obj" - -@erase "$(INTDIR)\apr_sha1.obj" - -@erase "$(INTDIR)\apr_strmatch.obj" - -@erase "$(INTDIR)\apr_thread_pool.obj" - -@erase "$(INTDIR)\apr_uri.obj" - -@erase "$(INTDIR)\apr_xml.obj" - -@erase "$(INTDIR)\aprutil-1.idb" - -@erase "$(INTDIR)\aprutil-1.pdb" - -@erase "$(INTDIR)\apu_dso.obj" - -@erase "$(INTDIR)\apu_version.obj" - -@erase "$(INTDIR)\getuuid.obj" - -@erase "$(INTDIR)\sdbm.obj" - -@erase "$(INTDIR)\sdbm_hash.obj" - -@erase "$(INTDIR)\sdbm_lock.obj" - -@erase "$(INTDIR)\sdbm_pair.obj" - -@erase "$(INTDIR)\uuid.obj" - -@erase "$(INTDIR)\xlate.obj" - -@erase "$(OUTDIR)\aprutil-1.lib" - -@erase ".\include\apr_ldap.h" - -@erase ".\include\apu.h" - -@erase ".\include\apu_want.h" - -@erase ".\include\private\apu_config.h" - -@erase ".\include\private\apu_select_dbm.h" - -"$(OUTDIR)" : - if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)" - -CPP=cl.exe -CPP_PROJ=/nologo /MDd /W3 /Zi /Od /I "./include" /I "../apr/include" /I "./include/private" /I "../apr-iconv/include" /I "./dbm/sdbm" /I "./xml/expat/lib" /D "_DEBUG" /D "APR_DECLARE_STATIC" /D "APU_DECLARE_STATIC" /D "API_DECLARE_STATIC" /D "APU_USE_SDBM" /D "HAVE_SQL_H" /D "XML_STATIC" /D "WIN32" /D "_WINDOWS" /Fo"$(INTDIR)\\" /Fd"$(OUTDIR)\aprutil-1" /FD /EHsc /c - -.c{$(INTDIR)}.obj:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - -.cpp{$(INTDIR)}.obj:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - -.cxx{$(INTDIR)}.obj:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - -.c{$(INTDIR)}.sbr:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - -.cpp{$(INTDIR)}.sbr:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - -.cxx{$(INTDIR)}.sbr:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - -RSC=rc.exe -BSC32=bscmake.exe -BSC32_FLAGS=/nologo /o"$(OUTDIR)\aprutil.bsc" -BSC32_SBRS= \ - -LIB32=link.exe -lib -LIB32_FLAGS=/nologo /out:"$(OUTDIR)\aprutil-1.lib" -LIB32_OBJS= \ - "$(INTDIR)\apr_brigade.obj" \ - "$(INTDIR)\apr_buckets.obj" \ - "$(INTDIR)\apr_buckets_alloc.obj" \ - "$(INTDIR)\apr_buckets_eos.obj" \ - "$(INTDIR)\apr_buckets_file.obj" \ - "$(INTDIR)\apr_buckets_flush.obj" \ - "$(INTDIR)\apr_buckets_heap.obj" \ - "$(INTDIR)\apr_buckets_mmap.obj" \ - "$(INTDIR)\apr_buckets_pipe.obj" \ - "$(INTDIR)\apr_buckets_pool.obj" \ - "$(INTDIR)\apr_buckets_refcount.obj" \ - "$(INTDIR)\apr_buckets_simple.obj" \ - "$(INTDIR)\apr_buckets_socket.obj" \ - "$(INTDIR)\apr_crypto.obj" \ - "$(INTDIR)\apr_md4.obj" \ - "$(INTDIR)\apr_md5.obj" \ - "$(INTDIR)\apr_sha1.obj" \ - "$(INTDIR)\getuuid.obj" \ - "$(INTDIR)\uuid.obj" \ - "$(INTDIR)\apr_dbd.obj" \ - "$(INTDIR)\apr_dbd_freetds.obj" \ - "$(INTDIR)\apr_dbd_mysql.obj" \ - "$(INTDIR)\apr_dbd_odbc.obj" \ - "$(INTDIR)\apr_dbd_oracle.obj" \ - "$(INTDIR)\apr_dbd_pgsql.obj" \ - "$(INTDIR)\apr_dbd_sqlite2.obj" \ - "$(INTDIR)\apr_dbd_sqlite3.obj" \ - "$(INTDIR)\apr_dbm.obj" \ - "$(INTDIR)\apr_dbm_berkeleydb.obj" \ - "$(INTDIR)\apr_dbm_gdbm.obj" \ - "$(INTDIR)\apr_dbm_sdbm.obj" \ - "$(INTDIR)\apr_base64.obj" \ - "$(INTDIR)\apr_hooks.obj" \ - "$(INTDIR)\apr_ldap_init.obj" \ - "$(INTDIR)\apr_ldap_option.obj" \ - "$(INTDIR)\apr_ldap_rebind.obj" \ - "$(INTDIR)\apr_ldap_stub.obj" \ - "$(INTDIR)\apr_ldap_url.obj" \ - "$(INTDIR)\apr_memcache.obj" \ - "$(INTDIR)\apr_date.obj" \ - "$(INTDIR)\apu_dso.obj" \ - "$(INTDIR)\apr_queue.obj" \ - "$(INTDIR)\apr_reslist.obj" \ - "$(INTDIR)\apr_rmm.obj" \ - "$(INTDIR)\apr_thread_pool.obj" \ - "$(INTDIR)\apu_version.obj" \ - "$(INTDIR)\sdbm.obj" \ - "$(INTDIR)\sdbm_hash.obj" \ - "$(INTDIR)\sdbm_lock.obj" \ - "$(INTDIR)\sdbm_pair.obj" \ - "$(INTDIR)\apr_strmatch.obj" \ - "$(INTDIR)\apr_uri.obj" \ - "$(INTDIR)\xlate.obj" \ - "$(INTDIR)\apr_xml.obj" \ - "..\apr-iconv\x64\LibD\apriconv-1.lib" \ - ".\xml\expat\lib\x64\LibD\xml.lib" - -"$(OUTDIR)\aprutil-1.lib" : "$(OUTDIR)" $(DEF_FILE) $(LIB32_OBJS) - $(LIB32) @<< - $(LIB32_FLAGS) $(DEF_FLAGS) $(LIB32_OBJS) -<< - -!ENDIF - - -!IF "$(NO_EXTERNAL_DEPS)" != "1" -!IF EXISTS("aprutil.dep") -!INCLUDE "aprutil.dep" -!ELSE -!MESSAGE Warning: cannot find "aprutil.dep" -!ENDIF -!ENDIF - - -!IF "$(CFG)" == "aprutil - Win32 Release" || "$(CFG)" == "aprutil - Win32 Debug" || "$(CFG)" == "aprutil - x64 Release" || "$(CFG)" == "aprutil - x64 Debug" -SOURCE=.\buckets\apr_brigade.c - -"$(INTDIR)\apr_brigade.obj" : $(SOURCE) "$(INTDIR)" ".\include\apu.h" - $(CPP) $(CPP_PROJ) $(SOURCE) - - -SOURCE=.\buckets\apr_buckets.c - -"$(INTDIR)\apr_buckets.obj" : $(SOURCE) "$(INTDIR)" ".\include\apu.h" - $(CPP) $(CPP_PROJ) $(SOURCE) - - -SOURCE=.\buckets\apr_buckets_alloc.c - -"$(INTDIR)\apr_buckets_alloc.obj" : $(SOURCE) "$(INTDIR)" ".\include\apu.h" - $(CPP) $(CPP_PROJ) $(SOURCE) - - -SOURCE=.\buckets\apr_buckets_eos.c - -"$(INTDIR)\apr_buckets_eos.obj" : $(SOURCE) "$(INTDIR)" ".\include\apu.h" - $(CPP) $(CPP_PROJ) $(SOURCE) - - -SOURCE=.\buckets\apr_buckets_file.c - -"$(INTDIR)\apr_buckets_file.obj" : $(SOURCE) "$(INTDIR)" ".\include\apu.h" - $(CPP) $(CPP_PROJ) $(SOURCE) - - -SOURCE=.\buckets\apr_buckets_flush.c - -"$(INTDIR)\apr_buckets_flush.obj" : $(SOURCE) "$(INTDIR)" ".\include\apu.h" - $(CPP) $(CPP_PROJ) $(SOURCE) - - -SOURCE=.\buckets\apr_buckets_heap.c - -"$(INTDIR)\apr_buckets_heap.obj" : $(SOURCE) "$(INTDIR)" ".\include\apu.h" - $(CPP) $(CPP_PROJ) $(SOURCE) - - -SOURCE=.\buckets\apr_buckets_mmap.c - -"$(INTDIR)\apr_buckets_mmap.obj" : $(SOURCE) "$(INTDIR)" ".\include\apu.h" - $(CPP) $(CPP_PROJ) $(SOURCE) - - -SOURCE=.\buckets\apr_buckets_pipe.c - -"$(INTDIR)\apr_buckets_pipe.obj" : $(SOURCE) "$(INTDIR)" ".\include\apu.h" - $(CPP) $(CPP_PROJ) $(SOURCE) - - -SOURCE=.\buckets\apr_buckets_pool.c - -"$(INTDIR)\apr_buckets_pool.obj" : $(SOURCE) "$(INTDIR)" ".\include\apu.h" - $(CPP) $(CPP_PROJ) $(SOURCE) - - -SOURCE=.\buckets\apr_buckets_refcount.c - -"$(INTDIR)\apr_buckets_refcount.obj" : $(SOURCE) "$(INTDIR)" ".\include\apu.h" - $(CPP) $(CPP_PROJ) $(SOURCE) - - -SOURCE=.\buckets\apr_buckets_simple.c - -"$(INTDIR)\apr_buckets_simple.obj" : $(SOURCE) "$(INTDIR)" ".\include\apu.h" - $(CPP) $(CPP_PROJ) $(SOURCE) - - -SOURCE=.\buckets\apr_buckets_socket.c - -"$(INTDIR)\apr_buckets_socket.obj" : $(SOURCE) "$(INTDIR)" ".\include\apu.h" - $(CPP) $(CPP_PROJ) $(SOURCE) - - -SOURCE=.\crypto\apr_crypto.c - -"$(INTDIR)\apr_crypto.obj" : $(SOURCE) "$(INTDIR)" ".\include\private\apu_config.h" ".\include\apu.h" - $(CPP) $(CPP_PROJ) $(SOURCE) - - -SOURCE=.\crypto\apr_md4.c - -"$(INTDIR)\apr_md4.obj" : $(SOURCE) "$(INTDIR)" ".\include\apu.h" - $(CPP) $(CPP_PROJ) $(SOURCE) - - -SOURCE=.\crypto\apr_md5.c - -"$(INTDIR)\apr_md5.obj" : $(SOURCE) "$(INTDIR)" ".\include\private\apu_config.h" ".\include\apu.h" - $(CPP) $(CPP_PROJ) $(SOURCE) - - -SOURCE=.\crypto\apr_sha1.c - -"$(INTDIR)\apr_sha1.obj" : $(SOURCE) "$(INTDIR)" ".\include\apu.h" - $(CPP) $(CPP_PROJ) $(SOURCE) - - -SOURCE=.\crypto\getuuid.c - -"$(INTDIR)\getuuid.obj" : $(SOURCE) "$(INTDIR)" ".\include\apu.h" - $(CPP) $(CPP_PROJ) $(SOURCE) - - -SOURCE=.\crypto\uuid.c - -"$(INTDIR)\uuid.obj" : $(SOURCE) "$(INTDIR)" ".\include\apu.h" - $(CPP) $(CPP_PROJ) $(SOURCE) - - -SOURCE=.\dbd\apr_dbd.c - -"$(INTDIR)\apr_dbd.obj" : $(SOURCE) "$(INTDIR)" ".\include\private\apu_config.h" ".\include\apu.h" - $(CPP) $(CPP_PROJ) $(SOURCE) - - -SOURCE=.\dbd\apr_dbd_freetds.c - -"$(INTDIR)\apr_dbd_freetds.obj" : $(SOURCE) "$(INTDIR)" ".\include\apu.h" ".\include\private\apu_config.h" - $(CPP) $(CPP_PROJ) $(SOURCE) - - -SOURCE=.\dbd\apr_dbd_mysql.c - -"$(INTDIR)\apr_dbd_mysql.obj" : $(SOURCE) "$(INTDIR)" ".\include\apu.h" ".\include\private\apu_config.h" - $(CPP) $(CPP_PROJ) $(SOURCE) - - -SOURCE=.\dbd\apr_dbd_odbc.c - -"$(INTDIR)\apr_dbd_odbc.obj" : $(SOURCE) "$(INTDIR)" ".\include\apu.h" ".\include\private\apu_config.h" - $(CPP) $(CPP_PROJ) $(SOURCE) - - -SOURCE=.\dbd\apr_dbd_oracle.c - -"$(INTDIR)\apr_dbd_oracle.obj" : $(SOURCE) "$(INTDIR)" ".\include\apu.h" - $(CPP) $(CPP_PROJ) $(SOURCE) - - -SOURCE=.\dbd\apr_dbd_pgsql.c - -"$(INTDIR)\apr_dbd_pgsql.obj" : $(SOURCE) "$(INTDIR)" ".\include\apu.h" ".\include\private\apu_config.h" - $(CPP) $(CPP_PROJ) $(SOURCE) - - -SOURCE=.\dbd\apr_dbd_sqlite2.c - -"$(INTDIR)\apr_dbd_sqlite2.obj" : $(SOURCE) "$(INTDIR)" ".\include\apu.h" - $(CPP) $(CPP_PROJ) $(SOURCE) - - -SOURCE=.\dbd\apr_dbd_sqlite3.c - -"$(INTDIR)\apr_dbd_sqlite3.obj" : $(SOURCE) "$(INTDIR)" ".\include\apu.h" - $(CPP) $(CPP_PROJ) $(SOURCE) - - -SOURCE=.\dbm\apr_dbm.c - -"$(INTDIR)\apr_dbm.obj" : $(SOURCE) "$(INTDIR)" ".\include\private\apu_config.h" ".\include\apu.h" ".\include\private\apu_select_dbm.h" - $(CPP) $(CPP_PROJ) $(SOURCE) - - -SOURCE=.\dbm\apr_dbm_berkeleydb.c - -"$(INTDIR)\apr_dbm_berkeleydb.obj" : $(SOURCE) "$(INTDIR)" ".\include\apu_want.h" ".\include\private\apu_config.h" ".\include\apu.h" ".\include\private\apu_select_dbm.h" - $(CPP) $(CPP_PROJ) $(SOURCE) - - -SOURCE=.\dbm\apr_dbm_gdbm.c - -"$(INTDIR)\apr_dbm_gdbm.obj" : $(SOURCE) "$(INTDIR)" ".\include\private\apu_config.h" ".\include\apu.h" ".\include\private\apu_select_dbm.h" - $(CPP) $(CPP_PROJ) $(SOURCE) - - -SOURCE=.\dbm\apr_dbm_sdbm.c - -"$(INTDIR)\apr_dbm_sdbm.obj" : $(SOURCE) "$(INTDIR)" ".\include\private\apu_config.h" ".\include\apu.h" ".\include\private\apu_select_dbm.h" - $(CPP) $(CPP_PROJ) $(SOURCE) - - -SOURCE=.\encoding\apr_base64.c - -"$(INTDIR)\apr_base64.obj" : $(SOURCE) "$(INTDIR)" ".\include\apu.h" - $(CPP) $(CPP_PROJ) $(SOURCE) - - -SOURCE=.\hooks\apr_hooks.c - -"$(INTDIR)\apr_hooks.obj" : $(SOURCE) "$(INTDIR)" ".\include\apu.h" - $(CPP) $(CPP_PROJ) $(SOURCE) - - -SOURCE=.\ldap\apr_ldap_init.c - -"$(INTDIR)\apr_ldap_init.obj" : $(SOURCE) "$(INTDIR)" ".\include\apu.h" ".\include\private\apu_config.h" ".\include\apr_ldap.h" - $(CPP) $(CPP_PROJ) $(SOURCE) - - -SOURCE=.\ldap\apr_ldap_option.c - -"$(INTDIR)\apr_ldap_option.obj" : $(SOURCE) "$(INTDIR)" ".\include\apu.h" ".\include\private\apu_config.h" ".\include\apr_ldap.h" - $(CPP) $(CPP_PROJ) $(SOURCE) - - -SOURCE=.\ldap\apr_ldap_rebind.c - -"$(INTDIR)\apr_ldap_rebind.obj" : $(SOURCE) "$(INTDIR)" ".\include\apu.h" ".\include\private\apu_config.h" ".\include\apr_ldap.h" - $(CPP) $(CPP_PROJ) $(SOURCE) - - -SOURCE=.\ldap\apr_ldap_stub.c - -"$(INTDIR)\apr_ldap_stub.obj" : $(SOURCE) "$(INTDIR)" ".\include\apu.h" ".\include\private\apu_config.h" ".\include\apr_ldap.h" - $(CPP) $(CPP_PROJ) $(SOURCE) - - -SOURCE=.\ldap\apr_ldap_url.c - -"$(INTDIR)\apr_ldap_url.obj" : $(SOURCE) "$(INTDIR)" ".\include\apu.h" ".\include\apr_ldap.h" - $(CPP) $(CPP_PROJ) $(SOURCE) - - -SOURCE=.\memcache\apr_memcache.c - -"$(INTDIR)\apr_memcache.obj" : $(SOURCE) "$(INTDIR)" ".\include\apu.h" - $(CPP) $(CPP_PROJ) $(SOURCE) - - -SOURCE=.\misc\apr_date.c - -"$(INTDIR)\apr_date.obj" : $(SOURCE) "$(INTDIR)" ".\include\apu.h" - $(CPP) $(CPP_PROJ) $(SOURCE) - - -SOURCE=.\misc\apr_queue.c - -"$(INTDIR)\apr_queue.obj" : $(SOURCE) "$(INTDIR)" ".\include\apu.h" - $(CPP) $(CPP_PROJ) $(SOURCE) - - -SOURCE=.\misc\apr_reslist.c - -"$(INTDIR)\apr_reslist.obj" : $(SOURCE) "$(INTDIR)" ".\include\apu.h" - $(CPP) $(CPP_PROJ) $(SOURCE) - - -SOURCE=.\misc\apr_rmm.c - -"$(INTDIR)\apr_rmm.obj" : $(SOURCE) "$(INTDIR)" ".\include\apu.h" - $(CPP) $(CPP_PROJ) $(SOURCE) - - -SOURCE=.\misc\apr_thread_pool.c - -"$(INTDIR)\apr_thread_pool.obj" : $(SOURCE) "$(INTDIR)" ".\include\apu.h" - $(CPP) $(CPP_PROJ) $(SOURCE) - - -SOURCE=.\misc\apu_dso.c - -"$(INTDIR)\apu_dso.obj" : $(SOURCE) "$(INTDIR)" ".\include\private\apu_config.h" ".\include\apu.h" - $(CPP) $(CPP_PROJ) $(SOURCE) - - -SOURCE=.\misc\apu_version.c - -"$(INTDIR)\apu_version.obj" : $(SOURCE) "$(INTDIR)" ".\include\apu.h" - $(CPP) $(CPP_PROJ) $(SOURCE) - - -SOURCE=.\dbm\sdbm\sdbm.c - -"$(INTDIR)\sdbm.obj" : $(SOURCE) "$(INTDIR)" ".\include\apu.h" - $(CPP) $(CPP_PROJ) $(SOURCE) - - -SOURCE=.\dbm\sdbm\sdbm_hash.c - -"$(INTDIR)\sdbm_hash.obj" : $(SOURCE) "$(INTDIR)" ".\include\apu.h" - $(CPP) $(CPP_PROJ) $(SOURCE) - - -SOURCE=.\dbm\sdbm\sdbm_lock.c - -"$(INTDIR)\sdbm_lock.obj" : $(SOURCE) "$(INTDIR)" ".\include\apu.h" - $(CPP) $(CPP_PROJ) $(SOURCE) - - -SOURCE=.\dbm\sdbm\sdbm_pair.c - -"$(INTDIR)\sdbm_pair.obj" : $(SOURCE) "$(INTDIR)" ".\include\apu.h" - $(CPP) $(CPP_PROJ) $(SOURCE) - - -SOURCE=.\strmatch\apr_strmatch.c - -"$(INTDIR)\apr_strmatch.obj" : $(SOURCE) "$(INTDIR)" ".\include\apu.h" - $(CPP) $(CPP_PROJ) $(SOURCE) - - -SOURCE=.\uri\apr_uri.c - -"$(INTDIR)\apr_uri.obj" : $(SOURCE) "$(INTDIR)" ".\include\apu.h" - $(CPP) $(CPP_PROJ) $(SOURCE) - - -SOURCE=.\xlate\xlate.c - -"$(INTDIR)\xlate.obj" : $(SOURCE) "$(INTDIR)" ".\include\apu.h" ".\include\private\apu_config.h" - $(CPP) $(CPP_PROJ) $(SOURCE) - - -SOURCE=.\xml\apr_xml.c - -"$(INTDIR)\apr_xml.obj" : $(SOURCE) "$(INTDIR)" ".\include\private\apu_config.h" ".\include\apu.h" - $(CPP) $(CPP_PROJ) $(SOURCE) - - -SOURCE=.\include\apr_ldap.hw - -!IF "$(CFG)" == "aprutil - Win32 Release" - -InputPath=.\include\apr_ldap.hw - -".\include\apr_ldap.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" - < .\include\apr_ldap.h -<< - - -!ELSEIF "$(CFG)" == "aprutil - Win32 Debug" - -InputPath=.\include\apr_ldap.hw - -".\include\apr_ldap.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" - < .\include\apr_ldap.h -<< - - -!ELSEIF "$(CFG)" == "aprutil - x64 Release" - -InputPath=.\include\apr_ldap.hw - -".\include\apr_ldap.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" - < .\include\apr_ldap.h -<< - - -!ELSEIF "$(CFG)" == "aprutil - x64 Debug" - -InputPath=.\include\apr_ldap.hw - -".\include\apr_ldap.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" - < .\include\apr_ldap.h -<< - - -!ENDIF - -SOURCE=.\include\apu.hw - -!IF "$(CFG)" == "aprutil - Win32 Release" - -InputPath=.\include\apu.hw - -".\include\apu.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" - < .\include\apu.h -<< - - -!ELSEIF "$(CFG)" == "aprutil - Win32 Debug" - -InputPath=.\include\apu.hw - -".\include\apu.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" - < .\include\apu.h -<< - - -!ELSEIF "$(CFG)" == "aprutil - x64 Release" - -InputPath=.\include\apu.hw - -".\include\apu.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" - < .\include\apu.h -<< - - -!ELSEIF "$(CFG)" == "aprutil - x64 Debug" - -InputPath=.\include\apu.hw - -".\include\apu.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" - < .\include\apu.h -<< - - -!ENDIF - -SOURCE=.\include\private\apu_config.hw - -!IF "$(CFG)" == "aprutil - Win32 Release" - -InputPath=.\include\private\apu_config.hw - -".\include\private\apu_config.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" - < .\include\private\apu_config.h -<< - - -!ELSEIF "$(CFG)" == "aprutil - Win32 Debug" - -InputPath=.\include\private\apu_config.hw - -".\include\private\apu_config.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" - < .\include\private\apu_config.h -<< - - -!ELSEIF "$(CFG)" == "aprutil - x64 Release" - -InputPath=.\include\private\apu_config.hw - -".\include\private\apu_config.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" - < .\include\private\apu_config.h -<< - - -!ELSEIF "$(CFG)" == "aprutil - x64 Debug" - -InputPath=.\include\private\apu_config.hw - -".\include\private\apu_config.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" - < .\include\private\apu_config.h -<< - - -!ENDIF - -SOURCE=.\include\private\apu_select_dbm.hw - -!IF "$(CFG)" == "aprutil - Win32 Release" - -InputPath=.\include\private\apu_select_dbm.hw - -".\include\private\apu_select_dbm.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" - < .\include\private\apu_select_dbm.h -<< - - -!ELSEIF "$(CFG)" == "aprutil - Win32 Debug" - -InputPath=.\include\private\apu_select_dbm.hw - -".\include\private\apu_select_dbm.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" - < .\include\private\apu_select_dbm.h -<< - - -!ELSEIF "$(CFG)" == "aprutil - x64 Release" - -InputPath=.\include\private\apu_select_dbm.hw - -".\include\private\apu_select_dbm.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" - < .\include\private\apu_select_dbm.h -<< - - -!ELSEIF "$(CFG)" == "aprutil - x64 Debug" - -InputPath=.\include\private\apu_select_dbm.hw - -".\include\private\apu_select_dbm.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" - < .\include\private\apu_select_dbm.h -<< - - -!ENDIF - -SOURCE=.\include\apu_want.hw - -!IF "$(CFG)" == "aprutil - Win32 Release" - -InputPath=.\include\apu_want.hw - -".\include\apu_want.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" - < .\include\apu_want.h -<< - - -!ELSEIF "$(CFG)" == "aprutil - Win32 Debug" - -InputPath=.\include\apu_want.hw - -".\include\apu_want.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" - < .\include\apu_want.h -<< - - -!ELSEIF "$(CFG)" == "aprutil - x64 Release" - -InputPath=.\include\apu_want.hw - -".\include\apu_want.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" - < .\include\apu_want.h -<< - - -!ELSEIF "$(CFG)" == "aprutil - x64 Debug" - -InputPath=.\include\apu_want.hw - -".\include\apu_want.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" - < .\include\apu_want.h -<< - - -!ENDIF - -!IF "$(CFG)" == "aprutil - Win32 Release" - -"apriconv - Win32 Release" : - cd ".\..\apr-iconv" - $(MAKE) /$(MAKEFLAGS) /F ".\apriconv.mak" CFG="apriconv - Win32 Release" - cd "..\apr-util" - -"apriconv - Win32 ReleaseCLEAN" : - cd ".\..\apr-iconv" - $(MAKE) /$(MAKEFLAGS) /F ".\apriconv.mak" CFG="apriconv - Win32 Release" RECURSE=1 CLEAN - cd "..\apr-util" - -!ELSEIF "$(CFG)" == "aprutil - Win32 Debug" - -"apriconv - Win32 Debug" : - cd ".\..\apr-iconv" - $(MAKE) /$(MAKEFLAGS) /F ".\apriconv.mak" CFG="apriconv - Win32 Debug" - cd "..\apr-util" - -"apriconv - Win32 DebugCLEAN" : - cd ".\..\apr-iconv" - $(MAKE) /$(MAKEFLAGS) /F ".\apriconv.mak" CFG="apriconv - Win32 Debug" RECURSE=1 CLEAN - cd "..\apr-util" - -!ELSEIF "$(CFG)" == "aprutil - x64 Release" - -"apriconv - x64 Release" : - cd ".\..\apr-iconv" - $(MAKE) /$(MAKEFLAGS) /F ".\apriconv.mak" CFG="apriconv - x64 Release" - cd "..\apr-util" - -"apriconv - x64 ReleaseCLEAN" : - cd ".\..\apr-iconv" - $(MAKE) /$(MAKEFLAGS) /F ".\apriconv.mak" CFG="apriconv - x64 Release" RECURSE=1 CLEAN - cd "..\apr-util" - -!ELSEIF "$(CFG)" == "aprutil - x64 Debug" - -"apriconv - x64 Debug" : - cd ".\..\apr-iconv" - $(MAKE) /$(MAKEFLAGS) /F ".\apriconv.mak" CFG="apriconv - x64 Debug" - cd "..\apr-util" - -"apriconv - x64 DebugCLEAN" : - cd ".\..\apr-iconv" - $(MAKE) /$(MAKEFLAGS) /F ".\apriconv.mak" CFG="apriconv - x64 Debug" RECURSE=1 CLEAN - cd "..\apr-util" - -!ENDIF - -!IF "$(CFG)" == "aprutil - Win32 Release" - -"xml - Win32 Release" : - cd ".\xml\expat\lib" - $(MAKE) /$(MAKEFLAGS) /F ".\xml.mak" CFG="xml - Win32 Release" - cd "..\..\.." - -"xml - Win32 ReleaseCLEAN" : - cd ".\xml\expat\lib" - $(MAKE) /$(MAKEFLAGS) /F ".\xml.mak" CFG="xml - Win32 Release" RECURSE=1 CLEAN - cd "..\..\.." - -!ELSEIF "$(CFG)" == "aprutil - Win32 Debug" - -"xml - Win32 Debug" : - cd ".\xml\expat\lib" - $(MAKE) /$(MAKEFLAGS) /F ".\xml.mak" CFG="xml - Win32 Debug" - cd "..\..\.." - -"xml - Win32 DebugCLEAN" : - cd ".\xml\expat\lib" - $(MAKE) /$(MAKEFLAGS) /F ".\xml.mak" CFG="xml - Win32 Debug" RECURSE=1 CLEAN - cd "..\..\.." - -!ELSEIF "$(CFG)" == "aprutil - x64 Release" - -"xml - x64 Release" : - cd ".\xml\expat\lib" - $(MAKE) /$(MAKEFLAGS) /F ".\xml.mak" CFG="xml - x64 Release" - cd "..\..\.." - -"xml - x64 ReleaseCLEAN" : - cd ".\xml\expat\lib" - $(MAKE) /$(MAKEFLAGS) /F ".\xml.mak" CFG="xml - x64 Release" RECURSE=1 CLEAN - cd "..\..\.." - -!ELSEIF "$(CFG)" == "aprutil - x64 Debug" - -"xml - x64 Debug" : - cd ".\xml\expat\lib" - $(MAKE) /$(MAKEFLAGS) /F ".\xml.mak" CFG="xml - x64 Debug" - cd "..\..\.." - -"xml - x64 DebugCLEAN" : - cd ".\xml\expat\lib" - $(MAKE) /$(MAKEFLAGS) /F ".\xml.mak" CFG="xml - x64 Debug" RECURSE=1 CLEAN - cd "..\..\.." - -!ENDIF - - -!ENDIF - diff --git a/iis/winbuild/build.bat b/iis/winbuild/build.bat deleted file mode 100644 index 0965911c..00000000 --- a/iis/winbuild/build.bat +++ /dev/null @@ -1,11 +0,0 @@ -c: - -call build_apache.bat -call build_pcre.bat -call build_zlib.bat -call build_libxml2.bat -call build_lua.bat -call build_curl.bat -call build_module.bat - -cd %WORK% diff --git a/iis/winbuild/build32.bat b/iis/winbuild/build32.bat deleted file mode 100644 index 437a7248..00000000 --- a/iis/winbuild/build32.bat +++ /dev/null @@ -1,5 +0,0 @@ -SET APACHE24_ZIP=httpd-2.4.3-win32.zip -mkdir %DROP% -call vsvars32.bat -call init.bat -call build.bat diff --git a/iis/winbuild/build64.bat b/iis/winbuild/build64.bat deleted file mode 100644 index 0bc40d13..00000000 --- a/iis/winbuild/build64.bat +++ /dev/null @@ -1,6 +0,0 @@ -SET APACHE24_ZIP=httpd-2.4.3-win64.zip -mkdir %DROP% -call vcvars64.bat -call init.bat -SET CL=/D "WIN64" /D "_WIN64" -call build.bat diff --git a/iis/winbuild/build_apache.bat b/iis/winbuild/build_apache.bat deleted file mode 100644 index f62b7282..00000000 --- a/iis/winbuild/build_apache.bat +++ /dev/null @@ -1,40 +0,0 @@ -cd %WORK% -rmdir /s /q %APACHE% -rmdir /s /q %HTTPD% -IF NOT DEFINED BUILD_APACHE GOTO USE_APACHE_24 -7z.exe x %HTTPD%-win32-src.zip -fart.exe -r -i -C %WORK%\%HTTPD%\*.mak \x2Fmachine:x86 " " -fart.exe -r -i -C %WORK%\%HTTPD%\*.mk.win \x2Fmachine:x86 " " -copy /y %WORK%\libhttpd.mak %WORK%\%HTTPD% -copy /y %WORK%\mod_ssl.mak %WORK%\%HTTPD%\modules\ssl -copy /y %WORK%\apr.mak %WORK%\%HTTPD%\srclib\apr -copy /y %WORK%\libapr.mak %WORK%\%HTTPD%\srclib\apr -copy /y %WORK%\aprutil.mak %WORK%\%HTTPD%\srclib\apr-util -copy /y %WORK%\libaprutil.mak %WORK%\%HTTPD%\srclib\apr-util -copy /y %WORK%\dftables.mak %WORK%\%HTTPD%\srclib\pcre -copy /y %WORK%\pcre.mak %WORK%\%HTTPD%\srclib\pcre -cd %HTTPD% -nmake -f Makefile.win installr -IF NOT DEFINED FULLBUILD pause -GOTO END - -:USE_APACHE_24 -set APACHE=%WORK%\Apache24 -del /q /f --*.* -del /q /f readme.txt -rmdir /s /q %APACHE% -7z.exe x %APACHE24_ZIP% -7z.exe x %HTTPD%.zip - -:END -copy /y %APACHE%\bin\libapr-1.dll %DROP% -copy /y %APACHE%\bin\libapr-1.pdb %DROP% -copy /y %APACHE%\lib\libapr-1.lib %DROP% -copy /y %APACHE%\bin\libapriconv-1.dll %DROP% -copy /y %APACHE%\bin\libapriconv-1.pdb %DROP% -copy /y %APACHE%\lib\libapriconv-1.lib %DROP% -copy /y %APACHE%\bin\libaprutil-1.dll %DROP% -copy /y %APACHE%\bin\libaprutil-1.pdb %DROP% -copy /y %APACHE%\lib\libaprutil-1.lib %DROP% -SET HTTPD_BUILD=%WORK%\%HTTPD% -cd %WORK% diff --git a/iis/winbuild/build_curl.bat b/iis/winbuild/build_curl.bat deleted file mode 100644 index ce902e34..00000000 --- a/iis/winbuild/build_curl.bat +++ /dev/null @@ -1,14 +0,0 @@ -cd %WORK% -rmdir /s /q %CURL% -7z.exe x %CURL%.zip -copy /y CMakeLists.txt %CURL% -CD %CURL% -CMAKE -G "NMake Makefiles" -DCMAKE_BUILD_TYPE=RelWithDebInfo -DBUILD_SHARED_LIBS=True -DCURL_ZLIB=True -%WORK%\fart.exe -r -C %WORK%\%CURL%\include\curl\curlbuild.h LLU ULL -NMAKE -IF NOT DEFINED FULLBUILD pause -cd %WORK% - -copy /y %WORK%\%CURL%\libcurl.dll %DROP% -copy /y %WORK%\%CURL%\libcurl.pdb %DROP% -copy /y %WORK%\%CURL%\libcurl_imp.lib %DROP% diff --git a/iis/winbuild/build_libxml2.bat b/iis/winbuild/build_libxml2.bat deleted file mode 100644 index efef5dce..00000000 --- a/iis/winbuild/build_libxml2.bat +++ /dev/null @@ -1,12 +0,0 @@ -cd %WORK% -rmdir /s /q %LIBXML2% -7z.exe x %LIBXML2%.zip -fart.exe -r -i -C %WORK%\%LIBXML2%\win32\*.* \x2Fopt:nowin98 " " -cd %LIBXML2%\win32 -CSCRIPT configure.js iconv=no vcmanifest=yes zlib=yes -NMAKE -f Makefile.msvc -IF NOT DEFINED FULLBUILD pause -cd %WORK% - -copy /y %WORK%\%LIBXML2%\win32\bin.msvc\libxml2.dll %DROP% -copy /y %WORK%\%LIBXML2%\win32\bin.msvc\libxml2.lib %DROP% diff --git a/iis/winbuild/build_lua.bat b/iis/winbuild/build_lua.bat deleted file mode 100644 index 140be214..00000000 --- a/iis/winbuild/build_lua.bat +++ /dev/null @@ -1,14 +0,0 @@ -cd %WORK% -rmdir /s /q %LUA% -7z.exe x %LUA%.zip -CD %LUA%\src -CL /Ox /arch:SSE2 /GF /GL /Gy /FD /EHsc /MD /Zi /TC /wd4005 /D "_MBCS" /D "LUA_CORE" /D "LUA_BUILD_AS_DLL" /D "_CRT_SECURE_NO_WARNINGS" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_WIN32" /D "_WINDLL" /c *.c -DEL lua.obj luac.obj -LINK /DLL /LTCG /DEBUG /OUT:lua5.1.dll *.obj -IF EXIST lua5.1.dll.manifest MT -manifest lua5.1.dll.manifest -outputresource:lua5.1.dll;2 -IF NOT DEFINED FULLBUILD pause -cd %WORK% - -copy /y %WORK%\%LUA%\src\lua5.1.dll %DROP% -copy /y %WORK%\%LUA%\src\lua5.1.pdb %DROP% -copy /y %WORK%\%LUA%\src\lua5.1.lib %DROP% diff --git a/iis/winbuild/build_module.bat b/iis/winbuild/build_module.bat deleted file mode 100644 index 7d54ae4a..00000000 --- a/iis/winbuild/build_module.bat +++ /dev/null @@ -1,16 +0,0 @@ -cd %WORK% -CD mod_security\apache2 -del *.obj *.dll *.lib -NMAKE -f Makefile.win APACHE=%APACHE% PCRE=%WORK%\%PCRE% LIBXML2=%WORK%\%LIBXML2% LUA=%WORK%\%LUA%\src VERSION=VERSION_IIS -cd ..\mlogc -copy /y %WORK%\Makefile.win . -nmake -f Makefile.win clean -nmake -f Makefile.win APACHE=%APACHE% PCRE=%WORK%\%PCRE% CURL=%WORK%\%CURL% VERSION=VERSION_IIS -cd ..\iis -nmake -f Makefile.win clean -NMAKE -f Makefile.win APACHE=%APACHE% PCRE=%WORK%\%PCRE% LIBXML2=%WORK%\%LIBXML2% LUA=%WORK%\%LUA%\src VERSION=VERSION_IIS -cd %WORK% - -copy /y %WORK%\mod_security\mlogc\mlogc.exe %DROP% -copy /y %WORK%\mod_security\iis\modsecurityiis.dll %DROP% -copy /y %WORK%\mod_security\iis\modsecurityiis.pdb %DROP% diff --git a/iis/winbuild/build_pcre.bat b/iis/winbuild/build_pcre.bat deleted file mode 100644 index d1d17387..00000000 --- a/iis/winbuild/build_pcre.bat +++ /dev/null @@ -1,12 +0,0 @@ -cd %WORK% -rmdir /s /q %PCRE% -7z.exe x %PCRE%.zip -cd %PCRE% -CMAKE -G "NMake Makefiles" -DCMAKE_BUILD_TYPE=RelWithDebInfo -DBUILD_SHARED_LIBS=True -NMAKE -IF NOT DEFINED FULLBUILD pause -cd %WORK% - -copy /y %WORK%\%PCRE%\pcre.dll %DROP% -copy /y %WORK%\%PCRE%\pcre.pdb %DROP% -copy /y %WORK%\%PCRE%\pcre.lib %DROP% diff --git a/iis/winbuild/build_zlib.bat b/iis/winbuild/build_zlib.bat deleted file mode 100644 index d9b901bb..00000000 --- a/iis/winbuild/build_zlib.bat +++ /dev/null @@ -1,13 +0,0 @@ -cd %WORK% -rmdir /s /q %ZLIB% -7z.exe x %ZLIB%.zip -cd %ZLIB% -nmake -f win32\Makefile.msc -SET INCLUDE=%INCLUDE%;%WORK%\%ZLIB% -SET LIB=%LIB%;%WORK%\%ZLIB% -IF NOT DEFINED FULLBUILD pause -cd %WORK% - -copy /y %WORK%\%ZLIB%\zlib1.dll %DROP% -copy /y %WORK%\%ZLIB%\zlib1.pdb %DROP% -copy /y %WORK%\%ZLIB%\zdll.lib %DROP% diff --git a/iis/winbuild/buildall.bat b/iis/winbuild/buildall.bat deleted file mode 100644 index f99dd5ca..00000000 --- a/iis/winbuild/buildall.bat +++ /dev/null @@ -1,7 +0,0 @@ -set FULLBUILD=1 - -set DROP=c:\drop\amd64 -cmd.exe /c build64.bat - -set DROP=c:\drop\x86 -cmd.exe /c build32.bat diff --git a/iis/winbuild/dftables.mak b/iis/winbuild/dftables.mak deleted file mode 100644 index 94428aa0..00000000 --- a/iis/winbuild/dftables.mak +++ /dev/null @@ -1,238 +0,0 @@ -# Microsoft Developer Studio Generated NMAKE File, Based on dftables.dsp -!IF "$(CFG)" == "" -CFG=dftables - Win32 Debug -!MESSAGE No configuration specified. Defaulting to dftables - Win32 Debug. -!ENDIF - -!IF "$(CFG)" != "dftables - Win32 Release" && "$(CFG)" != "dftables - Win32 Debug" -!MESSAGE Invalid configuration "$(CFG)" specified. -!MESSAGE You can specify a configuration when running NMAKE -!MESSAGE by defining the macro CFG on the command line. For example: -!MESSAGE -!MESSAGE NMAKE /f "dftables.mak" CFG="dftables - Win32 Debug" -!MESSAGE -!MESSAGE Possible choices for configuration are: -!MESSAGE -!MESSAGE "dftables - Win32 Release" (based on "Win32 (x86) Console Application") -!MESSAGE "dftables - Win32 Debug" (based on "Win32 (x86) Console Application") -!MESSAGE -!ERROR An invalid configuration is specified. -!ENDIF - -!IF "$(OS)" == "Windows_NT" -NULL= -!ELSE -NULL=nul -!ENDIF - -!IF "$(CFG)" == "dftables - Win32 Release" - -OUTDIR=. -INTDIR=.\Release -# Begin Custom Macros -OutDir=. -# End Custom Macros - -ALL : "$(OUTDIR)\dftables.exe" - - -CLEAN : - -@erase "$(INTDIR)\dftables.idb" - -@erase "$(INTDIR)\dftables.obj" - -@erase "$(OUTDIR)\dftables.exe" - -"$(INTDIR)" : - if not exist "$(INTDIR)/$(NULL)" mkdir "$(INTDIR)" - -CPP=cl.exe -CPP_PROJ=/nologo /MD /W3 /O2 /D "_WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /D "_CRT_SECURE_NO_DEPRECATE" /D "_CRT_NONSTDC_NO_DEPRECATE" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\dftables" /FD /c - -.c{$(INTDIR)}.obj:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - -.cpp{$(INTDIR)}.obj:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - -.cxx{$(INTDIR)}.obj:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - -.c{$(INTDIR)}.sbr:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - -.cpp{$(INTDIR)}.sbr:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - -.cxx{$(INTDIR)}.sbr:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - -RSC=rc.exe -BSC32=bscmake.exe -BSC32_FLAGS=/nologo /o"$(OUTDIR)\dftables.bsc" -BSC32_SBRS= \ - -LINK32=link.exe -LINK32_FLAGS=kernel32.lib /nologo /subsystem:console /incremental:no /pdb:"$(OUTDIR)\Release\dftables.pdb" /out:"$(OUTDIR)\dftables.exe" /opt:ref -LINK32_OBJS= \ - "$(INTDIR)\dftables.obj" - -"$(OUTDIR)\dftables.exe" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS) - $(LINK32) @<< - $(LINK32_FLAGS) $(LINK32_OBJS) -<< - -!ELSEIF "$(CFG)" == "dftables - Win32 Debug" - -OUTDIR=. -INTDIR=.\Debug -# Begin Custom Macros -OutDir=. -# End Custom Macros - -ALL : ".\pcre.h" ".\config.h" "$(OUTDIR)\dftables.exe" - - -CLEAN : - -@erase "$(INTDIR)\dftables.idb" - -@erase "$(INTDIR)\dftables.obj" - -@erase "$(OUTDIR)\Debug\dftables.pdb" - -@erase "$(OUTDIR)\dftables.exe" - -@erase ".\config.h" - -@erase ".\pcre.h" - -"$(INTDIR)" : - if not exist "$(INTDIR)/$(NULL)" mkdir "$(INTDIR)" - -CPP=cl.exe -CPP_PROJ=/nologo /MDd /W3 /Zi /Od /D "_WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /D "_CRT_SECURE_NO_DEPRECATE" /D "_CRT_NONSTDC_NO_DEPRECATE" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\dftables" /FD /EHsc /c - -.c{$(INTDIR)}.obj:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - -.cpp{$(INTDIR)}.obj:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - -.cxx{$(INTDIR)}.obj:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - -.c{$(INTDIR)}.sbr:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - -.cpp{$(INTDIR)}.sbr:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - -.cxx{$(INTDIR)}.sbr:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - -RSC=rc.exe -BSC32=bscmake.exe -BSC32_FLAGS=/nologo /o"$(OUTDIR)\dftables.bsc" -BSC32_SBRS= \ - -LINK32=link.exe -LINK32_FLAGS=kernel32.lib /nologo /subsystem:console /incremental:no /pdb:"$(OUTDIR)\Debug\dftables.pdb" /debug /out:"$(OUTDIR)\dftables.exe" -LINK32_OBJS= \ - "$(INTDIR)\dftables.obj" - -"$(OUTDIR)\dftables.exe" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS) - $(LINK32) @<< - $(LINK32_FLAGS) $(LINK32_OBJS) -<< - -!ENDIF - - -!IF "$(NO_EXTERNAL_DEPS)" != "1" -!IF EXISTS("dftables.dep") -!INCLUDE "dftables.dep" -!ELSE -!MESSAGE Warning: cannot find "dftables.dep" -!ENDIF -!ENDIF - - -!IF "$(CFG)" == "dftables - Win32 Release" || "$(CFG)" == "dftables - Win32 Debug" -SOURCE=.\dftables.c - -"$(INTDIR)\dftables.obj" : $(SOURCE) "$(INTDIR)" ".\config.h" ".\pcre.h" - - -SOURCE=.\config.hw - -!IF "$(CFG)" == "dftables - Win32 Release" - -InputPath=.\config.hw - -".\config.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" - < .\config.h -<< - - -!ELSEIF "$(CFG)" == "dftables - Win32 Debug" - -InputPath=.\config.hw - -".\config.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" - < .\config.h -<< - - -!ENDIF - -SOURCE=.\maketables.c -SOURCE=.\pcre.hw - -!IF "$(CFG)" == "dftables - Win32 Release" - -InputPath=.\pcre.hw - -".\pcre.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" - < .\pcre.h -<< - - -!ELSEIF "$(CFG)" == "dftables - Win32 Debug" - -InputPath=.\pcre.hw - -".\pcre.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" - < .\pcre.h -<< - - -!ENDIF - - -!ENDIF - diff --git a/iis/winbuild/fart.exe b/iis/winbuild/fart.exe deleted file mode 100644 index 075563cd..00000000 Binary files a/iis/winbuild/fart.exe and /dev/null differ diff --git a/iis/winbuild/init.bat b/iis/winbuild/init.bat deleted file mode 100644 index 7f01426f..00000000 --- a/iis/winbuild/init.bat +++ /dev/null @@ -1,13 +0,0 @@ -set PATH=%PATH%;c:\work\cmake-2.8.7-win32-x86\bin;"c:\program files\7-zip" - -rem set BUILD_APACHE=YES -set HTTPD=httpd-2.2.22 -IF NOT DEFINED BUILD_APACHE SET HTTPD=httpd-2.4.3 - -set WORK=c:\work -set APACHE=c:\Apache22 -set PCRE=pcre-8.30 -set ZLIB=zlib-1.2.7 -set LIBXML2=libxml2-2.7.7 -set LUA=lua-5.1.5 -set CURL=curl-7.24.0 diff --git a/iis/winbuild/libapr.mak b/iis/winbuild/libapr.mak deleted file mode 100644 index 90871c7b..00000000 --- a/iis/winbuild/libapr.mak +++ /dev/null @@ -1,1917 +0,0 @@ -# Microsoft Developer Studio Generated NMAKE File, Based on libapr.dsp -!IF "$(CFG)" == "" -CFG=libapr - Win32 Release -!MESSAGE No configuration specified. Defaulting to libapr - Win32 Release. -!ENDIF - -!IF "$(CFG)" != "libapr - Win32 Release" && "$(CFG)" != "libapr - Win32 Debug" && "$(CFG)" != "libapr - Win32 Release9x" && "$(CFG)" != "libapr - Win32 Debug9x" && "$(CFG)" != "libapr - x64 Release" && "$(CFG)" != "libapr - x64 Debug" -!MESSAGE Invalid configuration "$(CFG)" specified. -!MESSAGE You can specify a configuration when running NMAKE -!MESSAGE by defining the macro CFG on the command line. For example: -!MESSAGE -!MESSAGE NMAKE /f "libapr.mak" CFG="libapr - Win32 Release" -!MESSAGE -!MESSAGE Possible choices for configuration are: -!MESSAGE -!MESSAGE "libapr - Win32 Release" (based on "Win32 (x86) Dynamic-Link Library") -!MESSAGE "libapr - Win32 Debug" (based on "Win32 (x86) Dynamic-Link Library") -!MESSAGE "libapr - Win32 Release9x" (based on "Win32 (x86) Dynamic-Link Library") -!MESSAGE "libapr - Win32 Debug9x" (based on "Win32 (x86) Dynamic-Link Library") -!MESSAGE "libapr - x64 Release" (based on "Win32 (x86) Dynamic-Link Library") -!MESSAGE "libapr - x64 Debug" (based on "Win32 (x86) Dynamic-Link Library") -!MESSAGE -!ERROR An invalid configuration is specified. -!ENDIF - -!IF "$(OS)" == "Windows_NT" -NULL= -!ELSE -NULL=nul -!ENDIF - -!IF "$(CFG)" == "libapr - Win32 Release" - -OUTDIR=.\Release -INTDIR=.\Release -DS_POSTBUILD_DEP=$(INTDIR)\postbld.dep -# Begin Custom Macros -OutDir=.\Release -# End Custom Macros - -ALL : "$(OUTDIR)\libapr-1.dll" "$(DS_POSTBUILD_DEP)" - - -CLEAN : - -@erase "$(INTDIR)\apr_atomic.obj" - -@erase "$(INTDIR)\apr_cpystrn.obj" - -@erase "$(INTDIR)\apr_fnmatch.obj" - -@erase "$(INTDIR)\apr_getpass.obj" - -@erase "$(INTDIR)\apr_hash.obj" - -@erase "$(INTDIR)\apr_pools.obj" - -@erase "$(INTDIR)\apr_random.obj" - -@erase "$(INTDIR)\apr_snprintf.obj" - -@erase "$(INTDIR)\apr_strings.obj" - -@erase "$(INTDIR)\apr_strnatcmp.obj" - -@erase "$(INTDIR)\apr_strtok.obj" - -@erase "$(INTDIR)\apr_tables.obj" - -@erase "$(INTDIR)\buffer.obj" - -@erase "$(INTDIR)\charset.obj" - -@erase "$(INTDIR)\common.obj" - -@erase "$(INTDIR)\copy.obj" - -@erase "$(INTDIR)\dir.obj" - -@erase "$(INTDIR)\dso.obj" - -@erase "$(INTDIR)\env.obj" - -@erase "$(INTDIR)\errorcodes.obj" - -@erase "$(INTDIR)\fileacc.obj" - -@erase "$(INTDIR)\filedup.obj" - -@erase "$(INTDIR)\filepath.obj" - -@erase "$(INTDIR)\filepath_util.obj" - -@erase "$(INTDIR)\filestat.obj" - -@erase "$(INTDIR)\filesys.obj" - -@erase "$(INTDIR)\flock.obj" - -@erase "$(INTDIR)\fullrw.obj" - -@erase "$(INTDIR)\getopt.obj" - -@erase "$(INTDIR)\groupinfo.obj" - -@erase "$(INTDIR)\inet_ntop.obj" - -@erase "$(INTDIR)\inet_pton.obj" - -@erase "$(INTDIR)\internal.obj" - -@erase "$(INTDIR)\libapr.res" - -@erase "$(INTDIR)\libapr_src.idb" - -@erase "$(INTDIR)\libapr_src.pdb" - -@erase "$(INTDIR)\misc.obj" - -@erase "$(INTDIR)\mktemp.obj" - -@erase "$(INTDIR)\mmap.obj" - -@erase "$(INTDIR)\multicast.obj" - -@erase "$(INTDIR)\open.obj" - -@erase "$(INTDIR)\otherchild.obj" - -@erase "$(INTDIR)\pipe.obj" - -@erase "$(INTDIR)\poll.obj" - -@erase "$(INTDIR)\pollcb.obj" - -@erase "$(INTDIR)\pollset.obj" - -@erase "$(INTDIR)\proc.obj" - -@erase "$(INTDIR)\proc_mutex.obj" - -@erase "$(INTDIR)\rand.obj" - -@erase "$(INTDIR)\readwrite.obj" - -@erase "$(INTDIR)\seek.obj" - -@erase "$(INTDIR)\select.obj" - -@erase "$(INTDIR)\sendrecv.obj" - -@erase "$(INTDIR)\sha2.obj" - -@erase "$(INTDIR)\sha2_glue.obj" - -@erase "$(INTDIR)\shm.obj" - -@erase "$(INTDIR)\signals.obj" - -@erase "$(INTDIR)\sockaddr.obj" - -@erase "$(INTDIR)\socket_util.obj" - -@erase "$(INTDIR)\sockets.obj" - -@erase "$(INTDIR)\sockopt.obj" - -@erase "$(INTDIR)\start.obj" - -@erase "$(INTDIR)\tempdir.obj" - -@erase "$(INTDIR)\thread.obj" - -@erase "$(INTDIR)\thread_cond.obj" - -@erase "$(INTDIR)\thread_mutex.obj" - -@erase "$(INTDIR)\thread_rwlock.obj" - -@erase "$(INTDIR)\threadpriv.obj" - -@erase "$(INTDIR)\time.obj" - -@erase "$(INTDIR)\timestr.obj" - -@erase "$(INTDIR)\userinfo.obj" - -@erase "$(INTDIR)\utf8.obj" - -@erase "$(INTDIR)\version.obj" - -@erase "$(OUTDIR)\libapr-1.dll" - -@erase "$(OUTDIR)\libapr-1.exp" - -@erase "$(OUTDIR)\libapr-1.lib" - -@erase "$(OUTDIR)\libapr-1.pdb" - -"$(OUTDIR)" : - if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)" - -CPP=cl.exe -CPP_PROJ=/nologo /MD /W3 /Zi /O2 /Oy- /I "./include" /I "./include/arch" /I "./include/arch/win32" /I "./include/arch/unix" /D "NDEBUG" /D "APR_DECLARE_EXPORT" /D "WIN32" /D "WINNT" /D "_WINDOWS" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\libapr_src" /FD /c - -.c{$(INTDIR)}.obj:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - -.cpp{$(INTDIR)}.obj:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - -.cxx{$(INTDIR)}.obj:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - -.c{$(INTDIR)}.sbr:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - -.cpp{$(INTDIR)}.sbr:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - -.cxx{$(INTDIR)}.sbr:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - -MTL=midl.exe -MTL_PROJ=/nologo /D "NDEBUG" /mktyplib203 /o /win32 "NUL" -RSC=rc.exe -RSC_PROJ=/l 0x409 /fo"$(INTDIR)\libapr.res" /i "./include" /d "NDEBUG" /d "APR_VERSION_ONLY" -BSC32=bscmake.exe -BSC32_FLAGS=/nologo /o"$(OUTDIR)\libapr.bsc" -BSC32_SBRS= \ - -LINK32=link.exe -LINK32_FLAGS=kernel32.lib advapi32.lib ws2_32.lib mswsock.lib ole32.lib shell32.lib rpcrt4.lib /nologo /base:"0x6EEC0000" /subsystem:windows /dll /incremental:no /pdb:"$(OUTDIR)\libapr-1.pdb" /debug /out:"$(OUTDIR)\libapr-1.dll" /implib:"$(OUTDIR)\libapr-1.lib" /opt:ref -LINK32_OBJS= \ - "$(INTDIR)\apr_atomic.obj" \ - "$(INTDIR)\dso.obj" \ - "$(INTDIR)\buffer.obj" \ - "$(INTDIR)\copy.obj" \ - "$(INTDIR)\dir.obj" \ - "$(INTDIR)\fileacc.obj" \ - "$(INTDIR)\filedup.obj" \ - "$(INTDIR)\filepath.obj" \ - "$(INTDIR)\filepath_util.obj" \ - "$(INTDIR)\filestat.obj" \ - "$(INTDIR)\filesys.obj" \ - "$(INTDIR)\flock.obj" \ - "$(INTDIR)\fullrw.obj" \ - "$(INTDIR)\mktemp.obj" \ - "$(INTDIR)\open.obj" \ - "$(INTDIR)\pipe.obj" \ - "$(INTDIR)\readwrite.obj" \ - "$(INTDIR)\seek.obj" \ - "$(INTDIR)\tempdir.obj" \ - "$(INTDIR)\proc_mutex.obj" \ - "$(INTDIR)\thread_cond.obj" \ - "$(INTDIR)\thread_mutex.obj" \ - "$(INTDIR)\thread_rwlock.obj" \ - "$(INTDIR)\apr_pools.obj" \ - "$(INTDIR)\charset.obj" \ - "$(INTDIR)\env.obj" \ - "$(INTDIR)\errorcodes.obj" \ - "$(INTDIR)\getopt.obj" \ - "$(INTDIR)\internal.obj" \ - "$(INTDIR)\misc.obj" \ - "$(INTDIR)\otherchild.obj" \ - "$(INTDIR)\rand.obj" \ - "$(INTDIR)\start.obj" \ - "$(INTDIR)\utf8.obj" \ - "$(INTDIR)\version.obj" \ - "$(INTDIR)\common.obj" \ - "$(INTDIR)\mmap.obj" \ - "$(INTDIR)\inet_ntop.obj" \ - "$(INTDIR)\inet_pton.obj" \ - "$(INTDIR)\multicast.obj" \ - "$(INTDIR)\sendrecv.obj" \ - "$(INTDIR)\sockaddr.obj" \ - "$(INTDIR)\sockets.obj" \ - "$(INTDIR)\socket_util.obj" \ - "$(INTDIR)\sockopt.obj" \ - "$(INTDIR)\apr_getpass.obj" \ - "$(INTDIR)\poll.obj" \ - "$(INTDIR)\pollcb.obj" \ - "$(INTDIR)\pollset.obj" \ - "$(INTDIR)\select.obj" \ - "$(INTDIR)\apr_random.obj" \ - "$(INTDIR)\sha2.obj" \ - "$(INTDIR)\sha2_glue.obj" \ - "$(INTDIR)\shm.obj" \ - "$(INTDIR)\apr_cpystrn.obj" \ - "$(INTDIR)\apr_fnmatch.obj" \ - "$(INTDIR)\apr_snprintf.obj" \ - "$(INTDIR)\apr_strings.obj" \ - "$(INTDIR)\apr_strnatcmp.obj" \ - "$(INTDIR)\apr_strtok.obj" \ - "$(INTDIR)\apr_hash.obj" \ - "$(INTDIR)\apr_tables.obj" \ - "$(INTDIR)\proc.obj" \ - "$(INTDIR)\signals.obj" \ - "$(INTDIR)\thread.obj" \ - "$(INTDIR)\threadpriv.obj" \ - "$(INTDIR)\time.obj" \ - "$(INTDIR)\timestr.obj" \ - "$(INTDIR)\groupinfo.obj" \ - "$(INTDIR)\userinfo.obj" \ - "$(INTDIR)\libapr.res" - -"$(OUTDIR)\libapr-1.dll" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS) - $(LINK32) @<< - $(LINK32_FLAGS) $(LINK32_OBJS) -<< - -TargetPath=.\Release\libapr-1.dll -SOURCE="$(InputPath)" -PostBuild_Desc=Embed .manifest -DS_POSTBUILD_DEP=$(INTDIR)\postbld.dep - -# Begin Custom Macros -OutDir=.\Release -# End Custom Macros - -"$(DS_POSTBUILD_DEP)" : "$(OUTDIR)\libapr-1.dll" - if exist .\Release\libapr-1.dll.manifest mt.exe -manifest .\Release\libapr-1.dll.manifest -outputresource:.\Release\libapr-1.dll;2 - echo Helper for Post-build step > "$(DS_POSTBUILD_DEP)" - -!ELSEIF "$(CFG)" == "libapr - Win32 Debug" - -OUTDIR=.\Debug -INTDIR=.\Debug -DS_POSTBUILD_DEP=$(INTDIR)\postbld.dep -# Begin Custom Macros -OutDir=.\Debug -# End Custom Macros - -ALL : ".\include\apr.h" "$(OUTDIR)\libapr-1.dll" "$(DS_POSTBUILD_DEP)" - - -CLEAN : - -@erase "$(INTDIR)\apr_atomic.obj" - -@erase "$(INTDIR)\apr_cpystrn.obj" - -@erase "$(INTDIR)\apr_fnmatch.obj" - -@erase "$(INTDIR)\apr_getpass.obj" - -@erase "$(INTDIR)\apr_hash.obj" - -@erase "$(INTDIR)\apr_pools.obj" - -@erase "$(INTDIR)\apr_random.obj" - -@erase "$(INTDIR)\apr_snprintf.obj" - -@erase "$(INTDIR)\apr_strings.obj" - -@erase "$(INTDIR)\apr_strnatcmp.obj" - -@erase "$(INTDIR)\apr_strtok.obj" - -@erase "$(INTDIR)\apr_tables.obj" - -@erase "$(INTDIR)\buffer.obj" - -@erase "$(INTDIR)\charset.obj" - -@erase "$(INTDIR)\common.obj" - -@erase "$(INTDIR)\copy.obj" - -@erase "$(INTDIR)\dir.obj" - -@erase "$(INTDIR)\dso.obj" - -@erase "$(INTDIR)\env.obj" - -@erase "$(INTDIR)\errorcodes.obj" - -@erase "$(INTDIR)\fileacc.obj" - -@erase "$(INTDIR)\filedup.obj" - -@erase "$(INTDIR)\filepath.obj" - -@erase "$(INTDIR)\filepath_util.obj" - -@erase "$(INTDIR)\filestat.obj" - -@erase "$(INTDIR)\filesys.obj" - -@erase "$(INTDIR)\flock.obj" - -@erase "$(INTDIR)\fullrw.obj" - -@erase "$(INTDIR)\getopt.obj" - -@erase "$(INTDIR)\groupinfo.obj" - -@erase "$(INTDIR)\inet_ntop.obj" - -@erase "$(INTDIR)\inet_pton.obj" - -@erase "$(INTDIR)\internal.obj" - -@erase "$(INTDIR)\libapr.res" - -@erase "$(INTDIR)\libapr_src.idb" - -@erase "$(INTDIR)\libapr_src.pdb" - -@erase "$(INTDIR)\misc.obj" - -@erase "$(INTDIR)\mktemp.obj" - -@erase "$(INTDIR)\mmap.obj" - -@erase "$(INTDIR)\multicast.obj" - -@erase "$(INTDIR)\open.obj" - -@erase "$(INTDIR)\otherchild.obj" - -@erase "$(INTDIR)\pipe.obj" - -@erase "$(INTDIR)\poll.obj" - -@erase "$(INTDIR)\pollcb.obj" - -@erase "$(INTDIR)\pollset.obj" - -@erase "$(INTDIR)\proc.obj" - -@erase "$(INTDIR)\proc_mutex.obj" - -@erase "$(INTDIR)\rand.obj" - -@erase "$(INTDIR)\readwrite.obj" - -@erase "$(INTDIR)\seek.obj" - -@erase "$(INTDIR)\select.obj" - -@erase "$(INTDIR)\sendrecv.obj" - -@erase "$(INTDIR)\sha2.obj" - -@erase "$(INTDIR)\sha2_glue.obj" - -@erase "$(INTDIR)\shm.obj" - -@erase "$(INTDIR)\signals.obj" - -@erase "$(INTDIR)\sockaddr.obj" - -@erase "$(INTDIR)\socket_util.obj" - -@erase "$(INTDIR)\sockets.obj" - -@erase "$(INTDIR)\sockopt.obj" - -@erase "$(INTDIR)\start.obj" - -@erase "$(INTDIR)\tempdir.obj" - -@erase "$(INTDIR)\thread.obj" - -@erase "$(INTDIR)\thread_cond.obj" - -@erase "$(INTDIR)\thread_mutex.obj" - -@erase "$(INTDIR)\thread_rwlock.obj" - -@erase "$(INTDIR)\threadpriv.obj" - -@erase "$(INTDIR)\time.obj" - -@erase "$(INTDIR)\timestr.obj" - -@erase "$(INTDIR)\userinfo.obj" - -@erase "$(INTDIR)\utf8.obj" - -@erase "$(INTDIR)\version.obj" - -@erase "$(OUTDIR)\libapr-1.dll" - -@erase "$(OUTDIR)\libapr-1.exp" - -@erase "$(OUTDIR)\libapr-1.lib" - -@erase "$(OUTDIR)\libapr-1.pdb" - -@erase ".\include\apr.h" - -"$(OUTDIR)" : - if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)" - -CPP=cl.exe -CPP_PROJ=/nologo /MDd /W3 /Zi /Od /I "./include" /I "./include/arch" /I "./include/arch/win32" /I "./include/arch/unix" /D "_DEBUG" /D "APR_DECLARE_EXPORT" /D "WIN32" /D "WINNT" /D "_WINDOWS" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\libapr_src" /FD /EHsc /c - -.c{$(INTDIR)}.obj:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - -.cpp{$(INTDIR)}.obj:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - -.cxx{$(INTDIR)}.obj:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - -.c{$(INTDIR)}.sbr:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - -.cpp{$(INTDIR)}.sbr:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - -.cxx{$(INTDIR)}.sbr:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - -MTL=midl.exe -MTL_PROJ=/nologo /D "_DEBUG" /mktyplib203 /o /win32 "NUL" -RSC=rc.exe -RSC_PROJ=/l 0x409 /fo"$(INTDIR)\libapr.res" /i "./include" /d "_DEBUG" /d "APR_VERSION_ONLY" -BSC32=bscmake.exe -BSC32_FLAGS=/nologo /o"$(OUTDIR)\libapr.bsc" -BSC32_SBRS= \ - -LINK32=link.exe -LINK32_FLAGS=kernel32.lib advapi32.lib ws2_32.lib mswsock.lib ole32.lib shell32.lib rpcrt4.lib /nologo /base:"0x6EEC0000" /subsystem:windows /dll /incremental:no /pdb:"$(OUTDIR)\libapr-1.pdb" /debug /out:"$(OUTDIR)\libapr-1.dll" /implib:"$(OUTDIR)\libapr-1.lib" -LINK32_OBJS= \ - "$(INTDIR)\apr_atomic.obj" \ - "$(INTDIR)\dso.obj" \ - "$(INTDIR)\buffer.obj" \ - "$(INTDIR)\copy.obj" \ - "$(INTDIR)\dir.obj" \ - "$(INTDIR)\fileacc.obj" \ - "$(INTDIR)\filedup.obj" \ - "$(INTDIR)\filepath.obj" \ - "$(INTDIR)\filepath_util.obj" \ - "$(INTDIR)\filestat.obj" \ - "$(INTDIR)\filesys.obj" \ - "$(INTDIR)\flock.obj" \ - "$(INTDIR)\fullrw.obj" \ - "$(INTDIR)\mktemp.obj" \ - "$(INTDIR)\open.obj" \ - "$(INTDIR)\pipe.obj" \ - "$(INTDIR)\readwrite.obj" \ - "$(INTDIR)\seek.obj" \ - "$(INTDIR)\tempdir.obj" \ - "$(INTDIR)\proc_mutex.obj" \ - "$(INTDIR)\thread_cond.obj" \ - "$(INTDIR)\thread_mutex.obj" \ - "$(INTDIR)\thread_rwlock.obj" \ - "$(INTDIR)\apr_pools.obj" \ - "$(INTDIR)\charset.obj" \ - "$(INTDIR)\env.obj" \ - "$(INTDIR)\errorcodes.obj" \ - "$(INTDIR)\getopt.obj" \ - "$(INTDIR)\internal.obj" \ - "$(INTDIR)\misc.obj" \ - "$(INTDIR)\otherchild.obj" \ - "$(INTDIR)\rand.obj" \ - "$(INTDIR)\start.obj" \ - "$(INTDIR)\utf8.obj" \ - "$(INTDIR)\version.obj" \ - "$(INTDIR)\common.obj" \ - "$(INTDIR)\mmap.obj" \ - "$(INTDIR)\inet_ntop.obj" \ - "$(INTDIR)\inet_pton.obj" \ - "$(INTDIR)\multicast.obj" \ - "$(INTDIR)\sendrecv.obj" \ - "$(INTDIR)\sockaddr.obj" \ - "$(INTDIR)\sockets.obj" \ - "$(INTDIR)\socket_util.obj" \ - "$(INTDIR)\sockopt.obj" \ - "$(INTDIR)\apr_getpass.obj" \ - "$(INTDIR)\poll.obj" \ - "$(INTDIR)\pollcb.obj" \ - "$(INTDIR)\pollset.obj" \ - "$(INTDIR)\select.obj" \ - "$(INTDIR)\apr_random.obj" \ - "$(INTDIR)\sha2.obj" \ - "$(INTDIR)\sha2_glue.obj" \ - "$(INTDIR)\shm.obj" \ - "$(INTDIR)\apr_cpystrn.obj" \ - "$(INTDIR)\apr_fnmatch.obj" \ - "$(INTDIR)\apr_snprintf.obj" \ - "$(INTDIR)\apr_strings.obj" \ - "$(INTDIR)\apr_strnatcmp.obj" \ - "$(INTDIR)\apr_strtok.obj" \ - "$(INTDIR)\apr_hash.obj" \ - "$(INTDIR)\apr_tables.obj" \ - "$(INTDIR)\proc.obj" \ - "$(INTDIR)\signals.obj" \ - "$(INTDIR)\thread.obj" \ - "$(INTDIR)\threadpriv.obj" \ - "$(INTDIR)\time.obj" \ - "$(INTDIR)\timestr.obj" \ - "$(INTDIR)\groupinfo.obj" \ - "$(INTDIR)\userinfo.obj" \ - "$(INTDIR)\libapr.res" - -"$(OUTDIR)\libapr-1.dll" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS) - $(LINK32) @<< - $(LINK32_FLAGS) $(LINK32_OBJS) -<< - -TargetPath=.\Debug\libapr-1.dll -SOURCE="$(InputPath)" -PostBuild_Desc=Embed .manifest -DS_POSTBUILD_DEP=$(INTDIR)\postbld.dep - -# Begin Custom Macros -OutDir=.\Debug -# End Custom Macros - -"$(DS_POSTBUILD_DEP)" : "$(OUTDIR)\libapr-1.dll" - if exist .\Debug\libapr-1.dll.manifest mt.exe -manifest .\Debug\libapr-1.dll.manifest -outputresource:.\Debug\libapr-1.dll;2 - echo Helper for Post-build step > "$(DS_POSTBUILD_DEP)" - -!ELSEIF "$(CFG)" == "libapr - Win32 Release9x" - -OUTDIR=.\9x\Release -INTDIR=.\9x\Release -DS_POSTBUILD_DEP=$(INTDIR)\postbld.dep -# Begin Custom Macros -OutDir=.\9x\Release -# End Custom Macros - -ALL : ".\include\apr.h" "$(OUTDIR)\libapr-1.dll" "$(DS_POSTBUILD_DEP)" - - -CLEAN : - -@erase "$(INTDIR)\apr_atomic.obj" - -@erase "$(INTDIR)\apr_cpystrn.obj" - -@erase "$(INTDIR)\apr_fnmatch.obj" - -@erase "$(INTDIR)\apr_getpass.obj" - -@erase "$(INTDIR)\apr_hash.obj" - -@erase "$(INTDIR)\apr_pools.obj" - -@erase "$(INTDIR)\apr_random.obj" - -@erase "$(INTDIR)\apr_snprintf.obj" - -@erase "$(INTDIR)\apr_strings.obj" - -@erase "$(INTDIR)\apr_strnatcmp.obj" - -@erase "$(INTDIR)\apr_strtok.obj" - -@erase "$(INTDIR)\apr_tables.obj" - -@erase "$(INTDIR)\buffer.obj" - -@erase "$(INTDIR)\charset.obj" - -@erase "$(INTDIR)\common.obj" - -@erase "$(INTDIR)\copy.obj" - -@erase "$(INTDIR)\dir.obj" - -@erase "$(INTDIR)\dso.obj" - -@erase "$(INTDIR)\env.obj" - -@erase "$(INTDIR)\errorcodes.obj" - -@erase "$(INTDIR)\fileacc.obj" - -@erase "$(INTDIR)\filedup.obj" - -@erase "$(INTDIR)\filepath.obj" - -@erase "$(INTDIR)\filepath_util.obj" - -@erase "$(INTDIR)\filestat.obj" - -@erase "$(INTDIR)\filesys.obj" - -@erase "$(INTDIR)\flock.obj" - -@erase "$(INTDIR)\fullrw.obj" - -@erase "$(INTDIR)\getopt.obj" - -@erase "$(INTDIR)\groupinfo.obj" - -@erase "$(INTDIR)\inet_ntop.obj" - -@erase "$(INTDIR)\inet_pton.obj" - -@erase "$(INTDIR)\internal.obj" - -@erase "$(INTDIR)\libapr.res" - -@erase "$(INTDIR)\libapr_src.idb" - -@erase "$(INTDIR)\libapr_src.pdb" - -@erase "$(INTDIR)\misc.obj" - -@erase "$(INTDIR)\mktemp.obj" - -@erase "$(INTDIR)\mmap.obj" - -@erase "$(INTDIR)\multicast.obj" - -@erase "$(INTDIR)\open.obj" - -@erase "$(INTDIR)\otherchild.obj" - -@erase "$(INTDIR)\pipe.obj" - -@erase "$(INTDIR)\poll.obj" - -@erase "$(INTDIR)\pollcb.obj" - -@erase "$(INTDIR)\pollset.obj" - -@erase "$(INTDIR)\proc.obj" - -@erase "$(INTDIR)\proc_mutex.obj" - -@erase "$(INTDIR)\rand.obj" - -@erase "$(INTDIR)\readwrite.obj" - -@erase "$(INTDIR)\seek.obj" - -@erase "$(INTDIR)\select.obj" - -@erase "$(INTDIR)\sendrecv.obj" - -@erase "$(INTDIR)\sha2.obj" - -@erase "$(INTDIR)\sha2_glue.obj" - -@erase "$(INTDIR)\shm.obj" - -@erase "$(INTDIR)\signals.obj" - -@erase "$(INTDIR)\sockaddr.obj" - -@erase "$(INTDIR)\socket_util.obj" - -@erase "$(INTDIR)\sockets.obj" - -@erase "$(INTDIR)\sockopt.obj" - -@erase "$(INTDIR)\start.obj" - -@erase "$(INTDIR)\tempdir.obj" - -@erase "$(INTDIR)\thread.obj" - -@erase "$(INTDIR)\thread_cond.obj" - -@erase "$(INTDIR)\thread_mutex.obj" - -@erase "$(INTDIR)\thread_rwlock.obj" - -@erase "$(INTDIR)\threadpriv.obj" - -@erase "$(INTDIR)\time.obj" - -@erase "$(INTDIR)\timestr.obj" - -@erase "$(INTDIR)\userinfo.obj" - -@erase "$(INTDIR)\utf8.obj" - -@erase "$(INTDIR)\version.obj" - -@erase "$(OUTDIR)\libapr-1.dll" - -@erase "$(OUTDIR)\libapr-1.exp" - -@erase "$(OUTDIR)\libapr-1.lib" - -@erase "$(OUTDIR)\libapr-1.pdb" - -@erase ".\include\apr.h" - -"$(OUTDIR)" : - if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)" - -CPP=cl.exe -CPP_PROJ=/nologo /MD /W3 /Zi /O2 /Oy- /I "./include" /I "./include/arch" /I "./include/arch/win32" /I "./include/arch/unix" /D "NDEBUG" /D "APR_DECLARE_EXPORT" /D "WIN32" /D "_WINDOWS" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\libapr_src" /FD /c - -.c{$(INTDIR)}.obj:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - -.cpp{$(INTDIR)}.obj:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - -.cxx{$(INTDIR)}.obj:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - -.c{$(INTDIR)}.sbr:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - -.cpp{$(INTDIR)}.sbr:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - -.cxx{$(INTDIR)}.sbr:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - -MTL=midl.exe -MTL_PROJ=/nologo /D "NDEBUG" /mktyplib203 /o /win32 "NUL" -RSC=rc.exe -RSC_PROJ=/l 0x409 /fo"$(INTDIR)\libapr.res" /i "./include" /d "NDEBUG" /d "APR_VERSION_ONLY" -BSC32=bscmake.exe -BSC32_FLAGS=/nologo /o"$(OUTDIR)\libapr.bsc" -BSC32_SBRS= \ - -LINK32=link.exe -LINK32_FLAGS=kernel32.lib advapi32.lib ws2_32.lib mswsock.lib ole32.lib shell32.lib rpcrt4.lib /nologo /base:"0x6EEC0000" /subsystem:windows /dll /incremental:no /pdb:"$(OUTDIR)\libapr-1.pdb" /debug /out:"$(OUTDIR)\libapr-1.dll" /implib:"$(OUTDIR)\libapr-1.lib" /opt:ref -LINK32_OBJS= \ - "$(INTDIR)\apr_atomic.obj" \ - "$(INTDIR)\dso.obj" \ - "$(INTDIR)\buffer.obj" \ - "$(INTDIR)\copy.obj" \ - "$(INTDIR)\dir.obj" \ - "$(INTDIR)\fileacc.obj" \ - "$(INTDIR)\filedup.obj" \ - "$(INTDIR)\filepath.obj" \ - "$(INTDIR)\filepath_util.obj" \ - "$(INTDIR)\filestat.obj" \ - "$(INTDIR)\filesys.obj" \ - "$(INTDIR)\flock.obj" \ - "$(INTDIR)\fullrw.obj" \ - "$(INTDIR)\mktemp.obj" \ - "$(INTDIR)\open.obj" \ - "$(INTDIR)\pipe.obj" \ - "$(INTDIR)\readwrite.obj" \ - "$(INTDIR)\seek.obj" \ - "$(INTDIR)\tempdir.obj" \ - "$(INTDIR)\proc_mutex.obj" \ - "$(INTDIR)\thread_cond.obj" \ - "$(INTDIR)\thread_mutex.obj" \ - "$(INTDIR)\thread_rwlock.obj" \ - "$(INTDIR)\apr_pools.obj" \ - "$(INTDIR)\charset.obj" \ - "$(INTDIR)\env.obj" \ - "$(INTDIR)\errorcodes.obj" \ - "$(INTDIR)\getopt.obj" \ - "$(INTDIR)\internal.obj" \ - "$(INTDIR)\misc.obj" \ - "$(INTDIR)\otherchild.obj" \ - "$(INTDIR)\rand.obj" \ - "$(INTDIR)\start.obj" \ - "$(INTDIR)\utf8.obj" \ - "$(INTDIR)\version.obj" \ - "$(INTDIR)\common.obj" \ - "$(INTDIR)\mmap.obj" \ - "$(INTDIR)\inet_ntop.obj" \ - "$(INTDIR)\inet_pton.obj" \ - "$(INTDIR)\multicast.obj" \ - "$(INTDIR)\sendrecv.obj" \ - "$(INTDIR)\sockaddr.obj" \ - "$(INTDIR)\sockets.obj" \ - "$(INTDIR)\socket_util.obj" \ - "$(INTDIR)\sockopt.obj" \ - "$(INTDIR)\apr_getpass.obj" \ - "$(INTDIR)\poll.obj" \ - "$(INTDIR)\pollcb.obj" \ - "$(INTDIR)\pollset.obj" \ - "$(INTDIR)\select.obj" \ - "$(INTDIR)\apr_random.obj" \ - "$(INTDIR)\sha2.obj" \ - "$(INTDIR)\sha2_glue.obj" \ - "$(INTDIR)\shm.obj" \ - "$(INTDIR)\apr_cpystrn.obj" \ - "$(INTDIR)\apr_fnmatch.obj" \ - "$(INTDIR)\apr_snprintf.obj" \ - "$(INTDIR)\apr_strings.obj" \ - "$(INTDIR)\apr_strnatcmp.obj" \ - "$(INTDIR)\apr_strtok.obj" \ - "$(INTDIR)\apr_hash.obj" \ - "$(INTDIR)\apr_tables.obj" \ - "$(INTDIR)\proc.obj" \ - "$(INTDIR)\signals.obj" \ - "$(INTDIR)\thread.obj" \ - "$(INTDIR)\threadpriv.obj" \ - "$(INTDIR)\time.obj" \ - "$(INTDIR)\timestr.obj" \ - "$(INTDIR)\groupinfo.obj" \ - "$(INTDIR)\userinfo.obj" \ - "$(INTDIR)\libapr.res" - -"$(OUTDIR)\libapr-1.dll" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS) - $(LINK32) @<< - $(LINK32_FLAGS) $(LINK32_OBJS) -<< - -TargetPath=.\9x\Release\libapr-1.dll -SOURCE="$(InputPath)" -PostBuild_Desc=Embed .manifest -DS_POSTBUILD_DEP=$(INTDIR)\postbld.dep - -# Begin Custom Macros -OutDir=.\9x\Release -# End Custom Macros - -"$(DS_POSTBUILD_DEP)" : "$(OUTDIR)\libapr-1.dll" - if exist .\9x\Release\libapr-1.dll.manifest mt.exe -manifest .\9x\Release\libapr-1.dll.manifest -outputresource:.\9x\Release\libapr-1.dll;2 - echo Helper for Post-build step > "$(DS_POSTBUILD_DEP)" - -!ELSEIF "$(CFG)" == "libapr - Win32 Debug9x" - -OUTDIR=.\9x\Debug -INTDIR=.\9x\Debug -DS_POSTBUILD_DEP=$(INTDIR)\postbld.dep -# Begin Custom Macros -OutDir=.\9x\Debug -# End Custom Macros - -ALL : ".\include\apr.h" "$(OUTDIR)\libapr-1.dll" "$(DS_POSTBUILD_DEP)" - - -CLEAN : - -@erase "$(INTDIR)\apr_atomic.obj" - -@erase "$(INTDIR)\apr_cpystrn.obj" - -@erase "$(INTDIR)\apr_fnmatch.obj" - -@erase "$(INTDIR)\apr_getpass.obj" - -@erase "$(INTDIR)\apr_hash.obj" - -@erase "$(INTDIR)\apr_pools.obj" - -@erase "$(INTDIR)\apr_random.obj" - -@erase "$(INTDIR)\apr_snprintf.obj" - -@erase "$(INTDIR)\apr_strings.obj" - -@erase "$(INTDIR)\apr_strnatcmp.obj" - -@erase "$(INTDIR)\apr_strtok.obj" - -@erase "$(INTDIR)\apr_tables.obj" - -@erase "$(INTDIR)\buffer.obj" - -@erase "$(INTDIR)\charset.obj" - -@erase "$(INTDIR)\common.obj" - -@erase "$(INTDIR)\copy.obj" - -@erase "$(INTDIR)\dir.obj" - -@erase "$(INTDIR)\dso.obj" - -@erase "$(INTDIR)\env.obj" - -@erase "$(INTDIR)\errorcodes.obj" - -@erase "$(INTDIR)\fileacc.obj" - -@erase "$(INTDIR)\filedup.obj" - -@erase "$(INTDIR)\filepath.obj" - -@erase "$(INTDIR)\filepath_util.obj" - -@erase "$(INTDIR)\filestat.obj" - -@erase "$(INTDIR)\filesys.obj" - -@erase "$(INTDIR)\flock.obj" - -@erase "$(INTDIR)\fullrw.obj" - -@erase "$(INTDIR)\getopt.obj" - -@erase "$(INTDIR)\groupinfo.obj" - -@erase "$(INTDIR)\inet_ntop.obj" - -@erase "$(INTDIR)\inet_pton.obj" - -@erase "$(INTDIR)\internal.obj" - -@erase "$(INTDIR)\libapr.res" - -@erase "$(INTDIR)\libapr_src.idb" - -@erase "$(INTDIR)\libapr_src.pdb" - -@erase "$(INTDIR)\misc.obj" - -@erase "$(INTDIR)\mktemp.obj" - -@erase "$(INTDIR)\mmap.obj" - -@erase "$(INTDIR)\multicast.obj" - -@erase "$(INTDIR)\open.obj" - -@erase "$(INTDIR)\otherchild.obj" - -@erase "$(INTDIR)\pipe.obj" - -@erase "$(INTDIR)\poll.obj" - -@erase "$(INTDIR)\pollcb.obj" - -@erase "$(INTDIR)\pollset.obj" - -@erase "$(INTDIR)\proc.obj" - -@erase "$(INTDIR)\proc_mutex.obj" - -@erase "$(INTDIR)\rand.obj" - -@erase "$(INTDIR)\readwrite.obj" - -@erase "$(INTDIR)\seek.obj" - -@erase "$(INTDIR)\select.obj" - -@erase "$(INTDIR)\sendrecv.obj" - -@erase "$(INTDIR)\sha2.obj" - -@erase "$(INTDIR)\sha2_glue.obj" - -@erase "$(INTDIR)\shm.obj" - -@erase "$(INTDIR)\signals.obj" - -@erase "$(INTDIR)\sockaddr.obj" - -@erase "$(INTDIR)\socket_util.obj" - -@erase "$(INTDIR)\sockets.obj" - -@erase "$(INTDIR)\sockopt.obj" - -@erase "$(INTDIR)\start.obj" - -@erase "$(INTDIR)\tempdir.obj" - -@erase "$(INTDIR)\thread.obj" - -@erase "$(INTDIR)\thread_cond.obj" - -@erase "$(INTDIR)\thread_mutex.obj" - -@erase "$(INTDIR)\thread_rwlock.obj" - -@erase "$(INTDIR)\threadpriv.obj" - -@erase "$(INTDIR)\time.obj" - -@erase "$(INTDIR)\timestr.obj" - -@erase "$(INTDIR)\userinfo.obj" - -@erase "$(INTDIR)\utf8.obj" - -@erase "$(INTDIR)\version.obj" - -@erase "$(OUTDIR)\libapr-1.dll" - -@erase "$(OUTDIR)\libapr-1.exp" - -@erase "$(OUTDIR)\libapr-1.lib" - -@erase "$(OUTDIR)\libapr-1.pdb" - -@erase ".\include\apr.h" - -"$(OUTDIR)" : - if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)" - -CPP=cl.exe -CPP_PROJ=/nologo /MDd /W3 /Zi /Od /I "./include" /I "./include/arch" /I "./include/arch/win32" /I "./include/arch/unix" /D "_DEBUG" /D "APR_DECLARE_EXPORT" /D "WIN32" /D "_WINDOWS" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\libapr_src" /FD /EHsc /c - -.c{$(INTDIR)}.obj:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - -.cpp{$(INTDIR)}.obj:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - -.cxx{$(INTDIR)}.obj:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - -.c{$(INTDIR)}.sbr:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - -.cpp{$(INTDIR)}.sbr:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - -.cxx{$(INTDIR)}.sbr:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - -MTL=midl.exe -MTL_PROJ=/nologo /D "_DEBUG" /mktyplib203 /o /win32 "NUL" -RSC=rc.exe -RSC_PROJ=/l 0x409 /fo"$(INTDIR)\libapr.res" /i "./include" /d "_DEBUG" /d "APR_VERSION_ONLY" -BSC32=bscmake.exe -BSC32_FLAGS=/nologo /o"$(OUTDIR)\libapr.bsc" -BSC32_SBRS= \ - -LINK32=link.exe -LINK32_FLAGS=kernel32.lib advapi32.lib ws2_32.lib mswsock.lib ole32.lib shell32.lib rpcrt4.lib /nologo /base:"0x6EEC0000" /subsystem:windows /dll /incremental:no /pdb:"$(OUTDIR)\libapr-1.pdb" /debug /out:"$(OUTDIR)\libapr-1.dll" /implib:"$(OUTDIR)\libapr-1.lib" -LINK32_OBJS= \ - "$(INTDIR)\apr_atomic.obj" \ - "$(INTDIR)\dso.obj" \ - "$(INTDIR)\buffer.obj" \ - "$(INTDIR)\copy.obj" \ - "$(INTDIR)\dir.obj" \ - "$(INTDIR)\fileacc.obj" \ - "$(INTDIR)\filedup.obj" \ - "$(INTDIR)\filepath.obj" \ - "$(INTDIR)\filepath_util.obj" \ - "$(INTDIR)\filestat.obj" \ - "$(INTDIR)\filesys.obj" \ - "$(INTDIR)\flock.obj" \ - "$(INTDIR)\fullrw.obj" \ - "$(INTDIR)\mktemp.obj" \ - "$(INTDIR)\open.obj" \ - "$(INTDIR)\pipe.obj" \ - "$(INTDIR)\readwrite.obj" \ - "$(INTDIR)\seek.obj" \ - "$(INTDIR)\tempdir.obj" \ - "$(INTDIR)\proc_mutex.obj" \ - "$(INTDIR)\thread_cond.obj" \ - "$(INTDIR)\thread_mutex.obj" \ - "$(INTDIR)\thread_rwlock.obj" \ - "$(INTDIR)\apr_pools.obj" \ - "$(INTDIR)\charset.obj" \ - "$(INTDIR)\env.obj" \ - "$(INTDIR)\errorcodes.obj" \ - "$(INTDIR)\getopt.obj" \ - "$(INTDIR)\internal.obj" \ - "$(INTDIR)\misc.obj" \ - "$(INTDIR)\otherchild.obj" \ - "$(INTDIR)\rand.obj" \ - "$(INTDIR)\start.obj" \ - "$(INTDIR)\utf8.obj" \ - "$(INTDIR)\version.obj" \ - "$(INTDIR)\common.obj" \ - "$(INTDIR)\mmap.obj" \ - "$(INTDIR)\inet_ntop.obj" \ - "$(INTDIR)\inet_pton.obj" \ - "$(INTDIR)\multicast.obj" \ - "$(INTDIR)\sendrecv.obj" \ - "$(INTDIR)\sockaddr.obj" \ - "$(INTDIR)\sockets.obj" \ - "$(INTDIR)\socket_util.obj" \ - "$(INTDIR)\sockopt.obj" \ - "$(INTDIR)\apr_getpass.obj" \ - "$(INTDIR)\poll.obj" \ - "$(INTDIR)\pollcb.obj" \ - "$(INTDIR)\pollset.obj" \ - "$(INTDIR)\select.obj" \ - "$(INTDIR)\apr_random.obj" \ - "$(INTDIR)\sha2.obj" \ - "$(INTDIR)\sha2_glue.obj" \ - "$(INTDIR)\shm.obj" \ - "$(INTDIR)\apr_cpystrn.obj" \ - "$(INTDIR)\apr_fnmatch.obj" \ - "$(INTDIR)\apr_snprintf.obj" \ - "$(INTDIR)\apr_strings.obj" \ - "$(INTDIR)\apr_strnatcmp.obj" \ - "$(INTDIR)\apr_strtok.obj" \ - "$(INTDIR)\apr_hash.obj" \ - "$(INTDIR)\apr_tables.obj" \ - "$(INTDIR)\proc.obj" \ - "$(INTDIR)\signals.obj" \ - "$(INTDIR)\thread.obj" \ - "$(INTDIR)\threadpriv.obj" \ - "$(INTDIR)\time.obj" \ - "$(INTDIR)\timestr.obj" \ - "$(INTDIR)\groupinfo.obj" \ - "$(INTDIR)\userinfo.obj" \ - "$(INTDIR)\libapr.res" - -"$(OUTDIR)\libapr-1.dll" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS) - $(LINK32) @<< - $(LINK32_FLAGS) $(LINK32_OBJS) -<< - -TargetPath=.\9x\Debug\libapr-1.dll -SOURCE="$(InputPath)" -PostBuild_Desc=Embed .manifest -DS_POSTBUILD_DEP=$(INTDIR)\postbld.dep - -# Begin Custom Macros -OutDir=.\9x\Debug -# End Custom Macros - -"$(DS_POSTBUILD_DEP)" : "$(OUTDIR)\libapr-1.dll" - if exist .\9x\Debug\libapr-1.dll.manifest mt.exe -manifest .\9x\Debug\libapr-1.dll.manifest -outputresource:.\9x\Debug\libapr-1.dll;2 - echo Helper for Post-build step > "$(DS_POSTBUILD_DEP)" - -!ELSEIF "$(CFG)" == "libapr - x64 Release" - -OUTDIR=.\x64\Release -INTDIR=.\x64\Release -DS_POSTBUILD_DEP=$(INTDIR)\postbld.dep -# Begin Custom Macros -OutDir=.\x64\Release -# End Custom Macros - -ALL : ".\include\apr.h" "$(OUTDIR)\libapr-1.dll" "$(DS_POSTBUILD_DEP)" - - -CLEAN : - -@erase "$(INTDIR)\apr_atomic.obj" - -@erase "$(INTDIR)\apr_cpystrn.obj" - -@erase "$(INTDIR)\apr_fnmatch.obj" - -@erase "$(INTDIR)\apr_getpass.obj" - -@erase "$(INTDIR)\apr_hash.obj" - -@erase "$(INTDIR)\apr_pools.obj" - -@erase "$(INTDIR)\apr_random.obj" - -@erase "$(INTDIR)\apr_snprintf.obj" - -@erase "$(INTDIR)\apr_strings.obj" - -@erase "$(INTDIR)\apr_strnatcmp.obj" - -@erase "$(INTDIR)\apr_strtok.obj" - -@erase "$(INTDIR)\apr_tables.obj" - -@erase "$(INTDIR)\buffer.obj" - -@erase "$(INTDIR)\charset.obj" - -@erase "$(INTDIR)\common.obj" - -@erase "$(INTDIR)\copy.obj" - -@erase "$(INTDIR)\dir.obj" - -@erase "$(INTDIR)\dso.obj" - -@erase "$(INTDIR)\env.obj" - -@erase "$(INTDIR)\errorcodes.obj" - -@erase "$(INTDIR)\fileacc.obj" - -@erase "$(INTDIR)\filedup.obj" - -@erase "$(INTDIR)\filepath.obj" - -@erase "$(INTDIR)\filepath_util.obj" - -@erase "$(INTDIR)\filestat.obj" - -@erase "$(INTDIR)\filesys.obj" - -@erase "$(INTDIR)\flock.obj" - -@erase "$(INTDIR)\fullrw.obj" - -@erase "$(INTDIR)\getopt.obj" - -@erase "$(INTDIR)\groupinfo.obj" - -@erase "$(INTDIR)\inet_ntop.obj" - -@erase "$(INTDIR)\inet_pton.obj" - -@erase "$(INTDIR)\internal.obj" - -@erase "$(INTDIR)\libapr.res" - -@erase "$(INTDIR)\libapr_src.idb" - -@erase "$(INTDIR)\libapr_src.pdb" - -@erase "$(INTDIR)\misc.obj" - -@erase "$(INTDIR)\mktemp.obj" - -@erase "$(INTDIR)\mmap.obj" - -@erase "$(INTDIR)\multicast.obj" - -@erase "$(INTDIR)\open.obj" - -@erase "$(INTDIR)\otherchild.obj" - -@erase "$(INTDIR)\pipe.obj" - -@erase "$(INTDIR)\poll.obj" - -@erase "$(INTDIR)\pollcb.obj" - -@erase "$(INTDIR)\pollset.obj" - -@erase "$(INTDIR)\proc.obj" - -@erase "$(INTDIR)\proc_mutex.obj" - -@erase "$(INTDIR)\rand.obj" - -@erase "$(INTDIR)\readwrite.obj" - -@erase "$(INTDIR)\seek.obj" - -@erase "$(INTDIR)\select.obj" - -@erase "$(INTDIR)\sendrecv.obj" - -@erase "$(INTDIR)\sha2.obj" - -@erase "$(INTDIR)\sha2_glue.obj" - -@erase "$(INTDIR)\shm.obj" - -@erase "$(INTDIR)\signals.obj" - -@erase "$(INTDIR)\sockaddr.obj" - -@erase "$(INTDIR)\socket_util.obj" - -@erase "$(INTDIR)\sockets.obj" - -@erase "$(INTDIR)\sockopt.obj" - -@erase "$(INTDIR)\start.obj" - -@erase "$(INTDIR)\tempdir.obj" - -@erase "$(INTDIR)\thread.obj" - -@erase "$(INTDIR)\thread_cond.obj" - -@erase "$(INTDIR)\thread_mutex.obj" - -@erase "$(INTDIR)\thread_rwlock.obj" - -@erase "$(INTDIR)\threadpriv.obj" - -@erase "$(INTDIR)\time.obj" - -@erase "$(INTDIR)\timestr.obj" - -@erase "$(INTDIR)\userinfo.obj" - -@erase "$(INTDIR)\utf8.obj" - -@erase "$(INTDIR)\version.obj" - -@erase "$(OUTDIR)\libapr-1.dll" - -@erase "$(OUTDIR)\libapr-1.exp" - -@erase "$(OUTDIR)\libapr-1.lib" - -@erase "$(OUTDIR)\libapr-1.pdb" - -@erase ".\include\apr.h" - -"$(OUTDIR)" : - if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)" - -CPP=cl.exe -CPP_PROJ=/nologo /MD /W3 /Zi /O2 /Oy- /I "./include" /I "./include/arch" /I "./include/arch/win32" /I "./include/arch/unix" /D "NDEBUG" /D "APR_DECLARE_EXPORT" /D "WIN32" /D "WINNT" /D "_WINDOWS" /D "WIN64" /D "_WIN64" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\libapr_src" /FD /c - -.c{$(INTDIR)}.obj:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - -.cpp{$(INTDIR)}.obj:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - -.cxx{$(INTDIR)}.obj:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - -.c{$(INTDIR)}.sbr:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - -.cpp{$(INTDIR)}.sbr:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - -.cxx{$(INTDIR)}.sbr:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - -MTL=midl.exe -MTL_PROJ=/nologo /D "NDEBUG" /mktyplib203 /o /win32 "NUL" -RSC=rc.exe -RSC_PROJ=/l 0x409 /fo"$(INTDIR)\libapr.res" /i "./include" /d "NDEBUG" /d "APR_VERSION_ONLY" -BSC32=bscmake.exe -BSC32_FLAGS=/nologo /o"$(OUTDIR)\libapr.bsc" -BSC32_SBRS= \ - -LINK32=link.exe -LINK32_FLAGS=kernel32.lib advapi32.lib ws2_32.lib mswsock.lib ole32.lib shell32.lib rpcrt4.lib /nologo /base:"0x6EEC0000" /subsystem:windows /dll /incremental:no /pdb:"$(OUTDIR)\libapr-1.pdb" /debug /out:"$(OUTDIR)\libapr-1.dll" /implib:"$(OUTDIR)\libapr-1.lib" /MACHINE:X64 /opt:ref -LINK32_OBJS= \ - "$(INTDIR)\apr_atomic.obj" \ - "$(INTDIR)\dso.obj" \ - "$(INTDIR)\buffer.obj" \ - "$(INTDIR)\copy.obj" \ - "$(INTDIR)\dir.obj" \ - "$(INTDIR)\fileacc.obj" \ - "$(INTDIR)\filedup.obj" \ - "$(INTDIR)\filepath.obj" \ - "$(INTDIR)\filepath_util.obj" \ - "$(INTDIR)\filestat.obj" \ - "$(INTDIR)\filesys.obj" \ - "$(INTDIR)\flock.obj" \ - "$(INTDIR)\fullrw.obj" \ - "$(INTDIR)\mktemp.obj" \ - "$(INTDIR)\open.obj" \ - "$(INTDIR)\pipe.obj" \ - "$(INTDIR)\readwrite.obj" \ - "$(INTDIR)\seek.obj" \ - "$(INTDIR)\tempdir.obj" \ - "$(INTDIR)\proc_mutex.obj" \ - "$(INTDIR)\thread_cond.obj" \ - "$(INTDIR)\thread_mutex.obj" \ - "$(INTDIR)\thread_rwlock.obj" \ - "$(INTDIR)\apr_pools.obj" \ - "$(INTDIR)\charset.obj" \ - "$(INTDIR)\env.obj" \ - "$(INTDIR)\errorcodes.obj" \ - "$(INTDIR)\getopt.obj" \ - "$(INTDIR)\internal.obj" \ - "$(INTDIR)\misc.obj" \ - "$(INTDIR)\otherchild.obj" \ - "$(INTDIR)\rand.obj" \ - "$(INTDIR)\start.obj" \ - "$(INTDIR)\utf8.obj" \ - "$(INTDIR)\version.obj" \ - "$(INTDIR)\common.obj" \ - "$(INTDIR)\mmap.obj" \ - "$(INTDIR)\inet_ntop.obj" \ - "$(INTDIR)\inet_pton.obj" \ - "$(INTDIR)\multicast.obj" \ - "$(INTDIR)\sendrecv.obj" \ - "$(INTDIR)\sockaddr.obj" \ - "$(INTDIR)\sockets.obj" \ - "$(INTDIR)\socket_util.obj" \ - "$(INTDIR)\sockopt.obj" \ - "$(INTDIR)\apr_getpass.obj" \ - "$(INTDIR)\poll.obj" \ - "$(INTDIR)\pollcb.obj" \ - "$(INTDIR)\pollset.obj" \ - "$(INTDIR)\select.obj" \ - "$(INTDIR)\apr_random.obj" \ - "$(INTDIR)\sha2.obj" \ - "$(INTDIR)\sha2_glue.obj" \ - "$(INTDIR)\shm.obj" \ - "$(INTDIR)\apr_cpystrn.obj" \ - "$(INTDIR)\apr_fnmatch.obj" \ - "$(INTDIR)\apr_snprintf.obj" \ - "$(INTDIR)\apr_strings.obj" \ - "$(INTDIR)\apr_strnatcmp.obj" \ - "$(INTDIR)\apr_strtok.obj" \ - "$(INTDIR)\apr_hash.obj" \ - "$(INTDIR)\apr_tables.obj" \ - "$(INTDIR)\proc.obj" \ - "$(INTDIR)\signals.obj" \ - "$(INTDIR)\thread.obj" \ - "$(INTDIR)\threadpriv.obj" \ - "$(INTDIR)\time.obj" \ - "$(INTDIR)\timestr.obj" \ - "$(INTDIR)\groupinfo.obj" \ - "$(INTDIR)\userinfo.obj" \ - "$(INTDIR)\libapr.res" - -"$(OUTDIR)\libapr-1.dll" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS) - $(LINK32) @<< - $(LINK32_FLAGS) $(LINK32_OBJS) -<< - -TargetPath=.\x64\Release\libapr-1.dll -SOURCE="$(InputPath)" -PostBuild_Desc=Embed .manifest -DS_POSTBUILD_DEP=$(INTDIR)\postbld.dep - -# Begin Custom Macros -OutDir=.\x64\Release -# End Custom Macros - -"$(DS_POSTBUILD_DEP)" : "$(OUTDIR)\libapr-1.dll" - if exist .\x64\Release\libapr-1.dll.manifest mt.exe -manifest .\x64\Release\libapr-1.dll.manifest -outputresource:.\x64\Release\libapr-1.dll;2 - echo Helper for Post-build step > "$(DS_POSTBUILD_DEP)" - -!ELSEIF "$(CFG)" == "libapr - x64 Debug" - -OUTDIR=.\x64\Debug -INTDIR=.\x64\Debug -DS_POSTBUILD_DEP=$(INTDIR)\postbld.dep -# Begin Custom Macros -OutDir=.\x64\Debug -# End Custom Macros - -ALL : ".\include\apr.h" "$(OUTDIR)\libapr-1.dll" "$(DS_POSTBUILD_DEP)" - - -CLEAN : - -@erase "$(INTDIR)\apr_atomic.obj" - -@erase "$(INTDIR)\apr_cpystrn.obj" - -@erase "$(INTDIR)\apr_fnmatch.obj" - -@erase "$(INTDIR)\apr_getpass.obj" - -@erase "$(INTDIR)\apr_hash.obj" - -@erase "$(INTDIR)\apr_pools.obj" - -@erase "$(INTDIR)\apr_random.obj" - -@erase "$(INTDIR)\apr_snprintf.obj" - -@erase "$(INTDIR)\apr_strings.obj" - -@erase "$(INTDIR)\apr_strnatcmp.obj" - -@erase "$(INTDIR)\apr_strtok.obj" - -@erase "$(INTDIR)\apr_tables.obj" - -@erase "$(INTDIR)\buffer.obj" - -@erase "$(INTDIR)\charset.obj" - -@erase "$(INTDIR)\common.obj" - -@erase "$(INTDIR)\copy.obj" - -@erase "$(INTDIR)\dir.obj" - -@erase "$(INTDIR)\dso.obj" - -@erase "$(INTDIR)\env.obj" - -@erase "$(INTDIR)\errorcodes.obj" - -@erase "$(INTDIR)\fileacc.obj" - -@erase "$(INTDIR)\filedup.obj" - -@erase "$(INTDIR)\filepath.obj" - -@erase "$(INTDIR)\filepath_util.obj" - -@erase "$(INTDIR)\filestat.obj" - -@erase "$(INTDIR)\filesys.obj" - -@erase "$(INTDIR)\flock.obj" - -@erase "$(INTDIR)\fullrw.obj" - -@erase "$(INTDIR)\getopt.obj" - -@erase "$(INTDIR)\groupinfo.obj" - -@erase "$(INTDIR)\inet_ntop.obj" - -@erase "$(INTDIR)\inet_pton.obj" - -@erase "$(INTDIR)\internal.obj" - -@erase "$(INTDIR)\libapr.res" - -@erase "$(INTDIR)\libapr_src.idb" - -@erase "$(INTDIR)\libapr_src.pdb" - -@erase "$(INTDIR)\misc.obj" - -@erase "$(INTDIR)\mktemp.obj" - -@erase "$(INTDIR)\mmap.obj" - -@erase "$(INTDIR)\multicast.obj" - -@erase "$(INTDIR)\open.obj" - -@erase "$(INTDIR)\otherchild.obj" - -@erase "$(INTDIR)\pipe.obj" - -@erase "$(INTDIR)\poll.obj" - -@erase "$(INTDIR)\pollcb.obj" - -@erase "$(INTDIR)\pollset.obj" - -@erase "$(INTDIR)\proc.obj" - -@erase "$(INTDIR)\proc_mutex.obj" - -@erase "$(INTDIR)\rand.obj" - -@erase "$(INTDIR)\readwrite.obj" - -@erase "$(INTDIR)\seek.obj" - -@erase "$(INTDIR)\select.obj" - -@erase "$(INTDIR)\sendrecv.obj" - -@erase "$(INTDIR)\sha2.obj" - -@erase "$(INTDIR)\sha2_glue.obj" - -@erase "$(INTDIR)\shm.obj" - -@erase "$(INTDIR)\signals.obj" - -@erase "$(INTDIR)\sockaddr.obj" - -@erase "$(INTDIR)\socket_util.obj" - -@erase "$(INTDIR)\sockets.obj" - -@erase "$(INTDIR)\sockopt.obj" - -@erase "$(INTDIR)\start.obj" - -@erase "$(INTDIR)\tempdir.obj" - -@erase "$(INTDIR)\thread.obj" - -@erase "$(INTDIR)\thread_cond.obj" - -@erase "$(INTDIR)\thread_mutex.obj" - -@erase "$(INTDIR)\thread_rwlock.obj" - -@erase "$(INTDIR)\threadpriv.obj" - -@erase "$(INTDIR)\time.obj" - -@erase "$(INTDIR)\timestr.obj" - -@erase "$(INTDIR)\userinfo.obj" - -@erase "$(INTDIR)\utf8.obj" - -@erase "$(INTDIR)\version.obj" - -@erase "$(OUTDIR)\libapr-1.dll" - -@erase "$(OUTDIR)\libapr-1.exp" - -@erase "$(OUTDIR)\libapr-1.lib" - -@erase "$(OUTDIR)\libapr-1.pdb" - -@erase ".\include\apr.h" - -"$(OUTDIR)" : - if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)" - -CPP=cl.exe -CPP_PROJ=/nologo /MDd /W3 /Zi /Od /I "./include" /I "./include/arch" /I "./include/arch/win32" /I "./include/arch/unix" /D "_DEBUG" /D "APR_DECLARE_EXPORT" /D "WIN32" /D "WINNT" /D "_WINDOWS" /D "WIN64" /D "_WIN64" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\libapr_src" /FD /EHsc /c - -.c{$(INTDIR)}.obj:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - -.cpp{$(INTDIR)}.obj:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - -.cxx{$(INTDIR)}.obj:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - -.c{$(INTDIR)}.sbr:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - -.cpp{$(INTDIR)}.sbr:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - -.cxx{$(INTDIR)}.sbr:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - -MTL=midl.exe -MTL_PROJ=/nologo /D "_DEBUG" /mktyplib203 /o /win32 "NUL" -RSC=rc.exe -RSC_PROJ=/l 0x409 /fo"$(INTDIR)\libapr.res" /i "./include" /d "_DEBUG" /d "APR_VERSION_ONLY" -BSC32=bscmake.exe -BSC32_FLAGS=/nologo /o"$(OUTDIR)\libapr.bsc" -BSC32_SBRS= \ - -LINK32=link.exe -LINK32_FLAGS=kernel32.lib advapi32.lib ws2_32.lib mswsock.lib ole32.lib shell32.lib rpcrt4.lib /nologo /base:"0x6EEC0000" /subsystem:windows /dll /incremental:no /pdb:"$(OUTDIR)\libapr-1.pdb" /debug /out:"$(OUTDIR)\libapr-1.dll" /implib:"$(OUTDIR)\libapr-1.lib" /MACHINE:X64 -LINK32_OBJS= \ - "$(INTDIR)\apr_atomic.obj" \ - "$(INTDIR)\dso.obj" \ - "$(INTDIR)\buffer.obj" \ - "$(INTDIR)\copy.obj" \ - "$(INTDIR)\dir.obj" \ - "$(INTDIR)\fileacc.obj" \ - "$(INTDIR)\filedup.obj" \ - "$(INTDIR)\filepath.obj" \ - "$(INTDIR)\filepath_util.obj" \ - "$(INTDIR)\filestat.obj" \ - "$(INTDIR)\filesys.obj" \ - "$(INTDIR)\flock.obj" \ - "$(INTDIR)\fullrw.obj" \ - "$(INTDIR)\mktemp.obj" \ - "$(INTDIR)\open.obj" \ - "$(INTDIR)\pipe.obj" \ - "$(INTDIR)\readwrite.obj" \ - "$(INTDIR)\seek.obj" \ - "$(INTDIR)\tempdir.obj" \ - "$(INTDIR)\proc_mutex.obj" \ - "$(INTDIR)\thread_cond.obj" \ - "$(INTDIR)\thread_mutex.obj" \ - "$(INTDIR)\thread_rwlock.obj" \ - "$(INTDIR)\apr_pools.obj" \ - "$(INTDIR)\charset.obj" \ - "$(INTDIR)\env.obj" \ - "$(INTDIR)\errorcodes.obj" \ - "$(INTDIR)\getopt.obj" \ - "$(INTDIR)\internal.obj" \ - "$(INTDIR)\misc.obj" \ - "$(INTDIR)\otherchild.obj" \ - "$(INTDIR)\rand.obj" \ - "$(INTDIR)\start.obj" \ - "$(INTDIR)\utf8.obj" \ - "$(INTDIR)\version.obj" \ - "$(INTDIR)\common.obj" \ - "$(INTDIR)\mmap.obj" \ - "$(INTDIR)\inet_ntop.obj" \ - "$(INTDIR)\inet_pton.obj" \ - "$(INTDIR)\multicast.obj" \ - "$(INTDIR)\sendrecv.obj" \ - "$(INTDIR)\sockaddr.obj" \ - "$(INTDIR)\sockets.obj" \ - "$(INTDIR)\socket_util.obj" \ - "$(INTDIR)\sockopt.obj" \ - "$(INTDIR)\apr_getpass.obj" \ - "$(INTDIR)\poll.obj" \ - "$(INTDIR)\pollcb.obj" \ - "$(INTDIR)\pollset.obj" \ - "$(INTDIR)\select.obj" \ - "$(INTDIR)\apr_random.obj" \ - "$(INTDIR)\sha2.obj" \ - "$(INTDIR)\sha2_glue.obj" \ - "$(INTDIR)\shm.obj" \ - "$(INTDIR)\apr_cpystrn.obj" \ - "$(INTDIR)\apr_fnmatch.obj" \ - "$(INTDIR)\apr_snprintf.obj" \ - "$(INTDIR)\apr_strings.obj" \ - "$(INTDIR)\apr_strnatcmp.obj" \ - "$(INTDIR)\apr_strtok.obj" \ - "$(INTDIR)\apr_hash.obj" \ - "$(INTDIR)\apr_tables.obj" \ - "$(INTDIR)\proc.obj" \ - "$(INTDIR)\signals.obj" \ - "$(INTDIR)\thread.obj" \ - "$(INTDIR)\threadpriv.obj" \ - "$(INTDIR)\time.obj" \ - "$(INTDIR)\timestr.obj" \ - "$(INTDIR)\groupinfo.obj" \ - "$(INTDIR)\userinfo.obj" \ - "$(INTDIR)\libapr.res" - -"$(OUTDIR)\libapr-1.dll" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS) - $(LINK32) @<< - $(LINK32_FLAGS) $(LINK32_OBJS) -<< - -TargetPath=.\x64\Debug\libapr-1.dll -SOURCE="$(InputPath)" -PostBuild_Desc=Embed .manifest -DS_POSTBUILD_DEP=$(INTDIR)\postbld.dep - -# Begin Custom Macros -OutDir=.\x64\Debug -# End Custom Macros - -"$(DS_POSTBUILD_DEP)" : "$(OUTDIR)\libapr-1.dll" - if exist .\x64\Debug\libapr-1.dll.manifest mt.exe -manifest .\x64\Debug\libapr-1.dll.manifest -outputresource:.\x64\Debug\libapr-1.dll;2 - echo Helper for Post-build step > "$(DS_POSTBUILD_DEP)" - -!ENDIF - - -!IF "$(NO_EXTERNAL_DEPS)" != "1" -!IF EXISTS("libapr.dep") -!INCLUDE "libapr.dep" -!ELSE -!MESSAGE Warning: cannot find "libapr.dep" -!ENDIF -!ENDIF - - -!IF "$(CFG)" == "libapr - Win32 Release" || "$(CFG)" == "libapr - Win32 Debug" || "$(CFG)" == "libapr - Win32 Release9x" || "$(CFG)" == "libapr - Win32 Debug9x" || "$(CFG)" == "libapr - x64 Release" || "$(CFG)" == "libapr - x64 Debug" -SOURCE=.\atomic\win32\apr_atomic.c - -"$(INTDIR)\apr_atomic.obj" : $(SOURCE) "$(INTDIR)" ".\include\apr.h" - $(CPP) $(CPP_PROJ) $(SOURCE) - - -SOURCE=.\dso\win32\dso.c - -"$(INTDIR)\dso.obj" : $(SOURCE) "$(INTDIR)" ".\include\apr.h" - $(CPP) $(CPP_PROJ) $(SOURCE) - - -SOURCE=.\file_io\win32\buffer.c - -"$(INTDIR)\buffer.obj" : $(SOURCE) "$(INTDIR)" ".\include\apr.h" - $(CPP) $(CPP_PROJ) $(SOURCE) - - -SOURCE=.\file_io\unix\copy.c - -"$(INTDIR)\copy.obj" : $(SOURCE) "$(INTDIR)" ".\include\apr.h" - $(CPP) $(CPP_PROJ) $(SOURCE) - - -SOURCE=.\file_io\win32\dir.c - -"$(INTDIR)\dir.obj" : $(SOURCE) "$(INTDIR)" ".\include\apr.h" - $(CPP) $(CPP_PROJ) $(SOURCE) - - -SOURCE=.\file_io\unix\fileacc.c - -"$(INTDIR)\fileacc.obj" : $(SOURCE) "$(INTDIR)" ".\include\apr.h" - $(CPP) $(CPP_PROJ) $(SOURCE) - - -SOURCE=.\file_io\win32\filedup.c - -"$(INTDIR)\filedup.obj" : $(SOURCE) "$(INTDIR)" ".\include\apr.h" - $(CPP) $(CPP_PROJ) $(SOURCE) - - -SOURCE=.\file_io\win32\filepath.c - -"$(INTDIR)\filepath.obj" : $(SOURCE) "$(INTDIR)" ".\include\apr.h" - $(CPP) $(CPP_PROJ) $(SOURCE) - - -SOURCE=.\file_io\unix\filepath_util.c - -"$(INTDIR)\filepath_util.obj" : $(SOURCE) "$(INTDIR)" ".\include\apr.h" - $(CPP) $(CPP_PROJ) $(SOURCE) - - -SOURCE=.\file_io\win32\filestat.c - -"$(INTDIR)\filestat.obj" : $(SOURCE) "$(INTDIR)" ".\include\apr.h" - $(CPP) $(CPP_PROJ) $(SOURCE) - - -SOURCE=.\file_io\win32\filesys.c - -"$(INTDIR)\filesys.obj" : $(SOURCE) "$(INTDIR)" ".\include\apr.h" - $(CPP) $(CPP_PROJ) $(SOURCE) - - -SOURCE=.\file_io\win32\flock.c - -"$(INTDIR)\flock.obj" : $(SOURCE) "$(INTDIR)" ".\include\apr.h" - $(CPP) $(CPP_PROJ) $(SOURCE) - - -SOURCE=.\file_io\unix\fullrw.c - -"$(INTDIR)\fullrw.obj" : $(SOURCE) "$(INTDIR)" ".\include\apr.h" - $(CPP) $(CPP_PROJ) $(SOURCE) - - -SOURCE=.\file_io\unix\mktemp.c - -"$(INTDIR)\mktemp.obj" : $(SOURCE) "$(INTDIR)" ".\include\apr.h" - $(CPP) $(CPP_PROJ) $(SOURCE) - - -SOURCE=.\file_io\win32\open.c - -"$(INTDIR)\open.obj" : $(SOURCE) "$(INTDIR)" ".\include\apr.h" - $(CPP) $(CPP_PROJ) $(SOURCE) - - -SOURCE=.\file_io\win32\pipe.c - -"$(INTDIR)\pipe.obj" : $(SOURCE) "$(INTDIR)" ".\include\apr.h" - $(CPP) $(CPP_PROJ) $(SOURCE) - - -SOURCE=.\file_io\win32\readwrite.c - -"$(INTDIR)\readwrite.obj" : $(SOURCE) "$(INTDIR)" ".\include\apr.h" - $(CPP) $(CPP_PROJ) $(SOURCE) - - -SOURCE=.\file_io\win32\seek.c - -"$(INTDIR)\seek.obj" : $(SOURCE) "$(INTDIR)" ".\include\apr.h" - $(CPP) $(CPP_PROJ) $(SOURCE) - - -SOURCE=.\file_io\unix\tempdir.c - -"$(INTDIR)\tempdir.obj" : $(SOURCE) "$(INTDIR)" ".\include\apr.h" - $(CPP) $(CPP_PROJ) $(SOURCE) - - -SOURCE=.\locks\win32\proc_mutex.c - -"$(INTDIR)\proc_mutex.obj" : $(SOURCE) "$(INTDIR)" ".\include\apr.h" - $(CPP) $(CPP_PROJ) $(SOURCE) - - -SOURCE=.\locks\win32\thread_cond.c - -"$(INTDIR)\thread_cond.obj" : $(SOURCE) "$(INTDIR)" ".\include\apr.h" - $(CPP) $(CPP_PROJ) $(SOURCE) - - -SOURCE=.\locks\win32\thread_mutex.c - -"$(INTDIR)\thread_mutex.obj" : $(SOURCE) "$(INTDIR)" ".\include\apr.h" - $(CPP) $(CPP_PROJ) $(SOURCE) - - -SOURCE=.\locks\win32\thread_rwlock.c - -"$(INTDIR)\thread_rwlock.obj" : $(SOURCE) "$(INTDIR)" ".\include\apr.h" - $(CPP) $(CPP_PROJ) $(SOURCE) - - -SOURCE=.\memory\unix\apr_pools.c - -"$(INTDIR)\apr_pools.obj" : $(SOURCE) "$(INTDIR)" ".\include\apr.h" - $(CPP) $(CPP_PROJ) $(SOURCE) - - -SOURCE=.\misc\win32\apr_app.c -SOURCE=.\misc\win32\charset.c - -"$(INTDIR)\charset.obj" : $(SOURCE) "$(INTDIR)" ".\include\apr.h" - $(CPP) $(CPP_PROJ) $(SOURCE) - - -SOURCE=.\misc\win32\env.c - -"$(INTDIR)\env.obj" : $(SOURCE) "$(INTDIR)" ".\include\apr.h" - $(CPP) $(CPP_PROJ) $(SOURCE) - - -SOURCE=.\misc\unix\errorcodes.c - -"$(INTDIR)\errorcodes.obj" : $(SOURCE) "$(INTDIR)" ".\include\apr.h" - $(CPP) $(CPP_PROJ) $(SOURCE) - - -SOURCE=.\misc\unix\getopt.c - -"$(INTDIR)\getopt.obj" : $(SOURCE) "$(INTDIR)" ".\include\apr.h" - $(CPP) $(CPP_PROJ) $(SOURCE) - - -SOURCE=.\misc\win32\internal.c - -"$(INTDIR)\internal.obj" : $(SOURCE) "$(INTDIR)" ".\include\apr.h" - $(CPP) $(CPP_PROJ) $(SOURCE) - - -SOURCE=.\misc\win32\misc.c - -"$(INTDIR)\misc.obj" : $(SOURCE) "$(INTDIR)" ".\include\apr.h" - $(CPP) $(CPP_PROJ) $(SOURCE) - - -SOURCE=.\misc\unix\otherchild.c - -"$(INTDIR)\otherchild.obj" : $(SOURCE) "$(INTDIR)" ".\include\apr.h" - $(CPP) $(CPP_PROJ) $(SOURCE) - - -SOURCE=.\misc\win32\rand.c - -"$(INTDIR)\rand.obj" : $(SOURCE) "$(INTDIR)" ".\include\apr.h" - $(CPP) $(CPP_PROJ) $(SOURCE) - - -SOURCE=.\misc\win32\start.c - -"$(INTDIR)\start.obj" : $(SOURCE) "$(INTDIR)" ".\include\apr.h" - $(CPP) $(CPP_PROJ) $(SOURCE) - - -SOURCE=.\misc\win32\utf8.c - -"$(INTDIR)\utf8.obj" : $(SOURCE) "$(INTDIR)" ".\include\apr.h" - $(CPP) $(CPP_PROJ) $(SOURCE) - - -SOURCE=.\misc\unix\version.c - -"$(INTDIR)\version.obj" : $(SOURCE) "$(INTDIR)" ".\include\apr.h" - $(CPP) $(CPP_PROJ) $(SOURCE) - - -SOURCE=.\mmap\unix\common.c - -"$(INTDIR)\common.obj" : $(SOURCE) "$(INTDIR)" ".\include\apr.h" - $(CPP) $(CPP_PROJ) $(SOURCE) - - -SOURCE=.\mmap\win32\mmap.c - -"$(INTDIR)\mmap.obj" : $(SOURCE) "$(INTDIR)" ".\include\apr.h" - $(CPP) $(CPP_PROJ) $(SOURCE) - - -SOURCE=.\network_io\unix\inet_ntop.c - -"$(INTDIR)\inet_ntop.obj" : $(SOURCE) "$(INTDIR)" ".\include\apr.h" - $(CPP) $(CPP_PROJ) $(SOURCE) - - -SOURCE=.\network_io\unix\inet_pton.c - -"$(INTDIR)\inet_pton.obj" : $(SOURCE) "$(INTDIR)" ".\include\apr.h" - $(CPP) $(CPP_PROJ) $(SOURCE) - - -SOURCE=.\network_io\unix\multicast.c - -"$(INTDIR)\multicast.obj" : $(SOURCE) "$(INTDIR)" ".\include\apr.h" - $(CPP) $(CPP_PROJ) $(SOURCE) - - -SOURCE=.\network_io\win32\sendrecv.c - -"$(INTDIR)\sendrecv.obj" : $(SOURCE) "$(INTDIR)" ".\include\apr.h" - $(CPP) $(CPP_PROJ) $(SOURCE) - - -SOURCE=.\network_io\unix\sockaddr.c - -"$(INTDIR)\sockaddr.obj" : $(SOURCE) "$(INTDIR)" ".\include\apr.h" - $(CPP) $(CPP_PROJ) $(SOURCE) - - -SOURCE=.\network_io\unix\socket_util.c - -"$(INTDIR)\socket_util.obj" : $(SOURCE) "$(INTDIR)" ".\include\apr.h" - $(CPP) $(CPP_PROJ) $(SOURCE) - - -SOURCE=.\network_io\win32\sockets.c - -"$(INTDIR)\sockets.obj" : $(SOURCE) "$(INTDIR)" ".\include\apr.h" - $(CPP) $(CPP_PROJ) $(SOURCE) - - -SOURCE=.\network_io\win32\sockopt.c - -"$(INTDIR)\sockopt.obj" : $(SOURCE) "$(INTDIR)" ".\include\apr.h" - $(CPP) $(CPP_PROJ) $(SOURCE) - - -SOURCE=.\passwd\apr_getpass.c - -"$(INTDIR)\apr_getpass.obj" : $(SOURCE) "$(INTDIR)" ".\include\apr.h" - $(CPP) $(CPP_PROJ) $(SOURCE) - - -SOURCE=.\poll\unix\poll.c - -"$(INTDIR)\poll.obj" : $(SOURCE) "$(INTDIR)" ".\include\apr.h" - $(CPP) $(CPP_PROJ) $(SOURCE) - - -SOURCE=.\poll\unix\pollcb.c - -"$(INTDIR)\pollcb.obj" : $(SOURCE) "$(INTDIR)" ".\include\apr.h" - $(CPP) $(CPP_PROJ) $(SOURCE) - - -SOURCE=.\poll\unix\pollset.c - -"$(INTDIR)\pollset.obj" : $(SOURCE) "$(INTDIR)" ".\include\apr.h" - $(CPP) $(CPP_PROJ) $(SOURCE) - - -SOURCE=.\poll\unix\select.c - -"$(INTDIR)\select.obj" : $(SOURCE) "$(INTDIR)" ".\include\apr.h" - $(CPP) $(CPP_PROJ) $(SOURCE) - - -SOURCE=.\random\unix\apr_random.c - -"$(INTDIR)\apr_random.obj" : $(SOURCE) "$(INTDIR)" ".\include\apr.h" - $(CPP) $(CPP_PROJ) $(SOURCE) - - -SOURCE=.\random\unix\sha2.c - -"$(INTDIR)\sha2.obj" : $(SOURCE) "$(INTDIR)" ".\include\apr.h" - $(CPP) $(CPP_PROJ) $(SOURCE) - - -SOURCE=.\random\unix\sha2_glue.c - -"$(INTDIR)\sha2_glue.obj" : $(SOURCE) "$(INTDIR)" ".\include\apr.h" - $(CPP) $(CPP_PROJ) $(SOURCE) - - -SOURCE=.\shmem\win32\shm.c - -"$(INTDIR)\shm.obj" : $(SOURCE) "$(INTDIR)" ".\include\apr.h" - $(CPP) $(CPP_PROJ) $(SOURCE) - - -SOURCE=.\strings\apr_cpystrn.c - -"$(INTDIR)\apr_cpystrn.obj" : $(SOURCE) "$(INTDIR)" ".\include\apr.h" - $(CPP) $(CPP_PROJ) $(SOURCE) - - -SOURCE=.\strings\apr_fnmatch.c - -"$(INTDIR)\apr_fnmatch.obj" : $(SOURCE) "$(INTDIR)" ".\include\apr.h" - $(CPP) $(CPP_PROJ) $(SOURCE) - - -SOURCE=.\strings\apr_snprintf.c - -"$(INTDIR)\apr_snprintf.obj" : $(SOURCE) "$(INTDIR)" ".\include\apr.h" - $(CPP) $(CPP_PROJ) $(SOURCE) - - -SOURCE=.\strings\apr_strings.c - -"$(INTDIR)\apr_strings.obj" : $(SOURCE) "$(INTDIR)" ".\include\apr.h" - $(CPP) $(CPP_PROJ) $(SOURCE) - - -SOURCE=.\strings\apr_strnatcmp.c - -"$(INTDIR)\apr_strnatcmp.obj" : $(SOURCE) "$(INTDIR)" ".\include\apr.h" - $(CPP) $(CPP_PROJ) $(SOURCE) - - -SOURCE=.\strings\apr_strtok.c - -"$(INTDIR)\apr_strtok.obj" : $(SOURCE) "$(INTDIR)" ".\include\apr.h" - $(CPP) $(CPP_PROJ) $(SOURCE) - - -SOURCE=.\tables\apr_hash.c - -"$(INTDIR)\apr_hash.obj" : $(SOURCE) "$(INTDIR)" ".\include\apr.h" - $(CPP) $(CPP_PROJ) $(SOURCE) - - -SOURCE=.\tables\apr_tables.c - -"$(INTDIR)\apr_tables.obj" : $(SOURCE) "$(INTDIR)" ".\include\apr.h" - $(CPP) $(CPP_PROJ) $(SOURCE) - - -SOURCE=.\threadproc\win32\proc.c - -"$(INTDIR)\proc.obj" : $(SOURCE) "$(INTDIR)" ".\include\apr.h" - $(CPP) $(CPP_PROJ) $(SOURCE) - - -SOURCE=.\threadproc\win32\signals.c - -"$(INTDIR)\signals.obj" : $(SOURCE) "$(INTDIR)" ".\include\apr.h" - $(CPP) $(CPP_PROJ) $(SOURCE) - - -SOURCE=.\threadproc\win32\thread.c - -"$(INTDIR)\thread.obj" : $(SOURCE) "$(INTDIR)" ".\include\apr.h" - $(CPP) $(CPP_PROJ) $(SOURCE) - - -SOURCE=.\threadproc\win32\threadpriv.c - -"$(INTDIR)\threadpriv.obj" : $(SOURCE) "$(INTDIR)" ".\include\apr.h" - $(CPP) $(CPP_PROJ) $(SOURCE) - - -SOURCE=.\time\win32\time.c - -"$(INTDIR)\time.obj" : $(SOURCE) "$(INTDIR)" ".\include\apr.h" - $(CPP) $(CPP_PROJ) $(SOURCE) - - -SOURCE=.\time\win32\timestr.c - -"$(INTDIR)\timestr.obj" : $(SOURCE) "$(INTDIR)" ".\include\apr.h" - $(CPP) $(CPP_PROJ) $(SOURCE) - - -SOURCE=.\user\win32\groupinfo.c - -"$(INTDIR)\groupinfo.obj" : $(SOURCE) "$(INTDIR)" ".\include\apr.h" - $(CPP) $(CPP_PROJ) $(SOURCE) - - -SOURCE=.\user\win32\userinfo.c - -"$(INTDIR)\userinfo.obj" : $(SOURCE) "$(INTDIR)" ".\include\apr.h" - $(CPP) $(CPP_PROJ) $(SOURCE) - - -SOURCE=.\include\apr.hw - -!IF "$(CFG)" == "libapr - Win32 Release" - -InputPath=.\include\apr.hw - -".\include\apr.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" - < .\include\apr.h -<< - - -!ELSEIF "$(CFG)" == "libapr - Win32 Debug" - -InputPath=.\include\apr.hw - -".\include\apr.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" - < .\include\apr.h -<< - - -!ELSEIF "$(CFG)" == "libapr - Win32 Release9x" - -InputPath=.\include\apr.hw - -".\include\apr.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" - < .\include\apr.h -<< - - -!ELSEIF "$(CFG)" == "libapr - Win32 Debug9x" - -InputPath=.\include\apr.hw - -".\include\apr.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" - < .\include\apr.h -<< - - -!ELSEIF "$(CFG)" == "libapr - x64 Release" - -InputPath=.\include\apr.hw - -".\include\apr.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" - < .\include\apr.h -<< - - -!ELSEIF "$(CFG)" == "libapr - x64 Debug" - -InputPath=.\include\apr.hw - -".\include\apr.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" - < .\include\apr.h -<< - - -!ENDIF - -SOURCE=.\libapr.rc - -"$(INTDIR)\libapr.res" : $(SOURCE) "$(INTDIR)" ".\include\apr.h" - $(RSC) $(RSC_PROJ) $(SOURCE) - - - -!ENDIF - diff --git a/iis/winbuild/libaprutil.mak b/iis/winbuild/libaprutil.mak deleted file mode 100644 index 83bee3db..00000000 --- a/iis/winbuild/libaprutil.mak +++ /dev/null @@ -1,1465 +0,0 @@ -# Microsoft Developer Studio Generated NMAKE File, Based on libaprutil.dsp -!IF "$(CFG)" == "" -CFG=libaprutil - Win32 Release -!MESSAGE No configuration specified. Defaulting to libaprutil - Win32 Release. -!ENDIF - -!IF "$(CFG)" != "libaprutil - Win32 Release" && "$(CFG)" != "libaprutil - Win32 Debug" && "$(CFG)" != "libaprutil - x64 Release" && "$(CFG)" != "libaprutil - x64 Debug" -!MESSAGE Invalid configuration "$(CFG)" specified. -!MESSAGE You can specify a configuration when running NMAKE -!MESSAGE by defining the macro CFG on the command line. For example: -!MESSAGE -!MESSAGE NMAKE /f "libaprutil.mak" CFG="libaprutil - Win32 Release" -!MESSAGE -!MESSAGE Possible choices for configuration are: -!MESSAGE -!MESSAGE "libaprutil - Win32 Release" (based on "Win32 (x86) Dynamic-Link Library") -!MESSAGE "libaprutil - Win32 Debug" (based on "Win32 (x86) Dynamic-Link Library") -!MESSAGE "libaprutil - x64 Release" (based on "Win32 (x86) Dynamic-Link Library") -!MESSAGE "libaprutil - x64 Debug" (based on "Win32 (x86) Dynamic-Link Library") -!MESSAGE -!ERROR An invalid configuration is specified. -!ENDIF - -!IF "$(OS)" == "Windows_NT" -NULL= -!ELSE -NULL=nul -!ENDIF - -!IF "$(CFG)" == "libaprutil - Win32 Release" - -OUTDIR=.\Release -INTDIR=.\Release -DS_POSTBUILD_DEP=$(INTDIR)\postbld.dep -# Begin Custom Macros -OutDir=.\Release -# End Custom Macros - -!IF "$(RECURSE)" == "0" - -ALL : ".\include\apu_want.h" "$(OUTDIR)\libaprutil-1.dll" "$(DS_POSTBUILD_DEP)" - -!ELSE - -ALL : "xml - Win32 Release" "libapriconv - Win32 Release" "libapr - Win32 Release" ".\include\apu_want.h" "$(OUTDIR)\libaprutil-1.dll" "$(DS_POSTBUILD_DEP)" - -!ENDIF - -!IF "$(RECURSE)" == "1" -CLEAN :"libapr - Win32 ReleaseCLEAN" "libapriconv - Win32 ReleaseCLEAN" "xml - Win32 ReleaseCLEAN" -!ELSE -CLEAN : -!ENDIF - -@erase "$(INTDIR)\apr_base64.obj" - -@erase "$(INTDIR)\apr_brigade.obj" - -@erase "$(INTDIR)\apr_buckets.obj" - -@erase "$(INTDIR)\apr_buckets_alloc.obj" - -@erase "$(INTDIR)\apr_buckets_eos.obj" - -@erase "$(INTDIR)\apr_buckets_file.obj" - -@erase "$(INTDIR)\apr_buckets_flush.obj" - -@erase "$(INTDIR)\apr_buckets_heap.obj" - -@erase "$(INTDIR)\apr_buckets_mmap.obj" - -@erase "$(INTDIR)\apr_buckets_pipe.obj" - -@erase "$(INTDIR)\apr_buckets_pool.obj" - -@erase "$(INTDIR)\apr_buckets_refcount.obj" - -@erase "$(INTDIR)\apr_buckets_simple.obj" - -@erase "$(INTDIR)\apr_buckets_socket.obj" - -@erase "$(INTDIR)\apr_crypto.obj" - -@erase "$(INTDIR)\apr_date.obj" - -@erase "$(INTDIR)\apr_dbd.obj" - -@erase "$(INTDIR)\apr_dbm.obj" - -@erase "$(INTDIR)\apr_dbm_sdbm.obj" - -@erase "$(INTDIR)\apr_hooks.obj" - -@erase "$(INTDIR)\apr_ldap_stub.obj" - -@erase "$(INTDIR)\apr_ldap_url.obj" - -@erase "$(INTDIR)\apr_md4.obj" - -@erase "$(INTDIR)\apr_md5.obj" - -@erase "$(INTDIR)\apr_memcache.obj" - -@erase "$(INTDIR)\apr_queue.obj" - -@erase "$(INTDIR)\apr_reslist.obj" - -@erase "$(INTDIR)\apr_rmm.obj" - -@erase "$(INTDIR)\apr_sha1.obj" - -@erase "$(INTDIR)\apr_strmatch.obj" - -@erase "$(INTDIR)\apr_thread_pool.obj" - -@erase "$(INTDIR)\apr_uri.obj" - -@erase "$(INTDIR)\apr_xml.obj" - -@erase "$(INTDIR)\apu_dso.obj" - -@erase "$(INTDIR)\apu_version.obj" - -@erase "$(INTDIR)\getuuid.obj" - -@erase "$(INTDIR)\libaprutil.res" - -@erase "$(INTDIR)\libaprutil_src.idb" - -@erase "$(INTDIR)\libaprutil_src.pdb" - -@erase "$(INTDIR)\sdbm.obj" - -@erase "$(INTDIR)\sdbm_hash.obj" - -@erase "$(INTDIR)\sdbm_lock.obj" - -@erase "$(INTDIR)\sdbm_pair.obj" - -@erase "$(INTDIR)\uuid.obj" - -@erase "$(INTDIR)\xlate.obj" - -@erase "$(OUTDIR)\libaprutil-1.dll" - -@erase "$(OUTDIR)\libaprutil-1.exp" - -@erase "$(OUTDIR)\libaprutil-1.lib" - -@erase "$(OUTDIR)\libaprutil-1.pdb" - -@erase ".\include\apu_want.h" - -"$(OUTDIR)" : - if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)" - -CPP=cl.exe -CPP_PROJ=/nologo /MD /W3 /Zi /O2 /Oy- /I "./include" /I "../apr/include" /I "./include/private" /I "../apr-iconv/include" /I "./dbm/sdbm" /I "./xml/expat/lib" /D "NDEBUG" /D "APU_DECLARE_EXPORT" /D "APU_USE_SDBM" /D "XML_STATIC" /D "WIN32" /D "_WINDOWS" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\libaprutil_src" /FD /c - -.c{$(INTDIR)}.obj:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - -.cpp{$(INTDIR)}.obj:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - -.cxx{$(INTDIR)}.obj:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - -.c{$(INTDIR)}.sbr:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - -.cpp{$(INTDIR)}.sbr:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - -.cxx{$(INTDIR)}.sbr:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - -MTL=midl.exe -MTL_PROJ=/nologo /D "NDEBUG" /mktyplib203 /o /win32 "NUL" -RSC=rc.exe -RSC_PROJ=/l 0x409 /fo"$(INTDIR)\libaprutil.res" /i "./include" /i "../apr/include" /d "NDEBUG" /d "APU_VERSION_ONLY" -BSC32=bscmake.exe -BSC32_FLAGS=/nologo /o"$(OUTDIR)\libaprutil.bsc" -BSC32_SBRS= \ - -LINK32=link.exe -LINK32_FLAGS=kernel32.lib advapi32.lib ws2_32.lib mswsock.lib ole32.lib /nologo /base:"0x6EE60000" /subsystem:windows /dll /incremental:no /pdb:"$(OUTDIR)\libaprutil-1.pdb" /debug /out:"$(OUTDIR)\libaprutil-1.dll" /implib:"$(OUTDIR)\libaprutil-1.lib" /opt:ref -LINK32_OBJS= \ - "$(INTDIR)\apr_brigade.obj" \ - "$(INTDIR)\apr_buckets.obj" \ - "$(INTDIR)\apr_buckets_alloc.obj" \ - "$(INTDIR)\apr_buckets_eos.obj" \ - "$(INTDIR)\apr_buckets_file.obj" \ - "$(INTDIR)\apr_buckets_flush.obj" \ - "$(INTDIR)\apr_buckets_heap.obj" \ - "$(INTDIR)\apr_buckets_mmap.obj" \ - "$(INTDIR)\apr_buckets_pipe.obj" \ - "$(INTDIR)\apr_buckets_pool.obj" \ - "$(INTDIR)\apr_buckets_refcount.obj" \ - "$(INTDIR)\apr_buckets_simple.obj" \ - "$(INTDIR)\apr_buckets_socket.obj" \ - "$(INTDIR)\apr_crypto.obj" \ - "$(INTDIR)\apr_md4.obj" \ - "$(INTDIR)\apr_md5.obj" \ - "$(INTDIR)\apr_sha1.obj" \ - "$(INTDIR)\getuuid.obj" \ - "$(INTDIR)\uuid.obj" \ - "$(INTDIR)\apr_dbd.obj" \ - "$(INTDIR)\apr_dbm.obj" \ - "$(INTDIR)\apr_dbm_sdbm.obj" \ - "$(INTDIR)\apr_base64.obj" \ - "$(INTDIR)\apr_hooks.obj" \ - "$(INTDIR)\apr_ldap_stub.obj" \ - "$(INTDIR)\apr_ldap_url.obj" \ - "$(INTDIR)\apr_memcache.obj" \ - "$(INTDIR)\apr_date.obj" \ - "$(INTDIR)\apu_dso.obj" \ - "$(INTDIR)\apr_queue.obj" \ - "$(INTDIR)\apr_reslist.obj" \ - "$(INTDIR)\apr_rmm.obj" \ - "$(INTDIR)\apr_thread_pool.obj" \ - "$(INTDIR)\apu_version.obj" \ - "$(INTDIR)\sdbm.obj" \ - "$(INTDIR)\sdbm_hash.obj" \ - "$(INTDIR)\sdbm_lock.obj" \ - "$(INTDIR)\sdbm_pair.obj" \ - "$(INTDIR)\apr_strmatch.obj" \ - "$(INTDIR)\apr_uri.obj" \ - "$(INTDIR)\xlate.obj" \ - "$(INTDIR)\apr_xml.obj" \ - "$(INTDIR)\libaprutil.res" \ - "..\apr\Release\libapr-1.lib" \ - "..\apr-iconv\Release\libapriconv-1.lib" \ - ".\xml\expat\lib\LibR\xml.lib" - -"$(OUTDIR)\libaprutil-1.dll" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS) - $(LINK32) @<< - $(LINK32_FLAGS) $(LINK32_OBJS) -<< - -TargetPath=.\Release\libaprutil-1.dll -SOURCE="$(InputPath)" -PostBuild_Desc=Embed .manifest -DS_POSTBUILD_DEP=$(INTDIR)\postbld.dep - -# Begin Custom Macros -OutDir=.\Release -# End Custom Macros - -"$(DS_POSTBUILD_DEP)" : "$(OUTDIR)\libaprutil-1.dll" - if exist .\Release\libaprutil-1.dll.manifest mt.exe -manifest .\Release\libaprutil-1.dll.manifest -outputresource:.\Release\libaprutil-1.dll;2 - echo Helper for Post-build step > "$(DS_POSTBUILD_DEP)" - -!ELSEIF "$(CFG)" == "libaprutil - Win32 Debug" - -OUTDIR=.\Debug -INTDIR=.\Debug -DS_POSTBUILD_DEP=$(INTDIR)\postbld.dep -# Begin Custom Macros -OutDir=.\Debug -# End Custom Macros - -!IF "$(RECURSE)" == "0" - -ALL : ".\include\private\apu_select_dbm.h" ".\include\private\apu_config.h" ".\include\apu_want.h" ".\include\apu.h" ".\include\apr_ldap.h" "$(OUTDIR)\libaprutil-1.dll" "$(DS_POSTBUILD_DEP)" - -!ELSE - -ALL : "xml - Win32 Debug" "libapriconv - Win32 Debug" "libapr - Win32 Debug" ".\include\private\apu_select_dbm.h" ".\include\private\apu_config.h" ".\include\apu_want.h" ".\include\apu.h" ".\include\apr_ldap.h" "$(OUTDIR)\libaprutil-1.dll" "$(DS_POSTBUILD_DEP)" - -!ENDIF - -!IF "$(RECURSE)" == "1" -CLEAN :"libapr - Win32 DebugCLEAN" "libapriconv - Win32 DebugCLEAN" "xml - Win32 DebugCLEAN" -!ELSE -CLEAN : -!ENDIF - -@erase "$(INTDIR)\apr_base64.obj" - -@erase "$(INTDIR)\apr_brigade.obj" - -@erase "$(INTDIR)\apr_buckets.obj" - -@erase "$(INTDIR)\apr_buckets_alloc.obj" - -@erase "$(INTDIR)\apr_buckets_eos.obj" - -@erase "$(INTDIR)\apr_buckets_file.obj" - -@erase "$(INTDIR)\apr_buckets_flush.obj" - -@erase "$(INTDIR)\apr_buckets_heap.obj" - -@erase "$(INTDIR)\apr_buckets_mmap.obj" - -@erase "$(INTDIR)\apr_buckets_pipe.obj" - -@erase "$(INTDIR)\apr_buckets_pool.obj" - -@erase "$(INTDIR)\apr_buckets_refcount.obj" - -@erase "$(INTDIR)\apr_buckets_simple.obj" - -@erase "$(INTDIR)\apr_buckets_socket.obj" - -@erase "$(INTDIR)\apr_crypto.obj" - -@erase "$(INTDIR)\apr_date.obj" - -@erase "$(INTDIR)\apr_dbd.obj" - -@erase "$(INTDIR)\apr_dbm.obj" - -@erase "$(INTDIR)\apr_dbm_sdbm.obj" - -@erase "$(INTDIR)\apr_hooks.obj" - -@erase "$(INTDIR)\apr_ldap_stub.obj" - -@erase "$(INTDIR)\apr_ldap_url.obj" - -@erase "$(INTDIR)\apr_md4.obj" - -@erase "$(INTDIR)\apr_md5.obj" - -@erase "$(INTDIR)\apr_memcache.obj" - -@erase "$(INTDIR)\apr_queue.obj" - -@erase "$(INTDIR)\apr_reslist.obj" - -@erase "$(INTDIR)\apr_rmm.obj" - -@erase "$(INTDIR)\apr_sha1.obj" - -@erase "$(INTDIR)\apr_strmatch.obj" - -@erase "$(INTDIR)\apr_thread_pool.obj" - -@erase "$(INTDIR)\apr_uri.obj" - -@erase "$(INTDIR)\apr_xml.obj" - -@erase "$(INTDIR)\apu_dso.obj" - -@erase "$(INTDIR)\apu_version.obj" - -@erase "$(INTDIR)\getuuid.obj" - -@erase "$(INTDIR)\libaprutil.res" - -@erase "$(INTDIR)\libaprutil_src.idb" - -@erase "$(INTDIR)\libaprutil_src.pdb" - -@erase "$(INTDIR)\sdbm.obj" - -@erase "$(INTDIR)\sdbm_hash.obj" - -@erase "$(INTDIR)\sdbm_lock.obj" - -@erase "$(INTDIR)\sdbm_pair.obj" - -@erase "$(INTDIR)\uuid.obj" - -@erase "$(INTDIR)\xlate.obj" - -@erase "$(OUTDIR)\libaprutil-1.dll" - -@erase "$(OUTDIR)\libaprutil-1.exp" - -@erase "$(OUTDIR)\libaprutil-1.lib" - -@erase "$(OUTDIR)\libaprutil-1.pdb" - -@erase ".\include\apr_ldap.h" - -@erase ".\include\apu.h" - -@erase ".\include\apu_want.h" - -@erase ".\include\private\apu_config.h" - -@erase ".\include\private\apu_select_dbm.h" - -"$(OUTDIR)" : - if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)" - -CPP=cl.exe -CPP_PROJ=/nologo /MDd /W3 /Zi /Od /I "./include" /I "../apr/include" /I "./include/private" /I "../apr-iconv/include" /I "./dbm/sdbm" /I "./xml/expat/lib" /D "_DEBUG" /D "APU_DECLARE_EXPORT" /D "APU_USE_SDBM" /D "XML_STATIC" /D "WIN32" /D "_WINDOWS" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\libaprutil_src" /FD /EHsc /c - -.c{$(INTDIR)}.obj:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - -.cpp{$(INTDIR)}.obj:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - -.cxx{$(INTDIR)}.obj:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - -.c{$(INTDIR)}.sbr:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - -.cpp{$(INTDIR)}.sbr:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - -.cxx{$(INTDIR)}.sbr:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - -MTL=midl.exe -MTL_PROJ=/nologo /D "_DEBUG" /mktyplib203 /o /win32 "NUL" -RSC=rc.exe -RSC_PROJ=/l 0x409 /fo"$(INTDIR)\libaprutil.res" /i "./include" /i "../apr/include" /d "_DEBUG" /d "APU_VERSION_ONLY" -BSC32=bscmake.exe -BSC32_FLAGS=/nologo /o"$(OUTDIR)\libaprutil.bsc" -BSC32_SBRS= \ - -LINK32=link.exe -LINK32_FLAGS=kernel32.lib advapi32.lib ws2_32.lib mswsock.lib ole32.lib /nologo /base:"0x6EE60000" /subsystem:windows /dll /incremental:no /pdb:"$(OUTDIR)\libaprutil-1.pdb" /debug /out:"$(OUTDIR)\libaprutil-1.dll" /implib:"$(OUTDIR)\libaprutil-1.lib" -LINK32_OBJS= \ - "$(INTDIR)\apr_brigade.obj" \ - "$(INTDIR)\apr_buckets.obj" \ - "$(INTDIR)\apr_buckets_alloc.obj" \ - "$(INTDIR)\apr_buckets_eos.obj" \ - "$(INTDIR)\apr_buckets_file.obj" \ - "$(INTDIR)\apr_buckets_flush.obj" \ - "$(INTDIR)\apr_buckets_heap.obj" \ - "$(INTDIR)\apr_buckets_mmap.obj" \ - "$(INTDIR)\apr_buckets_pipe.obj" \ - "$(INTDIR)\apr_buckets_pool.obj" \ - "$(INTDIR)\apr_buckets_refcount.obj" \ - "$(INTDIR)\apr_buckets_simple.obj" \ - "$(INTDIR)\apr_buckets_socket.obj" \ - "$(INTDIR)\apr_crypto.obj" \ - "$(INTDIR)\apr_md4.obj" \ - "$(INTDIR)\apr_md5.obj" \ - "$(INTDIR)\apr_sha1.obj" \ - "$(INTDIR)\getuuid.obj" \ - "$(INTDIR)\uuid.obj" \ - "$(INTDIR)\apr_dbd.obj" \ - "$(INTDIR)\apr_dbm.obj" \ - "$(INTDIR)\apr_dbm_sdbm.obj" \ - "$(INTDIR)\apr_base64.obj" \ - "$(INTDIR)\apr_hooks.obj" \ - "$(INTDIR)\apr_ldap_stub.obj" \ - "$(INTDIR)\apr_ldap_url.obj" \ - "$(INTDIR)\apr_memcache.obj" \ - "$(INTDIR)\apr_date.obj" \ - "$(INTDIR)\apu_dso.obj" \ - "$(INTDIR)\apr_queue.obj" \ - "$(INTDIR)\apr_reslist.obj" \ - "$(INTDIR)\apr_rmm.obj" \ - "$(INTDIR)\apr_thread_pool.obj" \ - "$(INTDIR)\apu_version.obj" \ - "$(INTDIR)\sdbm.obj" \ - "$(INTDIR)\sdbm_hash.obj" \ - "$(INTDIR)\sdbm_lock.obj" \ - "$(INTDIR)\sdbm_pair.obj" \ - "$(INTDIR)\apr_strmatch.obj" \ - "$(INTDIR)\apr_uri.obj" \ - "$(INTDIR)\xlate.obj" \ - "$(INTDIR)\apr_xml.obj" \ - "$(INTDIR)\libaprutil.res" \ - "..\apr\Debug\libapr-1.lib" \ - "..\apr-iconv\Debug\libapriconv-1.lib" \ - ".\xml\expat\lib\LibD\xml.lib" - -"$(OUTDIR)\libaprutil-1.dll" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS) - $(LINK32) @<< - $(LINK32_FLAGS) $(LINK32_OBJS) -<< - -TargetPath=.\Debug\libaprutil-1.dll -SOURCE="$(InputPath)" -PostBuild_Desc=Embed .manifest -DS_POSTBUILD_DEP=$(INTDIR)\postbld.dep - -# Begin Custom Macros -OutDir=.\Debug -# End Custom Macros - -"$(DS_POSTBUILD_DEP)" : "$(OUTDIR)\libaprutil-1.dll" - if exist .\Debug\libaprutil-1.dll.manifest mt.exe -manifest .\Debug\libaprutil-1.dll.manifest -outputresource:.\Debug\libaprutil-1.dll;2 - echo Helper for Post-build step > "$(DS_POSTBUILD_DEP)" - -!ELSEIF "$(CFG)" == "libaprutil - x64 Release" - -OUTDIR=.\x64\Release -INTDIR=.\x64\Release -DS_POSTBUILD_DEP=$(INTDIR)\postbld.dep -# Begin Custom Macros -OutDir=.\x64\Release -# End Custom Macros - -!IF "$(RECURSE)" == "0" - -ALL : ".\include\private\apu_select_dbm.h" ".\include\private\apu_config.h" ".\include\apu_want.h" ".\include\apu.h" ".\include\apr_ldap.h" "$(OUTDIR)\libaprutil-1.dll" "$(DS_POSTBUILD_DEP)" - -!ELSE - -ALL : "xml - x64 Release" "libapriconv - x64 Release" "libapr - x64 Release" ".\include\private\apu_select_dbm.h" ".\include\private\apu_config.h" ".\include\apu_want.h" ".\include\apu.h" ".\include\apr_ldap.h" "$(OUTDIR)\libaprutil-1.dll" "$(DS_POSTBUILD_DEP)" - -!ENDIF - -!IF "$(RECURSE)" == "1" -CLEAN :"libapr - x64 ReleaseCLEAN" "libapriconv - x64 ReleaseCLEAN" "xml - x64 ReleaseCLEAN" -!ELSE -CLEAN : -!ENDIF - -@erase "$(INTDIR)\apr_base64.obj" - -@erase "$(INTDIR)\apr_brigade.obj" - -@erase "$(INTDIR)\apr_buckets.obj" - -@erase "$(INTDIR)\apr_buckets_alloc.obj" - -@erase "$(INTDIR)\apr_buckets_eos.obj" - -@erase "$(INTDIR)\apr_buckets_file.obj" - -@erase "$(INTDIR)\apr_buckets_flush.obj" - -@erase "$(INTDIR)\apr_buckets_heap.obj" - -@erase "$(INTDIR)\apr_buckets_mmap.obj" - -@erase "$(INTDIR)\apr_buckets_pipe.obj" - -@erase "$(INTDIR)\apr_buckets_pool.obj" - -@erase "$(INTDIR)\apr_buckets_refcount.obj" - -@erase "$(INTDIR)\apr_buckets_simple.obj" - -@erase "$(INTDIR)\apr_buckets_socket.obj" - -@erase "$(INTDIR)\apr_crypto.obj" - -@erase "$(INTDIR)\apr_date.obj" - -@erase "$(INTDIR)\apr_dbd.obj" - -@erase "$(INTDIR)\apr_dbm.obj" - -@erase "$(INTDIR)\apr_dbm_sdbm.obj" - -@erase "$(INTDIR)\apr_hooks.obj" - -@erase "$(INTDIR)\apr_ldap_stub.obj" - -@erase "$(INTDIR)\apr_ldap_url.obj" - -@erase "$(INTDIR)\apr_md4.obj" - -@erase "$(INTDIR)\apr_md5.obj" - -@erase "$(INTDIR)\apr_memcache.obj" - -@erase "$(INTDIR)\apr_queue.obj" - -@erase "$(INTDIR)\apr_reslist.obj" - -@erase "$(INTDIR)\apr_rmm.obj" - -@erase "$(INTDIR)\apr_sha1.obj" - -@erase "$(INTDIR)\apr_strmatch.obj" - -@erase "$(INTDIR)\apr_thread_pool.obj" - -@erase "$(INTDIR)\apr_uri.obj" - -@erase "$(INTDIR)\apr_xml.obj" - -@erase "$(INTDIR)\apu_dso.obj" - -@erase "$(INTDIR)\apu_version.obj" - -@erase "$(INTDIR)\getuuid.obj" - -@erase "$(INTDIR)\libaprutil.res" - -@erase "$(INTDIR)\libaprutil_src.idb" - -@erase "$(INTDIR)\libaprutil_src.pdb" - -@erase "$(INTDIR)\sdbm.obj" - -@erase "$(INTDIR)\sdbm_hash.obj" - -@erase "$(INTDIR)\sdbm_lock.obj" - -@erase "$(INTDIR)\sdbm_pair.obj" - -@erase "$(INTDIR)\uuid.obj" - -@erase "$(INTDIR)\xlate.obj" - -@erase "$(OUTDIR)\libaprutil-1.dll" - -@erase "$(OUTDIR)\libaprutil-1.exp" - -@erase "$(OUTDIR)\libaprutil-1.lib" - -@erase "$(OUTDIR)\libaprutil-1.pdb" - -@erase ".\include\apr_ldap.h" - -@erase ".\include\apu.h" - -@erase ".\include\apu_want.h" - -@erase ".\include\private\apu_config.h" - -@erase ".\include\private\apu_select_dbm.h" - -"$(OUTDIR)" : - if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)" - -CPP=cl.exe -CPP_PROJ=/nologo /MD /W3 /Zi /O2 /Oy- /I "./include" /I "../apr/include" /I "./include/private" /I "../apr-iconv/include" /I "./dbm/sdbm" /I "./xml/expat/lib" /D "NDEBUG" /D "APU_DECLARE_EXPORT" /D "APU_USE_SDBM" /D "XML_STATIC" /D "WIN32" /D "_WINDOWS" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\libaprutil_src" /FD /c - -.c{$(INTDIR)}.obj:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - -.cpp{$(INTDIR)}.obj:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - -.cxx{$(INTDIR)}.obj:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - -.c{$(INTDIR)}.sbr:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - -.cpp{$(INTDIR)}.sbr:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - -.cxx{$(INTDIR)}.sbr:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - -MTL=midl.exe -MTL_PROJ=/nologo /D "NDEBUG" /mktyplib203 /o /win32 "NUL" -RSC=rc.exe -RSC_PROJ=/l 0x409 /fo"$(INTDIR)\libaprutil.res" /i "./include" /i "../apr/include" /d "NDEBUG" /d "APU_VERSION_ONLY" -BSC32=bscmake.exe -BSC32_FLAGS=/nologo /o"$(OUTDIR)\libaprutil.bsc" -BSC32_SBRS= \ - -LINK32=link.exe -LINK32_FLAGS=kernel32.lib advapi32.lib ws2_32.lib mswsock.lib ole32.lib /nologo /base:"0x6EE60000" /subsystem:windows /dll /incremental:no /pdb:"$(OUTDIR)\libaprutil-1.pdb" /debug /out:"$(OUTDIR)\libaprutil-1.dll" /implib:"$(OUTDIR)\libaprutil-1.lib" /MACHINE:X64 /opt:ref -LINK32_OBJS= \ - "$(INTDIR)\apr_brigade.obj" \ - "$(INTDIR)\apr_buckets.obj" \ - "$(INTDIR)\apr_buckets_alloc.obj" \ - "$(INTDIR)\apr_buckets_eos.obj" \ - "$(INTDIR)\apr_buckets_file.obj" \ - "$(INTDIR)\apr_buckets_flush.obj" \ - "$(INTDIR)\apr_buckets_heap.obj" \ - "$(INTDIR)\apr_buckets_mmap.obj" \ - "$(INTDIR)\apr_buckets_pipe.obj" \ - "$(INTDIR)\apr_buckets_pool.obj" \ - "$(INTDIR)\apr_buckets_refcount.obj" \ - "$(INTDIR)\apr_buckets_simple.obj" \ - "$(INTDIR)\apr_buckets_socket.obj" \ - "$(INTDIR)\apr_crypto.obj" \ - "$(INTDIR)\apr_md4.obj" \ - "$(INTDIR)\apr_md5.obj" \ - "$(INTDIR)\apr_sha1.obj" \ - "$(INTDIR)\getuuid.obj" \ - "$(INTDIR)\uuid.obj" \ - "$(INTDIR)\apr_dbd.obj" \ - "$(INTDIR)\apr_dbm.obj" \ - "$(INTDIR)\apr_dbm_sdbm.obj" \ - "$(INTDIR)\apr_base64.obj" \ - "$(INTDIR)\apr_hooks.obj" \ - "$(INTDIR)\apr_ldap_stub.obj" \ - "$(INTDIR)\apr_ldap_url.obj" \ - "$(INTDIR)\apr_memcache.obj" \ - "$(INTDIR)\apr_date.obj" \ - "$(INTDIR)\apu_dso.obj" \ - "$(INTDIR)\apr_queue.obj" \ - "$(INTDIR)\apr_reslist.obj" \ - "$(INTDIR)\apr_rmm.obj" \ - "$(INTDIR)\apr_thread_pool.obj" \ - "$(INTDIR)\apu_version.obj" \ - "$(INTDIR)\sdbm.obj" \ - "$(INTDIR)\sdbm_hash.obj" \ - "$(INTDIR)\sdbm_lock.obj" \ - "$(INTDIR)\sdbm_pair.obj" \ - "$(INTDIR)\apr_strmatch.obj" \ - "$(INTDIR)\apr_uri.obj" \ - "$(INTDIR)\xlate.obj" \ - "$(INTDIR)\apr_xml.obj" \ - "$(INTDIR)\libaprutil.res" \ - "..\apr\x64\Release\libapr-1.lib" \ - "..\apr-iconv\x64\Release\libapriconv-1.lib" \ - ".\xml\expat\lib\x64\LibR\xml.lib" - -"$(OUTDIR)\libaprutil-1.dll" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS) - $(LINK32) @<< - $(LINK32_FLAGS) $(LINK32_OBJS) -<< - -TargetPath=.\x64\Release\libaprutil-1.dll -SOURCE="$(InputPath)" -PostBuild_Desc=Embed .manifest -DS_POSTBUILD_DEP=$(INTDIR)\postbld.dep - -# Begin Custom Macros -OutDir=.\x64\Release -# End Custom Macros - -"$(DS_POSTBUILD_DEP)" : "$(OUTDIR)\libaprutil-1.dll" - if exist .\x64\Release\libaprutil-1.dll.manifest mt.exe -manifest .\x64\Release\libaprutil-1.dll.manifest -outputresource:.\x64\Release\libaprutil-1.dll;2 - echo Helper for Post-build step > "$(DS_POSTBUILD_DEP)" - -!ELSEIF "$(CFG)" == "libaprutil - x64 Debug" - -OUTDIR=.\x64\Debug -INTDIR=.\x64\Debug -DS_POSTBUILD_DEP=$(INTDIR)\postbld.dep -# Begin Custom Macros -OutDir=.\x64\Debug -# End Custom Macros - -!IF "$(RECURSE)" == "0" - -ALL : ".\include\private\apu_select_dbm.h" ".\include\private\apu_config.h" ".\include\apu_want.h" ".\include\apu.h" ".\include\apr_ldap.h" "$(OUTDIR)\libaprutil-1.dll" "$(DS_POSTBUILD_DEP)" - -!ELSE - -ALL : "xml - x64 Debug" "libapriconv - x64 Debug" "libapr - x64 Debug" ".\include\private\apu_select_dbm.h" ".\include\private\apu_config.h" ".\include\apu_want.h" ".\include\apu.h" ".\include\apr_ldap.h" "$(OUTDIR)\libaprutil-1.dll" "$(DS_POSTBUILD_DEP)" - -!ENDIF - -!IF "$(RECURSE)" == "1" -CLEAN :"libapr - x64 DebugCLEAN" "libapriconv - x64 DebugCLEAN" "xml - x64 DebugCLEAN" -!ELSE -CLEAN : -!ENDIF - -@erase "$(INTDIR)\apr_base64.obj" - -@erase "$(INTDIR)\apr_brigade.obj" - -@erase "$(INTDIR)\apr_buckets.obj" - -@erase "$(INTDIR)\apr_buckets_alloc.obj" - -@erase "$(INTDIR)\apr_buckets_eos.obj" - -@erase "$(INTDIR)\apr_buckets_file.obj" - -@erase "$(INTDIR)\apr_buckets_flush.obj" - -@erase "$(INTDIR)\apr_buckets_heap.obj" - -@erase "$(INTDIR)\apr_buckets_mmap.obj" - -@erase "$(INTDIR)\apr_buckets_pipe.obj" - -@erase "$(INTDIR)\apr_buckets_pool.obj" - -@erase "$(INTDIR)\apr_buckets_refcount.obj" - -@erase "$(INTDIR)\apr_buckets_simple.obj" - -@erase "$(INTDIR)\apr_buckets_socket.obj" - -@erase "$(INTDIR)\apr_crypto.obj" - -@erase "$(INTDIR)\apr_date.obj" - -@erase "$(INTDIR)\apr_dbd.obj" - -@erase "$(INTDIR)\apr_dbm.obj" - -@erase "$(INTDIR)\apr_dbm_sdbm.obj" - -@erase "$(INTDIR)\apr_hooks.obj" - -@erase "$(INTDIR)\apr_ldap_stub.obj" - -@erase "$(INTDIR)\apr_ldap_url.obj" - -@erase "$(INTDIR)\apr_md4.obj" - -@erase "$(INTDIR)\apr_md5.obj" - -@erase "$(INTDIR)\apr_memcache.obj" - -@erase "$(INTDIR)\apr_queue.obj" - -@erase "$(INTDIR)\apr_reslist.obj" - -@erase "$(INTDIR)\apr_rmm.obj" - -@erase "$(INTDIR)\apr_sha1.obj" - -@erase "$(INTDIR)\apr_strmatch.obj" - -@erase "$(INTDIR)\apr_thread_pool.obj" - -@erase "$(INTDIR)\apr_uri.obj" - -@erase "$(INTDIR)\apr_xml.obj" - -@erase "$(INTDIR)\apu_dso.obj" - -@erase "$(INTDIR)\apu_version.obj" - -@erase "$(INTDIR)\getuuid.obj" - -@erase "$(INTDIR)\libaprutil.res" - -@erase "$(INTDIR)\libaprutil_src.idb" - -@erase "$(INTDIR)\libaprutil_src.pdb" - -@erase "$(INTDIR)\sdbm.obj" - -@erase "$(INTDIR)\sdbm_hash.obj" - -@erase "$(INTDIR)\sdbm_lock.obj" - -@erase "$(INTDIR)\sdbm_pair.obj" - -@erase "$(INTDIR)\uuid.obj" - -@erase "$(INTDIR)\xlate.obj" - -@erase "$(OUTDIR)\libaprutil-1.dll" - -@erase "$(OUTDIR)\libaprutil-1.exp" - -@erase "$(OUTDIR)\libaprutil-1.lib" - -@erase "$(OUTDIR)\libaprutil-1.pdb" - -@erase ".\include\apr_ldap.h" - -@erase ".\include\apu.h" - -@erase ".\include\apu_want.h" - -@erase ".\include\private\apu_config.h" - -@erase ".\include\private\apu_select_dbm.h" - -"$(OUTDIR)" : - if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)" - -CPP=cl.exe -CPP_PROJ=/nologo /MDd /W3 /Zi /Od /I "./include" /I "../apr/include" /I "./include/private" /I "../apr-iconv/include" /I "./dbm/sdbm" /I "./xml/expat/lib" /D "_DEBUG" /D "APU_DECLARE_EXPORT" /D "APU_USE_SDBM" /D "XML_STATIC" /D "WIN32" /D "_WINDOWS" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\libaprutil_src" /FD /EHsc /c - -.c{$(INTDIR)}.obj:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - -.cpp{$(INTDIR)}.obj:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - -.cxx{$(INTDIR)}.obj:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - -.c{$(INTDIR)}.sbr:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - -.cpp{$(INTDIR)}.sbr:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - -.cxx{$(INTDIR)}.sbr:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - -MTL=midl.exe -MTL_PROJ=/nologo /D "_DEBUG" /mktyplib203 /o /win32 "NUL" -RSC=rc.exe -RSC_PROJ=/l 0x409 /fo"$(INTDIR)\libaprutil.res" /i "./include" /i "../apr/include" /d "_DEBUG" /d "APU_VERSION_ONLY" -BSC32=bscmake.exe -BSC32_FLAGS=/nologo /o"$(OUTDIR)\libaprutil.bsc" -BSC32_SBRS= \ - -LINK32=link.exe -LINK32_FLAGS=kernel32.lib advapi32.lib ws2_32.lib mswsock.lib ole32.lib /nologo /base:"0x6EE60000" /subsystem:windows /dll /incremental:no /pdb:"$(OUTDIR)\libaprutil-1.pdb" /debug /out:"$(OUTDIR)\libaprutil-1.dll" /implib:"$(OUTDIR)\libaprutil-1.lib" /MACHINE:X64 -LINK32_OBJS= \ - "$(INTDIR)\apr_brigade.obj" \ - "$(INTDIR)\apr_buckets.obj" \ - "$(INTDIR)\apr_buckets_alloc.obj" \ - "$(INTDIR)\apr_buckets_eos.obj" \ - "$(INTDIR)\apr_buckets_file.obj" \ - "$(INTDIR)\apr_buckets_flush.obj" \ - "$(INTDIR)\apr_buckets_heap.obj" \ - "$(INTDIR)\apr_buckets_mmap.obj" \ - "$(INTDIR)\apr_buckets_pipe.obj" \ - "$(INTDIR)\apr_buckets_pool.obj" \ - "$(INTDIR)\apr_buckets_refcount.obj" \ - "$(INTDIR)\apr_buckets_simple.obj" \ - "$(INTDIR)\apr_buckets_socket.obj" \ - "$(INTDIR)\apr_crypto.obj" \ - "$(INTDIR)\apr_md4.obj" \ - "$(INTDIR)\apr_md5.obj" \ - "$(INTDIR)\apr_sha1.obj" \ - "$(INTDIR)\getuuid.obj" \ - "$(INTDIR)\uuid.obj" \ - "$(INTDIR)\apr_dbd.obj" \ - "$(INTDIR)\apr_dbm.obj" \ - "$(INTDIR)\apr_dbm_sdbm.obj" \ - "$(INTDIR)\apr_base64.obj" \ - "$(INTDIR)\apr_hooks.obj" \ - "$(INTDIR)\apr_ldap_stub.obj" \ - "$(INTDIR)\apr_ldap_url.obj" \ - "$(INTDIR)\apr_memcache.obj" \ - "$(INTDIR)\apr_date.obj" \ - "$(INTDIR)\apu_dso.obj" \ - "$(INTDIR)\apr_queue.obj" \ - "$(INTDIR)\apr_reslist.obj" \ - "$(INTDIR)\apr_rmm.obj" \ - "$(INTDIR)\apr_thread_pool.obj" \ - "$(INTDIR)\apu_version.obj" \ - "$(INTDIR)\sdbm.obj" \ - "$(INTDIR)\sdbm_hash.obj" \ - "$(INTDIR)\sdbm_lock.obj" \ - "$(INTDIR)\sdbm_pair.obj" \ - "$(INTDIR)\apr_strmatch.obj" \ - "$(INTDIR)\apr_uri.obj" \ - "$(INTDIR)\xlate.obj" \ - "$(INTDIR)\apr_xml.obj" \ - "$(INTDIR)\libaprutil.res" \ - "..\apr\x64\Debug\libapr-1.lib" \ - "..\apr-iconv\x64\Debug\libapriconv-1.lib" \ - ".\xml\expat\lib\x64\LibD\xml.lib" - -"$(OUTDIR)\libaprutil-1.dll" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS) - $(LINK32) @<< - $(LINK32_FLAGS) $(LINK32_OBJS) -<< - -TargetPath=.\x64\Debug\libaprutil-1.dll -SOURCE="$(InputPath)" -PostBuild_Desc=Embed .manifest -DS_POSTBUILD_DEP=$(INTDIR)\postbld.dep - -# Begin Custom Macros -OutDir=.\x64\Debug -# End Custom Macros - -"$(DS_POSTBUILD_DEP)" : "$(OUTDIR)\libaprutil-1.dll" - if exist .\x64\Debug\libaprutil-1.dll.manifest mt.exe -manifest .\x64\Debug\libaprutil-1.dll.manifest -outputresource:.\x64\Debug\libaprutil-1.dll;2 - echo Helper for Post-build step > "$(DS_POSTBUILD_DEP)" - -!ENDIF - - -!IF "$(NO_EXTERNAL_DEPS)" != "1" -!IF EXISTS("libaprutil.dep") -!INCLUDE "libaprutil.dep" -!ELSE -!MESSAGE Warning: cannot find "libaprutil.dep" -!ENDIF -!ENDIF - - -!IF "$(CFG)" == "libaprutil - Win32 Release" || "$(CFG)" == "libaprutil - Win32 Debug" || "$(CFG)" == "libaprutil - x64 Release" || "$(CFG)" == "libaprutil - x64 Debug" -SOURCE=.\buckets\apr_brigade.c - -"$(INTDIR)\apr_brigade.obj" : $(SOURCE) "$(INTDIR)" ".\include\apu.h" - $(CPP) $(CPP_PROJ) $(SOURCE) - - -SOURCE=.\buckets\apr_buckets.c - -"$(INTDIR)\apr_buckets.obj" : $(SOURCE) "$(INTDIR)" ".\include\apu.h" - $(CPP) $(CPP_PROJ) $(SOURCE) - - -SOURCE=.\buckets\apr_buckets_alloc.c - -"$(INTDIR)\apr_buckets_alloc.obj" : $(SOURCE) "$(INTDIR)" ".\include\apu.h" - $(CPP) $(CPP_PROJ) $(SOURCE) - - -SOURCE=.\buckets\apr_buckets_eos.c - -"$(INTDIR)\apr_buckets_eos.obj" : $(SOURCE) "$(INTDIR)" ".\include\apu.h" - $(CPP) $(CPP_PROJ) $(SOURCE) - - -SOURCE=.\buckets\apr_buckets_file.c - -"$(INTDIR)\apr_buckets_file.obj" : $(SOURCE) "$(INTDIR)" ".\include\apu.h" - $(CPP) $(CPP_PROJ) $(SOURCE) - - -SOURCE=.\buckets\apr_buckets_flush.c - -"$(INTDIR)\apr_buckets_flush.obj" : $(SOURCE) "$(INTDIR)" ".\include\apu.h" - $(CPP) $(CPP_PROJ) $(SOURCE) - - -SOURCE=.\buckets\apr_buckets_heap.c - -"$(INTDIR)\apr_buckets_heap.obj" : $(SOURCE) "$(INTDIR)" ".\include\apu.h" - $(CPP) $(CPP_PROJ) $(SOURCE) - - -SOURCE=.\buckets\apr_buckets_mmap.c - -"$(INTDIR)\apr_buckets_mmap.obj" : $(SOURCE) "$(INTDIR)" ".\include\apu.h" - $(CPP) $(CPP_PROJ) $(SOURCE) - - -SOURCE=.\buckets\apr_buckets_pipe.c - -"$(INTDIR)\apr_buckets_pipe.obj" : $(SOURCE) "$(INTDIR)" ".\include\apu.h" - $(CPP) $(CPP_PROJ) $(SOURCE) - - -SOURCE=.\buckets\apr_buckets_pool.c - -"$(INTDIR)\apr_buckets_pool.obj" : $(SOURCE) "$(INTDIR)" ".\include\apu.h" - $(CPP) $(CPP_PROJ) $(SOURCE) - - -SOURCE=.\buckets\apr_buckets_refcount.c - -"$(INTDIR)\apr_buckets_refcount.obj" : $(SOURCE) "$(INTDIR)" ".\include\apu.h" - $(CPP) $(CPP_PROJ) $(SOURCE) - - -SOURCE=.\buckets\apr_buckets_simple.c - -"$(INTDIR)\apr_buckets_simple.obj" : $(SOURCE) "$(INTDIR)" ".\include\apu.h" - $(CPP) $(CPP_PROJ) $(SOURCE) - - -SOURCE=.\buckets\apr_buckets_socket.c - -"$(INTDIR)\apr_buckets_socket.obj" : $(SOURCE) "$(INTDIR)" ".\include\apu.h" - $(CPP) $(CPP_PROJ) $(SOURCE) - - -SOURCE=.\crypto\apr_crypto.c - -"$(INTDIR)\apr_crypto.obj" : $(SOURCE) "$(INTDIR)" ".\include\private\apu_config.h" ".\include\apu.h" - $(CPP) $(CPP_PROJ) $(SOURCE) - - -SOURCE=.\crypto\apr_md4.c - -"$(INTDIR)\apr_md4.obj" : $(SOURCE) "$(INTDIR)" ".\include\apu.h" - $(CPP) $(CPP_PROJ) $(SOURCE) - - -SOURCE=.\crypto\apr_md5.c - -"$(INTDIR)\apr_md5.obj" : $(SOURCE) "$(INTDIR)" ".\include\private\apu_config.h" ".\include\apu.h" - $(CPP) $(CPP_PROJ) $(SOURCE) - - -SOURCE=.\crypto\apr_sha1.c - -"$(INTDIR)\apr_sha1.obj" : $(SOURCE) "$(INTDIR)" ".\include\apu.h" - $(CPP) $(CPP_PROJ) $(SOURCE) - - -SOURCE=.\crypto\getuuid.c - -"$(INTDIR)\getuuid.obj" : $(SOURCE) "$(INTDIR)" ".\include\apu.h" - $(CPP) $(CPP_PROJ) $(SOURCE) - - -SOURCE=.\crypto\uuid.c - -"$(INTDIR)\uuid.obj" : $(SOURCE) "$(INTDIR)" ".\include\apu.h" - $(CPP) $(CPP_PROJ) $(SOURCE) - - -SOURCE=.\dbd\apr_dbd.c - -"$(INTDIR)\apr_dbd.obj" : $(SOURCE) "$(INTDIR)" ".\include\private\apu_config.h" ".\include\apu.h" - $(CPP) $(CPP_PROJ) $(SOURCE) - - -SOURCE=.\dbd\apr_dbd_freetds.c -SOURCE=.\dbd\apr_dbd_mysql.c -SOURCE=.\dbd\apr_dbd_odbc.c -SOURCE=.\dbd\apr_dbd_oracle.c -SOURCE=.\dbd\apr_dbd_pgsql.c -SOURCE=.\dbd\apr_dbd_sqlite2.c -SOURCE=.\dbd\apr_dbd_sqlite3.c -SOURCE=.\dbm\apr_dbm.c - -"$(INTDIR)\apr_dbm.obj" : $(SOURCE) "$(INTDIR)" ".\include\private\apu_config.h" ".\include\apu.h" ".\include\private\apu_select_dbm.h" - $(CPP) $(CPP_PROJ) $(SOURCE) - - -SOURCE=.\dbm\apr_dbm_berkeleydb.c -SOURCE=.\dbm\apr_dbm_gdbm.c -SOURCE=.\dbm\apr_dbm_sdbm.c - -"$(INTDIR)\apr_dbm_sdbm.obj" : $(SOURCE) "$(INTDIR)" ".\include\private\apu_config.h" ".\include\apu.h" ".\include\private\apu_select_dbm.h" - $(CPP) $(CPP_PROJ) $(SOURCE) - - -SOURCE=.\encoding\apr_base64.c - -"$(INTDIR)\apr_base64.obj" : $(SOURCE) "$(INTDIR)" ".\include\apu.h" - $(CPP) $(CPP_PROJ) $(SOURCE) - - -SOURCE=.\hooks\apr_hooks.c - -"$(INTDIR)\apr_hooks.obj" : $(SOURCE) "$(INTDIR)" ".\include\apu.h" - $(CPP) $(CPP_PROJ) $(SOURCE) - - -SOURCE=.\ldap\apr_ldap_init.c -SOURCE=.\ldap\apr_ldap_option.c -SOURCE=.\ldap\apr_ldap_rebind.c -SOURCE=.\ldap\apr_ldap_stub.c - -"$(INTDIR)\apr_ldap_stub.obj" : $(SOURCE) "$(INTDIR)" ".\include\apu.h" ".\include\private\apu_config.h" ".\include\apr_ldap.h" - $(CPP) $(CPP_PROJ) $(SOURCE) - - -SOURCE=.\ldap\apr_ldap_url.c - -"$(INTDIR)\apr_ldap_url.obj" : $(SOURCE) "$(INTDIR)" ".\include\apu.h" ".\include\apr_ldap.h" - $(CPP) $(CPP_PROJ) $(SOURCE) - - -SOURCE=.\memcache\apr_memcache.c - -"$(INTDIR)\apr_memcache.obj" : $(SOURCE) "$(INTDIR)" ".\include\apu.h" - $(CPP) $(CPP_PROJ) $(SOURCE) - - -SOURCE=.\misc\apr_date.c - -"$(INTDIR)\apr_date.obj" : $(SOURCE) "$(INTDIR)" ".\include\apu.h" - $(CPP) $(CPP_PROJ) $(SOURCE) - - -SOURCE=.\misc\apr_queue.c - -"$(INTDIR)\apr_queue.obj" : $(SOURCE) "$(INTDIR)" ".\include\apu.h" - $(CPP) $(CPP_PROJ) $(SOURCE) - - -SOURCE=.\misc\apr_reslist.c - -"$(INTDIR)\apr_reslist.obj" : $(SOURCE) "$(INTDIR)" ".\include\apu.h" - $(CPP) $(CPP_PROJ) $(SOURCE) - - -SOURCE=.\misc\apr_rmm.c - -"$(INTDIR)\apr_rmm.obj" : $(SOURCE) "$(INTDIR)" ".\include\apu.h" - $(CPP) $(CPP_PROJ) $(SOURCE) - - -SOURCE=.\misc\apr_thread_pool.c - -"$(INTDIR)\apr_thread_pool.obj" : $(SOURCE) "$(INTDIR)" ".\include\apu.h" - $(CPP) $(CPP_PROJ) $(SOURCE) - - -SOURCE=.\misc\apu_dso.c - -"$(INTDIR)\apu_dso.obj" : $(SOURCE) "$(INTDIR)" ".\include\private\apu_config.h" ".\include\apu.h" - $(CPP) $(CPP_PROJ) $(SOURCE) - - -SOURCE=.\misc\apu_version.c - -"$(INTDIR)\apu_version.obj" : $(SOURCE) "$(INTDIR)" ".\include\apu.h" - $(CPP) $(CPP_PROJ) $(SOURCE) - - -SOURCE=.\dbm\sdbm\sdbm.c - -"$(INTDIR)\sdbm.obj" : $(SOURCE) "$(INTDIR)" ".\include\apu.h" - $(CPP) $(CPP_PROJ) $(SOURCE) - - -SOURCE=.\dbm\sdbm\sdbm_hash.c - -"$(INTDIR)\sdbm_hash.obj" : $(SOURCE) "$(INTDIR)" ".\include\apu.h" - $(CPP) $(CPP_PROJ) $(SOURCE) - - -SOURCE=.\dbm\sdbm\sdbm_lock.c - -"$(INTDIR)\sdbm_lock.obj" : $(SOURCE) "$(INTDIR)" ".\include\apu.h" - $(CPP) $(CPP_PROJ) $(SOURCE) - - -SOURCE=.\dbm\sdbm\sdbm_pair.c - -"$(INTDIR)\sdbm_pair.obj" : $(SOURCE) "$(INTDIR)" ".\include\apu.h" - $(CPP) $(CPP_PROJ) $(SOURCE) - - -SOURCE=.\strmatch\apr_strmatch.c - -"$(INTDIR)\apr_strmatch.obj" : $(SOURCE) "$(INTDIR)" ".\include\apu.h" - $(CPP) $(CPP_PROJ) $(SOURCE) - - -SOURCE=.\uri\apr_uri.c - -"$(INTDIR)\apr_uri.obj" : $(SOURCE) "$(INTDIR)" ".\include\apu.h" - $(CPP) $(CPP_PROJ) $(SOURCE) - - -SOURCE=.\xlate\xlate.c - -"$(INTDIR)\xlate.obj" : $(SOURCE) "$(INTDIR)" ".\include\apu.h" ".\include\private\apu_config.h" - $(CPP) $(CPP_PROJ) $(SOURCE) - - -SOURCE=.\xml\apr_xml.c - -"$(INTDIR)\apr_xml.obj" : $(SOURCE) "$(INTDIR)" ".\include\private\apu_config.h" ".\include\apu.h" - $(CPP) $(CPP_PROJ) $(SOURCE) - - -SOURCE=.\include\apr_ldap.hw - -!IF "$(CFG)" == "libaprutil - Win32 Release" - -InputPath=.\include\apr_ldap.hw - -".\include\apr_ldap.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" - < .\include\apr_ldap.h -<< - - -!ELSEIF "$(CFG)" == "libaprutil - Win32 Debug" - -InputPath=.\include\apr_ldap.hw - -".\include\apr_ldap.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" - < .\include\apr_ldap.h -<< - - -!ELSEIF "$(CFG)" == "libaprutil - x64 Release" - -InputPath=.\include\apr_ldap.hw - -".\include\apr_ldap.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" - < .\include\apr_ldap.h -<< - - -!ELSEIF "$(CFG)" == "libaprutil - x64 Debug" - -InputPath=.\include\apr_ldap.hw - -".\include\apr_ldap.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" - < .\include\apr_ldap.h -<< - - -!ENDIF - -SOURCE=.\include\apu.hw - -!IF "$(CFG)" == "libaprutil - Win32 Release" - -InputPath=.\include\apu.hw - -".\include\apu.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" - < .\include\apu.h -<< - - -!ELSEIF "$(CFG)" == "libaprutil - Win32 Debug" - -InputPath=.\include\apu.hw - -".\include\apu.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" - < .\include\apu.h -<< - - -!ELSEIF "$(CFG)" == "libaprutil - x64 Release" - -InputPath=.\include\apu.hw - -".\include\apu.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" - < .\include\apu.h -<< - - -!ELSEIF "$(CFG)" == "libaprutil - x64 Debug" - -InputPath=.\include\apu.hw - -".\include\apu.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" - < .\include\apu.h -<< - - -!ENDIF - -SOURCE=.\include\private\apu_config.hw - -!IF "$(CFG)" == "libaprutil - Win32 Release" - -InputPath=.\include\private\apu_config.hw - -".\include\private\apu_config.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" - < .\include\private\apu_config.h -<< - - -!ELSEIF "$(CFG)" == "libaprutil - Win32 Debug" - -InputPath=.\include\private\apu_config.hw - -".\include\private\apu_config.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" - < .\include\private\apu_config.h -<< - - -!ELSEIF "$(CFG)" == "libaprutil - x64 Release" - -InputPath=.\include\private\apu_config.hw - -".\include\private\apu_config.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" - < .\include\private\apu_config.h -<< - - -!ELSEIF "$(CFG)" == "libaprutil - x64 Debug" - -InputPath=.\include\private\apu_config.hw - -".\include\private\apu_config.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" - < .\include\private\apu_config.h -<< - - -!ENDIF - -SOURCE=.\include\private\apu_select_dbm.hw - -!IF "$(CFG)" == "libaprutil - Win32 Release" - -InputPath=.\include\private\apu_select_dbm.hw - -".\include\private\apu_select_dbm.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" - < .\include\private\apu_select_dbm.h -<< - - -!ELSEIF "$(CFG)" == "libaprutil - Win32 Debug" - -InputPath=.\include\private\apu_select_dbm.hw - -".\include\private\apu_select_dbm.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" - < .\include\private\apu_select_dbm.h -<< - - -!ELSEIF "$(CFG)" == "libaprutil - x64 Release" - -InputPath=.\include\private\apu_select_dbm.hw - -".\include\private\apu_select_dbm.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" - < .\include\private\apu_select_dbm.h -<< - - -!ELSEIF "$(CFG)" == "libaprutil - x64 Debug" - -InputPath=.\include\private\apu_select_dbm.hw - -".\include\private\apu_select_dbm.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" - < .\include\private\apu_select_dbm.h -<< - - -!ENDIF - -SOURCE=.\include\apu_want.hw - -!IF "$(CFG)" == "libaprutil - Win32 Release" - -InputPath=.\include\apu_want.hw - -".\include\apu_want.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" - < .\include\apu_want.h -<< - - -!ELSEIF "$(CFG)" == "libaprutil - Win32 Debug" - -InputPath=.\include\apu_want.hw - -".\include\apu_want.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" - < .\include\apu_want.h -<< - - -!ELSEIF "$(CFG)" == "libaprutil - x64 Release" - -InputPath=.\include\apu_want.hw - -".\include\apu_want.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" - < .\include\apu_want.h -<< - - -!ELSEIF "$(CFG)" == "libaprutil - x64 Debug" - -InputPath=.\include\apu_want.hw - -".\include\apu_want.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" - < .\include\apu_want.h -<< - - -!ENDIF - -!IF "$(CFG)" == "libaprutil - Win32 Release" - -"libapr - Win32 Release" : - cd ".\..\apr" - $(MAKE) /$(MAKEFLAGS) /F ".\libapr.mak" CFG="libapr - Win32 Release" - cd "..\apr-util" - -"libapr - Win32 ReleaseCLEAN" : - cd ".\..\apr" - $(MAKE) /$(MAKEFLAGS) /F ".\libapr.mak" CFG="libapr - Win32 Release" RECURSE=1 CLEAN - cd "..\apr-util" - -!ELSEIF "$(CFG)" == "libaprutil - Win32 Debug" - -"libapr - Win32 Debug" : - cd ".\..\apr" - $(MAKE) /$(MAKEFLAGS) /F ".\libapr.mak" CFG="libapr - Win32 Debug" - cd "..\apr-util" - -"libapr - Win32 DebugCLEAN" : - cd ".\..\apr" - $(MAKE) /$(MAKEFLAGS) /F ".\libapr.mak" CFG="libapr - Win32 Debug" RECURSE=1 CLEAN - cd "..\apr-util" - -!ELSEIF "$(CFG)" == "libaprutil - x64 Release" - -"libapr - x64 Release" : - cd ".\..\apr" - $(MAKE) /$(MAKEFLAGS) /F ".\libapr.mak" CFG="libapr - x64 Release" - cd "..\apr-util" - -"libapr - x64 ReleaseCLEAN" : - cd ".\..\apr" - $(MAKE) /$(MAKEFLAGS) /F ".\libapr.mak" CFG="libapr - x64 Release" RECURSE=1 CLEAN - cd "..\apr-util" - -!ELSEIF "$(CFG)" == "libaprutil - x64 Debug" - -"libapr - x64 Debug" : - cd ".\..\apr" - $(MAKE) /$(MAKEFLAGS) /F ".\libapr.mak" CFG="libapr - x64 Debug" - cd "..\apr-util" - -"libapr - x64 DebugCLEAN" : - cd ".\..\apr" - $(MAKE) /$(MAKEFLAGS) /F ".\libapr.mak" CFG="libapr - x64 Debug" RECURSE=1 CLEAN - cd "..\apr-util" - -!ENDIF - -!IF "$(CFG)" == "libaprutil - Win32 Release" - -"libapriconv - Win32 Release" : - cd ".\..\apr-iconv" - $(MAKE) /$(MAKEFLAGS) /F ".\libapriconv.mak" CFG="libapriconv - Win32 Release" - cd "..\apr-util" - -"libapriconv - Win32 ReleaseCLEAN" : - cd ".\..\apr-iconv" - $(MAKE) /$(MAKEFLAGS) /F ".\libapriconv.mak" CFG="libapriconv - Win32 Release" RECURSE=1 CLEAN - cd "..\apr-util" - -!ELSEIF "$(CFG)" == "libaprutil - Win32 Debug" - -"libapriconv - Win32 Debug" : - cd ".\..\apr-iconv" - $(MAKE) /$(MAKEFLAGS) /F ".\libapriconv.mak" CFG="libapriconv - Win32 Debug" - cd "..\apr-util" - -"libapriconv - Win32 DebugCLEAN" : - cd ".\..\apr-iconv" - $(MAKE) /$(MAKEFLAGS) /F ".\libapriconv.mak" CFG="libapriconv - Win32 Debug" RECURSE=1 CLEAN - cd "..\apr-util" - -!ELSEIF "$(CFG)" == "libaprutil - x64 Release" - -"libapriconv - x64 Release" : - cd ".\..\apr-iconv" - $(MAKE) /$(MAKEFLAGS) /F ".\libapriconv.mak" CFG="libapriconv - x64 Release" - cd "..\apr-util" - -"libapriconv - x64 ReleaseCLEAN" : - cd ".\..\apr-iconv" - $(MAKE) /$(MAKEFLAGS) /F ".\libapriconv.mak" CFG="libapriconv - x64 Release" RECURSE=1 CLEAN - cd "..\apr-util" - -!ELSEIF "$(CFG)" == "libaprutil - x64 Debug" - -"libapriconv - x64 Debug" : - cd ".\..\apr-iconv" - $(MAKE) /$(MAKEFLAGS) /F ".\libapriconv.mak" CFG="libapriconv - x64 Debug" - cd "..\apr-util" - -"libapriconv - x64 DebugCLEAN" : - cd ".\..\apr-iconv" - $(MAKE) /$(MAKEFLAGS) /F ".\libapriconv.mak" CFG="libapriconv - x64 Debug" RECURSE=1 CLEAN - cd "..\apr-util" - -!ENDIF - -!IF "$(CFG)" == "libaprutil - Win32 Release" - -"xml - Win32 Release" : - cd ".\xml\expat\lib" - $(MAKE) /$(MAKEFLAGS) /F ".\xml.mak" CFG="xml - Win32 Release" - cd "..\..\.." - -"xml - Win32 ReleaseCLEAN" : - cd ".\xml\expat\lib" - $(MAKE) /$(MAKEFLAGS) /F ".\xml.mak" CFG="xml - Win32 Release" RECURSE=1 CLEAN - cd "..\..\.." - -!ELSEIF "$(CFG)" == "libaprutil - Win32 Debug" - -"xml - Win32 Debug" : - cd ".\xml\expat\lib" - $(MAKE) /$(MAKEFLAGS) /F ".\xml.mak" CFG="xml - Win32 Debug" - cd "..\..\.." - -"xml - Win32 DebugCLEAN" : - cd ".\xml\expat\lib" - $(MAKE) /$(MAKEFLAGS) /F ".\xml.mak" CFG="xml - Win32 Debug" RECURSE=1 CLEAN - cd "..\..\.." - -!ELSEIF "$(CFG)" == "libaprutil - x64 Release" - -"xml - x64 Release" : - cd ".\xml\expat\lib" - $(MAKE) /$(MAKEFLAGS) /F ".\xml.mak" CFG="xml - x64 Release" - cd "..\..\.." - -"xml - x64 ReleaseCLEAN" : - cd ".\xml\expat\lib" - $(MAKE) /$(MAKEFLAGS) /F ".\xml.mak" CFG="xml - x64 Release" RECURSE=1 CLEAN - cd "..\..\.." - -!ELSEIF "$(CFG)" == "libaprutil - x64 Debug" - -"xml - x64 Debug" : - cd ".\xml\expat\lib" - $(MAKE) /$(MAKEFLAGS) /F ".\xml.mak" CFG="xml - x64 Debug" - cd "..\..\.." - -"xml - x64 DebugCLEAN" : - cd ".\xml\expat\lib" - $(MAKE) /$(MAKEFLAGS) /F ".\xml.mak" CFG="xml - x64 Debug" RECURSE=1 CLEAN - cd "..\..\.." - -!ENDIF - -SOURCE=.\libaprutil.rc - -"$(INTDIR)\libaprutil.res" : $(SOURCE) "$(INTDIR)" ".\include\apu.h" - $(RSC) $(RSC_PROJ) $(SOURCE) - - - -!ENDIF - diff --git a/iis/winbuild/libhttpd.mak b/iis/winbuild/libhttpd.mak deleted file mode 100644 index 7808ed1d..00000000 --- a/iis/winbuild/libhttpd.mak +++ /dev/null @@ -1,1052 +0,0 @@ -# Microsoft Developer Studio Generated NMAKE File, Based on libhttpd.dsp -!IF "$(CFG)" == "" -CFG=libhttpd - Win32 Release -!MESSAGE No configuration specified. Defaulting to libhttpd - Win32 Release. -!ENDIF - -!IF "$(CFG)" != "libhttpd - Win32 Release" && "$(CFG)" != "libhttpd - Win32 Debug" -!MESSAGE Invalid configuration "$(CFG)" specified. -!MESSAGE You can specify a configuration when running NMAKE -!MESSAGE by defining the macro CFG on the command line. For example: -!MESSAGE -!MESSAGE NMAKE /f "libhttpd.mak" CFG="libhttpd - Win32 Release" -!MESSAGE -!MESSAGE Possible choices for configuration are: -!MESSAGE -!MESSAGE "libhttpd - Win32 Release" (based on "Win32 (x86) Dynamic-Link Library") -!MESSAGE "libhttpd - Win32 Debug" (based on "Win32 (x86) Dynamic-Link Library") -!MESSAGE -!ERROR An invalid configuration is specified. -!ENDIF - -!IF "$(OS)" == "Windows_NT" -NULL= -!ELSE -NULL=nul -!ENDIF - -!IF "$(CFG)" == "libhttpd - Win32 Release" - -OUTDIR=.\Release -INTDIR=.\Release -DS_POSTBUILD_DEP=$(INTDIR)\postbld.dep -# Begin Custom Macros -OutDir=.\Release -# End Custom Macros - -!IF "$(RECURSE)" == "0" - -ALL : ".\include\mod_dav.h" "$(OUTDIR)\libhttpd.dll" "$(DS_POSTBUILD_DEP)" - -!ELSE - -ALL : "pcre - Win32 Release" "gen_test_char - Win32 Release" "libaprutil - Win32 Release" "libapriconv - Win32 Release" "libapr - Win32 Release" ".\include\mod_dav.h" "$(OUTDIR)\libhttpd.dll" "$(DS_POSTBUILD_DEP)" - -!ENDIF - -!IF "$(RECURSE)" == "1" -CLEAN :"libapr - Win32 ReleaseCLEAN" "libapriconv - Win32 ReleaseCLEAN" "libaprutil - Win32 ReleaseCLEAN" "gen_test_char - Win32 ReleaseCLEAN" "pcre - Win32 ReleaseCLEAN" -!ELSE -CLEAN : -!ENDIF - -@erase "$(INTDIR)\ap_regkey.obj" - -@erase "$(INTDIR)\byterange_filter.obj" - -@erase "$(INTDIR)\child.obj" - -@erase "$(INTDIR)\chunk_filter.obj" - -@erase "$(INTDIR)\config.obj" - -@erase "$(INTDIR)\connection.obj" - -@erase "$(INTDIR)\core.obj" - -@erase "$(INTDIR)\core_filters.obj" - -@erase "$(INTDIR)\eoc_bucket.obj" - -@erase "$(INTDIR)\error_bucket.obj" - -@erase "$(INTDIR)\http_core.obj" - -@erase "$(INTDIR)\http_etag.obj" - -@erase "$(INTDIR)\http_filters.obj" - -@erase "$(INTDIR)\http_protocol.obj" - -@erase "$(INTDIR)\http_request.obj" - -@erase "$(INTDIR)\libhttpd.res" - -@erase "$(INTDIR)\libhttpd_cl.idb" - -@erase "$(INTDIR)\libhttpd_cl.pdb" - -@erase "$(INTDIR)\listen.obj" - -@erase "$(INTDIR)\log.obj" - -@erase "$(INTDIR)\mod_so.obj" - -@erase "$(INTDIR)\mod_win32.obj" - -@erase "$(INTDIR)\modules.obj" - -@erase "$(INTDIR)\mpm_common.obj" - -@erase "$(INTDIR)\mpm_winnt.obj" - -@erase "$(INTDIR)\nt_eventlog.obj" - -@erase "$(INTDIR)\protocol.obj" - -@erase "$(INTDIR)\provider.obj" - -@erase "$(INTDIR)\request.obj" - -@erase "$(INTDIR)\scoreboard.obj" - -@erase "$(INTDIR)\service.obj" - -@erase "$(INTDIR)\util.obj" - -@erase "$(INTDIR)\util_cfgtree.obj" - -@erase "$(INTDIR)\util_filter.obj" - -@erase "$(INTDIR)\util_md5.obj" - -@erase "$(INTDIR)\util_pcre.obj" - -@erase "$(INTDIR)\util_script.obj" - -@erase "$(INTDIR)\util_time.obj" - -@erase "$(INTDIR)\util_win32.obj" - -@erase "$(INTDIR)\util_xml.obj" - -@erase "$(INTDIR)\vhost.obj" - -@erase "$(OUTDIR)\libhttpd.dll" - -@erase "$(OUTDIR)\libhttpd.exp" - -@erase "$(OUTDIR)\libhttpd.lib" - -@erase "$(OUTDIR)\libhttpd.pdb" - -@erase ".\include\mod_dav.h" - -"$(OUTDIR)" : - if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)" - -CPP=cl.exe -CPP_PROJ=/nologo /MD /W3 /Zi /O2 /Oy- /I "./include" /I "./srclib/apr/include" /I "./srclib/apr-util/include" /I "./srclib/pcre" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "PCRE_STATIC" /D "AP_DECLARE_EXPORT" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\libhttpd_cl" /FD /c - -.c{$(INTDIR)}.obj:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - -.cpp{$(INTDIR)}.obj:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - -.cxx{$(INTDIR)}.obj:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - -.c{$(INTDIR)}.sbr:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - -.cpp{$(INTDIR)}.sbr:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - -.cxx{$(INTDIR)}.sbr:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - -MTL=midl.exe -MTL_PROJ=/nologo /D "NDEBUG" /mktyplib203 /win32 -RSC=rc.exe -RSC_PROJ=/l 0x409 /fo"$(INTDIR)\libhttpd.res" /i "./include" /i "./srclib/apr/include" /d "NDEBUG" /d BIN_NAME="libhttpd.dll" /d LONG_NAME="Apache HTTP Server Core" -BSC32=bscmake.exe -BSC32_FLAGS=/nologo /o"$(OUTDIR)\libhttpd.bsc" -BSC32_SBRS= \ - -LINK32=link.exe -LINK32_FLAGS=kernel32.lib user32.lib advapi32.lib ws2_32.lib mswsock.lib "Release\buildmark.obj" /nologo /subsystem:windows /dll /incremental:no /pdb:"$(OUTDIR)\libhttpd.pdb" /debug /out:"$(OUTDIR)\libhttpd.dll" /implib:"$(OUTDIR)\libhttpd.lib" /base:@"os\win32\BaseAddr.ref",libhttpd.dll /opt:ref -LINK32_OBJS= \ - "$(INTDIR)\byterange_filter.obj" \ - "$(INTDIR)\chunk_filter.obj" \ - "$(INTDIR)\config.obj" \ - "$(INTDIR)\connection.obj" \ - "$(INTDIR)\core.obj" \ - "$(INTDIR)\core_filters.obj" \ - "$(INTDIR)\http_core.obj" \ - "$(INTDIR)\http_etag.obj" \ - "$(INTDIR)\http_filters.obj" \ - "$(INTDIR)\http_protocol.obj" \ - "$(INTDIR)\http_request.obj" \ - "$(INTDIR)\log.obj" \ - "$(INTDIR)\protocol.obj" \ - "$(INTDIR)\request.obj" \ - "$(INTDIR)\vhost.obj" \ - "$(INTDIR)\mod_so.obj" \ - "$(INTDIR)\mod_win32.obj" \ - "$(INTDIR)\modules.obj" \ - "$(INTDIR)\eoc_bucket.obj" \ - "$(INTDIR)\error_bucket.obj" \ - "$(INTDIR)\util.obj" \ - "$(INTDIR)\util_cfgtree.obj" \ - "$(INTDIR)\util_filter.obj" \ - "$(INTDIR)\util_md5.obj" \ - "$(INTDIR)\util_pcre.obj" \ - "$(INTDIR)\util_script.obj" \ - "$(INTDIR)\util_time.obj" \ - "$(INTDIR)\util_win32.obj" \ - "$(INTDIR)\util_xml.obj" \ - "$(INTDIR)\ap_regkey.obj" \ - "$(INTDIR)\child.obj" \ - "$(INTDIR)\listen.obj" \ - "$(INTDIR)\mpm_common.obj" \ - "$(INTDIR)\mpm_winnt.obj" \ - "$(INTDIR)\nt_eventlog.obj" \ - "$(INTDIR)\provider.obj" \ - "$(INTDIR)\scoreboard.obj" \ - "$(INTDIR)\service.obj" \ - "$(INTDIR)\libhttpd.res" \ - ".\srclib\apr\Release\libapr-1.lib" \ - ".\srclib\apr-iconv\Release\libapriconv-1.lib" \ - ".\srclib\apr-util\Release\libaprutil-1.lib" \ - ".\srclib\pcre\LibR\pcre.lib" - -"$(OUTDIR)\libhttpd.dll" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS) - cl.exe /nologo /MD /W3 /O2 /Oy- /Zi /I "./include" /I "./srclib/apr/include" /I "./srclib/apr-util/include" /I "./srclib/pcre" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "PCRE_STATIC" /D "AP_DECLARE_EXPORT" /Fd"Release\libhttpd" /FD /c server\buildmark.c /Fo"Release\buildmark.obj" - $(LINK32) @<< - $(LINK32_FLAGS) $(LINK32_OBJS) -<< - -TargetPath=.\Release\libhttpd.dll -SOURCE="$(InputPath)" -PostBuild_Desc=Embed .manifest -DS_POSTBUILD_DEP=$(INTDIR)\postbld.dep - -# Begin Custom Macros -OutDir=.\Release -# End Custom Macros - -"$(DS_POSTBUILD_DEP)" : "$(OUTDIR)\libhttpd.dll" - if exist .\Release\libhttpd.dll.manifest mt.exe -manifest .\Release\libhttpd.dll.manifest -outputresource:.\Release\libhttpd.dll;2 - echo Helper for Post-build step > "$(DS_POSTBUILD_DEP)" - -!ELSEIF "$(CFG)" == "libhttpd - Win32 Debug" - -OUTDIR=.\Debug -INTDIR=.\Debug -DS_POSTBUILD_DEP=$(INTDIR)\postbld.dep -# Begin Custom Macros -OutDir=.\Debug -# End Custom Macros - -!IF "$(RECURSE)" == "0" - -ALL : ".\server\test_char.h" ".\include\mpm_default.h" ".\include\mpm.h" ".\include\mod_so.h" ".\include\mod_proxy.h" ".\include\mod_include.h" ".\include\mod_dav.h" ".\include\mod_core.h" ".\include\mod_cgi.h" "$(OUTDIR)\libhttpd.dll" "$(DS_POSTBUILD_DEP)" - -!ELSE - -ALL : "pcre - Win32 Debug" "gen_test_char - Win32 Debug" "libaprutil - Win32 Debug" "libapriconv - Win32 Debug" "libapr - Win32 Debug" ".\server\test_char.h" ".\include\mpm_default.h" ".\include\mpm.h" ".\include\mod_so.h" ".\include\mod_proxy.h" ".\include\mod_include.h" ".\include\mod_dav.h" ".\include\mod_core.h" ".\include\mod_cgi.h" "$(OUTDIR)\libhttpd.dll" "$(DS_POSTBUILD_DEP)" - -!ENDIF - -!IF "$(RECURSE)" == "1" -CLEAN :"libapr - Win32 DebugCLEAN" "libapriconv - Win32 DebugCLEAN" "libaprutil - Win32 DebugCLEAN" "gen_test_char - Win32 DebugCLEAN" "pcre - Win32 DebugCLEAN" -!ELSE -CLEAN : -!ENDIF - -@erase "$(INTDIR)\ap_regkey.obj" - -@erase "$(INTDIR)\byterange_filter.obj" - -@erase "$(INTDIR)\child.obj" - -@erase "$(INTDIR)\chunk_filter.obj" - -@erase "$(INTDIR)\config.obj" - -@erase "$(INTDIR)\connection.obj" - -@erase "$(INTDIR)\core.obj" - -@erase "$(INTDIR)\core_filters.obj" - -@erase "$(INTDIR)\eoc_bucket.obj" - -@erase "$(INTDIR)\error_bucket.obj" - -@erase "$(INTDIR)\http_core.obj" - -@erase "$(INTDIR)\http_etag.obj" - -@erase "$(INTDIR)\http_filters.obj" - -@erase "$(INTDIR)\http_protocol.obj" - -@erase "$(INTDIR)\http_request.obj" - -@erase "$(INTDIR)\libhttpd.res" - -@erase "$(INTDIR)\libhttpd_cl.idb" - -@erase "$(INTDIR)\libhttpd_cl.pdb" - -@erase "$(INTDIR)\listen.obj" - -@erase "$(INTDIR)\log.obj" - -@erase "$(INTDIR)\mod_so.obj" - -@erase "$(INTDIR)\mod_win32.obj" - -@erase "$(INTDIR)\modules.obj" - -@erase "$(INTDIR)\mpm_common.obj" - -@erase "$(INTDIR)\mpm_winnt.obj" - -@erase "$(INTDIR)\nt_eventlog.obj" - -@erase "$(INTDIR)\protocol.obj" - -@erase "$(INTDIR)\provider.obj" - -@erase "$(INTDIR)\request.obj" - -@erase "$(INTDIR)\scoreboard.obj" - -@erase "$(INTDIR)\service.obj" - -@erase "$(INTDIR)\util.obj" - -@erase "$(INTDIR)\util_cfgtree.obj" - -@erase "$(INTDIR)\util_filter.obj" - -@erase "$(INTDIR)\util_md5.obj" - -@erase "$(INTDIR)\util_pcre.obj" - -@erase "$(INTDIR)\util_script.obj" - -@erase "$(INTDIR)\util_time.obj" - -@erase "$(INTDIR)\util_win32.obj" - -@erase "$(INTDIR)\util_xml.obj" - -@erase "$(INTDIR)\vhost.obj" - -@erase "$(OUTDIR)\libhttpd.dll" - -@erase "$(OUTDIR)\libhttpd.exp" - -@erase "$(OUTDIR)\libhttpd.lib" - -@erase "$(OUTDIR)\libhttpd.pdb" - -@erase ".\include\mod_cgi.h" - -@erase ".\include\mod_core.h" - -@erase ".\include\mod_dav.h" - -@erase ".\include\mod_include.h" - -@erase ".\include\mod_proxy.h" - -@erase ".\include\mod_so.h" - -@erase ".\include\mpm.h" - -@erase ".\include\mpm_default.h" - -@erase ".\server\test_char.h" - -"$(OUTDIR)" : - if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)" - -CPP=cl.exe -CPP_PROJ=/nologo /MDd /W3 /Zi /Od /I "./include" /I "./srclib/apr/include" /I "./srclib/apr-util/include" /I "./srclib/pcre" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D "PCRE_STATIC" /D "AP_DECLARE_EXPORT" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\libhttpd_cl" /FD /EHsc /c - -.c{$(INTDIR)}.obj:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - -.cpp{$(INTDIR)}.obj:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - -.cxx{$(INTDIR)}.obj:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - -.c{$(INTDIR)}.sbr:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - -.cpp{$(INTDIR)}.sbr:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - -.cxx{$(INTDIR)}.sbr:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - -MTL=midl.exe -MTL_PROJ=/nologo /D "_DEBUG" /mktyplib203 /win32 -RSC=rc.exe -RSC_PROJ=/l 0x409 /fo"$(INTDIR)\libhttpd.res" /i "./include" /i "./srclib/apr/include" /d "_DEBUG" /d BIN_NAME="libhttpd.dll" /d LONG_NAME="Apache HTTP Server Core" -BSC32=bscmake.exe -BSC32_FLAGS=/nologo /o"$(OUTDIR)\libhttpd.bsc" -BSC32_SBRS= \ - -LINK32=link.exe -LINK32_FLAGS=kernel32.lib user32.lib advapi32.lib ws2_32.lib mswsock.lib "Debug\buildmark.obj" /nologo /subsystem:windows /dll /incremental:no /pdb:"$(OUTDIR)\libhttpd.pdb" /debug /out:"$(OUTDIR)\libhttpd.dll" /implib:"$(OUTDIR)\libhttpd.lib" /base:@"os\win32\BaseAddr.ref",libhttpd.dll -LINK32_OBJS= \ - "$(INTDIR)\byterange_filter.obj" \ - "$(INTDIR)\chunk_filter.obj" \ - "$(INTDIR)\config.obj" \ - "$(INTDIR)\connection.obj" \ - "$(INTDIR)\core.obj" \ - "$(INTDIR)\core_filters.obj" \ - "$(INTDIR)\http_core.obj" \ - "$(INTDIR)\http_etag.obj" \ - "$(INTDIR)\http_filters.obj" \ - "$(INTDIR)\http_protocol.obj" \ - "$(INTDIR)\http_request.obj" \ - "$(INTDIR)\log.obj" \ - "$(INTDIR)\protocol.obj" \ - "$(INTDIR)\request.obj" \ - "$(INTDIR)\vhost.obj" \ - "$(INTDIR)\mod_so.obj" \ - "$(INTDIR)\mod_win32.obj" \ - "$(INTDIR)\modules.obj" \ - "$(INTDIR)\eoc_bucket.obj" \ - "$(INTDIR)\error_bucket.obj" \ - "$(INTDIR)\util.obj" \ - "$(INTDIR)\util_cfgtree.obj" \ - "$(INTDIR)\util_filter.obj" \ - "$(INTDIR)\util_md5.obj" \ - "$(INTDIR)\util_pcre.obj" \ - "$(INTDIR)\util_script.obj" \ - "$(INTDIR)\util_time.obj" \ - "$(INTDIR)\util_win32.obj" \ - "$(INTDIR)\util_xml.obj" \ - "$(INTDIR)\ap_regkey.obj" \ - "$(INTDIR)\child.obj" \ - "$(INTDIR)\listen.obj" \ - "$(INTDIR)\mpm_common.obj" \ - "$(INTDIR)\mpm_winnt.obj" \ - "$(INTDIR)\nt_eventlog.obj" \ - "$(INTDIR)\provider.obj" \ - "$(INTDIR)\scoreboard.obj" \ - "$(INTDIR)\service.obj" \ - "$(INTDIR)\libhttpd.res" \ - ".\srclib\apr\Debug\libapr-1.lib" \ - ".\srclib\apr-iconv\Debug\libapriconv-1.lib" \ - ".\srclib\apr-util\Debug\libaprutil-1.lib" \ - ".\srclib\pcre\LibD\pcre.lib" - -"$(OUTDIR)\libhttpd.dll" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS) - cl.exe /nologo /MDd /W3 /EHsc /Zi /Od /I "./include" /I "./srclib/apr/include" /I "./srclib/apr-util/include" /I "./srclib/pcre" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D "PCRE_STATIC" /D "AP_DECLARE_EXPORT" /Fd"Debug\libhttpd" /FD /c server\buildmark.c /Fo"Debug\buildmark.obj" - $(LINK32) @<< - $(LINK32_FLAGS) $(LINK32_OBJS) -<< - -TargetPath=.\Debug\libhttpd.dll -SOURCE="$(InputPath)" -PostBuild_Desc=Embed .manifest -DS_POSTBUILD_DEP=$(INTDIR)\postbld.dep - -# Begin Custom Macros -OutDir=.\Debug -# End Custom Macros - -"$(DS_POSTBUILD_DEP)" : "$(OUTDIR)\libhttpd.dll" - if exist .\Debug\libhttpd.dll.manifest mt.exe -manifest .\Debug\libhttpd.dll.manifest -outputresource:.\Debug\libhttpd.dll;2 - echo Helper for Post-build step > "$(DS_POSTBUILD_DEP)" - -!ENDIF - - -!IF "$(NO_EXTERNAL_DEPS)" != "1" -!IF EXISTS("libhttpd.dep") -!INCLUDE "libhttpd.dep" -!ELSE -!MESSAGE Warning: cannot find "libhttpd.dep" -!ENDIF -!ENDIF - - -!IF "$(CFG)" == "libhttpd - Win32 Release" || "$(CFG)" == "libhttpd - Win32 Debug" -SOURCE=.\modules\generators\mod_cgi.h - -!IF "$(CFG)" == "libhttpd - Win32 Release" - -InputPath=.\modules\generators\mod_cgi.h - -".\include\mod_cgi.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" - < .\include\mod_cgi.h -<< - - -!ELSEIF "$(CFG)" == "libhttpd - Win32 Debug" - -InputPath=.\modules\generators\mod_cgi.h - -".\include\mod_cgi.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" - < .\include\mod_cgi.h -<< - - -!ENDIF - -SOURCE=.\modules\http\mod_core.h - -!IF "$(CFG)" == "libhttpd - Win32 Release" - -InputPath=.\modules\http\mod_core.h - -".\include\mod_core.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" - < .\include\mod_core.h -<< - - -!ELSEIF "$(CFG)" == "libhttpd - Win32 Debug" - -InputPath=.\modules\http\mod_core.h - -".\include\mod_core.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" - < .\include\mod_core.h -<< - - -!ENDIF - -SOURCE=.\modules\dav\main\mod_dav.h - -!IF "$(CFG)" == "libhttpd - Win32 Release" - -InputPath=.\modules\dav\main\mod_dav.h - -".\include\mod_dav.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" - < .\include\mod_dav.h -<< - - -!ELSEIF "$(CFG)" == "libhttpd - Win32 Debug" - -InputPath=.\modules\dav\main\mod_dav.h - -".\include\mod_dav.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" - < .\include\mod_dav.h -<< - - -!ENDIF - -SOURCE=.\modules\filters\mod_include.h - -!IF "$(CFG)" == "libhttpd - Win32 Release" - -InputPath=.\modules\filters\mod_include.h - -".\include\mod_include.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" - < .\include\mod_include.h -<< - - -!ELSEIF "$(CFG)" == "libhttpd - Win32 Debug" - -InputPath=.\modules\filters\mod_include.h - -".\include\mod_include.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" - < .\include\mod_include.h -<< - - -!ENDIF - -SOURCE=.\modules\proxy\mod_proxy.h - -!IF "$(CFG)" == "libhttpd - Win32 Release" - -InputPath=.\modules\proxy\mod_proxy.h - -".\include\mod_proxy.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" - < .\include\mod_proxy.h -<< - - -!ELSEIF "$(CFG)" == "libhttpd - Win32 Debug" - -InputPath=.\modules\proxy\mod_proxy.h - -".\include\mod_proxy.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" - < .\include\mod_proxy.h -<< - - -!ENDIF - -SOURCE=.\modules\mappers\mod_so.h - -!IF "$(CFG)" == "libhttpd - Win32 Release" - -InputPath=.\modules\mappers\mod_so.h - -".\include\mod_so.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" - < .\include\mod_so.h -<< - - -!ELSEIF "$(CFG)" == "libhttpd - Win32 Debug" - -InputPath=.\modules\mappers\mod_so.h - -".\include\mod_so.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" - < .\include\mod_so.h -<< - - -!ENDIF - -SOURCE=.\os\win32\os.h - -!IF "$(CFG)" == "libhttpd - Win32 Release" - -InputPath=.\os\win32\os.h - -".\include\os.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" - < .\include\os.h -<< - - -!ELSEIF "$(CFG)" == "libhttpd - Win32 Debug" - -InputPath=.\os\win32\os.h - -".\include\os.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" - < .\include\os.h -<< - - -!ENDIF - -SOURCE=.\server\buildmark.c -SOURCE=.\modules\http\byterange_filter.c - -"$(INTDIR)\byterange_filter.obj" : $(SOURCE) "$(INTDIR)" ".\modules\http\mod_core.h" ".\include\os.h" - $(CPP) $(CPP_PROJ) $(SOURCE) - - -SOURCE=.\modules\http\chunk_filter.c - -"$(INTDIR)\chunk_filter.obj" : $(SOURCE) "$(INTDIR)" ".\modules\http\mod_core.h" ".\include\os.h" - $(CPP) $(CPP_PROJ) $(SOURCE) - - -SOURCE=.\server\config.c - -"$(INTDIR)\config.obj" : $(SOURCE) "$(INTDIR)" ".\include\mpm.h" ".\include\os.h" - $(CPP) $(CPP_PROJ) $(SOURCE) - - -SOURCE=.\server\connection.c - -"$(INTDIR)\connection.obj" : $(SOURCE) "$(INTDIR)" ".\include\mpm_default.h" ".\include\os.h" - $(CPP) $(CPP_PROJ) $(SOURCE) - - -SOURCE=.\server\core.c - -"$(INTDIR)\core.obj" : $(SOURCE) "$(INTDIR)" ".\include\mpm.h" ".\include\mod_core.h" ".\include\mod_proxy.h" ".\include\mod_so.h" ".\include\os.h" - $(CPP) $(CPP_PROJ) $(SOURCE) - - -SOURCE=.\server\core_filters.c - -"$(INTDIR)\core_filters.obj" : $(SOURCE) "$(INTDIR)" ".\include\mpm.h" ".\include\mod_core.h" ".\include\mod_proxy.h" ".\include\mod_so.h" ".\include\os.h" - $(CPP) $(CPP_PROJ) $(SOURCE) - - -SOURCE=.\modules\http\http_core.c - -"$(INTDIR)\http_core.obj" : $(SOURCE) "$(INTDIR)" ".\modules\http\mod_core.h" ".\include\os.h" - $(CPP) $(CPP_PROJ) $(SOURCE) - - -SOURCE=.\modules\http\http_etag.c - -"$(INTDIR)\http_etag.obj" : $(SOURCE) "$(INTDIR)" ".\include\os.h" - $(CPP) $(CPP_PROJ) $(SOURCE) - - -SOURCE=.\modules\http\http_filters.c - -"$(INTDIR)\http_filters.obj" : $(SOURCE) "$(INTDIR)" ".\modules\http\mod_core.h" ".\include\os.h" - $(CPP) $(CPP_PROJ) $(SOURCE) - - -SOURCE=.\modules\http\http_protocol.c - -"$(INTDIR)\http_protocol.obj" : $(SOURCE) "$(INTDIR)" ".\modules\http\mod_core.h" ".\include\os.h" - $(CPP) $(CPP_PROJ) $(SOURCE) - - -SOURCE=.\modules\http\http_request.c - -"$(INTDIR)\http_request.obj" : $(SOURCE) "$(INTDIR)" ".\modules\http\mod_core.h" ".\include\os.h" - $(CPP) $(CPP_PROJ) $(SOURCE) - - -SOURCE=.\server\log.c - -"$(INTDIR)\log.obj" : $(SOURCE) "$(INTDIR)" ".\include\os.h" - $(CPP) $(CPP_PROJ) $(SOURCE) - - -SOURCE=.\server\protocol.c - -"$(INTDIR)\protocol.obj" : $(SOURCE) "$(INTDIR)" ".\include\mod_core.h" ".\include\os.h" - $(CPP) $(CPP_PROJ) $(SOURCE) - - -SOURCE=.\server\request.c - -"$(INTDIR)\request.obj" : $(SOURCE) "$(INTDIR)" ".\include\mod_core.h" ".\include\os.h" - $(CPP) $(CPP_PROJ) $(SOURCE) - - -SOURCE=.\server\vhost.c - -"$(INTDIR)\vhost.obj" : $(SOURCE) "$(INTDIR)" ".\include\os.h" - $(CPP) $(CPP_PROJ) $(SOURCE) - - -SOURCE=.\modules\mappers\mod_so.c - -"$(INTDIR)\mod_so.obj" : $(SOURCE) "$(INTDIR)" ".\modules\mappers\mod_so.h" ".\include\os.h" - $(CPP) $(CPP_PROJ) $(SOURCE) - - -SOURCE=.\modules\arch\win32\mod_win32.c - -"$(INTDIR)\mod_win32.obj" : $(SOURCE) "$(INTDIR)" ".\include\mod_core.h" ".\include\mod_cgi.h" ".\include\os.h" ".\include\mod_include.h" - $(CPP) $(CPP_PROJ) $(SOURCE) - - -SOURCE=.\os\win32\modules.c - -"$(INTDIR)\modules.obj" : $(SOURCE) "$(INTDIR)" ".\include\os.h" - $(CPP) $(CPP_PROJ) $(SOURCE) - - -SOURCE=.\server\eoc_bucket.c - -"$(INTDIR)\eoc_bucket.obj" : $(SOURCE) "$(INTDIR)" ".\include\os.h" - $(CPP) $(CPP_PROJ) $(SOURCE) - - -SOURCE=.\server\error_bucket.c - -"$(INTDIR)\error_bucket.obj" : $(SOURCE) "$(INTDIR)" ".\include\os.h" - $(CPP) $(CPP_PROJ) $(SOURCE) - - -SOURCE=.\server\util.c - -"$(INTDIR)\util.obj" : $(SOURCE) "$(INTDIR)" ".\server\test_char.h" ".\include\os.h" - $(CPP) $(CPP_PROJ) $(SOURCE) - - -SOURCE=.\server\util_cfgtree.c - -"$(INTDIR)\util_cfgtree.obj" : $(SOURCE) "$(INTDIR)" ".\include\os.h" - $(CPP) $(CPP_PROJ) $(SOURCE) - - -SOURCE=.\server\util_filter.c - -"$(INTDIR)\util_filter.obj" : $(SOURCE) "$(INTDIR)" ".\include\os.h" - $(CPP) $(CPP_PROJ) $(SOURCE) - - -SOURCE=.\server\util_md5.c - -"$(INTDIR)\util_md5.obj" : $(SOURCE) "$(INTDIR)" ".\include\os.h" - $(CPP) $(CPP_PROJ) $(SOURCE) - - -SOURCE=.\server\util_pcre.c - -"$(INTDIR)\util_pcre.obj" : $(SOURCE) "$(INTDIR)" ".\include\os.h" - $(CPP) $(CPP_PROJ) $(SOURCE) - - -SOURCE=.\server\util_script.c - -"$(INTDIR)\util_script.obj" : $(SOURCE) "$(INTDIR)" ".\include\os.h" - $(CPP) $(CPP_PROJ) $(SOURCE) - - -SOURCE=.\server\util_time.c - -"$(INTDIR)\util_time.obj" : $(SOURCE) "$(INTDIR)" ".\include\os.h" - $(CPP) $(CPP_PROJ) $(SOURCE) - - -SOURCE=.\os\win32\util_win32.c - -"$(INTDIR)\util_win32.obj" : $(SOURCE) "$(INTDIR)" ".\include\os.h" - $(CPP) $(CPP_PROJ) $(SOURCE) - - -SOURCE=.\server\util_xml.c - -"$(INTDIR)\util_xml.obj" : $(SOURCE) "$(INTDIR)" ".\include\os.h" - $(CPP) $(CPP_PROJ) $(SOURCE) - - -SOURCE=.\os\win32\ap_regkey.c - -"$(INTDIR)\ap_regkey.obj" : $(SOURCE) "$(INTDIR)" ".\include\os.h" - $(CPP) $(CPP_PROJ) $(SOURCE) - - -SOURCE=.\server\mpm\winnt\child.c - -"$(INTDIR)\child.obj" : $(SOURCE) "$(INTDIR)" ".\server\mpm\winnt\mpm_default.h" ".\include\os.h" ".\include\mpm.h" - $(CPP) $(CPP_PROJ) $(SOURCE) - - -SOURCE=.\server\listen.c - -"$(INTDIR)\listen.obj" : $(SOURCE) "$(INTDIR)" ".\include\mpm.h" ".\include\os.h" - $(CPP) $(CPP_PROJ) $(SOURCE) - - -SOURCE=.\server\mpm\winnt\mpm.h - -!IF "$(CFG)" == "libhttpd - Win32 Release" - -InputPath=.\server\mpm\winnt\mpm.h - -".\include\mpm.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" - < .\include\mpm.h -<< - - -!ELSEIF "$(CFG)" == "libhttpd - Win32 Debug" - -InputPath=.\server\mpm\winnt\mpm.h - -".\include\mpm.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" - < .\include\mpm.h -<< - - -!ENDIF - -SOURCE=.\server\mpm_common.c - -"$(INTDIR)\mpm_common.obj" : $(SOURCE) "$(INTDIR)" ".\include\mpm.h" ".\include\mpm_default.h" ".\include\os.h" - $(CPP) $(CPP_PROJ) $(SOURCE) - - -SOURCE=.\server\mpm\winnt\mpm_default.h - -!IF "$(CFG)" == "libhttpd - Win32 Release" - -InputPath=.\server\mpm\winnt\mpm_default.h - -".\include\mpm_default.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" - < .\include\mpm_default.h -<< - - -!ELSEIF "$(CFG)" == "libhttpd - Win32 Debug" - -InputPath=.\server\mpm\winnt\mpm_default.h - -".\include\mpm_default.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" - < .\include\mpm_default.h -<< - - -!ENDIF - -SOURCE=.\server\mpm\winnt\mpm_winnt.c - -"$(INTDIR)\mpm_winnt.obj" : $(SOURCE) "$(INTDIR)" ".\server\mpm\winnt\mpm_default.h" ".\include\os.h" ".\include\mpm.h" - $(CPP) $(CPP_PROJ) $(SOURCE) - - -SOURCE=.\server\mpm\winnt\nt_eventlog.c - -"$(INTDIR)\nt_eventlog.obj" : $(SOURCE) "$(INTDIR)" ".\include\os.h" - $(CPP) $(CPP_PROJ) $(SOURCE) - - -SOURCE=.\server\provider.c - -"$(INTDIR)\provider.obj" : $(SOURCE) "$(INTDIR)" ".\include\os.h" - $(CPP) $(CPP_PROJ) $(SOURCE) - - -SOURCE=.\server\scoreboard.c - -"$(INTDIR)\scoreboard.obj" : $(SOURCE) "$(INTDIR)" ".\include\mpm.h" ".\include\os.h" - $(CPP) $(CPP_PROJ) $(SOURCE) - - -SOURCE=.\server\mpm\winnt\service.c - -"$(INTDIR)\service.obj" : $(SOURCE) "$(INTDIR)" ".\include\os.h" - $(CPP) $(CPP_PROJ) $(SOURCE) - - -!IF "$(CFG)" == "libhttpd - Win32 Release" - -"libapr - Win32 Release" : - cd ".\srclib\apr" - $(MAKE) /$(MAKEFLAGS) /F ".\libapr.mak" CFG="libapr - Win32 Release" - cd "..\.." - -"libapr - Win32 ReleaseCLEAN" : - cd ".\srclib\apr" - $(MAKE) /$(MAKEFLAGS) /F ".\libapr.mak" CFG="libapr - Win32 Release" RECURSE=1 CLEAN - cd "..\.." - -!ELSEIF "$(CFG)" == "libhttpd - Win32 Debug" - -"libapr - Win32 Debug" : - cd ".\srclib\apr" - $(MAKE) /$(MAKEFLAGS) /F ".\libapr.mak" CFG="libapr - Win32 Debug" - cd "..\.." - -"libapr - Win32 DebugCLEAN" : - cd ".\srclib\apr" - $(MAKE) /$(MAKEFLAGS) /F ".\libapr.mak" CFG="libapr - Win32 Debug" RECURSE=1 CLEAN - cd "..\.." - -!ENDIF - -!IF "$(CFG)" == "libhttpd - Win32 Release" - -"libapriconv - Win32 Release" : - cd ".\srclib\apr-iconv" - $(MAKE) /$(MAKEFLAGS) /F ".\libapriconv.mak" CFG="libapriconv - Win32 Release" - cd "..\.." - -"libapriconv - Win32 ReleaseCLEAN" : - cd ".\srclib\apr-iconv" - $(MAKE) /$(MAKEFLAGS) /F ".\libapriconv.mak" CFG="libapriconv - Win32 Release" RECURSE=1 CLEAN - cd "..\.." - -!ELSEIF "$(CFG)" == "libhttpd - Win32 Debug" - -"libapriconv - Win32 Debug" : - cd ".\srclib\apr-iconv" - $(MAKE) /$(MAKEFLAGS) /F ".\libapriconv.mak" CFG="libapriconv - Win32 Debug" - cd "..\.." - -"libapriconv - Win32 DebugCLEAN" : - cd ".\srclib\apr-iconv" - $(MAKE) /$(MAKEFLAGS) /F ".\libapriconv.mak" CFG="libapriconv - Win32 Debug" RECURSE=1 CLEAN - cd "..\.." - -!ENDIF - -!IF "$(CFG)" == "libhttpd - Win32 Release" - -"libaprutil - Win32 Release" : - cd ".\srclib\apr-util" - $(MAKE) /$(MAKEFLAGS) /F ".\libaprutil.mak" CFG="libaprutil - Win32 Release" - cd "..\.." - -"libaprutil - Win32 ReleaseCLEAN" : - cd ".\srclib\apr-util" - $(MAKE) /$(MAKEFLAGS) /F ".\libaprutil.mak" CFG="libaprutil - Win32 Release" RECURSE=1 CLEAN - cd "..\.." - -!ELSEIF "$(CFG)" == "libhttpd - Win32 Debug" - -"libaprutil - Win32 Debug" : - cd ".\srclib\apr-util" - $(MAKE) /$(MAKEFLAGS) /F ".\libaprutil.mak" CFG="libaprutil - Win32 Debug" - cd "..\.." - -"libaprutil - Win32 DebugCLEAN" : - cd ".\srclib\apr-util" - $(MAKE) /$(MAKEFLAGS) /F ".\libaprutil.mak" CFG="libaprutil - Win32 Debug" RECURSE=1 CLEAN - cd "..\.." - -!ENDIF - -!IF "$(CFG)" == "libhttpd - Win32 Release" - -"gen_test_char - Win32 Release" : - cd ".\server" - $(MAKE) /$(MAKEFLAGS) /F ".\gen_test_char.mak" CFG="gen_test_char - Win32 Release" - cd ".." - -"gen_test_char - Win32 ReleaseCLEAN" : - cd ".\server" - $(MAKE) /$(MAKEFLAGS) /F ".\gen_test_char.mak" CFG="gen_test_char - Win32 Release" RECURSE=1 CLEAN - cd ".." - -!ELSEIF "$(CFG)" == "libhttpd - Win32 Debug" - -"gen_test_char - Win32 Debug" : - cd ".\server" - $(MAKE) /$(MAKEFLAGS) /F ".\gen_test_char.mak" CFG="gen_test_char - Win32 Debug" - cd ".." - -"gen_test_char - Win32 DebugCLEAN" : - cd ".\server" - $(MAKE) /$(MAKEFLAGS) /F ".\gen_test_char.mak" CFG="gen_test_char - Win32 Debug" RECURSE=1 CLEAN - cd ".." - -!ENDIF - -!IF "$(CFG)" == "libhttpd - Win32 Release" - -"pcre - Win32 Release" : - cd ".\srclib\pcre" - $(MAKE) /$(MAKEFLAGS) /F ".\pcre.mak" CFG="pcre - Win32 Release" - cd "..\.." - -"pcre - Win32 ReleaseCLEAN" : - cd ".\srclib\pcre" - $(MAKE) /$(MAKEFLAGS) /F ".\pcre.mak" CFG="pcre - Win32 Release" RECURSE=1 CLEAN - cd "..\.." - -!ELSEIF "$(CFG)" == "libhttpd - Win32 Debug" - -"pcre - Win32 Debug" : - cd ".\srclib\pcre" - $(MAKE) /$(MAKEFLAGS) /F ".\pcre.mak" CFG="pcre - Win32 Debug" - cd "..\.." - -"pcre - Win32 DebugCLEAN" : - cd ".\srclib\pcre" - $(MAKE) /$(MAKEFLAGS) /F ".\pcre.mak" CFG="pcre - Win32 Debug" RECURSE=1 CLEAN - cd "..\.." - -!ENDIF - -SOURCE=.\server\gen_test_char.exe - -!IF "$(CFG)" == "libhttpd - Win32 Release" - -InputPath=.\server\gen_test_char.exe -USERDEP__GEN_T=".\include\os.h" - -".\server\test_char.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" $(USERDEP__GEN_T) - <.\server\test_char.h -<< - - -!ELSEIF "$(CFG)" == "libhttpd - Win32 Debug" - -InputPath=.\server\gen_test_char.exe -USERDEP__GEN_T=".\include\os.h" - -".\server\test_char.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" $(USERDEP__GEN_T) - <.\server\test_char.h -<< - - -!ENDIF - -SOURCE=.\build\win32\httpd.rc - -!IF "$(CFG)" == "libhttpd - Win32 Release" - - -"$(INTDIR)\libhttpd.res" : $(SOURCE) "$(INTDIR)" - $(RSC) /l 0x409 /fo"$(INTDIR)\libhttpd.res" /i "./include" /i "./srclib/apr/include" /i "build\win32" /d "NDEBUG" /d BIN_NAME="libhttpd.dll" /d LONG_NAME="Apache HTTP Server Core" $(SOURCE) - - -!ELSEIF "$(CFG)" == "libhttpd - Win32 Debug" - - -"$(INTDIR)\libhttpd.res" : $(SOURCE) "$(INTDIR)" - $(RSC) /l 0x409 /fo"$(INTDIR)\libhttpd.res" /i "./include" /i "./srclib/apr/include" /i "build\win32" /d "_DEBUG" /d BIN_NAME="libhttpd.dll" /d LONG_NAME="Apache HTTP Server Core" $(SOURCE) - - -!ENDIF - - -!ENDIF - diff --git a/iis/winbuild/mod_ssl.mak b/iis/winbuild/mod_ssl.mak deleted file mode 100644 index db5baf60..00000000 --- a/iis/winbuild/mod_ssl.mak +++ /dev/null @@ -1,733 +0,0 @@ -# Microsoft Developer Studio Generated NMAKE File, Based on mod_ssl.dsp -!IF "$(CFG)" == "" -CFG=mod_ssl - Win32 Release -!MESSAGE No configuration specified. Defaulting to mod_ssl - Win32 Release. -!ENDIF - -!IF "$(CFG)" != "mod_ssl - Win32 Release" && "$(CFG)" != "mod_ssl - Win32 Debug" && "$(CFG)" != "mod_ssl - Win32 Lexical" -!MESSAGE Invalid configuration "$(CFG)" specified. -!MESSAGE You can specify a configuration when running NMAKE -!MESSAGE by defining the macro CFG on the command line. For example: -!MESSAGE -!MESSAGE NMAKE /f "mod_ssl.mak" CFG="mod_ssl - Win32 Release" -!MESSAGE -!MESSAGE Possible choices for configuration are: -!MESSAGE -!MESSAGE "mod_ssl - Win32 Release" (based on "Win32 (x86) Dynamic-Link Library") -!MESSAGE "mod_ssl - Win32 Debug" (based on "Win32 (x86) Dynamic-Link Library") -!MESSAGE "mod_ssl - Win32 Lexical" (based on "Win32 (x86) Dynamic-Link Library") -!MESSAGE -!ERROR An invalid configuration is specified. -!ENDIF - -!IF "$(OS)" == "Windows_NT" -NULL= -!ELSE -NULL=nul -!ENDIF - -!IF "$(CFG)" == "mod_ssl - Win32 Release" - -OUTDIR=.\Release -INTDIR=.\Release -DS_POSTBUILD_DEP=$(INTDIR)\postbld.dep -# Begin Custom Macros -OutDir=.\Release -# End Custom Macros - -!IF "$(RECURSE)" == "0" - -ALL : "$(OUTDIR)\mod_ssl.so" "$(DS_POSTBUILD_DEP)" - -!ELSE - -ALL : "libhttpd - Win32 Release" "libaprutil - Win32 Release" "libapr - Win32 Release" "$(OUTDIR)\mod_ssl.so" "$(DS_POSTBUILD_DEP)" - -!ENDIF - -!IF "$(RECURSE)" == "1" -CLEAN :"libapr - Win32 ReleaseCLEAN" "libaprutil - Win32 ReleaseCLEAN" "libhttpd - Win32 ReleaseCLEAN" -!ELSE -CLEAN : -!ENDIF - -@erase "$(INTDIR)\mod_ssl.obj" - -@erase "$(INTDIR)\mod_ssl.res" - -@erase "$(INTDIR)\mod_ssl_src.idb" - -@erase "$(INTDIR)\mod_ssl_src.pdb" - -@erase "$(INTDIR)\ssl_engine_config.obj" - -@erase "$(INTDIR)\ssl_engine_dh.obj" - -@erase "$(INTDIR)\ssl_engine_init.obj" - -@erase "$(INTDIR)\ssl_engine_io.obj" - -@erase "$(INTDIR)\ssl_engine_kernel.obj" - -@erase "$(INTDIR)\ssl_engine_log.obj" - -@erase "$(INTDIR)\ssl_engine_mutex.obj" - -@erase "$(INTDIR)\ssl_engine_pphrase.obj" - -@erase "$(INTDIR)\ssl_engine_rand.obj" - -@erase "$(INTDIR)\ssl_engine_vars.obj" - -@erase "$(INTDIR)\ssl_expr.obj" - -@erase "$(INTDIR)\ssl_expr_eval.obj" - -@erase "$(INTDIR)\ssl_expr_parse.obj" - -@erase "$(INTDIR)\ssl_expr_scan.obj" - -@erase "$(INTDIR)\ssl_scache.obj" - -@erase "$(INTDIR)\ssl_scache_dbm.obj" - -@erase "$(INTDIR)\ssl_scache_dc.obj" - -@erase "$(INTDIR)\ssl_scache_shmcb.obj" - -@erase "$(INTDIR)\ssl_util.obj" - -@erase "$(INTDIR)\ssl_util_ssl.obj" - -@erase "$(OUTDIR)\mod_ssl.exp" - -@erase "$(OUTDIR)\mod_ssl.lib" - -@erase "$(OUTDIR)\mod_ssl.pdb" - -@erase "$(OUTDIR)\mod_ssl.so" - -"$(OUTDIR)" : - if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)" - -CPP=cl.exe -CPP_PROJ=/nologo /MD /W3 /Zi /O2 /Oy- /I "../../include" /I "../generators" /I "../../srclib/apr/include" /I "../../srclib/apr-util/include" /I "../../srclib/openssl/inc32" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "WIN32_LEAN_AND_MEAN" /D "NO_IDEA" /D "NO_RC5" /D "NO_MDC2" /D "OPENSSL_NO_IDEA" /D "OPENSSL_NO_RC5" /D "OPENSSL_NO_MDC2" /D "HAVE_OPENSSL" /D "HAVE_SSL_SET_STATE" /D "HAVE_OPENSSL_ENGINE_H" /D "HAVE_ENGINE_INIT" /D "HAVE_ENGINE_LOAD_BUILTIN_ENGINES" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\mod_ssl_src" /FD /c - -.c{$(INTDIR)}.obj:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - -.cpp{$(INTDIR)}.obj:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - -.cxx{$(INTDIR)}.obj:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - -.c{$(INTDIR)}.sbr:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - -.cpp{$(INTDIR)}.sbr:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - -.cxx{$(INTDIR)}.sbr:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - -MTL=midl.exe -MTL_PROJ=/nologo /D "NDEBUG" /mktyplib203 /win32 -RSC=rc.exe -RSC_PROJ=/l 0x409 /fo"$(INTDIR)\mod_ssl.res" /i "../../include" /i "../../srclib/apr/include" /d "NDEBUG" /d BIN_NAME="mod_ssl.so" /d LONG_NAME="proxy_ssl_module for Apache" -BSC32=bscmake.exe -BSC32_FLAGS=/nologo /o"$(OUTDIR)\mod_ssl.bsc" -BSC32_SBRS= \ - -LINK32=link.exe -LINK32_FLAGS=kernel32.lib user32.lib wsock32.lib ws2_32.lib advapi32.lib gdi32.lib libeay32.lib ssleay32.lib /nologo /subsystem:windows /dll /incremental:no /pdb:"$(OUTDIR)\mod_ssl.pdb" /debug /out:"$(OUTDIR)\mod_ssl.so" /implib:"$(OUTDIR)\mod_ssl.lib" /libpath:"../../srclib/openssl/out32dll" /libpath:"../../srclib/openssl/out32" /base:@..\..\os\win32\BaseAddr.ref,mod_ssl.so /opt:ref -LINK32_OBJS= \ - "$(INTDIR)\mod_ssl.obj" \ - "$(INTDIR)\ssl_engine_config.obj" \ - "$(INTDIR)\ssl_engine_dh.obj" \ - "$(INTDIR)\ssl_engine_init.obj" \ - "$(INTDIR)\ssl_engine_io.obj" \ - "$(INTDIR)\ssl_engine_kernel.obj" \ - "$(INTDIR)\ssl_engine_log.obj" \ - "$(INTDIR)\ssl_engine_mutex.obj" \ - "$(INTDIR)\ssl_engine_pphrase.obj" \ - "$(INTDIR)\ssl_engine_rand.obj" \ - "$(INTDIR)\ssl_engine_vars.obj" \ - "$(INTDIR)\ssl_expr.obj" \ - "$(INTDIR)\ssl_expr_eval.obj" \ - "$(INTDIR)\ssl_expr_parse.obj" \ - "$(INTDIR)\ssl_expr_scan.obj" \ - "$(INTDIR)\ssl_scache.obj" \ - "$(INTDIR)\ssl_scache_dbm.obj" \ - "$(INTDIR)\ssl_scache_shmcb.obj" \ - "$(INTDIR)\ssl_scache_dc.obj" \ - "$(INTDIR)\ssl_util.obj" \ - "$(INTDIR)\ssl_util_ssl.obj" \ - "$(INTDIR)\mod_ssl.res" \ - "..\..\srclib\apr\Release\libapr-1.lib" \ - "..\..\srclib\apr-util\Release\libaprutil-1.lib" \ - "..\..\Release\libhttpd.lib" - -"$(OUTDIR)\mod_ssl.so" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS) - $(LINK32) @<< - $(LINK32_FLAGS) $(LINK32_OBJS) -<< - -TargetPath=.\Release\mod_ssl.so -SOURCE="$(InputPath)" -PostBuild_Desc=Embed .manifest -DS_POSTBUILD_DEP=$(INTDIR)\postbld.dep - -# Begin Custom Macros -OutDir=.\Release -# End Custom Macros - -"$(DS_POSTBUILD_DEP)" : "$(OUTDIR)\mod_ssl.so" - if exist .\Release\mod_ssl.so.manifest mt.exe -manifest .\Release\mod_ssl.so.manifest -outputresource:.\Release\mod_ssl.so;2 - echo Helper for Post-build step > "$(DS_POSTBUILD_DEP)" - -!ELSEIF "$(CFG)" == "mod_ssl - Win32 Debug" - -OUTDIR=.\Debug -INTDIR=.\Debug -DS_POSTBUILD_DEP=$(INTDIR)\postbld.dep -# Begin Custom Macros -OutDir=.\Debug -# End Custom Macros - -!IF "$(RECURSE)" == "0" - -ALL : "$(OUTDIR)\mod_ssl.so" "$(DS_POSTBUILD_DEP)" - -!ELSE - -ALL : "libhttpd - Win32 Debug" "libaprutil - Win32 Debug" "libapr - Win32 Debug" "$(OUTDIR)\mod_ssl.so" "$(DS_POSTBUILD_DEP)" - -!ENDIF - -!IF "$(RECURSE)" == "1" -CLEAN :"libapr - Win32 DebugCLEAN" "libaprutil - Win32 DebugCLEAN" "libhttpd - Win32 DebugCLEAN" -!ELSE -CLEAN : -!ENDIF - -@erase "$(INTDIR)\mod_ssl.obj" - -@erase "$(INTDIR)\mod_ssl.res" - -@erase "$(INTDIR)\mod_ssl_src.idb" - -@erase "$(INTDIR)\mod_ssl_src.pdb" - -@erase "$(INTDIR)\ssl_engine_config.obj" - -@erase "$(INTDIR)\ssl_engine_dh.obj" - -@erase "$(INTDIR)\ssl_engine_init.obj" - -@erase "$(INTDIR)\ssl_engine_io.obj" - -@erase "$(INTDIR)\ssl_engine_kernel.obj" - -@erase "$(INTDIR)\ssl_engine_log.obj" - -@erase "$(INTDIR)\ssl_engine_mutex.obj" - -@erase "$(INTDIR)\ssl_engine_pphrase.obj" - -@erase "$(INTDIR)\ssl_engine_rand.obj" - -@erase "$(INTDIR)\ssl_engine_vars.obj" - -@erase "$(INTDIR)\ssl_expr.obj" - -@erase "$(INTDIR)\ssl_expr_eval.obj" - -@erase "$(INTDIR)\ssl_expr_parse.obj" - -@erase "$(INTDIR)\ssl_expr_scan.obj" - -@erase "$(INTDIR)\ssl_scache.obj" - -@erase "$(INTDIR)\ssl_scache_dbm.obj" - -@erase "$(INTDIR)\ssl_scache_dc.obj" - -@erase "$(INTDIR)\ssl_scache_shmcb.obj" - -@erase "$(INTDIR)\ssl_util.obj" - -@erase "$(INTDIR)\ssl_util_ssl.obj" - -@erase "$(OUTDIR)\mod_ssl.exp" - -@erase "$(OUTDIR)\mod_ssl.lib" - -@erase "$(OUTDIR)\mod_ssl.pdb" - -@erase "$(OUTDIR)\mod_ssl.so" - -"$(OUTDIR)" : - if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)" - -CPP=cl.exe -CPP_PROJ=/nologo /MDd /W3 /Zi /Od /I "../../include" /I "../generators" /I "../../srclib/apr/include" /I "../../srclib/apr-util/include" /I "../../srclib/openssl/inc32" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D "WIN32_LEAN_AND_MEAN" /D "NO_IDEA" /D "NO_RC5" /D "NO_MDC2" /D "OPENSSL_NO_IDEA" /D "OPENSSL_NO_RC5" /D "OPENSSL_NO_MDC2" /D "HAVE_OPENSSL" /D "HAVE_SSL_SET_STATE" /D "HAVE_OPENSSL_ENGINE_H" /D "HAVE_ENGINE_INIT" /D "HAVE_ENGINE_LOAD_BUILTIN_ENGINES" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\mod_ssl_src" /FD /EHsc /c - -.c{$(INTDIR)}.obj:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - -.cpp{$(INTDIR)}.obj:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - -.cxx{$(INTDIR)}.obj:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - -.c{$(INTDIR)}.sbr:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - -.cpp{$(INTDIR)}.sbr:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - -.cxx{$(INTDIR)}.sbr:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - -MTL=midl.exe -MTL_PROJ=/nologo /D "_DEBUG" /mktyplib203 /win32 -RSC=rc.exe -RSC_PROJ=/l 0x409 /fo"$(INTDIR)\mod_ssl.res" /i "../../include" /i "../../srclib/apr/include" /d "_DEBUG" /d BIN_NAME="mod_ssl.so" /d LONG_NAME="proxy_ssl_module for Apache" -BSC32=bscmake.exe -BSC32_FLAGS=/nologo /o"$(OUTDIR)\mod_ssl.bsc" -BSC32_SBRS= \ - -LINK32=link.exe -LINK32_FLAGS=kernel32.lib user32.lib wsock32.lib ws2_32.lib advapi32.lib gdi32.lib libeay32.lib ssleay32.lib /nologo /subsystem:windows /dll /incremental:no /pdb:"$(OUTDIR)\mod_ssl.pdb" /debug /out:"$(OUTDIR)\mod_ssl.so" /implib:"$(OUTDIR)\mod_ssl.lib" /libpath:"../../srclib/openssl/out32dll.dbg" /libpath:"../../srclib/openssl/out32.dbg" /libpath:"../../srclib/openssl/out32dll" /libpath:"../../srclib/openssl/out32" /base:@..\..\os\win32\BaseAddr.ref,mod_ssl.so -LINK32_OBJS= \ - "$(INTDIR)\mod_ssl.obj" \ - "$(INTDIR)\ssl_engine_config.obj" \ - "$(INTDIR)\ssl_engine_dh.obj" \ - "$(INTDIR)\ssl_engine_init.obj" \ - "$(INTDIR)\ssl_engine_io.obj" \ - "$(INTDIR)\ssl_engine_kernel.obj" \ - "$(INTDIR)\ssl_engine_log.obj" \ - "$(INTDIR)\ssl_engine_mutex.obj" \ - "$(INTDIR)\ssl_engine_pphrase.obj" \ - "$(INTDIR)\ssl_engine_rand.obj" \ - "$(INTDIR)\ssl_engine_vars.obj" \ - "$(INTDIR)\ssl_expr.obj" \ - "$(INTDIR)\ssl_expr_eval.obj" \ - "$(INTDIR)\ssl_expr_parse.obj" \ - "$(INTDIR)\ssl_expr_scan.obj" \ - "$(INTDIR)\ssl_scache.obj" \ - "$(INTDIR)\ssl_scache_dbm.obj" \ - "$(INTDIR)\ssl_scache_shmcb.obj" \ - "$(INTDIR)\ssl_scache_dc.obj" \ - "$(INTDIR)\ssl_util.obj" \ - "$(INTDIR)\ssl_util_ssl.obj" \ - "$(INTDIR)\mod_ssl.res" \ - "..\..\srclib\apr\Debug\libapr-1.lib" \ - "..\..\srclib\apr-util\Debug\libaprutil-1.lib" \ - "..\..\Debug\libhttpd.lib" - -"$(OUTDIR)\mod_ssl.so" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS) - $(LINK32) @<< - $(LINK32_FLAGS) $(LINK32_OBJS) -<< - -TargetPath=.\Debug\mod_ssl.so -SOURCE="$(InputPath)" -PostBuild_Desc=Embed .manifest -DS_POSTBUILD_DEP=$(INTDIR)\postbld.dep - -# Begin Custom Macros -OutDir=.\Debug -# End Custom Macros - -"$(DS_POSTBUILD_DEP)" : "$(OUTDIR)\mod_ssl.so" - if exist .\Debug\mod_ssl.so.manifest mt.exe -manifest .\Debug\mod_ssl.so.manifest -outputresource:.\Debug\mod_ssl.so;2 - echo Helper for Post-build step > "$(DS_POSTBUILD_DEP)" - -!ELSEIF "$(CFG)" == "mod_ssl - Win32 Lexical" - -OUTDIR=.\Release -INTDIR=.\Release -DS_POSTBUILD_DEP=$(INTDIR)\postbld.dep -# Begin Custom Macros -OutDir=.\Release -# End Custom Macros - -!IF "$(RECURSE)" == "0" - -ALL : ".\ssl_expr_parse.h" ".\ssl_expr_parse.c" "$(OUTDIR)\mod_ssl.so" "$(DS_POSTBUILD_DEP)" - -!ELSE - -ALL : ".\ssl_expr_parse.h" ".\ssl_expr_parse.c" "$(OUTDIR)\mod_ssl.so" "$(DS_POSTBUILD_DEP)" - -!ENDIF - -!IF "$(RECURSE)" == "1" -CLEAN : -!ELSE -CLEAN : -!ENDIF - -@erase "$(INTDIR)\mod_ssl.obj" - -@erase "$(INTDIR)\mod_ssl.res" - -@erase "$(INTDIR)\mod_ssl_src.idb" - -@erase "$(INTDIR)\mod_ssl_src.pdb" - -@erase "$(INTDIR)\ssl_engine_config.obj" - -@erase "$(INTDIR)\ssl_engine_dh.obj" - -@erase "$(INTDIR)\ssl_engine_init.obj" - -@erase "$(INTDIR)\ssl_engine_io.obj" - -@erase "$(INTDIR)\ssl_engine_kernel.obj" - -@erase "$(INTDIR)\ssl_engine_log.obj" - -@erase "$(INTDIR)\ssl_engine_mutex.obj" - -@erase "$(INTDIR)\ssl_engine_pphrase.obj" - -@erase "$(INTDIR)\ssl_engine_rand.obj" - -@erase "$(INTDIR)\ssl_engine_vars.obj" - -@erase "$(INTDIR)\ssl_expr.obj" - -@erase "$(INTDIR)\ssl_expr_eval.obj" - -@erase "$(INTDIR)\ssl_expr_parse.obj" - -@erase "$(INTDIR)\ssl_expr_scan.obj" - -@erase "$(INTDIR)\ssl_scache.obj" - -@erase "$(INTDIR)\ssl_scache_dbm.obj" - -@erase "$(INTDIR)\ssl_scache_dc.obj" - -@erase "$(INTDIR)\ssl_scache_shmcb.obj" - -@erase "$(INTDIR)\ssl_util.obj" - -@erase "$(INTDIR)\ssl_util_ssl.obj" - -@erase "$(OUTDIR)\mod_ssl.exp" - -@erase "$(OUTDIR)\mod_ssl.lib" - -@erase "$(OUTDIR)\mod_ssl.pdb" - -@erase "$(OUTDIR)\mod_ssl.so" - -@erase "ssl_expr_parse.c" - -@erase "ssl_expr_parse.h" - -"$(OUTDIR)" : - if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)" - -CPP=cl.exe -CPP_PROJ=/nologo /MD /W3 /Zi /O2 /Oy- /I "../../include" /I "../generators" /I "../../srclib/apr/include" /I "../../srclib/apr-util/include" /I "../../srclib/openssl/inc32" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "WIN32_LEAN_AND_MEAN" /D "NO_IDEA" /D "NO_RC5" /D "NO_MDC2" /D "OPENSSL_NO_IDEA" /D "OPENSSL_NO_RC5" /D "OPENSSL_NO_MDC2" /D "HAVE_OPENSSL" /D "HAVE_SSL_SET_STATE" /D "HAVE_OPENSSL_ENGINE_H" /D "HAVE_ENGINE_INIT" /D "HAVE_ENGINE_LOAD_BUILTIN_ENGINES" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\mod_ssl_src" /FD /c - -.c{$(INTDIR)}.obj:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - -.cpp{$(INTDIR)}.obj:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - -.cxx{$(INTDIR)}.obj:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - -.c{$(INTDIR)}.sbr:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - -.cpp{$(INTDIR)}.sbr:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - -.cxx{$(INTDIR)}.sbr:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - -MTL=midl.exe -MTL_PROJ=/nologo /D "NDEBUG" /mktyplib203 /win32 -RSC=rc.exe -RSC_PROJ=/l 0x409 /fo"$(INTDIR)\mod_ssl.res" /i "../../include" /i "../../srclib/apr/include" /d "NDEBUG" /d BIN_NAME="mod_ssl.so" /d LONG_NAME="proxy_ssl_module for Apache" -BSC32=bscmake.exe -BSC32_FLAGS=/nologo /o"$(OUTDIR)\mod_ssl.bsc" -BSC32_SBRS= \ - -LINK32=link.exe -LINK32_FLAGS=kernel32.lib user32.lib wsock32.lib ws2_32.lib advapi32.lib gdi32.lib libeay32.lib ssleay32.lib /nologo /subsystem:windows /dll /incremental:no /pdb:"$(OUTDIR)\mod_ssl.pdb" /debug /out:"$(OUTDIR)\mod_ssl.so" /implib:"$(OUTDIR)\mod_ssl.lib" /libpath:"../../srclib/openssl/out32dll" /libpath:"../../srclib/openssl/out32" /base:@..\..\os\win32\BaseAddr.ref,mod_ssl.so /opt:ref -LINK32_OBJS= \ - "$(INTDIR)\mod_ssl.obj" \ - "$(INTDIR)\ssl_engine_config.obj" \ - "$(INTDIR)\ssl_engine_dh.obj" \ - "$(INTDIR)\ssl_engine_init.obj" \ - "$(INTDIR)\ssl_engine_io.obj" \ - "$(INTDIR)\ssl_engine_kernel.obj" \ - "$(INTDIR)\ssl_engine_log.obj" \ - "$(INTDIR)\ssl_engine_mutex.obj" \ - "$(INTDIR)\ssl_engine_pphrase.obj" \ - "$(INTDIR)\ssl_engine_rand.obj" \ - "$(INTDIR)\ssl_engine_vars.obj" \ - "$(INTDIR)\ssl_expr.obj" \ - "$(INTDIR)\ssl_expr_eval.obj" \ - "$(INTDIR)\ssl_expr_parse.obj" \ - "$(INTDIR)\ssl_expr_scan.obj" \ - "$(INTDIR)\ssl_scache.obj" \ - "$(INTDIR)\ssl_scache_dbm.obj" \ - "$(INTDIR)\ssl_scache_shmcb.obj" \ - "$(INTDIR)\ssl_scache_dc.obj" \ - "$(INTDIR)\ssl_util.obj" \ - "$(INTDIR)\ssl_util_ssl.obj" \ - "$(INTDIR)\mod_ssl.res" - -"$(OUTDIR)\mod_ssl.so" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS) - $(LINK32) @<< - $(LINK32_FLAGS) $(LINK32_OBJS) -<< - -TargetPath=.\Release\mod_ssl.so -SOURCE="$(InputPath)" -PostBuild_Desc=Embed .manifest -DS_POSTBUILD_DEP=$(INTDIR)\postbld.dep - -# Begin Custom Macros -OutDir=.\Release -# End Custom Macros - -"$(DS_POSTBUILD_DEP)" : "$(OUTDIR)\mod_ssl.so" - if exist .\Release\mod_ssl.so.manifest mt.exe -manifest .\Release\mod_ssl.so.manifest -outputresource:.\Release\mod_ssl.so;2 - echo Helper for Post-build step > "$(DS_POSTBUILD_DEP)" - -!ENDIF - - -!IF "$(NO_EXTERNAL_DEPS)" != "1" -!IF EXISTS("mod_ssl.dep") -!INCLUDE "mod_ssl.dep" -!ELSE -!MESSAGE Warning: cannot find "mod_ssl.dep" -!ENDIF -!ENDIF - - -!IF "$(CFG)" == "mod_ssl - Win32 Release" || "$(CFG)" == "mod_ssl - Win32 Debug" || "$(CFG)" == "mod_ssl - Win32 Lexical" -SOURCE=.\mod_ssl.c - -"$(INTDIR)\mod_ssl.obj" : $(SOURCE) "$(INTDIR)" - - -SOURCE=.\ssl_engine_config.c - -"$(INTDIR)\ssl_engine_config.obj" : $(SOURCE) "$(INTDIR)" - - -SOURCE=.\ssl_engine_dh.c - -"$(INTDIR)\ssl_engine_dh.obj" : $(SOURCE) "$(INTDIR)" - - -SOURCE=.\ssl_engine_init.c - -"$(INTDIR)\ssl_engine_init.obj" : $(SOURCE) "$(INTDIR)" - - -SOURCE=.\ssl_engine_io.c - -"$(INTDIR)\ssl_engine_io.obj" : $(SOURCE) "$(INTDIR)" - - -SOURCE=.\ssl_engine_kernel.c - -"$(INTDIR)\ssl_engine_kernel.obj" : $(SOURCE) "$(INTDIR)" - - -SOURCE=.\ssl_engine_log.c - -"$(INTDIR)\ssl_engine_log.obj" : $(SOURCE) "$(INTDIR)" - - -SOURCE=.\ssl_engine_mutex.c - -"$(INTDIR)\ssl_engine_mutex.obj" : $(SOURCE) "$(INTDIR)" - - -SOURCE=.\ssl_engine_pphrase.c - -"$(INTDIR)\ssl_engine_pphrase.obj" : $(SOURCE) "$(INTDIR)" - - -SOURCE=.\ssl_engine_rand.c - -"$(INTDIR)\ssl_engine_rand.obj" : $(SOURCE) "$(INTDIR)" - - -SOURCE=.\ssl_engine_vars.c - -"$(INTDIR)\ssl_engine_vars.obj" : $(SOURCE) "$(INTDIR)" - - -SOURCE=.\ssl_expr.c - -"$(INTDIR)\ssl_expr.obj" : $(SOURCE) "$(INTDIR)" - - -SOURCE=.\ssl_expr_eval.c - -"$(INTDIR)\ssl_expr_eval.obj" : $(SOURCE) "$(INTDIR)" - - -SOURCE=.\ssl_expr_parse.c - -"$(INTDIR)\ssl_expr_parse.obj" : $(SOURCE) "$(INTDIR)" - - -SOURCE=.\ssl_expr_scan.c - -"$(INTDIR)\ssl_expr_scan.obj" : $(SOURCE) "$(INTDIR)" - - -SOURCE=.\ssl_scache.c - -"$(INTDIR)\ssl_scache.obj" : $(SOURCE) "$(INTDIR)" - - -SOURCE=.\ssl_scache_dbm.c - -"$(INTDIR)\ssl_scache_dbm.obj" : $(SOURCE) "$(INTDIR)" - - -SOURCE=.\ssl_scache_dc.c - -"$(INTDIR)\ssl_scache_dc.obj" : $(SOURCE) "$(INTDIR)" - - -SOURCE=.\ssl_scache_shmcb.c - -"$(INTDIR)\ssl_scache_shmcb.obj" : $(SOURCE) "$(INTDIR)" - - -SOURCE=.\ssl_util.c - -"$(INTDIR)\ssl_util.obj" : $(SOURCE) "$(INTDIR)" - - -SOURCE=.\ssl_util_ssl.c - -"$(INTDIR)\ssl_util_ssl.obj" : $(SOURCE) "$(INTDIR)" - - -SOURCE=.\ssl_expr_parse.y - -!IF "$(CFG)" == "mod_ssl - Win32 Release" - -!ELSEIF "$(CFG)" == "mod_ssl - Win32 Debug" - -!ELSEIF "$(CFG)" == "mod_ssl - Win32 Lexical" - -InputPath=.\ssl_expr_parse.y - -".\ssl_expr_parse.c" ".\ssl_expr_parse.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" - <ssl_expr_parse.c - del y.tab.c - sed -e "s;yy;ssl_expr_yy;g" ssl_expr_parse.h - del y.tab.h -<< - - -!ENDIF - -SOURCE=.\ssl_expr_scan.l - -!IF "$(CFG)" == "mod_ssl - Win32 Release" - -!ELSEIF "$(CFG)" == "mod_ssl - Win32 Debug" - -!ELSEIF "$(CFG)" == "mod_ssl - Win32 Lexical" - -InputPath=.\ssl_expr_scan.l - -".\ssl_expr_scan.c" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" - <ssl_expr_scan.c - del lex.ssl_expr_yy.c -<< - - -!ENDIF - -!IF "$(CFG)" == "mod_ssl - Win32 Release" - -"libapr - Win32 Release" : - cd ".\..\..\srclib\apr" - $(MAKE) /$(MAKEFLAGS) /F ".\libapr.mak" CFG="libapr - Win32 Release" - cd "..\..\modules\ssl" - -"libapr - Win32 ReleaseCLEAN" : - cd ".\..\..\srclib\apr" - $(MAKE) /$(MAKEFLAGS) /F ".\libapr.mak" CFG="libapr - Win32 Release" RECURSE=1 CLEAN - cd "..\..\modules\ssl" - -!ELSEIF "$(CFG)" == "mod_ssl - Win32 Debug" - -"libapr - Win32 Debug" : - cd ".\..\..\srclib\apr" - $(MAKE) /$(MAKEFLAGS) /F ".\libapr.mak" CFG="libapr - Win32 Debug" - cd "..\..\modules\ssl" - -"libapr - Win32 DebugCLEAN" : - cd ".\..\..\srclib\apr" - $(MAKE) /$(MAKEFLAGS) /F ".\libapr.mak" CFG="libapr - Win32 Debug" RECURSE=1 CLEAN - cd "..\..\modules\ssl" - -!ELSEIF "$(CFG)" == "mod_ssl - Win32 Lexical" - -!ENDIF - -!IF "$(CFG)" == "mod_ssl - Win32 Release" - -"libaprutil - Win32 Release" : - cd ".\..\..\srclib\apr-util" - $(MAKE) /$(MAKEFLAGS) /F ".\libaprutil.mak" CFG="libaprutil - Win32 Release" - cd "..\..\modules\ssl" - -"libaprutil - Win32 ReleaseCLEAN" : - cd ".\..\..\srclib\apr-util" - $(MAKE) /$(MAKEFLAGS) /F ".\libaprutil.mak" CFG="libaprutil - Win32 Release" RECURSE=1 CLEAN - cd "..\..\modules\ssl" - -!ELSEIF "$(CFG)" == "mod_ssl - Win32 Debug" - -"libaprutil - Win32 Debug" : - cd ".\..\..\srclib\apr-util" - $(MAKE) /$(MAKEFLAGS) /F ".\libaprutil.mak" CFG="libaprutil - Win32 Debug" - cd "..\..\modules\ssl" - -"libaprutil - Win32 DebugCLEAN" : - cd ".\..\..\srclib\apr-util" - $(MAKE) /$(MAKEFLAGS) /F ".\libaprutil.mak" CFG="libaprutil - Win32 Debug" RECURSE=1 CLEAN - cd "..\..\modules\ssl" - -!ELSEIF "$(CFG)" == "mod_ssl - Win32 Lexical" - -!ENDIF - -!IF "$(CFG)" == "mod_ssl - Win32 Release" - -"libhttpd - Win32 Release" : - cd ".\..\.." - $(MAKE) /$(MAKEFLAGS) /F ".\libhttpd.mak" CFG="libhttpd - Win32 Release" - cd ".\modules\ssl" - -"libhttpd - Win32 ReleaseCLEAN" : - cd ".\..\.." - $(MAKE) /$(MAKEFLAGS) /F ".\libhttpd.mak" CFG="libhttpd - Win32 Release" RECURSE=1 CLEAN - cd ".\modules\ssl" - -!ELSEIF "$(CFG)" == "mod_ssl - Win32 Debug" - -"libhttpd - Win32 Debug" : - cd ".\..\.." - $(MAKE) /$(MAKEFLAGS) /F ".\libhttpd.mak" CFG="libhttpd - Win32 Debug" - cd ".\modules\ssl" - -"libhttpd - Win32 DebugCLEAN" : - cd ".\..\.." - $(MAKE) /$(MAKEFLAGS) /F ".\libhttpd.mak" CFG="libhttpd - Win32 Debug" RECURSE=1 CLEAN - cd ".\modules\ssl" - -!ELSEIF "$(CFG)" == "mod_ssl - Win32 Lexical" - -!ENDIF - -SOURCE=..\..\build\win32\httpd.rc - -!IF "$(CFG)" == "mod_ssl - Win32 Release" - - -"$(INTDIR)\mod_ssl.res" : $(SOURCE) "$(INTDIR)" - $(RSC) /l 0x409 /fo"$(INTDIR)\mod_ssl.res" /i "../../include" /i "../../srclib/apr/include" /i ".\..\..\build\win32" /d "NDEBUG" /d BIN_NAME="mod_ssl.so" /d LONG_NAME="proxy_ssl_module for Apache" $(SOURCE) - - -!ELSEIF "$(CFG)" == "mod_ssl - Win32 Debug" - - -"$(INTDIR)\mod_ssl.res" : $(SOURCE) "$(INTDIR)" - $(RSC) /l 0x409 /fo"$(INTDIR)\mod_ssl.res" /i "../../include" /i "../../srclib/apr/include" /i ".\..\..\build\win32" /d "_DEBUG" /d BIN_NAME="mod_ssl.so" /d LONG_NAME="proxy_ssl_module for Apache" $(SOURCE) - - -!ELSEIF "$(CFG)" == "mod_ssl - Win32 Lexical" - - -"$(INTDIR)\mod_ssl.res" : $(SOURCE) "$(INTDIR)" - $(RSC) /l 0x409 /fo"$(INTDIR)\mod_ssl.res" /i "../../include" /i "../../srclib/apr/include" /i ".\..\..\build\win32" /d "NDEBUG" /d BIN_NAME="mod_ssl.so" /d LONG_NAME="proxy_ssl_module for Apache" $(SOURCE) - - -!ENDIF - - -!ENDIF - diff --git a/iis/winbuild/pcre.mak b/iis/winbuild/pcre.mak deleted file mode 100644 index 54266a85..00000000 --- a/iis/winbuild/pcre.mak +++ /dev/null @@ -1,340 +0,0 @@ -# Microsoft Developer Studio Generated NMAKE File, Based on pcre.dsp -!IF "$(CFG)" == "" -CFG=pcre - Win32 Debug -!MESSAGE No configuration specified. Defaulting to pcre - Win32 Debug. -!ENDIF - -!IF "$(CFG)" != "pcre - Win32 Release" && "$(CFG)" != "pcre - Win32 Debug" -!MESSAGE Invalid configuration "$(CFG)" specified. -!MESSAGE You can specify a configuration when running NMAKE -!MESSAGE by defining the macro CFG on the command line. For example: -!MESSAGE -!MESSAGE NMAKE /f "pcre.mak" CFG="pcre - Win32 Debug" -!MESSAGE -!MESSAGE Possible choices for configuration are: -!MESSAGE -!MESSAGE "pcre - Win32 Release" (based on "Win32 (x86) Static Library") -!MESSAGE "pcre - Win32 Debug" (based on "Win32 (x86) Static Library") -!MESSAGE -!ERROR An invalid configuration is specified. -!ENDIF - -!IF "$(OS)" == "Windows_NT" -NULL= -!ELSE -NULL=nul -!ENDIF - -!IF "$(CFG)" == "pcre - Win32 Release" - -OUTDIR=.\LibR -INTDIR=.\LibR -# Begin Custom Macros -OutDir=.\LibR -# End Custom Macros - -!IF "$(RECURSE)" == "0" - -ALL : "$(OUTDIR)\pcre.lib" - -!ELSE - -ALL : "dftables - Win32 Release" "$(OUTDIR)\pcre.lib" - -!ENDIF - -!IF "$(RECURSE)" == "1" -CLEAN :"dftables - Win32 ReleaseCLEAN" -!ELSE -CLEAN : -!ENDIF - -@erase "$(INTDIR)\get.obj" - -@erase "$(INTDIR)\maketables.obj" - -@erase "$(INTDIR)\pcre.obj" - -@erase "$(INTDIR)\pcre_src.idb" - -@erase "$(INTDIR)\pcre_src.pdb" - -@erase "$(INTDIR)\study.obj" - -@erase "$(OUTDIR)\pcre.lib" - -"$(OUTDIR)" : - if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)" - -CPP=cl.exe -CPP_PROJ=/nologo /MD /W3 /Zi /O2 /D "_WIN32" /D "NDEBUG" /D "_WINDOWS" /D "PCRE_STATIC" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\pcre_src" /FD /c - -.c{$(INTDIR)}.obj:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - -.cpp{$(INTDIR)}.obj:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - -.cxx{$(INTDIR)}.obj:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - -.c{$(INTDIR)}.sbr:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - -.cpp{$(INTDIR)}.sbr:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - -.cxx{$(INTDIR)}.sbr:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - -RSC=rc.exe -BSC32=bscmake.exe -BSC32_FLAGS=/nologo /o"$(OUTDIR)\pcre.bsc" -BSC32_SBRS= \ - -LIB32=link.exe -lib -LIB32_FLAGS=/nologo /out:"$(OUTDIR)\pcre.lib" -LIB32_OBJS= \ - "$(INTDIR)\get.obj" \ - "$(INTDIR)\maketables.obj" \ - "$(INTDIR)\pcre.obj" \ - "$(INTDIR)\study.obj" - -"$(OUTDIR)\pcre.lib" : "$(OUTDIR)" $(DEF_FILE) $(LIB32_OBJS) - $(LIB32) @<< - $(LIB32_FLAGS) $(DEF_FLAGS) $(LIB32_OBJS) -<< - -!ELSEIF "$(CFG)" == "pcre - Win32 Debug" - -OUTDIR=.\LibD -INTDIR=.\LibD -# Begin Custom Macros -OutDir=.\LibD -# End Custom Macros - -!IF "$(RECURSE)" == "0" - -ALL : ".\pcre.h" ".\config.h" ".\chartables.c" "$(OUTDIR)\pcre.lib" - -!ELSE - -ALL : "dftables - Win32 Debug" ".\pcre.h" ".\config.h" ".\chartables.c" "$(OUTDIR)\pcre.lib" - -!ENDIF - -!IF "$(RECURSE)" == "1" -CLEAN :"dftables - Win32 DebugCLEAN" -!ELSE -CLEAN : -!ENDIF - -@erase "$(INTDIR)\get.obj" - -@erase "$(INTDIR)\maketables.obj" - -@erase "$(INTDIR)\pcre.obj" - -@erase "$(INTDIR)\pcre_src.idb" - -@erase "$(INTDIR)\pcre_src.pdb" - -@erase "$(INTDIR)\study.obj" - -@erase "$(OUTDIR)\pcre.lib" - -@erase ".\chartables.c" - -@erase ".\config.h" - -@erase ".\pcre.h" - -"$(OUTDIR)" : - if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)" - -CPP=cl.exe -CPP_PROJ=/nologo /MDd /W3 /Zi /Od /D "_WIN32" /D "_DEBUG" /D "_WINDOWS" /D "PCRE_STATIC" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\pcre_src" /FD /EHsc /c - -.c{$(INTDIR)}.obj:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - -.cpp{$(INTDIR)}.obj:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - -.cxx{$(INTDIR)}.obj:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - -.c{$(INTDIR)}.sbr:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - -.cpp{$(INTDIR)}.sbr:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - -.cxx{$(INTDIR)}.sbr:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - -RSC=rc.exe -BSC32=bscmake.exe -BSC32_FLAGS=/nologo /o"$(OUTDIR)\pcre.bsc" -BSC32_SBRS= \ - -LIB32=link.exe -lib -LIB32_FLAGS=/nologo /out:"$(OUTDIR)\pcre.lib" -LIB32_OBJS= \ - "$(INTDIR)\get.obj" \ - "$(INTDIR)\maketables.obj" \ - "$(INTDIR)\pcre.obj" \ - "$(INTDIR)\study.obj" - -"$(OUTDIR)\pcre.lib" : "$(OUTDIR)" $(DEF_FILE) $(LIB32_OBJS) - $(LIB32) @<< - $(LIB32_FLAGS) $(DEF_FLAGS) $(LIB32_OBJS) -<< - -!ENDIF - - -!IF "$(NO_EXTERNAL_DEPS)" != "1" -!IF EXISTS("pcre.dep") -!INCLUDE "pcre.dep" -!ELSE -!MESSAGE Warning: cannot find "pcre.dep" -!ENDIF -!ENDIF - - -!IF "$(CFG)" == "pcre - Win32 Release" || "$(CFG)" == "pcre - Win32 Debug" -SOURCE=.\dftables.exe - -!IF "$(CFG)" == "pcre - Win32 Release" - -InputPath=.\dftables.exe - -".\chartables.c" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" - < .\config.h -<< - - -!ELSEIF "$(CFG)" == "pcre - Win32 Debug" - -InputPath=.\config.hw - -".\config.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" - < .\config.h -<< - - -!ENDIF - -SOURCE=.\pcre.hw - -!IF "$(CFG)" == "pcre - Win32 Release" - -InputPath=.\pcre.hw - -".\pcre.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" - < .\pcre.h -<< - - -!ELSEIF "$(CFG)" == "pcre - Win32 Debug" - -InputPath=.\pcre.hw - -".\pcre.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" - < .\pcre.h -<< - - -!ENDIF - -!IF "$(CFG)" == "pcre - Win32 Release" - -"dftables - Win32 Release" : - cd "." - $(MAKE) /$(MAKEFLAGS) /F ".\dftables.mak" CFG="dftables - Win32 Release" - cd "." - -"dftables - Win32 ReleaseCLEAN" : - cd "." - $(MAKE) /$(MAKEFLAGS) /F ".\dftables.mak" CFG="dftables - Win32 Release" RECURSE=1 CLEAN - cd "." - -!ELSEIF "$(CFG)" == "pcre - Win32 Debug" - -"dftables - Win32 Debug" : - cd "." - $(MAKE) /$(MAKEFLAGS) /F ".\dftables.mak" CFG="dftables - Win32 Debug" - cd "." - -"dftables - Win32 DebugCLEAN" : - cd "." - $(MAKE) /$(MAKEFLAGS) /F ".\dftables.mak" CFG="dftables - Win32 Debug" RECURSE=1 CLEAN - cd "." - -!ENDIF - - -!ENDIF - diff --git a/iis/winbuild/vcvars64.bat b/iis/winbuild/vcvars64.bat deleted file mode 100644 index c7794638..00000000 --- a/iis/winbuild/vcvars64.bat +++ /dev/null @@ -1,113 +0,0 @@ -@echo Setting environment for using Microsoft Visual Studio 2010 x64 tools. - -@call :GetVSCommonToolsDir -@if "%VS100COMNTOOLS%"=="" goto error_no_VS100COMNTOOLSDIR - -@call "%VS100COMNTOOLS%VCVarsQueryRegistry.bat" No32bit 64bit - -@if "%VSINSTALLDIR%"=="" goto error_no_VSINSTALLDIR -@if "%VCINSTALLDIR%"=="" goto error_no_VCINSTALLDIR -@if "%FrameworkDir64%"=="" goto error_no_FrameworkDIR64 -@if "%FrameworkVersion64%"=="" goto error_no_FrameworkVer64 -@if "%Framework35Version%"=="" goto error_no_Framework35Version - -@set FrameworkDir=%FrameworkDir64% -@set FrameworkVersion=%FrameworkVersion64% - -@if not "%WindowsSdkDir%" == "" ( - @set "PATH=%WindowsSdkDir%bin\NETFX 4.0 Tools\x64;%WindowsSdkDir%bin\x64;%WindowsSdkDir%bin;%PATH%" - @set "INCLUDE=%WindowsSdkDir%include;%INCLUDE%" - @set "LIB=%WindowsSdkDir%lib\x64;%LIB%" -) - -@rem PATH -@rem ---- -@if exist "%VSINSTALLDIR%Team Tools\Performance Tools\x64" ( - @set "PATH=%VSINSTALLDIR%Team Tools\Performance Tools\x64;%VSINSTALLDIR%Team Tools\Performance Tools;%PATH%" -) -@if exist "%ProgramFiles%\HTML Help Workshop" set PATH=%ProgramFiles%\HTML Help Workshop;%PATH% -@if exist "%ProgramFiles(x86)%\HTML Help Workshop" set PATH=%ProgramFiles(x86)%\HTML Help Workshop;%PATH% -@set PATH=%VSINSTALLDIR%Common7\Tools;%PATH% -@set PATH=%VSINSTALLDIR%Common7\IDE;%PATH% -@set PATH=%VCINSTALLDIR%VCPackages;%PATH% -@set PATH=%FrameworkDir%\%Framework35Version%;%PATH% -@set PATH=%FrameworkDir%\%FrameworkVersion%;%PATH% -@set PATH=%VCINSTALLDIR%BIN\amd64;%PATH% - -@rem INCLUDE -@rem ------- -@if exist "%VCINSTALLDIR%ATLMFC\INCLUDE" set INCLUDE=%VCINSTALLDIR%ATLMFC\INCLUDE;%INCLUDE% -@set INCLUDE=%VCINSTALLDIR%INCLUDE;%INCLUDE% - -@rem LIB -@rem --- -@if exist "%VCINSTALLDIR%ATLMFC\LIB\amd64" set LIB=%VCINSTALLDIR%ATLMFC\LIB\amd64;%LIB% -@set LIB=%VCINSTALLDIR%LIB\amd64;%LIB% - -@rem LIBPATH -@rem ------- -@if exist "%VCINSTALLDIR%ATLMFC\LIB\amd64" set LIBPATH=%VCINSTALLDIR%ATLMFC\LIB\amd64;%LIBPATH% -@set LIBPATH=%VCINSTALLDIR%LIB\amd64;%LIBPATH% -@set LIBPATH=%FrameworkDir%\%Framework35Version%;%LIBPATH% -@set LIBPATH=%FrameworkDir%\%FrameworkVersion%;%LIBPATH% - -@set Platform=X64 -@set CommandPromptType=Native - -@goto end - -@REM ----------------------------------------------------------------------- -:GetVSCommonToolsDir -@set VS100COMNTOOLS= -@call :GetVSCommonToolsDirHelper32 HKLM > nul 2>&1 -@if errorlevel 1 call :GetVSCommonToolsDirHelper32 HKCU > nul 2>&1 -@if errorlevel 1 call :GetVSCommonToolsDirHelper64 HKLM > nul 2>&1 -@if errorlevel 1 call :GetVSCommonToolsDirHelper64 HKCU > nul 2>&1 -@exit /B 0 - -:GetVSCommonToolsDirHelper32 -@for /F "tokens=1,2*" %%i in ('reg query "%1\SOFTWARE\Microsoft\VisualStudio\SxS\VS7" /v "10.0"') DO ( - @if "%%i"=="10.0" ( - @SET "VS100COMNTOOLS=%%k" - ) -) -@if "%VS100COMNTOOLS%"=="" exit /B 1 -@SET "VS100COMNTOOLS=%VS100COMNTOOLS%Common7\Tools\" -@exit /B 0 - -:GetVSCommonToolsDirHelper64 -@for /F "tokens=1,2*" %%i in ('reg query "%1\SOFTWARE\Wow6432Node\Microsoft\VisualStudio\SxS\VS7" /v "10.0"') DO ( - @if "%%i"=="10.0" ( - @SET "VS100COMNTOOLS=%%k" - ) -) -@if "%VS100COMNTOOLS%"=="" exit /B 1 -@SET "VS100COMNTOOLS=%VS100COMNTOOLS%Common7\Tools\" -@exit /B 0 - -@REM ----------------------------------------------------------------------- -:error_no_VS100COMNTOOLSDIR -@echo ERROR: Cannot determine the location of the VS Common Tools folder. -@goto end - -:error_no_VSINSTALLDIR -@echo ERROR: Cannot determine the location of the VS installation. -@goto end - -:error_no_VCINSTALLDIR -@echo ERROR: Cannot determine the location of the VC installation. -@goto end - -:error_no_FrameworkDIR64 -@echo ERROR: Cannot determine the location of the .NET Framework 64bit installation. -@goto end - -:error_no_FrameworkVer64 -@echo ERROR: Cannot determine the version of the .NET Framework 64bit installation. -@goto end - -:error_no_Framework35Version -@echo ERROR: Cannot determine the .NET Framework 3.5 version. -@goto end - -:end diff --git a/iis/winbuild/vsvars32.bat b/iis/winbuild/vsvars32.bat deleted file mode 100644 index cdfc24ba..00000000 --- a/iis/winbuild/vsvars32.bat +++ /dev/null @@ -1,118 +0,0 @@ -@echo Setting environment for using Microsoft Visual Studio 2010 x86 tools. - -@call :GetVSCommonToolsDir -@if "%VS100COMNTOOLS%"=="" goto error_no_VS100COMNTOOLSDIR - -@call "%VS100COMNTOOLS%VCVarsQueryRegistry.bat" 32bit No64bit - -@if "%VSINSTALLDIR%"=="" goto error_no_VSINSTALLDIR -@if "%FrameworkDir32%"=="" goto error_no_FrameworkDIR32 -@if "%FrameworkVersion32%"=="" goto error_no_FrameworkVer32 -@if "%Framework35Version%"=="" goto error_no_Framework35Version - -@set FrameworkDir=%FrameworkDir32% -@set FrameworkVersion=%FrameworkVersion32% - -@if not "%WindowsSdkDir%" == "" ( - @set "PATH=%WindowsSdkDir%bin\NETFX 4.0 Tools;%WindowsSdkDir%bin;%PATH%" - @set "INCLUDE=%WindowsSdkDir%include;%INCLUDE%" - @set "LIB=%WindowsSdkDir%lib;%LIB%" -) - -@rem -@rem Root of Visual Studio IDE installed files. -@rem -@set DevEnvDir=%VSINSTALLDIR%Common7\IDE\ - -@rem PATH -@rem ---- -@if exist "%VSINSTALLDIR%Team Tools\Performance Tools" ( - @set "PATH=%VSINSTALLDIR%Team Tools\Performance Tools;%PATH%" -) -@if exist "%ProgramFiles%\HTML Help Workshop" set PATH=%ProgramFiles%\HTML Help Workshop;%PATH% -@if exist "%ProgramFiles(x86)%\HTML Help Workshop" set PATH=%ProgramFiles(x86)%\HTML Help Workshop;%PATH% -@if exist "%VCINSTALLDIR%VCPackages" set PATH=%VCINSTALLDIR%VCPackages;%PATH% -@set PATH=%FrameworkDir%%Framework35Version%;%PATH% -@set PATH=%FrameworkDir%%FrameworkVersion%;%PATH% -@set PATH=%VSINSTALLDIR%Common7\Tools;%PATH% -@if exist "%VCINSTALLDIR%BIN" set PATH=%VCINSTALLDIR%BIN;%PATH% -@set PATH=%DevEnvDir%;%PATH% - -@if exist "%VSINSTALLDIR%VSTSDB\Deploy" ( - @set "PATH=%VSINSTALLDIR%VSTSDB\Deploy;%PATH%" -) - -@if not "%FSHARPINSTALLDIR%" == "" ( - @set "PATH=%FSHARPINSTALLDIR%;%PATH%" -) - -@rem INCLUDE -@rem ------- -@if exist "%VCINSTALLDIR%ATLMFC\INCLUDE" set INCLUDE=%VCINSTALLDIR%ATLMFC\INCLUDE;%INCLUDE% -@if exist "%VCINSTALLDIR%INCLUDE" set INCLUDE=%VCINSTALLDIR%INCLUDE;%INCLUDE% - -@rem LIB -@rem --- -@if exist "%VCINSTALLDIR%ATLMFC\LIB" set LIB=%VCINSTALLDIR%ATLMFC\LIB;%LIB% -@if exist "%VCINSTALLDIR%LIB" set LIB=%VCINSTALLDIR%LIB;%LIB% - -@rem LIBPATH -@rem ------- -@if exist "%VCINSTALLDIR%ATLMFC\LIB" set LIBPATH=%VCINSTALLDIR%ATLMFC\LIB;%LIBPATH% -@if exist "%VCINSTALLDIR%LIB" set LIBPATH=%VCINSTALLDIR%LIB;%LIBPATH% -@set LIBPATH=%FrameworkDir%%Framework35Version%;%LIBPATH% -@set LIBPATH=%FrameworkDir%%FrameworkVersion%;%LIBPATH% - -@goto end - -@REM ----------------------------------------------------------------------- -:GetVSCommonToolsDir -@set VS100COMNTOOLS= -@call :GetVSCommonToolsDirHelper32 HKLM > nul 2>&1 -@if errorlevel 1 call :GetVSCommonToolsDirHelper32 HKCU > nul 2>&1 -@if errorlevel 1 call :GetVSCommonToolsDirHelper64 HKLM > nul 2>&1 -@if errorlevel 1 call :GetVSCommonToolsDirHelper64 HKCU > nul 2>&1 -@exit /B 0 - -:GetVSCommonToolsDirHelper32 -@for /F "tokens=1,2*" %%i in ('reg query "%1\SOFTWARE\Microsoft\VisualStudio\SxS\VS7" /v "10.0"') DO ( - @if "%%i"=="10.0" ( - @SET "VS100COMNTOOLS=%%k" - ) -) -@if "%VS100COMNTOOLS%"=="" exit /B 1 -@SET "VS100COMNTOOLS=%VS100COMNTOOLS%Common7\Tools\" -@exit /B 0 - -:GetVSCommonToolsDirHelper64 -@for /F "tokens=1,2*" %%i in ('reg query "%1\SOFTWARE\Wow6432Node\Microsoft\VisualStudio\SxS\VS7" /v "10.0"') DO ( - @if "%%i"=="10.0" ( - @SET "VS100COMNTOOLS=%%k" - ) -) -@if "%VS100COMNTOOLS%"=="" exit /B 1 -@SET "VS100COMNTOOLS=%VS100COMNTOOLS%Common7\Tools\" -@exit /B 0 - -@REM ----------------------------------------------------------------------- -:error_no_VS100COMNTOOLSDIR -@echo ERROR: Cannot determine the location of the VS Common Tools folder. -@goto end - -:error_no_VSINSTALLDIR -@echo ERROR: Cannot determine the location of the VS installation. -@goto end - -:error_no_FrameworkDIR32 -@echo ERROR: Cannot determine the location of the .NET Framework 32bit installation. -@goto end - -:error_no_FrameworkVer32 -@echo ERROR: Cannot determine the version of the .NET Framework 32bit installation. -@goto end - -:error_no_Framework35Version -@echo ERROR: Cannot determine the .NET Framework 3.5 version. -@goto end - -:end diff --git a/iis/wix/EULA.rtf b/iis/wix/EULA.rtf new file mode 100644 index 00000000..ae81e245 --- /dev/null +++ b/iis/wix/EULA.rtf @@ -0,0 +1,31 @@ +{\rtf1\ansi\ansicpg1252\deff0\deflang1033\deflangfe1033{\fonttbl{\f0\froman\fprq2\fcharset0 Times New Roman;}{\f1\fswiss\fprq2\fcharset0 Calibri;}} +{\colortbl ;\red0\green0\blue255;} +{\*\generator Msftedit 5.41.21.2510;}\viewkind4\uc1\pard\sb100\sa100\lang9\f0\fs24 Apache License\line\line Version 2.0, January 2004\line\line\pard{\field{\*\fldinst{HYPERLINK "http://www.apache.org/licenses/"}}{\fldrslt{\ul\cf1 http://www.apache.org/licenses/}}}\f0\fs24 \par +TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION\par +\b 1. Definitions\b0 .\par +"License" shall mean the terms and conditions for use, reproduction, and distribution as defined by Sections 1 through 9 of this document.\par +"Licensor" shall mean the copyright owner or entity authorized by the copyright owner that is granting the License.\par +"Legal Entity" shall mean the union of the acting entity and all other entities that control, are controlled by, or are under common control with that entity. For the purposes of this definition, "control" means (i) the power, direct or indirect, to cause the direction or management of such entity, whether by contract or otherwise, or (ii) ownership of fifty percent (50%) or more of the outstanding shares, or (iii) beneficial ownership of such entity.\par +"You" (or "Your") shall mean an individual or Legal Entity exercising permissions granted by this License.\par +"Source" form shall mean the preferred form for making modifications, including but not limited to software source code, documentation source, and configuration files.\par +"Object" form shall mean any form resulting from mechanical transformation or translation of a Source form, including but not limited to compiled object code, generated documentation, and conversions to other media types.\par +"Work" shall mean the work of authorship, whether in Source or Object form, made available under the License, as indicated by a copyright notice that is included in or attached to the work (an example is provided in the Appendix below).\par +"Derivative Works" shall mean any work, whether in Source or Object form, that is based on (or derived from) the Work and for which the editorial revisions, annotations, elaborations, or other modifications represent, as a whole, an original work of authorship. For the purposes of this License, Derivative Works shall not include works that remain separable from, or merely link (or bind by name) to the interfaces of, the Work and Derivative Works thereof.\par +"Contribution" shall mean any work of authorship, including the original version of the Work and any modifications or additions to that Work or Derivative Works thereof, that is intentionally submitted to Licensor for inclusion in the Work by the copyright owner or by an individual or Legal Entity authorized to submit on behalf of the copyright owner. For the purposes of this definition, "submitted" means any form of electronic, verbal, or written communication sent to the Licensor or its representatives, including but not limited to communication on electronic mailing lists, source code control systems, and issue tracking systems that are managed by, or on behalf of, the Licensor for the purpose of discussing and improving the Work, but excluding communication that is conspicuously marked or otherwise designated in writing by the copyright owner as "Not a Contribution."\par +"Contributor" shall mean Licensor and any individual or Legal Entity on behalf of whom a Contribution has been received by Licensor and subsequently incorporated within the Work.\par +\b 2. Grant of Copyright License\b0 . Subject to the terms and conditions of this License, each Contributor hereby grants to You a perpetual, worldwide, non-exclusive, no-charge, royalty-free, irrevocable copyright license to reproduce, prepare Derivative Works of, publicly display, publicly perform, sublicense, and distribute the Work and such Derivative Works in Source or Object form.\par +\b 3. Grant of Patent License\b0 . Subject to the terms and conditions of this License, each Contributor hereby grants to You a perpetual, worldwide, non-exclusive, no-charge, royalty-free, irrevocable (except as stated in this section) patent license to make, have made, use, offer to sell, sell, import, and otherwise transfer the Work, where such license applies only to those patent claims licensable by such Contributor that are necessarily infringed by their Contribution(s) alone or by combination of their Contribution(s) with the Work to which such Contribution(s) was submitted. If You institute patent litigation against any entity (including a cross-claim or counterclaim in a lawsuit) alleging that the Work or a Contribution incorporated within the Work constitutes direct or contributory patent infringement, then any patent licenses granted to You under this License for that Work shall terminate as of the date such litigation is filed.\par +\b 4. Redistribution\b0 . You may reproduce and distribute copies of the Work or Derivative Works thereof in any medium, with or without modifications, and in Source or Object form, provided that You meet the following conditions:\par +\pard\fi-360\li720\sb100\sa100\tx720 1.\tab You must give any other recipients of the Work or Derivative Works a copy of this License; and\par +\pard\fi-360\li720\sb100\sa100 2.\tab You must cause any modified files to carry prominent notices stating that You changed the files; and\par +3.\tab You must retain, in the Source form of any Derivative Works that You distribute, all copyright, patent, trademark, and attribution notices from the Source form of the Work, excluding those notices that do not pertain to any part of the Derivative Works; and\par +4.\tab If the Work includes a "NOTICE" text file as part of its distribution, then any Derivative Works that You distribute must include a readable copy of the attribution notices contained within such NOTICE file, excluding those notices that do not pertain to any part of the Derivative Works, in at least one of the following places: within a NOTICE text file distributed as part of the Derivative Works; within the Source form or documentation, if provided along with the Derivative Works; or, within a display generated by the Derivative Works, if and wherever such third-party notices normally appear. The contents of the NOTICE file are for informational purposes only and do not modify the License. You may add Your own attribution notices within Derivative Works that You distribute, alongside or as an addendum to the NOTICE text from the Work, provided that such additional attribution notices cannot be construed as modifying the License. You may add Your own copyright statement to Your modifications and may provide additional or different license terms and conditions for use, reproduction, or distribution of Your modifications, or for any such Derivative Works as a whole, provided Your use, reproduction, and distribution of the Work otherwise complies with the conditions stated in this License.\par +\pard\sb100\sa100\b 5. Submission of Contributions\b0 . Unless You explicitly state otherwise, any Contribution intentionally submitted for inclusion in the Work by You to the Licensor shall be under the terms and conditions of this License, without any additional terms or conditions. Notwithstanding the above, nothing herein shall supersede or modify the terms of any separate license agreement you may have executed with Licensor regarding such Contributions.\par +\b 6. Trademarks\b0 . This License does not grant permission to use the trade names, trademarks, service marks, or product names of the Licensor, except as required for reasonable and customary use in describing the origin of the Work and reproducing the content of the NOTICE file.\par +\b 7. Disclaimer of Warranty\b0 . Unless required by applicable law or agreed to in writing, Licensor provides the Work (and each Contributor provides its Contributions) on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied, including, without limitation, any warranties or conditions of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A PARTICULAR PURPOSE. You are solely responsible for determining the appropriateness of using or redistributing the Work and assume any risks associated with Your exercise of permissions under this License.\par +\b 8. Limitation of Liability\b0 . In no event and under no legal theory, whether in tort (including negligence), contract, or otherwise, unless required by applicable law (such as deliberate and grossly negligent acts) or agreed to in writing, shall any Contributor be liable to You for damages, including any direct, indirect, special, incidental, or consequential damages of any character arising as a result of this License or out of the use or inability to use the Work (including but not limited to damages for loss of goodwill, work stoppage, computer failure or malfunction, or any and all other commercial damages or losses), even if such Contributor has been advised of the possibility of such damages.\par +\b 9. Accepting Warranty or Additional Liability\b0 . While redistributing the Work or Derivative Works thereof, You may choose to offer, and charge a fee for, acceptance of support, warranty, indemnity, or other liability obligations and/or rights consistent with this License. However, in accepting such obligations, You may act only on Your own behalf and on Your sole responsibility, not on behalf of any other Contributor, and only if You agree to indemnify, defend, and hold each Contributor harmless for any liability incurred by, or claims asserted against, such Contributor by reason of your accepting any such warranty or additional liability.\par +END OF TERMS AND CONDITIONS\par +\pard\sa200\sl276\slmult1\lang1033\f1\fs22\par +} + \ No newline at end of file diff --git a/iis/wix/README.TXT b/iis/wix/README.TXT new file mode 100644 index 00000000..bcbc9326 --- /dev/null +++ b/iis/wix/README.TXT @@ -0,0 +1,21 @@ +Please note that installing ModSecurity for IIS requires IIS to be installed and enabled. + + +After installing ModSecurity for IIS, the module will be running in all websites by default. To remove from a website add to web.config: + + + + + +To configure module in a website add to web.config: + + + + + + + + +where configFile is standard ModSecurity config file. + +Events from the module will show up in "Application" Windows log. diff --git a/iis/wix/banner.jpg b/iis/wix/banner.jpg new file mode 100644 index 00000000..c1d9bd87 Binary files /dev/null and b/iis/wix/banner.jpg differ diff --git a/iis/wix/dialog.jpg b/iis/wix/dialog.jpg new file mode 100644 index 00000000..d9b48fb4 Binary files /dev/null and b/iis/wix/dialog.jpg differ diff --git a/iis/wix/modsecurity.conf b/iis/wix/modsecurity.conf new file mode 100644 index 00000000..f43e8f51 --- /dev/null +++ b/iis/wix/modsecurity.conf @@ -0,0 +1,214 @@ +# based on modsecurity.conf-recommended +# -- Rule engine initialization ---------------------------------------------- + +# Enable ModSecurity, attaching it to every transaction. Use detection +# only to start with, because that minimises the chances of post-installation +# disruption. +# +SecRuleEngine DetectionOnly + + +# -- Request body handling --------------------------------------------------- + +# Allow ModSecurity to access request bodies. If you don't, ModSecurity +# won't be able to see any POST parameters, which opens a large security +# hole for attackers to exploit. +# +SecRequestBodyAccess On + + +# Enable XML request body parser. +# Initiate XML Processor in case of xml content-type +# +SecRule REQUEST_HEADERS:Content-Type "text/xml" \ + "id:'200000',phase:1,t:none,t:lowercase,pass,nolog,ctl:requestBodyProcessor=XML" + + +# Maximum request body size we will accept for buffering. If you support +# file uploads then the value given on the first line has to be as large +# as the largest file you are willing to accept. The second value refers +# to the size of data, with files excluded. You want to keep that value as +# low as practical. +# +SecRequestBodyLimit 13107200 +SecRequestBodyNoFilesLimit 131072 + +# Store up to 128 KB of request body data in memory. When the multipart +# parser reachers this limit, it will start using your hard disk for +# storage. That is slow, but unavoidable. +# +SecRequestBodyInMemoryLimit 131072 + +# What do do if the request body size is above our configured limit. +# Keep in mind that this setting will automatically be set to ProcessPartial +# when SecRuleEngine is set to DetectionOnly mode in order to minimize +# disruptions when initially deploying ModSecurity. +# +SecRequestBodyLimitAction Reject + +# Verify that we've correctly processed the request body. +# As a rule of thumb, when failing to process a request body +# you should reject the request (when deployed in blocking mode) +# or log a high-severity alert (when deployed in detection-only mode). +# +SecRule REQBODY_ERROR "!@eq 0" \ +"id:'200001', phase:2,t:none,log,deny,status:400,msg:'Failed to parse request body.',logdata:'%{reqbody_error_msg}',severity:2" + +# By default be strict with what we accept in the multipart/form-data +# request body. If the rule below proves to be too strict for your +# environment consider changing it to detection-only. You are encouraged +# _not_ to remove it altogether. +# +SecRule MULTIPART_STRICT_ERROR "!@eq 0" \ +"id:'200002',phase:2,t:none,log,deny,status:44, \ +msg:'Multipart request body failed strict validation: \ +PE %{REQBODY_PROCESSOR_ERROR}, \ +BQ %{MULTIPART_BOUNDARY_QUOTED}, \ +BW %{MULTIPART_BOUNDARY_WHITESPACE}, \ +DB %{MULTIPART_DATA_BEFORE}, \ +DA %{MULTIPART_DATA_AFTER}, \ +HF %{MULTIPART_HEADER_FOLDING}, \ +LF %{MULTIPART_LF_LINE}, \ +SM %{MULTIPART_MISSING_SEMICOLON}, \ +IQ %{MULTIPART_INVALID_QUOTING}, \ +IP %{MULTIPART_INVALID_PART}, \ +IH %{MULTIPART_INVALID_HEADER_FOLDING}, \ +FL %{MULTIPART_FILE_LIMIT_EXCEEDED}'" + +# Did we see anything that might be a boundary? +# +SecRule MULTIPART_UNMATCHED_BOUNDARY "!@eq 0" \ +"id:'200003',phase:2,t:none,log,deny,status:44,msg:'Multipart parser detected a possible unmatched boundary.'" + +# PCRE Tuning +# We want to avoid a potential RegEx DoS condition +# +SecPcreMatchLimit 1000 +SecPcreMatchLimitRecursion 1000 + +# Some internal errors will set flags in TX and we will need to look for these. +# All of these are prefixed with "MSC_". The following flags currently exist: +# +# MSC_PCRE_LIMITS_EXCEEDED: PCRE match limits were exceeded. +# +SecRule TX:/^MSC_/ "!@streq 0" \ + "id:'200004',phase:2,t:none,deny,msg:'ModSecurity internal error flagged: %{MATCHED_VAR_NAME}'" + + +# -- Response body handling -------------------------------------------------- + +# Allow ModSecurity to access response bodies. +# You should have this directive enabled in order to identify errors +# and data leakage issues. +# +# Do keep in mind that enabling this directive does increases both +# memory consumption and response latency. +# +#SecResponseBodyAccess On + +# Which response MIME types do you want to inspect? You should adjust the +# configuration below to catch documents but avoid static files +# (e.g., images and archives). +# +SecResponseBodyMimeType text/plain text/html text/xml + +# Buffer response bodies of up to 512 KB in length. +SecResponseBodyLimit 524288 + +# What happens when we encounter a response body larger than the configured +# limit? By default, we process what we have and let the rest through. +# That's somewhat less secure, but does not break any legitimate pages. +# +SecResponseBodyLimitAction ProcessPartial + + +# -- Filesystem configuration ------------------------------------------------ + +# The location where ModSecurity stores temporary files (for example, when +# it needs to handle a file upload that is larger than the configured limit). +# +# This default setting is chosen due to all systems have /tmp available however, +# this is less than ideal. It is recommended that you specify a location that's private. +# +SecTmpDir c:\inetpub\temp\ + +# The location where ModSecurity will keep its persistent data. This default setting +# is chosen due to all systems have /tmp available however, it +# too should be updated to a place that other users can't access. +# +SecDataDir c:\inetpub\temp\ + + +# -- File uploads handling configuration ------------------------------------- + +# The location where ModSecurity stores intercepted uploaded files. This +# location must be private to ModSecurity. You don't want other users on +# the server to access the files, do you? +# +#SecUploadDir /opt/modsecurity/var/upload/ + +# By default, only keep the files that were determined to be unusual +# in some way (by an external inspection script). For this to work you +# will also need at least one file inspection rule. +# +#SecUploadKeepFiles RelevantOnly + +# Uploaded files are by default created with permissions that do not allow +# any other user to access them. You may need to relax that if you want to +# interface ModSecurity to an external program (e.g., an anti-virus). +# +#SecUploadFileMode 0600 + + +# -- Debug log configuration ------------------------------------------------- + +# The default debug log configuration is to duplicate the error, warning +# and notice messages from the error log. +# +#SecDebugLog /opt/modsecurity/var/log/debug.log +#SecDebugLogLevel 3 + + +# -- Audit log configuration ------------------------------------------------- + +# Log the transactions that are marked by a rule, as well as those that +# trigger a server error (determined by a 5xx or 4xx, excluding 404, +# level response status codes). +# +#SecAuditEngine RelevantOnly +#SecAuditLogRelevantStatus "^(?:5|4(?!04))" + +# Log everything we know about a transaction. +#SecAuditLogParts ABIJDEFHZ + +# Use a single file for logging. This is much easier to look at, but +# assumes that you will use the audit log only ocassionally. +# +#SecAuditLogType Serial +#SecAuditLog c:\inetpub\log\modsec_audit.log + +# Specify the path for concurrent audit logging. +#SecAuditLogStorageDir c:\inetpub\log\ + + +# -- Miscellaneous ----------------------------------------------------------- + +# Use the most commonly used application/x-www-form-urlencoded parameter +# separator. There's probably only one application somewhere that uses +# something else so don't expect to change this value. +# +SecArgumentSeparator & + +# Settle on version 0 (zero) cookies, as that is what most applications +# use. Using an incorrect cookie version may open your installation to +# evasion attacks (against the rules that examine named cookies). +# +SecCookieFormat 0 + +# Specify your Unicode Code Point. +# This mapping is used by the t:urlDecodeUni transformation function +# to properly map encoded data to your language. Properly setting +# these directives helps to reduce false positives and negatives. +# +#SecUnicodeCodePage 20127 +#SecUnicodeMapFile unicode.mapping diff --git a/iis/wix/modsecurity_crs_10_setup.conf b/iis/wix/modsecurity_crs_10_setup.conf new file mode 100644 index 00000000..a682275b --- /dev/null +++ b/iis/wix/modsecurity_crs_10_setup.conf @@ -0,0 +1,428 @@ +# --------------------------------------------------------------- +# Core ModSecurity Rule Set ver.2.2.6 +# Copyright (C) 2006-2012 Trustwave All rights reserved. +# +# The OWASP ModSecurity Core Rule Set is distributed under +# Apache Software License (ASL) version 2 +# Please see the enclosed LICENCE file for full details. +# --------------------------------------------------------------- + + +# +# -- [[ Recommended Base Configuration ]] ------------------------------------------------- +# +# The configuration directives/settings in this file are used to control +# the OWASP ModSecurity CRS. These settings do **NOT** configure the main +# ModSecurity settings such as: +# +# - SecRuleEngine +# - SecRequestBodyAccess +# - SecAuditEngine +# - SecDebugLog +# +# You should use the modsecurity.conf-recommended file that comes with the +# ModSecurity source code archive. +# +# Ref: http://mod-security.svn.sourceforge.net/viewvc/mod-security/m2/trunk/modsecurity.conf-recommended +# + + +# +# -- [[ Rule Version ]] ------------------------------------------------------------------- +# +# Rule version data is added to the "Producer" line of Section H of the Audit log: +# +# - Producer: ModSecurity for Apache/2.7.0-rc1 (http://www.modsecurity.org/); OWASP_CRS/2.2.4. +# +# Ref: https://sourceforge.net/apps/mediawiki/mod-security/index.php?title=Reference_Manual#SecComponentSignature +# +SecComponentSignature "OWASP_CRS/2.2.6" + + +# +# -- [[ Modes of Operation: Self-Contained vs. Collaborative Detection ]] ----------------- +# +# Each detection rule uses the "block" action which will inherit the SecDefaultAction +# specified below. Your settings here will determine which mode of operation you use. +# +# -- [[ Self-Contained Mode ]] -- +# Rules inherit the "deny" disruptive action. The first rule that matches will block. +# +# -- [[ Collaborative Detection Mode ]] -- +# This is a "delayed blocking" mode of operation where each matching rule will inherit +# the "pass" action and will only contribute to anomaly scores. Transactional blocking +# can be applied +# +# -- [[ Alert Logging Control ]] -- +# You have three options - +# +# - To log to both the Apache error_log and ModSecurity audit_log file use: "log" +# - To log *only* to the ModSecurity audit_log file use: "nolog,auditlog" +# - To log *only* to the Apache error_log file use: "log,noauditlog" +# +# Ref: http://blog.spiderlabs.com/2010/11/advanced-topic-of-the-week-traditional-vs-anomaly-scoring-detection-modes.html +# Ref: https://sourceforge.net/apps/mediawiki/mod-security/index.php?title=Reference_Manual#SecDefaultAction +# +SecDefaultAction "phase:1,deny,log" + + +# +# -- [[ Collaborative Detection Severity Levels ]] ---------------------------------------- +# +# These are the default scoring points for each severity level. You may +# adjust these to you liking. These settings will be used in macro expansion +# in the rules to increment the anomaly scores when rules match. +# +# These are the default Severity ratings (with anomaly scores) of the individual rules - +# +# - 2: Critical - Anomaly Score of 5. +# Is the highest severity level possible without correlation. It is +# normally generated by the web attack rules (40 level files). +# - 3: Error - Anomaly Score of 4. +# Is generated mostly from outbound leakage rules (50 level files). +# - 4: Warning - Anomaly Score of 3. +# Is generated by malicious client rules (35 level files). +# - 5: Notice - Anomaly Score of 2. +# Is generated by the Protocol policy and anomaly files. +# +SecAction \ + "id:'900001', \ + phase:1, \ + t:none, \ + setvar:tx.critical_anomaly_score=5, \ + setvar:tx.error_anomaly_score=4, \ + setvar:tx.warning_anomaly_score=3, \ + setvar:tx.notice_anomaly_score=2, \ + nolog, \ + pass" + + +# +# -- [[ Collaborative Detection Scoring Threshold Levels ]] ------------------------------ +# +# These variables are used in macro expansion in the 49 inbound blocking and 59 +# outbound blocking files. +# +# **MUST HAVE** ModSecurity v2.5.12 or higher to use macro expansion in numeric +# operators. If you have an earlier version, edit the 49/59 files directly to +# set the appropriate anomaly score levels. +# +# You should set the score to the proper threshold you would prefer. If set to "5" +# it will work similarly to previous Mod CRS rules and will create an event in the error_log +# file if there are any rules that match. If you would like to lessen the number of events +# generated in the error_log file, you should increase the anomaly score threshold to +# something like "20". This would only generate an event in the error_log file if +# there are multiple lower severity rule matches or if any 1 higher severity item matches. +# +SecAction \ + "id:'900002', \ + phase:1, \ + t:none, \ + setvar:tx.inbound_anomaly_score_level=5, \ + nolog, \ + pass" + + +SecAction \ + "id:'900003', \ + phase:1, \ + t:none, \ + setvar:tx.outbound_anomaly_score_level=4, \ + nolog, \ + pass" + + +# +# -- [[ Collaborative Detection Blocking ]] ----------------------------------------------- +# +# This is a collaborative detection mode where each rule will increment an overall +# anomaly score for the transaction. The scores are then evaluated in the following files: +# +# Inbound anomaly score - checked in the modsecurity_crs_49_inbound_blocking.conf file +# Outbound anomaly score - checked in the modsecurity_crs_59_outbound_blocking.conf file +# +# If you want to use anomaly scoring mode, then uncomment this line. +# +#SecAction \ + "id:'900004', \ + phase:1, \ + t:none, \ + setvar:tx.anomaly_score_blocking=on, \ + nolog, \ + pass" + + +# +# -- [[ GeoIP Database ]] ----------------------------------------------------------------- +# +# There are some rulesets that need to inspect the GEO data of the REMOTE_ADDR data. +# +# You must first download the MaxMind GeoIP Lite City DB - +# +# http://geolite.maxmind.com/download/geoip/database/GeoLiteCity.dat.gz +# +# You then need to define the proper path for the SecGeoLookupDb directive +# +# Ref: http://blog.spiderlabs.com/2010/10/detecting-malice-with-modsecurity-geolocation-data.html +# Ref: http://blog.spiderlabs.com/2010/11/detecting-malice-with-modsecurity-ip-forensics.html +# +#SecGeoLookupDb /opt/modsecurity/lib/GeoLiteCity.dat + +# +# -- [[ Regression Testing Mode ]] -------------------------------------------------------- +# +# If you are going to run the regression testing mode, you should uncomment the +# following rule. It will enable DetectionOnly mode for the SecRuleEngine and +# will enable Response Header tagging so that the client testing script can see +# which rule IDs have matched. +# +# You must specify the your source IP address where you will be running the tests +# from. +# +#SecRule REMOTE_ADDR "@ipMatch 192.168.1.100" \ + "id:'900005', \ + phase:1, \ + t:none, \ + ctl:ruleEngine=DetectionOnly, \ + setvar:tx.regression_testing=1, \ + nolog, \ + pass" + + +# +# -- [[ HTTP Policy Settings ]] ---------------------------------------------------------- +# +# Set the following policy settings here and they will be propagated to the 23 rules +# file (modsecurity_common_23_request_limits.conf) by using macro expansion. +# If you run into false positives, you can adjust the settings here. +# +# Only the max number of args is uncommented by default as there are a high rate +# of false positives. Uncomment the items you wish to set. +# +# +# -- Maximum number of arguments in request limited +SecAction \ + "id:'900006', \ + phase:1, \ + t:none, \ + setvar:tx.max_num_args=255, \ + nolog, \ + pass" + +# +# -- Limit argument name length +#SecAction \ + "id:'900007', \ + phase:1, \ + t:none, \ + setvar:tx.arg_name_length=100, \ + nolog, \ + pass" + +# +# -- Limit value name length +#SecAction \ + "id:'900008', \ + phase:1, \ + t:none, \ + setvar:tx.arg_length=400, \ + nolog, \ + pass" + +# +# -- Limit arguments total length +#SecAction \ + "id:'900009', \ + phase:1, \ + t:none, \ + setvar:tx.total_arg_length=64000, \ + nolog, \ + pass" + +# +# -- Individual file size is limited +#SecAction \ + "id:'900010', \ + phase:1, \ + t:none, \ + setvar:tx.max_file_size=1048576, \ + nolog, \ + pass" + +# +# -- Combined file size is limited +#SecAction \ + "id:'900011', \ + phase:1, \ + t:none, \ + setvar:tx.combined_file_sizes=1048576, \ + nolog, \ + pass" + + +# +# Set the following policy settings here and they will be propagated to the 30 rules +# file (modsecurity_crs_30_http_policy.conf) by using macro expansion. +# If you run into false positves, you can adjust the settings here. +# +SecAction \ + "id:'900012', \ + phase:1, \ + t:none, \ + setvar:'tx.allowed_methods=GET HEAD POST OPTIONS', \ + setvar:'tx.allowed_request_content_type=application/x-www-form-urlencoded|multipart/form-data|text/xml|application/xml|application/x-amf|application/json', \ + setvar:'tx.allowed_http_versions=HTTP/0.9 HTTP/1.0 HTTP/1.1', \ + setvar:'tx.restricted_extensions=.asa/ .asax/ .ascx/ .axd/ .backup/ .bak/ .bat/ .cdx/ .cer/ .cfg/ .cmd/ .com/ .config/ .conf/ .cs/ .csproj/ .csr/ .dat/ .db/ .dbf/ .dll/ .dos/ .htr/ .htw/ .ida/ .idc/ .idq/ .inc/ .ini/ .key/ .licx/ .lnk/ .log/ .mdb/ .old/ .pass/ .pdb/ .pol/ .printer/ .pwd/ .resources/ .resx/ .sql/ .sys/ .vb/ .vbs/ .vbproj/ .vsdisco/ .webinfo/ .xsd/ .xsx/', \ + setvar:'tx.restricted_headers=/Proxy-Connection/ /Lock-Token/ /Content-Range/ /Translate/ /via/ /if/', \ + nolog, \ + pass" + + +# +# -- [[ Content Security Policy (CSP) Settings ]] ----------------------------------------- +# +# The purpose of these settings is to send CSP response headers to +# Mozilla FireFox users so that you can enforce how dynamic content +# is used. CSP usage helps to prevent XSS attacks against your users. +# +# Reference Link: +# +# https://developer.mozilla.org/en/Security/CSP +# +# Uncomment this SecAction line if you want use CSP enforcement. +# You need to set the appropriate directives and settings for your site/domain and +# and activate the CSP file in the experimental_rules directory. +# +# Ref: http://blog.spiderlabs.com/2011/04/modsecurity-advanced-topic-of-the-week-integrating-content-security-policy-csp.html +# +#SecAction \ + "id:'900013', \ + phase:1, \ + t:none, \ + setvar:tx.csp_report_only=1, \ + setvar:tx.csp_report_uri=/csp_violation_report, \ + setenv:'csp_policy=allow \'self\'; img-src *.yoursite.com; media-src *.yoursite.com; style-src *.yoursite.com; frame-ancestors *.yoursite.com; script-src *.yoursite.com; report-uri %{tx.csp_report_uri}', \ + nolog, \ + pass" + + +# +# -- [[ Brute Force Protection ]] --------------------------------------------------------- +# +# If you are using the Brute Force Protection rule set, then uncomment the following +# lines and set the following variables: +# - Protected URLs: resources to protect (e.g. login pages) - set to your login page +# - Burst Time Slice Interval: time interval window to monitor for bursts +# - Request Threshold: request # threshold to trigger a burst +# - Block Period: temporary block timeout +# +#SecAction \ + "id:'900014', \ + phase:1, \ + t:none, \ + setvar:'tx.brute_force_protected_urls=/login.jsp /partner_login.php', \ + setvar:'tx.brute_force_burst_time_slice=60', \ + setvar:'tx.brute_force_counter_threshold=10', \ + setvar:'tx.brute_force_block_timeout=300', \ + nolog, \ + pass" + + +# +# -- [[ DoS Protection ]] ---------------------------------------------------------------- +# +# If you are using the DoS Protection rule set, then uncomment the following +# lines and set the following variables: +# - Burst Time Slice Interval: time interval window to monitor for bursts +# - Request Threshold: request # threshold to trigger a burst +# - Block Period: temporary block timeout +# +#SecAction \ + "id:'900015', \ + phase:1, \ + t:none, \ + setvar:'tx.dos_burst_time_slice=60', \ + setvar:'tx.dos_counter_threshold=100', \ + setvar:'tx.dos_block_timeout=600', \ + nolog, \ + pass" + + +# +# -- [[ Check UTF enconding ]] ----------------------------------------------------------- +# +# We only want to apply this check if UTF-8 encoding is actually used by the site, otherwise +# it will result in false positives. +# +# Uncomment this line if your site uses UTF8 encoding +#SecAction \ + "id:'900016', \ + phase:1, \ + t:none, \ + setvar:tx.crs_validate_utf8_encoding=1, \ + nolog, \ + pass" + + +# +# -- [[ Enable XML Body Parsing ]] ------------------------------------------------------- +# +# The rules in this file will trigger the XML parser upon an XML request +# +# Initiate XML Processor in case of xml content-type +# +SecRule REQUEST_HEADERS:Content-Type "text/xml" \ + "id:'900017', \ + phase:1, \ + t:none,t:lowercase, \ + nolog, \ + pass, \ + chain" + SecRule REQBODY_PROCESSOR "!@streq XML" \ + "ctl:requestBodyProcessor=XML" + + +# +# -- [[ Global and IP Collections ]] ----------------------------------------------------- +# +# Create both Global and IP collections for rules to use +# There are some CRS rules that assume that these two collections +# have already been initiated. +# +SecRule REQUEST_HEADERS:User-Agent "^(.*)$" \ + "id:'900018', \ + phase:1, \ + t:none,t:sha1,t:hexEncode, \ + setvar:tx.ua_hash=%{matched_var}, \ + nolog, \ + pass" + + +SecRule REQUEST_HEADERS:x-forwarded-for "^\b(\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3})\b" \ + "id:'900019', \ + phase:1, \ + t:none, \ + capture, \ + setvar:tx.real_ip=%{tx.1}, \ + nolog, \ + pass" + + +SecRule &TX:REAL_IP "!@eq 0" \ + "id:'900020', \ + phase:1, \ + t:none, \ + initcol:global=global, \ + initcol:ip=%{tx.real_ip}_%{tx.ua_hash}, \ + nolog, \ + pass" + + +SecRule &TX:REAL_IP "@eq 0" \ + "id:'900021', \ + phase:1, \ + t:none, \ + initcol:global=global, \ + initcol:ip=%{remote_addr}_%{tx.ua_hash}, \ + nolog, \ + pass" diff --git a/iis/wix/modsecurity_iis.conf b/iis/wix/modsecurity_iis.conf new file mode 100644 index 00000000..85d20ba7 --- /dev/null +++ b/iis/wix/modsecurity_iis.conf @@ -0,0 +1,3 @@ +Include modsecurity.conf +Include modsecurity_crs_10_setup.conf +Include owasp_crs\base_rules\*.conf diff --git a/mlogc/Makefile.am b/mlogc/Makefile.am index 2b088d97..e84e3de5 100644 --- a/mlogc/Makefile.am +++ b/mlogc/Makefile.am @@ -1,8 +1,23 @@ + bin_SCRIPTS = mlogc-batch-load.pl + bin_PROGRAMS = mlogc + mlogc_SOURCES = mlogc.c -mlogc_CPPFLAGS = @APR_CPPFLAGS@ @PCRE_CPPFLAGS@ @CURL_CPPFLAGS@ \ - -I$(top_srcdir)/apache2 -mlogc_CFLAGS = @APR_CFLAGS@ @PCRE_CFLAGS@ @CURL_CFLAGS@ -mlogc_LDFLAGS = @APR_LDFLAGS@ @PCRE_LDFLAGS@ @CURL_LDFLAGS@ -mlogc_LDADD = @APR_LDADD@ @PCRE_LDADD@ @CURL_LDADD@ + +mlogc_CPPFLAGS = @APR_CPPFLAGS@ \ + @PCRE_CPPFLAGS@ \ + @CURL_CPPFLAGS@ \ + -I$(top_srcdir)/apache2 + +mlogc_CFLAGS = @APR_CFLAGS@ \ + @CURL_CFLAGS@ \ + @PCRE_CFLAGS@ + +mlogc_LDFLAGS = @APR_LDFLAGS@ \ + @CURL_LDFLAGS@ \ + @PCRE_LDFLAGS@ + +mlogc_LDADD = @APR_LDADD@ \ + @CURL_LDADD@ \ + @PCRE_LDADD@ diff --git a/mlogc/Makefile.win b/mlogc/Makefile.win index 0352c52d..ebb59d8a 100755 --- a/mlogc/Makefile.win +++ b/mlogc/Makefile.win @@ -14,7 +14,7 @@ CURL = %CURL% LIBS = $(BASE)\lib\libapr-1.lib \ $(BASE)\lib\libaprutil-1.lib \ $(PCRE)\pcre.lib \ - $(CURL)\libcurl_imp.lib \ + $(CURL)\lib\libcurl_imp.lib \ wsock32.lib ########################################################################### diff --git a/nginx/modsecurity/config b/nginx/modsecurity/config deleted file mode 100644 index a77538ba..00000000 --- a/nginx/modsecurity/config +++ /dev/null @@ -1,7 +0,0 @@ -ngx_addon_name=ngx_http_modsecurity -CORE_MODULES="$CORE_MODULES ngx_pool_context_module" -HTTP_AUX_FILTER_MODULES="ngx_http_modsecurity $HTTP_AUX_FILTER_MODULES" -NGX_ADDON_SRCS="$NGX_ADDON_SRCS $ngx_addon_dir/ngx_http_modsecurity.c $ngx_addon_dir/apr_bucket_nginx.c $ngx_addon_dir/ngx_pool_context.c" -NGX_ADDON_DEPS="$NGX_ADDON_DEPS $ngx_addon_dir/apr_bucket_nginx.h $ngx_addon_dir/ngx_pool_context.h" -CORE_LIBS="$CORE_LIBS $ngx_addon_dir/../../standalone/.libs/standalone.a -L/usr/local/apr/lib -lapr-1 -L/usr/local/apr/lib -laprutil-1 -lpcre -lxml2 -lz -lm -ldl " -CORE_INCS="$CORE_INCS $ngx_addon_dir $ngx_addon_dir/../../standalone $ngx_addon_dir/../../apache2 /usr/include/libxml2 /usr/local/apache2/include /usr/local/apr/include/apr-1 /usr/local/apr/include/apr-1" diff --git a/nginx/modsecurity/config.in b/nginx/modsecurity/config.in new file mode 100644 index 00000000..4918224c --- /dev/null +++ b/nginx/modsecurity/config.in @@ -0,0 +1,44 @@ +#!/bin/sh + +CFLAGS="$CFLAGS \ + @APR_CFLAGS@ \ + @APU_CFLAGS@ \ + @APXS_CFLAGS@ \ + @LIBXML2_CFLAGS@ \ + @LUA_CFLAGS@ \ + @MODSEC_EXTRA_CFLAGS@ \ + @PCRE_CFLAGS@" + + +CORE_LIBS="$CORE_LIBS \ + @APR_LINKLD@ \ + @APU_LINKLD@ \ + @APXS_CFLAGS@ \ + @CURL_LDADD@ \ + @LIBXML2_LDADD@ \ + @LUA_LDADD@ \ + @PCRE_LDADD@ \ + @APXS_LIBS@" + +ngx_addon_name=ngx_http_modsecurity + +CORE_MODULES="$CORE_MODULES ngx_pool_context_module" + +HTTP_AUX_FILTER_MODULES="ngx_http_modsecurity $HTTP_AUX_FILTER_MODULES" + +NGX_ADDON_SRCS="$NGX_ADDON_SRCS \ + $ngx_addon_dir/ngx_http_modsecurity.c \ + $ngx_addon_dir/apr_bucket_nginx.c \ + $ngx_addon_dir/ngx_pool_context.c" + +NGX_ADDON_DEPS="$NGX_ADDON_DEPS \ + $ngx_addon_dir/apr_bucket_nginx.h \ + $ngx_addon_dir/ngx_pool_context.h" + +CORE_LIBS="$ngx_addon_dir/../../standalone/.libs/standalone.a $CORE_LIBS" + +CORE_INCS="$CORE_INCS \ + $ngx_addon_dir \ + $ngx_addon_dir/../../standalone \ + $ngx_addon_dir/../../apache2" + diff --git a/nginx/modsecurity/ngx_http_modsecurity.c b/nginx/modsecurity/ngx_http_modsecurity.c index 26112a67..b6b78e4e 100644 --- a/nginx/modsecurity/ngx_http_modsecurity.c +++ b/nginx/modsecurity/ngx_http_modsecurity.c @@ -615,7 +615,7 @@ ngx_http_modsecurity_load_headers_out(ngx_http_request_t *r) } ngx_snprintf(content_type, content_type_len, - "%V; charset=%V", + "%V; charset=%V\0", &r->headers_out.content_type, &r->headers_out.charset); @@ -652,7 +652,7 @@ ngx_http_modsecurity_load_headers_out(ngx_http_request_t *r) buf = ngx_cpymem(buf, h[i].value.data, h[i].value.len); *buf++ = '\0'; - apr_table_setn(req->headers_out, key, value); + apr_table_addn(req->headers_out, key, value); ngx_log_debug2(NGX_LOG_DEBUG_HTTP, r->connection->log, 0, "ModSecurity: load headers out: \"%V: %V\"", &h[i].key, &h[i].value); diff --git a/standalone/Makefile.am b/standalone/Makefile.am index 5678f6a9..f75c2d87 100644 --- a/standalone/Makefile.am +++ b/standalone/Makefile.am @@ -1,94 +1,139 @@ pkglibdir = $(prefix)/lib + pkglib_LTLIBRARIES = standalone.la -#include_HEADERS = re.h modsecurity.h msc_logging.h msc_multipart.h \ -# msc_parsers.h msc_pcre.h msc_util.h msc_xml.h \ -# persist_dbm.h apache2.h msc_geo.h acmp.h utf8tables.h \ -# msc_lua.h msc_release.h -standalone_la_SOURCES = ../apache2/mod_security2.c \ - ../apache2/apache2_config.c ../apache2/apache2_io.c ../apache2/apache2_util.c \ - ../apache2/re.c ../apache2/re_operators.c ../apache2/re_actions.c ../apache2/re_tfns.c \ - ../apache2/re_variables.c ../apache2/msc_logging.c ../apache2/msc_xml.c \ - ../apache2/msc_multipart.c ../apache2/modsecurity.c ../apache2/msc_parsers.c \ - ../apache2/msc_util.c ../apache2/msc_pcre.c ../apache2/persist_dbm.c ../apache2/msc_reqbody.c \ - ../apache2/msc_geo.c ../apache2/msc_gsb.c ../apache2/msc_unicode.c \ - ../apache2/acmp.c ../apache2/msc_lua.c ../apache2/msc_release.c \ - ../apache2/msc_crypt.c ../apache2/msc_tree.c ../apache2/libinjection/libinjection_sqli.c \ - api.c buckets.c \ - config.c filters.c \ - hooks.c \ - regex.c server.c +standalone_la_SOURCES = ../apache2/acmp.c \ + ../apache2/apache2_config.c \ + ../apache2/apache2_io.c \ + ../apache2/apache2_util.c \ + ../apache2/libinjection/libinjection_sqli.c \ + ../apache2/mod_security2.c \ + ../apache2/modsecurity.c \ + ../apache2/msc_crypt.c \ + ../apache2/msc_geo.c \ + ../apache2/msc_gsb.c \ + ../apache2/msc_logging.c \ + ../apache2/msc_lua.c \ + ../apache2/msc_multipart.c \ + ../apache2/msc_parsers.c \ + ../apache2/msc_pcre.c \ + ../apache2/msc_release.c \ + ../apache2/msc_reqbody.c \ + ../apache2/msc_tree.c \ + ../apache2/msc_unicode.c \ + ../apache2/msc_util.c \ + ../apache2/msc_xml.c \ + ../apache2/persist_dbm.c \ + ../apache2/re_actions.c \ + ../apache2/re.c \ + ../apache2/re_operators.c \ + ../apache2/re_tfns.c \ + ../apache2/re_variables.c \ + api.c \ + buckets.c \ + config.c \ + filters.c \ + hooks.c \ + regex.c \ + server.c -standalone_la_CFLAGS = @APXS_CFLAGS@ @APR_CFLAGS@ @APU_CFLAGS@ \ - @PCRE_CFLAGS@ @LIBXML2_CFLAGS@ @LUA_CFLAGS@ @MODSEC_EXTRA_CFLAGS@ @CURL_CFLAGS@ -DVERSION_NGINX -standalone_la_CPPFLAGS = @APR_CPPFLAGS@ @PCRE_CPPFLAGS@ @LIBXML2_CPPFLAGS@ -standalone_la_LIBADD = @APR_LDADD@ @APU_LDADD@ @PCRE_LDADD@ @LIBXML2_LDADD@ @LUA_LDADD@ + # FIXME: Standalone does not mean that it will be a nginx build. +standalone_la_CFLAGS = -DVERSION_NGINX \ + @APR_CFLAGS@ \ + @APU_CFLAGS@ \ + @APXS_CFLAGS@ \ + @CURL_CFLAGS@ \ + @LIBXML2_CFLAGS@ \ + @LUA_CFLAGS@ \ + @MODSEC_EXTRA_CFLAGS@ \ + @PCRE_CFLAGS@ + +standalone_la_CPPFLAGS = @APR_CPPFLAGS@ \ + @LIBXML2_CPPFLAGS@ \ + @PCRE_CPPFLAGS@ + +standalone_la_LIBADD = @APR_LDADD@ \ + @APU_LDADD@ \ + @LIBXML2_LDADD@ \ + @LUA_LDADD@ \ + @PCRE_LDADD@ if AIX standalone_la_LDFLAGS = -module -avoid-version \ - @APR_LDFLAGS@ @APU_LDFLAGS@ @APXS_LDFLAGS@ \ - @PCRE_LDFLAGS@ @LIBXML2_LDFLAGS@ @LUA_LDFLAGS@ + @APR_LDFLAGS@ \ + @APU_LDFLAGS@ \ + @APXS_LDFLAGS@ \ + @LIBXML2_LDFLAGS@ \ + @LUA_LDFLAGS@ \ + @PCRE_LDFLAGS@ endif if HPUX standalone_la_LDFLAGS = -module -avoid-version \ - @APR_LDFLAGS@ @APU_LDFLAGS@ @APXS_LDFLAGS@ \ - @PCRE_LDFLAGS@ @LIBXML2_LDFLAGS@ @LUA_LDFLAGS@ + @APR_LDFLAGS@ \ + @APU_LDFLAGS@ \ + @APXS_LDFLAGS@ \ + @LIBXML2_LDFLAGS@ \ + @LUA_LDFLAGS@ \ + @PCRE_LDFLAGS@ endif if MACOSX standalone_la_LDFLAGS = -module -avoid-version \ - @APR_LDFLAGS@ @APU_LDFLAGS@ @APXS_LDFLAGS@ \ - @PCRE_LDFLAGS@ @LIBXML2_LDFLAGS@ @LUA_LDFLAGS@ + @APR_LDFLAGS@ \ + @APU_LDFLAGS@ \ + @APXS_LDFLAGS@ \ + @LIBXML2_LDFLAGS@ \ + @LUA_LDFLAGS@ \ + @PCRE_LDFLAGS@ endif if SOLARIS standalone_la_LDFLAGS = -module -avoid-version \ - @APR_LDFLAGS@ @APU_LDFLAGS@ @APXS_LDFLAGS@ \ - @PCRE_LDFLAGS@ @LIBXML2_LDFLAGS@ @LUA_LDFLAGS@ + @APR_LDFLAGS@ \ + @APU_LDFLAGS@ \ + @APXS_LDFLAGS@ \ + @LIBXML2_LDFLAGS@ \ + @LUA_LDFLAGS@ \ + @PCRE_LDFLAGS@ endif if LINUX standalone_la_LDFLAGS = -no-undefined -module -avoid-version \ - @APR_LDFLAGS@ @APU_LDFLAGS@ @APXS_LDFLAGS@ \ - @PCRE_LDFLAGS@ @LIBXML2_LDFLAGS@ @LUA_LDFLAGS@ + @APR_LDFLAGS@ \ + @APU_LDFLAGS@ \ + @APXS_LDFLAGS@ \ + @LIBXML2_LDFLAGS@ \ + @LUA_LDFLAGS@ \ + @PCRE_LDFLAGS@ endif if FREEBSD standalone_la_LDFLAGS = -no-undefined -module -avoid-version \ - @APR_LDFLAGS@ @APU_LDFLAGS@ @APXS_LDFLAGS@ \ - @PCRE_LDFLAGS@ @LIBXML2_LDFLAGS@ @LUA_LDFLAGS@ + @APR_LDFLAGS@ \ + @APU_LDFLAGS@ \ + @APXS_LDFLAGS@ \ + @LIBXML2_LDFLAGS@ \ + @LUA_LDFLAGS@ \ + @PCRE_LDFLAGS@ endif if OPENBSD standalone_la_LDFLAGS = -no-undefined -module -avoid-version \ - @APR_LDFLAGS@ @APU_LDFLAGS@ @APXS_LDFLAGS@ \ - @PCRE_LDFLAGS@ @LIBXML2_LDFLAGS@ @LUA_LDFLAGS@ + @APR_LDFLAGS@ \ + @APU_LDFLAGS@ \ + @APXS_LDFLAGS@ \ + @LIBXML2_LDFLAGS@ \ + @LUA_LDFLAGS@ \ + @PCRE_LDFLAGS@ endif if NETBSD standalone_la_LDFLAGS = -no-undefined -module -avoid-version \ - @APR_LDFLAGS@ @APU_LDFLAGS@ @APXS_LDFLAGS@ \ - @PCRE_LDFLAGS@ @LIBXML2_LDFLAGS@ @LUA_LDFLAGS@ + @APR_LDFLAGS@ \ + @APU_LDFLAGS@ \ + @APXS_LDFLAGS@ \ + @LIBXML2_LDFLAGS@ \ + @LUA_LDFLAGS@ \ + @PCRE_LDFLAGS@ endif - -standalone_INCS = `echo "@LIBXML2_CFLAGS@ @LUA_CFLAGS@" | sed -n 's/ *-I *\([^ ]*\) /\1 /gp'` \ - @APXS_INCLUDEDIR@ @APR_INCLUDEDIR@ @APU_INCLUDEDIR@ -standalone_LIBS = @APR_LINKLD@ @APU_LINKLD@ @APXS_LDFLAGS@ \ - @PCRE_LDADD@ @LIBXML2_LDADD@ @LUA_LDADD@ -install-exec-hook: $(pkglib_LTLIBRARIES) - @echo "Creating Nginx config file..."; \ - rm -f ../nginx/modsecurity/config; \ - echo "ngx_addon_name=ngx_http_modsecurity" >> ../nginx/modsecurity/config; \ - echo "CORE_MODULES=\"\$$CORE_MODULES ngx_pool_context_module\"" >> ../nginx/modsecurity/config; \ - echo "HTTP_AUX_FILTER_MODULES=\"ngx_http_modsecurity \$$HTTP_AUX_FILTER_MODULES\"" >> ../nginx/modsecurity/config; \ - echo "NGX_ADDON_SRCS=\"\$$NGX_ADDON_SRCS \$$ngx_addon_dir/ngx_http_modsecurity.c \$$ngx_addon_dir/apr_bucket_nginx.c \$$ngx_addon_dir/ngx_pool_context.c\"" >> ../nginx/modsecurity/config;\ - echo "NGX_ADDON_DEPS=\"\$$NGX_ADDON_DEPS \$$ngx_addon_dir/apr_bucket_nginx.h \$$ngx_addon_dir/ngx_pool_context.h \$$ngx_addon_dir/ngx_http_modsecurity.c \$$ngx_addon_dir/apr_bucket_nginx.c \$$ngx_addon_dir/ngx_pool_context.c\"" >> ../nginx/modsecurity/config; \ - echo "CORE_LIBS=\"\$$CORE_LIBS \$$ngx_addon_dir/../../standalone/.libs/standalone.a $(standalone_LIBS) \"" >> ../nginx/modsecurity/config; \ - echo "CORE_INCS=\"\$$CORE_INCS \$$ngx_addon_dir \$$ngx_addon_dir/../../standalone \$$ngx_addon_dir/../../apache2 $(standalone_INCS)\"" >> ../nginx/modsecurity/config; \ - echo "Removing unused static libraries..."; \ - for m in $(pkglib_LTLIBRARIES); do \ - base=`echo $$m | sed 's/\..*//'`; \ - rm -f $(DESTDIR)$(pkglibdir)/$$base.*a; \ - cp -p $(DESTDIR)$(pkglibdir)/$$base.so $(APXS_MODULES); \ - done diff --git a/standalone/Makefile.in b/standalone/Makefile.in deleted file mode 100644 index 996a0082..00000000 --- a/standalone/Makefile.in +++ /dev/null @@ -1,1004 +0,0 @@ -# Makefile.in generated by automake 1.12.2 from Makefile.am. -# @configure_input@ - -# Copyright (C) 1994-2012 Free Software Foundation, Inc. - -# This Makefile.in is free software; the Free Software Foundation -# gives unlimited permission to copy and/or distribute it, -# with or without modifications, as long as this notice is preserved. - -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY, to the extent permitted by law; without -# even the implied warranty of MERCHANTABILITY or FITNESS FOR A -# PARTICULAR PURPOSE. - -@SET_MAKE@ - -VPATH = @srcdir@ -am__make_dryrun = \ - { \ - am__dry=no; \ - case $$MAKEFLAGS in \ - *\\[\ \ ]*) \ - echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ - | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ - *) \ - for am__flg in $$MAKEFLAGS; do \ - case $$am__flg in \ - *=*|--*) ;; \ - *n*) am__dry=yes; break;; \ - esac; \ - done;; \ - esac; \ - test $$am__dry = yes; \ - } -pkgdatadir = $(datadir)/@PACKAGE@ -pkgincludedir = $(includedir)/@PACKAGE@ -pkglibexecdir = $(libexecdir)/@PACKAGE@ -am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd -install_sh_DATA = $(install_sh) -c -m 644 -install_sh_PROGRAM = $(install_sh) -c -install_sh_SCRIPT = $(install_sh) -c -INSTALL_HEADER = $(INSTALL_DATA) -transform = $(program_transform_name) -NORMAL_INSTALL = : -PRE_INSTALL = : -POST_INSTALL = : -NORMAL_UNINSTALL = : -PRE_UNINSTALL = : -POST_UNINSTALL = : -build_triplet = @build@ -host_triplet = @host@ -subdir = standalone -DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ - $(top_srcdir)/build/depcomp -ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/build/find_apr.m4 \ - $(top_srcdir)/build/find_apu.m4 \ - $(top_srcdir)/build/find_curl.m4 \ - $(top_srcdir)/build/find_lua.m4 \ - $(top_srcdir)/build/find_pcre.m4 \ - $(top_srcdir)/build/find_xml.m4 $(top_srcdir)/build/libtool.m4 \ - $(top_srcdir)/build/ltoptions.m4 \ - $(top_srcdir)/build/ltsugar.m4 \ - $(top_srcdir)/build/ltversion.m4 \ - $(top_srcdir)/build/lt~obsolete.m4 $(top_srcdir)/configure.ac -am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ - $(ACLOCAL_M4) -mkinstalldirs = $(install_sh) -d -CONFIG_HEADER = $(top_builddir)/apache2/modsecurity_config_auto.h -CONFIG_CLEAN_FILES = -CONFIG_CLEAN_VPATH_FILES = -am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; -am__vpath_adj = case $$p in \ - $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ - *) f=$$p;; \ - esac; -am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`; -am__install_max = 40 -am__nobase_strip_setup = \ - srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'` -am__nobase_strip = \ - for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||" -am__nobase_list = $(am__nobase_strip_setup); \ - for p in $$list; do echo "$$p $$p"; done | \ - sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \ - $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \ - if (++n[$$2] == $(am__install_max)) \ - { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \ - END { for (dir in files) print dir, files[dir] }' -am__base_list = \ - sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \ - sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g' -am__uninstall_files_from_dir = { \ - test -z "$$files" \ - || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \ - || { echo " ( cd '$$dir' && rm -f" $$files ")"; \ - $(am__cd) "$$dir" && rm -f $$files; }; \ - } -am__installdirs = "$(DESTDIR)$(pkglibdir)" -LTLIBRARIES = $(pkglib_LTLIBRARIES) -standalone_la_DEPENDENCIES = -am_standalone_la_OBJECTS = standalone_la-mod_security2.lo \ - standalone_la-apache2_config.lo standalone_la-apache2_io.lo \ - standalone_la-apache2_util.lo standalone_la-re.lo \ - standalone_la-re_operators.lo standalone_la-re_actions.lo \ - standalone_la-re_tfns.lo standalone_la-re_variables.lo \ - standalone_la-msc_logging.lo standalone_la-msc_xml.lo \ - standalone_la-msc_multipart.lo standalone_la-modsecurity.lo \ - standalone_la-msc_parsers.lo standalone_la-msc_util.lo \ - standalone_la-msc_pcre.lo standalone_la-persist_dbm.lo \ - standalone_la-msc_reqbody.lo standalone_la-msc_geo.lo \ - standalone_la-msc_gsb.lo standalone_la-msc_unicode.lo \ - standalone_la-acmp.lo standalone_la-msc_lua.lo \ - standalone_la-msc_release.lo standalone_la-msc_crypt.lo \ - standalone_la-msc_tree.lo standalone_la-api.lo \ - standalone_la-buckets.lo standalone_la-config.lo \ - standalone_la-filters.lo standalone_la-hooks.lo \ - standalone_la-regex.lo standalone_la-server.lo -standalone_la_OBJECTS = $(am_standalone_la_OBJECTS) -standalone_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \ - $(LIBTOOLFLAGS) --mode=link $(CCLD) $(standalone_la_CFLAGS) \ - $(CFLAGS) $(standalone_la_LDFLAGS) $(LDFLAGS) -o $@ -DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)/apache2 -depcomp = $(SHELL) $(top_srcdir)/build/depcomp -am__depfiles_maybe = depfiles -am__mv = mv -f -COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ - $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ - --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ - $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -CCLD = $(CC) -LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ - --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \ - $(LDFLAGS) -o $@ -SOURCES = $(standalone_la_SOURCES) -DIST_SOURCES = $(standalone_la_SOURCES) -am__can_run_installinfo = \ - case $$AM_UPDATE_INFO_DIR in \ - n|no|NO) false;; \ - *) (install-info --version) >/dev/null 2>&1;; \ - esac -ETAGS = etags -CTAGS = ctags -DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) -pkglibdir = $(prefix)/lib -ACLOCAL = @ACLOCAL@ -AMTAR = @AMTAR@ -APR_CFLAGS = @APR_CFLAGS@ -APR_CONFIG = @APR_CONFIG@ -APR_CPPFLAGS = @APR_CPPFLAGS@ -APR_INCLUDEDIR = @APR_INCLUDEDIR@ -APR_LDADD = @APR_LDADD@ -APR_LDFLAGS = @APR_LDFLAGS@ -APR_LINKLD = @APR_LINKLD@ -APR_VERSION = @APR_VERSION@ -APU_CFLAGS = @APU_CFLAGS@ -APU_CONFIG = @APU_CONFIG@ -APU_INCLUDEDIR = @APU_INCLUDEDIR@ -APU_LDADD = @APU_LDADD@ -APU_LDFLAGS = @APU_LDFLAGS@ -APU_LINKLD = @APU_LINKLD@ -APU_VERSION = @APU_VERSION@ -APXS = @APXS@ -APXS_BINDIR = @APXS_BINDIR@ -APXS_CC = @APXS_CC@ -APXS_CFLAGS = @APXS_CFLAGS@ -APXS_EXTRA_CFLAGS = @APXS_EXTRA_CFLAGS@ -APXS_HTTPD = @APXS_HTTPD@ -APXS_INCLUDEDIR = @APXS_INCLUDEDIR@ -APXS_INCLUDES = @APXS_INCLUDES@ -APXS_LDFLAGS = @APXS_LDFLAGS@ -APXS_LIBDIR = @APXS_LIBDIR@ -APXS_LIBEXECDIR = @APXS_LIBEXECDIR@ -APXS_LIBS = @APXS_LIBS@ -APXS_LIBTOOL = @APXS_LIBTOOL@ -APXS_MODULES = @APXS_MODULES@ -APXS_PROGNAME = @APXS_PROGNAME@ -APXS_SBINDIR = @APXS_SBINDIR@ -APXS_WRAPPER = @APXS_WRAPPER@ -AR = @AR@ -AUTOCONF = @AUTOCONF@ -AUTOHEADER = @AUTOHEADER@ -AUTOMAKE = @AUTOMAKE@ -AWK = @AWK@ -CC = @CC@ -CCDEPMODE = @CCDEPMODE@ -CFLAGS = @CFLAGS@ -CPP = @CPP@ -CPPFLAGS = @CPPFLAGS@ -CURL_CFLAGS = @CURL_CFLAGS@ -CURL_CONFIG = @CURL_CONFIG@ -CURL_CPPFLAGS = @CURL_CPPFLAGS@ -CURL_LDADD = @CURL_LDADD@ -CURL_LDFLAGS = @CURL_LDFLAGS@ -CURL_USES_GNUTLS = @CURL_USES_GNUTLS@ -CURL_VERSION = @CURL_VERSION@ -CYGPATH_W = @CYGPATH_W@ -DEFS = @DEFS@ -DEPDIR = @DEPDIR@ -DLLTOOL = @DLLTOOL@ -DSYMUTIL = @DSYMUTIL@ -DUMPBIN = @DUMPBIN@ -ECHO_C = @ECHO_C@ -ECHO_N = @ECHO_N@ -ECHO_T = @ECHO_T@ -EGREP = @EGREP@ -ENV_CMD = @ENV_CMD@ -EXEEXT = @EXEEXT@ -EXTRA_CFLAGS = @EXTRA_CFLAGS@ -FGREP = @FGREP@ -GREP = @GREP@ -INSTALL = @INSTALL@ -INSTALL_DATA = @INSTALL_DATA@ -INSTALL_PROGRAM = @INSTALL_PROGRAM@ -INSTALL_SCRIPT = @INSTALL_SCRIPT@ -INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ -LD = @LD@ -LDFLAGS = @LDFLAGS@ -LIBOBJS = @LIBOBJS@ -LIBS = @LIBS@ -LIBTOOL = @LIBTOOL@ -LIBXML2_CFLAGS = @LIBXML2_CFLAGS@ -LIBXML2_CONFIG = @LIBXML2_CONFIG@ -LIBXML2_CPPFLAGS = @LIBXML2_CPPFLAGS@ -LIBXML2_LDADD = @LIBXML2_LDADD@ -LIBXML2_LDFLAGS = @LIBXML2_LDFLAGS@ -LIBXML2_VERSION = @LIBXML2_VERSION@ -LIPO = @LIPO@ -LN_S = @LN_S@ -LTLIBOBJS = @LTLIBOBJS@ -LUA_CFLAGS = @LUA_CFLAGS@ -LUA_LDADD = @LUA_LDADD@ -LUA_LDFLAGS = @LUA_LDFLAGS@ -MAKEINFO = @MAKEINFO@ -MANIFEST_TOOL = @MANIFEST_TOOL@ -MKDIR_P = @MKDIR_P@ -MODSEC_APXS_EXTRA_CFLAGS = @MODSEC_APXS_EXTRA_CFLAGS@ -MODSEC_EXTRA_CFLAGS = @MODSEC_EXTRA_CFLAGS@ -MSC_BASE_DIR = @MSC_BASE_DIR@ -MSC_PKGBASE_DIR = @MSC_PKGBASE_DIR@ -MSC_REGRESSION_CONF_DIR = @MSC_REGRESSION_CONF_DIR@ -MSC_REGRESSION_DIR = @MSC_REGRESSION_DIR@ -MSC_REGRESSION_DOCROOT_DIR = @MSC_REGRESSION_DOCROOT_DIR@ -MSC_REGRESSION_LOGS_DIR = @MSC_REGRESSION_LOGS_DIR@ -MSC_REGRESSION_SERVERROOT_DIR = @MSC_REGRESSION_SERVERROOT_DIR@ -MSC_TEST_DIR = @MSC_TEST_DIR@ -NM = @NM@ -NMEDIT = @NMEDIT@ -OBJDUMP = @OBJDUMP@ -OBJEXT = @OBJEXT@ -OTOOL = @OTOOL@ -OTOOL64 = @OTOOL64@ -PACKAGE = @PACKAGE@ -PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ -PACKAGE_NAME = @PACKAGE_NAME@ -PACKAGE_STRING = @PACKAGE_STRING@ -PACKAGE_TARNAME = @PACKAGE_TARNAME@ -PACKAGE_URL = @PACKAGE_URL@ -PACKAGE_VERSION = @PACKAGE_VERSION@ -PATH_SEPARATOR = @PATH_SEPARATOR@ -PCRE_CFLAGS = @PCRE_CFLAGS@ -PCRE_CONFIG = @PCRE_CONFIG@ -PCRE_CPPFLAGS = @PCRE_CPPFLAGS@ -PCRE_LDADD = @PCRE_LDADD@ -PCRE_LDFLAGS = @PCRE_LDFLAGS@ -PCRE_LD_PATH = @PCRE_LD_PATH@ -PCRE_VERSION = @PCRE_VERSION@ -PERL = @PERL@ -PKG_CONFIG = @PKG_CONFIG@ -PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ -PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ -RANLIB = @RANLIB@ -SED = @SED@ -SET_MAKE = @SET_MAKE@ -SHELL = @SHELL@ -STRIP = @STRIP@ -TOPLEVEL_SUBDIRS = @TOPLEVEL_SUBDIRS@ -VERSION = @VERSION@ -abs_builddir = @abs_builddir@ -abs_srcdir = @abs_srcdir@ -abs_top_builddir = @abs_top_builddir@ -abs_top_srcdir = @abs_top_srcdir@ -ac_ct_AR = @ac_ct_AR@ -ac_ct_CC = @ac_ct_CC@ -ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ -am__include = @am__include@ -am__leading_dot = @am__leading_dot@ -am__quote = @am__quote@ -am__tar = @am__tar@ -am__untar = @am__untar@ -bindir = @bindir@ -build = @build@ -build_alias = @build_alias@ -build_cpu = @build_cpu@ -build_os = @build_os@ -build_vendor = @build_vendor@ -builddir = @builddir@ -datadir = @datadir@ -datarootdir = @datarootdir@ -docdir = @docdir@ -dvidir = @dvidir@ -exec_prefix = @exec_prefix@ -host = @host@ -host_alias = @host_alias@ -host_cpu = @host_cpu@ -host_os = @host_os@ -host_vendor = @host_vendor@ -htmldir = @htmldir@ -includedir = @includedir@ -infodir = @infodir@ -install_sh = @install_sh@ -libdir = @libdir@ -libexecdir = @libexecdir@ -localedir = @localedir@ -localstatedir = @localstatedir@ -mandir = @mandir@ -mkdir_p = @mkdir_p@ -oldincludedir = @oldincludedir@ -pdfdir = @pdfdir@ -prefix = @prefix@ -program_transform_name = @program_transform_name@ -psdir = @psdir@ -sbindir = @sbindir@ -sharedstatedir = @sharedstatedir@ -srcdir = @srcdir@ -sysconfdir = @sysconfdir@ -target_alias = @target_alias@ -top_build_prefix = @top_build_prefix@ -top_builddir = @top_builddir@ -top_srcdir = @top_srcdir@ -pkglib_LTLIBRARIES = standalone.la -#include_HEADERS = re.h modsecurity.h msc_logging.h msc_multipart.h \ -# msc_parsers.h msc_pcre.h msc_util.h msc_xml.h \ -# persist_dbm.h apache2.h msc_geo.h acmp.h utf8tables.h \ -# msc_lua.h msc_release.h -standalone_la_SOURCES = ../apache2/mod_security2.c \ - ../apache2/apache2_config.c ../apache2/apache2_io.c ../apache2/apache2_util.c \ - ../apache2/re.c ../apache2/re_operators.c ../apache2/re_actions.c ../apache2/re_tfns.c \ - ../apache2/re_variables.c ../apache2/msc_logging.c ../apache2/msc_xml.c \ - ../apache2/msc_multipart.c ../apache2/modsecurity.c ../apache2/msc_parsers.c \ - ../apache2/msc_util.c ../apache2/msc_pcre.c ../apache2/persist_dbm.c ../apache2/msc_reqbody.c \ - ../apache2/msc_geo.c ../apache2/msc_gsb.c ../apache2/msc_unicode.c \ - ../apache2/acmp.c ../apache2/msc_lua.c ../apache2/msc_release.c \ - ../apache2/msc_crypt.c ../apache2/msc_tree.c \ - api.c buckets.c \ - config.c filters.c \ - hooks.c \ - regex.c server.c - -standalone_la_CFLAGS = @APXS_CFLAGS@ @APR_CFLAGS@ @APU_CFLAGS@ \ - @PCRE_CFLAGS@ @LIBXML2_CFLAGS@ @LUA_CFLAGS@ @MODSEC_EXTRA_CFLAGS@ @CURL_CFLAGS@ -DVERSION_NGINX - -standalone_la_CPPFLAGS = @APR_CPPFLAGS@ @PCRE_CPPFLAGS@ @LIBXML2_CPPFLAGS@ -standalone_la_LIBADD = @APR_LDADD@ @APU_LDADD@ @PCRE_LDADD@ @LIBXML2_LDADD@ @LUA_LDADD@ -@AIX_TRUE@standalone_la_LDFLAGS = -module -avoid-version \ -@AIX_TRUE@ @APR_LDFLAGS@ @APU_LDFLAGS@ @APXS_LDFLAGS@ \ -@AIX_TRUE@ @PCRE_LDFLAGS@ @LIBXML2_LDFLAGS@ @LUA_LDFLAGS@ - -@FREEBSD_TRUE@standalone_la_LDFLAGS = -no-undefined -module -avoid-version \ -@FREEBSD_TRUE@ @APR_LDFLAGS@ @APU_LDFLAGS@ @APXS_LDFLAGS@ \ -@FREEBSD_TRUE@ @PCRE_LDFLAGS@ @LIBXML2_LDFLAGS@ @LUA_LDFLAGS@ - -@HPUX_TRUE@standalone_la_LDFLAGS = -module -avoid-version \ -@HPUX_TRUE@ @APR_LDFLAGS@ @APU_LDFLAGS@ @APXS_LDFLAGS@ \ -@HPUX_TRUE@ @PCRE_LDFLAGS@ @LIBXML2_LDFLAGS@ @LUA_LDFLAGS@ - -@LINUX_TRUE@standalone_la_LDFLAGS = -no-undefined -module -avoid-version \ -@LINUX_TRUE@ @APR_LDFLAGS@ @APU_LDFLAGS@ @APXS_LDFLAGS@ \ -@LINUX_TRUE@ @PCRE_LDFLAGS@ @LIBXML2_LDFLAGS@ @LUA_LDFLAGS@ - -@MACOSX_TRUE@standalone_la_LDFLAGS = -module -avoid-version \ -@MACOSX_TRUE@ @APR_LDFLAGS@ @APU_LDFLAGS@ @APXS_LDFLAGS@ \ -@MACOSX_TRUE@ @PCRE_LDFLAGS@ @LIBXML2_LDFLAGS@ @LUA_LDFLAGS@ - -@NETBSD_TRUE@standalone_la_LDFLAGS = -no-undefined -module -avoid-version \ -@NETBSD_TRUE@ @APR_LDFLAGS@ @APU_LDFLAGS@ @APXS_LDFLAGS@ \ -@NETBSD_TRUE@ @PCRE_LDFLAGS@ @LIBXML2_LDFLAGS@ @LUA_LDFLAGS@ - -@OPENBSD_TRUE@standalone_la_LDFLAGS = -no-undefined -module -avoid-version \ -@OPENBSD_TRUE@ @APR_LDFLAGS@ @APU_LDFLAGS@ @APXS_LDFLAGS@ \ -@OPENBSD_TRUE@ @PCRE_LDFLAGS@ @LIBXML2_LDFLAGS@ @LUA_LDFLAGS@ - -@SOLARIS_TRUE@standalone_la_LDFLAGS = -module -avoid-version \ -@SOLARIS_TRUE@ @APR_LDFLAGS@ @APU_LDFLAGS@ @APXS_LDFLAGS@ \ -@SOLARIS_TRUE@ @PCRE_LDFLAGS@ @LIBXML2_LDFLAGS@ @LUA_LDFLAGS@ - -standalone_INCS = `echo "@LIBXML2_CFLAGS@ @LUA_CFLAGS@" | sed -n 's/ *-I *\([^ ]*\) /\1 /gp'` \ - @APXS_INCLUDEDIR@ @APR_INCLUDEDIR@ @APU_INCLUDEDIR@ - -standalone_LIBS = @APR_LINKLD@ @APU_LINKLD@ @APXS_LDFLAGS@ \ - @PCRE_LDADD@ @LIBXML2_LDADD@ @LUA_LDADD@ - -all: all-am - -.SUFFIXES: -.SUFFIXES: .c .lo .o .obj -$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) - @for dep in $?; do \ - case '$(am__configure_deps)' in \ - *$$dep*) \ - ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \ - && { if test -f $@; then exit 0; else break; fi; }; \ - exit 1;; \ - esac; \ - done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign standalone/Makefile'; \ - $(am__cd) $(top_srcdir) && \ - $(AUTOMAKE) --foreign standalone/Makefile -.PRECIOUS: Makefile -Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status - @case '$?' in \ - *config.status*) \ - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ - *) \ - echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ - cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ - esac; - -$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh - -$(top_srcdir)/configure: $(am__configure_deps) - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(ACLOCAL_M4): $(am__aclocal_m4_deps) - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(am__aclocal_m4_deps): -install-pkglibLTLIBRARIES: $(pkglib_LTLIBRARIES) - @$(NORMAL_INSTALL) - @list='$(pkglib_LTLIBRARIES)'; test -n "$(pkglibdir)" || list=; \ - list2=; for p in $$list; do \ - if test -f $$p; then \ - list2="$$list2 $$p"; \ - else :; fi; \ - done; \ - test -z "$$list2" || { \ - echo " $(MKDIR_P) '$(DESTDIR)$(pkglibdir)'"; \ - $(MKDIR_P) "$(DESTDIR)$(pkglibdir)" || exit 1; \ - echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 '$(DESTDIR)$(pkglibdir)'"; \ - $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 "$(DESTDIR)$(pkglibdir)"; \ - } - -uninstall-pkglibLTLIBRARIES: - @$(NORMAL_UNINSTALL) - @list='$(pkglib_LTLIBRARIES)'; test -n "$(pkglibdir)" || list=; \ - for p in $$list; do \ - $(am__strip_dir) \ - echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(pkglibdir)/$$f'"; \ - $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(pkglibdir)/$$f"; \ - done - -clean-pkglibLTLIBRARIES: - -test -z "$(pkglib_LTLIBRARIES)" || rm -f $(pkglib_LTLIBRARIES) - @list='$(pkglib_LTLIBRARIES)'; \ - locs=`for p in $$list; do echo $$p; done | \ - sed 's|^[^/]*$$|.|; s|/[^/]*$$||; s|$$|/so_locations|' | \ - sort -u`; \ - test -z "$$locs" || { \ - echo rm -f $${locs}; \ - rm -f $${locs}; \ - } -standalone.la: $(standalone_la_OBJECTS) $(standalone_la_DEPENDENCIES) $(EXTRA_standalone_la_DEPENDENCIES) - $(standalone_la_LINK) -rpath $(pkglibdir) $(standalone_la_OBJECTS) $(standalone_la_LIBADD) $(LIBS) - -mostlyclean-compile: - -rm -f *.$(OBJEXT) - -distclean-compile: - -rm -f *.tab.c - -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/standalone_la-acmp.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/standalone_la-apache2_config.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/standalone_la-apache2_io.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/standalone_la-apache2_util.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/standalone_la-api.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/standalone_la-buckets.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/standalone_la-config.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/standalone_la-filters.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/standalone_la-hooks.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/standalone_la-mod_security2.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/standalone_la-modsecurity.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/standalone_la-msc_crypt.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/standalone_la-msc_geo.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/standalone_la-msc_gsb.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/standalone_la-msc_logging.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/standalone_la-msc_lua.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/standalone_la-msc_multipart.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/standalone_la-msc_parsers.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/standalone_la-msc_pcre.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/standalone_la-msc_release.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/standalone_la-msc_reqbody.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/standalone_la-msc_tree.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/standalone_la-msc_unicode.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/standalone_la-msc_util.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/standalone_la-msc_xml.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/standalone_la-persist_dbm.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/standalone_la-re.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/standalone_la-re_actions.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/standalone_la-re_operators.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/standalone_la-re_tfns.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/standalone_la-re_variables.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/standalone_la-regex.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/standalone_la-server.Plo@am__quote@ - -.c.o: -@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< -@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(COMPILE) -c $< - -.c.obj: -@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` -@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'` - -.c.lo: -@am__fastdepCC_TRUE@ $(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< -@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $< - -standalone_la-mod_security2.lo: ../apache2/mod_security2.c -@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(standalone_la_CPPFLAGS) $(CPPFLAGS) $(standalone_la_CFLAGS) $(CFLAGS) -MT standalone_la-mod_security2.lo -MD -MP -MF $(DEPDIR)/standalone_la-mod_security2.Tpo -c -o standalone_la-mod_security2.lo `test -f '../apache2/mod_security2.c' || echo '$(srcdir)/'`../apache2/mod_security2.c -@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/standalone_la-mod_security2.Tpo $(DEPDIR)/standalone_la-mod_security2.Plo -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='../apache2/mod_security2.c' object='standalone_la-mod_security2.lo' libtool=yes @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(standalone_la_CPPFLAGS) $(CPPFLAGS) $(standalone_la_CFLAGS) $(CFLAGS) -c -o standalone_la-mod_security2.lo `test -f '../apache2/mod_security2.c' || echo '$(srcdir)/'`../apache2/mod_security2.c - -standalone_la-apache2_config.lo: ../apache2/apache2_config.c -@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(standalone_la_CPPFLAGS) $(CPPFLAGS) $(standalone_la_CFLAGS) $(CFLAGS) -MT standalone_la-apache2_config.lo -MD -MP -MF $(DEPDIR)/standalone_la-apache2_config.Tpo -c -o standalone_la-apache2_config.lo `test -f '../apache2/apache2_config.c' || echo '$(srcdir)/'`../apache2/apache2_config.c -@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/standalone_la-apache2_config.Tpo $(DEPDIR)/standalone_la-apache2_config.Plo -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='../apache2/apache2_config.c' object='standalone_la-apache2_config.lo' libtool=yes @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(standalone_la_CPPFLAGS) $(CPPFLAGS) $(standalone_la_CFLAGS) $(CFLAGS) -c -o standalone_la-apache2_config.lo `test -f '../apache2/apache2_config.c' || echo '$(srcdir)/'`../apache2/apache2_config.c - -standalone_la-apache2_io.lo: ../apache2/apache2_io.c -@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(standalone_la_CPPFLAGS) $(CPPFLAGS) $(standalone_la_CFLAGS) $(CFLAGS) -MT standalone_la-apache2_io.lo -MD -MP -MF $(DEPDIR)/standalone_la-apache2_io.Tpo -c -o standalone_la-apache2_io.lo `test -f '../apache2/apache2_io.c' || echo '$(srcdir)/'`../apache2/apache2_io.c -@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/standalone_la-apache2_io.Tpo $(DEPDIR)/standalone_la-apache2_io.Plo -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='../apache2/apache2_io.c' object='standalone_la-apache2_io.lo' libtool=yes @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(standalone_la_CPPFLAGS) $(CPPFLAGS) $(standalone_la_CFLAGS) $(CFLAGS) -c -o standalone_la-apache2_io.lo `test -f '../apache2/apache2_io.c' || echo '$(srcdir)/'`../apache2/apache2_io.c - -standalone_la-apache2_util.lo: ../apache2/apache2_util.c -@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(standalone_la_CPPFLAGS) $(CPPFLAGS) $(standalone_la_CFLAGS) $(CFLAGS) -MT standalone_la-apache2_util.lo -MD -MP -MF $(DEPDIR)/standalone_la-apache2_util.Tpo -c -o standalone_la-apache2_util.lo `test -f '../apache2/apache2_util.c' || echo '$(srcdir)/'`../apache2/apache2_util.c -@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/standalone_la-apache2_util.Tpo $(DEPDIR)/standalone_la-apache2_util.Plo -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='../apache2/apache2_util.c' object='standalone_la-apache2_util.lo' libtool=yes @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(standalone_la_CPPFLAGS) $(CPPFLAGS) $(standalone_la_CFLAGS) $(CFLAGS) -c -o standalone_la-apache2_util.lo `test -f '../apache2/apache2_util.c' || echo '$(srcdir)/'`../apache2/apache2_util.c - -standalone_la-re.lo: ../apache2/re.c -@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(standalone_la_CPPFLAGS) $(CPPFLAGS) $(standalone_la_CFLAGS) $(CFLAGS) -MT standalone_la-re.lo -MD -MP -MF $(DEPDIR)/standalone_la-re.Tpo -c -o standalone_la-re.lo `test -f '../apache2/re.c' || echo '$(srcdir)/'`../apache2/re.c -@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/standalone_la-re.Tpo $(DEPDIR)/standalone_la-re.Plo -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='../apache2/re.c' object='standalone_la-re.lo' libtool=yes @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(standalone_la_CPPFLAGS) $(CPPFLAGS) $(standalone_la_CFLAGS) $(CFLAGS) -c -o standalone_la-re.lo `test -f '../apache2/re.c' || echo '$(srcdir)/'`../apache2/re.c - -standalone_la-re_operators.lo: ../apache2/re_operators.c -@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(standalone_la_CPPFLAGS) $(CPPFLAGS) $(standalone_la_CFLAGS) $(CFLAGS) -MT standalone_la-re_operators.lo -MD -MP -MF $(DEPDIR)/standalone_la-re_operators.Tpo -c -o standalone_la-re_operators.lo `test -f '../apache2/re_operators.c' || echo '$(srcdir)/'`../apache2/re_operators.c -@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/standalone_la-re_operators.Tpo $(DEPDIR)/standalone_la-re_operators.Plo -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='../apache2/re_operators.c' object='standalone_la-re_operators.lo' libtool=yes @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(standalone_la_CPPFLAGS) $(CPPFLAGS) $(standalone_la_CFLAGS) $(CFLAGS) -c -o standalone_la-re_operators.lo `test -f '../apache2/re_operators.c' || echo '$(srcdir)/'`../apache2/re_operators.c - -standalone_la-re_actions.lo: ../apache2/re_actions.c -@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(standalone_la_CPPFLAGS) $(CPPFLAGS) $(standalone_la_CFLAGS) $(CFLAGS) -MT standalone_la-re_actions.lo -MD -MP -MF $(DEPDIR)/standalone_la-re_actions.Tpo -c -o standalone_la-re_actions.lo `test -f '../apache2/re_actions.c' || echo '$(srcdir)/'`../apache2/re_actions.c -@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/standalone_la-re_actions.Tpo $(DEPDIR)/standalone_la-re_actions.Plo -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='../apache2/re_actions.c' object='standalone_la-re_actions.lo' libtool=yes @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(standalone_la_CPPFLAGS) $(CPPFLAGS) $(standalone_la_CFLAGS) $(CFLAGS) -c -o standalone_la-re_actions.lo `test -f '../apache2/re_actions.c' || echo '$(srcdir)/'`../apache2/re_actions.c - -standalone_la-re_tfns.lo: ../apache2/re_tfns.c -@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(standalone_la_CPPFLAGS) $(CPPFLAGS) $(standalone_la_CFLAGS) $(CFLAGS) -MT standalone_la-re_tfns.lo -MD -MP -MF $(DEPDIR)/standalone_la-re_tfns.Tpo -c -o standalone_la-re_tfns.lo `test -f '../apache2/re_tfns.c' || echo '$(srcdir)/'`../apache2/re_tfns.c -@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/standalone_la-re_tfns.Tpo $(DEPDIR)/standalone_la-re_tfns.Plo -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='../apache2/re_tfns.c' object='standalone_la-re_tfns.lo' libtool=yes @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(standalone_la_CPPFLAGS) $(CPPFLAGS) $(standalone_la_CFLAGS) $(CFLAGS) -c -o standalone_la-re_tfns.lo `test -f '../apache2/re_tfns.c' || echo '$(srcdir)/'`../apache2/re_tfns.c - -standalone_la-re_variables.lo: ../apache2/re_variables.c -@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(standalone_la_CPPFLAGS) $(CPPFLAGS) $(standalone_la_CFLAGS) $(CFLAGS) -MT standalone_la-re_variables.lo -MD -MP -MF $(DEPDIR)/standalone_la-re_variables.Tpo -c -o standalone_la-re_variables.lo `test -f '../apache2/re_variables.c' || echo '$(srcdir)/'`../apache2/re_variables.c -@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/standalone_la-re_variables.Tpo $(DEPDIR)/standalone_la-re_variables.Plo -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='../apache2/re_variables.c' object='standalone_la-re_variables.lo' libtool=yes @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(standalone_la_CPPFLAGS) $(CPPFLAGS) $(standalone_la_CFLAGS) $(CFLAGS) -c -o standalone_la-re_variables.lo `test -f '../apache2/re_variables.c' || echo '$(srcdir)/'`../apache2/re_variables.c - -standalone_la-msc_logging.lo: ../apache2/msc_logging.c -@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(standalone_la_CPPFLAGS) $(CPPFLAGS) $(standalone_la_CFLAGS) $(CFLAGS) -MT standalone_la-msc_logging.lo -MD -MP -MF $(DEPDIR)/standalone_la-msc_logging.Tpo -c -o standalone_la-msc_logging.lo `test -f '../apache2/msc_logging.c' || echo '$(srcdir)/'`../apache2/msc_logging.c -@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/standalone_la-msc_logging.Tpo $(DEPDIR)/standalone_la-msc_logging.Plo -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='../apache2/msc_logging.c' object='standalone_la-msc_logging.lo' libtool=yes @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(standalone_la_CPPFLAGS) $(CPPFLAGS) $(standalone_la_CFLAGS) $(CFLAGS) -c -o standalone_la-msc_logging.lo `test -f '../apache2/msc_logging.c' || echo '$(srcdir)/'`../apache2/msc_logging.c - -standalone_la-msc_xml.lo: ../apache2/msc_xml.c -@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(standalone_la_CPPFLAGS) $(CPPFLAGS) $(standalone_la_CFLAGS) $(CFLAGS) -MT standalone_la-msc_xml.lo -MD -MP -MF $(DEPDIR)/standalone_la-msc_xml.Tpo -c -o standalone_la-msc_xml.lo `test -f '../apache2/msc_xml.c' || echo '$(srcdir)/'`../apache2/msc_xml.c -@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/standalone_la-msc_xml.Tpo $(DEPDIR)/standalone_la-msc_xml.Plo -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='../apache2/msc_xml.c' object='standalone_la-msc_xml.lo' libtool=yes @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(standalone_la_CPPFLAGS) $(CPPFLAGS) $(standalone_la_CFLAGS) $(CFLAGS) -c -o standalone_la-msc_xml.lo `test -f '../apache2/msc_xml.c' || echo '$(srcdir)/'`../apache2/msc_xml.c - -standalone_la-msc_multipart.lo: ../apache2/msc_multipart.c -@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(standalone_la_CPPFLAGS) $(CPPFLAGS) $(standalone_la_CFLAGS) $(CFLAGS) -MT standalone_la-msc_multipart.lo -MD -MP -MF $(DEPDIR)/standalone_la-msc_multipart.Tpo -c -o standalone_la-msc_multipart.lo `test -f '../apache2/msc_multipart.c' || echo '$(srcdir)/'`../apache2/msc_multipart.c -@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/standalone_la-msc_multipart.Tpo $(DEPDIR)/standalone_la-msc_multipart.Plo -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='../apache2/msc_multipart.c' object='standalone_la-msc_multipart.lo' libtool=yes @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(standalone_la_CPPFLAGS) $(CPPFLAGS) $(standalone_la_CFLAGS) $(CFLAGS) -c -o standalone_la-msc_multipart.lo `test -f '../apache2/msc_multipart.c' || echo '$(srcdir)/'`../apache2/msc_multipart.c - -standalone_la-modsecurity.lo: ../apache2/modsecurity.c -@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(standalone_la_CPPFLAGS) $(CPPFLAGS) $(standalone_la_CFLAGS) $(CFLAGS) -MT standalone_la-modsecurity.lo -MD -MP -MF $(DEPDIR)/standalone_la-modsecurity.Tpo -c -o standalone_la-modsecurity.lo `test -f '../apache2/modsecurity.c' || echo '$(srcdir)/'`../apache2/modsecurity.c -@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/standalone_la-modsecurity.Tpo $(DEPDIR)/standalone_la-modsecurity.Plo -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='../apache2/modsecurity.c' object='standalone_la-modsecurity.lo' libtool=yes @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(standalone_la_CPPFLAGS) $(CPPFLAGS) $(standalone_la_CFLAGS) $(CFLAGS) -c -o standalone_la-modsecurity.lo `test -f '../apache2/modsecurity.c' || echo '$(srcdir)/'`../apache2/modsecurity.c - -standalone_la-msc_parsers.lo: ../apache2/msc_parsers.c -@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(standalone_la_CPPFLAGS) $(CPPFLAGS) $(standalone_la_CFLAGS) $(CFLAGS) -MT standalone_la-msc_parsers.lo -MD -MP -MF $(DEPDIR)/standalone_la-msc_parsers.Tpo -c -o standalone_la-msc_parsers.lo `test -f '../apache2/msc_parsers.c' || echo '$(srcdir)/'`../apache2/msc_parsers.c -@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/standalone_la-msc_parsers.Tpo $(DEPDIR)/standalone_la-msc_parsers.Plo -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='../apache2/msc_parsers.c' object='standalone_la-msc_parsers.lo' libtool=yes @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(standalone_la_CPPFLAGS) $(CPPFLAGS) $(standalone_la_CFLAGS) $(CFLAGS) -c -o standalone_la-msc_parsers.lo `test -f '../apache2/msc_parsers.c' || echo '$(srcdir)/'`../apache2/msc_parsers.c - -standalone_la-msc_util.lo: ../apache2/msc_util.c -@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(standalone_la_CPPFLAGS) $(CPPFLAGS) $(standalone_la_CFLAGS) $(CFLAGS) -MT standalone_la-msc_util.lo -MD -MP -MF $(DEPDIR)/standalone_la-msc_util.Tpo -c -o standalone_la-msc_util.lo `test -f '../apache2/msc_util.c' || echo '$(srcdir)/'`../apache2/msc_util.c -@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/standalone_la-msc_util.Tpo $(DEPDIR)/standalone_la-msc_util.Plo -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='../apache2/msc_util.c' object='standalone_la-msc_util.lo' libtool=yes @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(standalone_la_CPPFLAGS) $(CPPFLAGS) $(standalone_la_CFLAGS) $(CFLAGS) -c -o standalone_la-msc_util.lo `test -f '../apache2/msc_util.c' || echo '$(srcdir)/'`../apache2/msc_util.c - -standalone_la-msc_pcre.lo: ../apache2/msc_pcre.c -@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(standalone_la_CPPFLAGS) $(CPPFLAGS) $(standalone_la_CFLAGS) $(CFLAGS) -MT standalone_la-msc_pcre.lo -MD -MP -MF $(DEPDIR)/standalone_la-msc_pcre.Tpo -c -o standalone_la-msc_pcre.lo `test -f '../apache2/msc_pcre.c' || echo '$(srcdir)/'`../apache2/msc_pcre.c -@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/standalone_la-msc_pcre.Tpo $(DEPDIR)/standalone_la-msc_pcre.Plo -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='../apache2/msc_pcre.c' object='standalone_la-msc_pcre.lo' libtool=yes @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(standalone_la_CPPFLAGS) $(CPPFLAGS) $(standalone_la_CFLAGS) $(CFLAGS) -c -o standalone_la-msc_pcre.lo `test -f '../apache2/msc_pcre.c' || echo '$(srcdir)/'`../apache2/msc_pcre.c - -standalone_la-persist_dbm.lo: ../apache2/persist_dbm.c -@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(standalone_la_CPPFLAGS) $(CPPFLAGS) $(standalone_la_CFLAGS) $(CFLAGS) -MT standalone_la-persist_dbm.lo -MD -MP -MF $(DEPDIR)/standalone_la-persist_dbm.Tpo -c -o standalone_la-persist_dbm.lo `test -f '../apache2/persist_dbm.c' || echo '$(srcdir)/'`../apache2/persist_dbm.c -@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/standalone_la-persist_dbm.Tpo $(DEPDIR)/standalone_la-persist_dbm.Plo -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='../apache2/persist_dbm.c' object='standalone_la-persist_dbm.lo' libtool=yes @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(standalone_la_CPPFLAGS) $(CPPFLAGS) $(standalone_la_CFLAGS) $(CFLAGS) -c -o standalone_la-persist_dbm.lo `test -f '../apache2/persist_dbm.c' || echo '$(srcdir)/'`../apache2/persist_dbm.c - -standalone_la-msc_reqbody.lo: ../apache2/msc_reqbody.c -@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(standalone_la_CPPFLAGS) $(CPPFLAGS) $(standalone_la_CFLAGS) $(CFLAGS) -MT standalone_la-msc_reqbody.lo -MD -MP -MF $(DEPDIR)/standalone_la-msc_reqbody.Tpo -c -o standalone_la-msc_reqbody.lo `test -f '../apache2/msc_reqbody.c' || echo '$(srcdir)/'`../apache2/msc_reqbody.c -@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/standalone_la-msc_reqbody.Tpo $(DEPDIR)/standalone_la-msc_reqbody.Plo -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='../apache2/msc_reqbody.c' object='standalone_la-msc_reqbody.lo' libtool=yes @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(standalone_la_CPPFLAGS) $(CPPFLAGS) $(standalone_la_CFLAGS) $(CFLAGS) -c -o standalone_la-msc_reqbody.lo `test -f '../apache2/msc_reqbody.c' || echo '$(srcdir)/'`../apache2/msc_reqbody.c - -standalone_la-msc_geo.lo: ../apache2/msc_geo.c -@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(standalone_la_CPPFLAGS) $(CPPFLAGS) $(standalone_la_CFLAGS) $(CFLAGS) -MT standalone_la-msc_geo.lo -MD -MP -MF $(DEPDIR)/standalone_la-msc_geo.Tpo -c -o standalone_la-msc_geo.lo `test -f '../apache2/msc_geo.c' || echo '$(srcdir)/'`../apache2/msc_geo.c -@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/standalone_la-msc_geo.Tpo $(DEPDIR)/standalone_la-msc_geo.Plo -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='../apache2/msc_geo.c' object='standalone_la-msc_geo.lo' libtool=yes @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(standalone_la_CPPFLAGS) $(CPPFLAGS) $(standalone_la_CFLAGS) $(CFLAGS) -c -o standalone_la-msc_geo.lo `test -f '../apache2/msc_geo.c' || echo '$(srcdir)/'`../apache2/msc_geo.c - -standalone_la-msc_gsb.lo: ../apache2/msc_gsb.c -@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(standalone_la_CPPFLAGS) $(CPPFLAGS) $(standalone_la_CFLAGS) $(CFLAGS) -MT standalone_la-msc_gsb.lo -MD -MP -MF $(DEPDIR)/standalone_la-msc_gsb.Tpo -c -o standalone_la-msc_gsb.lo `test -f '../apache2/msc_gsb.c' || echo '$(srcdir)/'`../apache2/msc_gsb.c -@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/standalone_la-msc_gsb.Tpo $(DEPDIR)/standalone_la-msc_gsb.Plo -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='../apache2/msc_gsb.c' object='standalone_la-msc_gsb.lo' libtool=yes @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(standalone_la_CPPFLAGS) $(CPPFLAGS) $(standalone_la_CFLAGS) $(CFLAGS) -c -o standalone_la-msc_gsb.lo `test -f '../apache2/msc_gsb.c' || echo '$(srcdir)/'`../apache2/msc_gsb.c - -standalone_la-msc_unicode.lo: ../apache2/msc_unicode.c -@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(standalone_la_CPPFLAGS) $(CPPFLAGS) $(standalone_la_CFLAGS) $(CFLAGS) -MT standalone_la-msc_unicode.lo -MD -MP -MF $(DEPDIR)/standalone_la-msc_unicode.Tpo -c -o standalone_la-msc_unicode.lo `test -f '../apache2/msc_unicode.c' || echo '$(srcdir)/'`../apache2/msc_unicode.c -@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/standalone_la-msc_unicode.Tpo $(DEPDIR)/standalone_la-msc_unicode.Plo -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='../apache2/msc_unicode.c' object='standalone_la-msc_unicode.lo' libtool=yes @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(standalone_la_CPPFLAGS) $(CPPFLAGS) $(standalone_la_CFLAGS) $(CFLAGS) -c -o standalone_la-msc_unicode.lo `test -f '../apache2/msc_unicode.c' || echo '$(srcdir)/'`../apache2/msc_unicode.c - -standalone_la-acmp.lo: ../apache2/acmp.c -@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(standalone_la_CPPFLAGS) $(CPPFLAGS) $(standalone_la_CFLAGS) $(CFLAGS) -MT standalone_la-acmp.lo -MD -MP -MF $(DEPDIR)/standalone_la-acmp.Tpo -c -o standalone_la-acmp.lo `test -f '../apache2/acmp.c' || echo '$(srcdir)/'`../apache2/acmp.c -@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/standalone_la-acmp.Tpo $(DEPDIR)/standalone_la-acmp.Plo -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='../apache2/acmp.c' object='standalone_la-acmp.lo' libtool=yes @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(standalone_la_CPPFLAGS) $(CPPFLAGS) $(standalone_la_CFLAGS) $(CFLAGS) -c -o standalone_la-acmp.lo `test -f '../apache2/acmp.c' || echo '$(srcdir)/'`../apache2/acmp.c - -standalone_la-msc_lua.lo: ../apache2/msc_lua.c -@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(standalone_la_CPPFLAGS) $(CPPFLAGS) $(standalone_la_CFLAGS) $(CFLAGS) -MT standalone_la-msc_lua.lo -MD -MP -MF $(DEPDIR)/standalone_la-msc_lua.Tpo -c -o standalone_la-msc_lua.lo `test -f '../apache2/msc_lua.c' || echo '$(srcdir)/'`../apache2/msc_lua.c -@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/standalone_la-msc_lua.Tpo $(DEPDIR)/standalone_la-msc_lua.Plo -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='../apache2/msc_lua.c' object='standalone_la-msc_lua.lo' libtool=yes @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(standalone_la_CPPFLAGS) $(CPPFLAGS) $(standalone_la_CFLAGS) $(CFLAGS) -c -o standalone_la-msc_lua.lo `test -f '../apache2/msc_lua.c' || echo '$(srcdir)/'`../apache2/msc_lua.c - -standalone_la-msc_release.lo: ../apache2/msc_release.c -@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(standalone_la_CPPFLAGS) $(CPPFLAGS) $(standalone_la_CFLAGS) $(CFLAGS) -MT standalone_la-msc_release.lo -MD -MP -MF $(DEPDIR)/standalone_la-msc_release.Tpo -c -o standalone_la-msc_release.lo `test -f '../apache2/msc_release.c' || echo '$(srcdir)/'`../apache2/msc_release.c -@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/standalone_la-msc_release.Tpo $(DEPDIR)/standalone_la-msc_release.Plo -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='../apache2/msc_release.c' object='standalone_la-msc_release.lo' libtool=yes @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(standalone_la_CPPFLAGS) $(CPPFLAGS) $(standalone_la_CFLAGS) $(CFLAGS) -c -o standalone_la-msc_release.lo `test -f '../apache2/msc_release.c' || echo '$(srcdir)/'`../apache2/msc_release.c - -standalone_la-msc_crypt.lo: ../apache2/msc_crypt.c -@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(standalone_la_CPPFLAGS) $(CPPFLAGS) $(standalone_la_CFLAGS) $(CFLAGS) -MT standalone_la-msc_crypt.lo -MD -MP -MF $(DEPDIR)/standalone_la-msc_crypt.Tpo -c -o standalone_la-msc_crypt.lo `test -f '../apache2/msc_crypt.c' || echo '$(srcdir)/'`../apache2/msc_crypt.c -@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/standalone_la-msc_crypt.Tpo $(DEPDIR)/standalone_la-msc_crypt.Plo -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='../apache2/msc_crypt.c' object='standalone_la-msc_crypt.lo' libtool=yes @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(standalone_la_CPPFLAGS) $(CPPFLAGS) $(standalone_la_CFLAGS) $(CFLAGS) -c -o standalone_la-msc_crypt.lo `test -f '../apache2/msc_crypt.c' || echo '$(srcdir)/'`../apache2/msc_crypt.c - -standalone_la-msc_tree.lo: ../apache2/msc_tree.c -@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(standalone_la_CPPFLAGS) $(CPPFLAGS) $(standalone_la_CFLAGS) $(CFLAGS) -MT standalone_la-msc_tree.lo -MD -MP -MF $(DEPDIR)/standalone_la-msc_tree.Tpo -c -o standalone_la-msc_tree.lo `test -f '../apache2/msc_tree.c' || echo '$(srcdir)/'`../apache2/msc_tree.c -@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/standalone_la-msc_tree.Tpo $(DEPDIR)/standalone_la-msc_tree.Plo -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='../apache2/msc_tree.c' object='standalone_la-msc_tree.lo' libtool=yes @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(standalone_la_CPPFLAGS) $(CPPFLAGS) $(standalone_la_CFLAGS) $(CFLAGS) -c -o standalone_la-msc_tree.lo `test -f '../apache2/msc_tree.c' || echo '$(srcdir)/'`../apache2/msc_tree.c - -standalone_la-api.lo: api.c -@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(standalone_la_CPPFLAGS) $(CPPFLAGS) $(standalone_la_CFLAGS) $(CFLAGS) -MT standalone_la-api.lo -MD -MP -MF $(DEPDIR)/standalone_la-api.Tpo -c -o standalone_la-api.lo `test -f 'api.c' || echo '$(srcdir)/'`api.c -@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/standalone_la-api.Tpo $(DEPDIR)/standalone_la-api.Plo -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='api.c' object='standalone_la-api.lo' libtool=yes @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(standalone_la_CPPFLAGS) $(CPPFLAGS) $(standalone_la_CFLAGS) $(CFLAGS) -c -o standalone_la-api.lo `test -f 'api.c' || echo '$(srcdir)/'`api.c - -standalone_la-buckets.lo: buckets.c -@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(standalone_la_CPPFLAGS) $(CPPFLAGS) $(standalone_la_CFLAGS) $(CFLAGS) -MT standalone_la-buckets.lo -MD -MP -MF $(DEPDIR)/standalone_la-buckets.Tpo -c -o standalone_la-buckets.lo `test -f 'buckets.c' || echo '$(srcdir)/'`buckets.c -@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/standalone_la-buckets.Tpo $(DEPDIR)/standalone_la-buckets.Plo -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='buckets.c' object='standalone_la-buckets.lo' libtool=yes @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(standalone_la_CPPFLAGS) $(CPPFLAGS) $(standalone_la_CFLAGS) $(CFLAGS) -c -o standalone_la-buckets.lo `test -f 'buckets.c' || echo '$(srcdir)/'`buckets.c - -standalone_la-config.lo: config.c -@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(standalone_la_CPPFLAGS) $(CPPFLAGS) $(standalone_la_CFLAGS) $(CFLAGS) -MT standalone_la-config.lo -MD -MP -MF $(DEPDIR)/standalone_la-config.Tpo -c -o standalone_la-config.lo `test -f 'config.c' || echo '$(srcdir)/'`config.c -@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/standalone_la-config.Tpo $(DEPDIR)/standalone_la-config.Plo -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='config.c' object='standalone_la-config.lo' libtool=yes @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(standalone_la_CPPFLAGS) $(CPPFLAGS) $(standalone_la_CFLAGS) $(CFLAGS) -c -o standalone_la-config.lo `test -f 'config.c' || echo '$(srcdir)/'`config.c - -standalone_la-filters.lo: filters.c -@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(standalone_la_CPPFLAGS) $(CPPFLAGS) $(standalone_la_CFLAGS) $(CFLAGS) -MT standalone_la-filters.lo -MD -MP -MF $(DEPDIR)/standalone_la-filters.Tpo -c -o standalone_la-filters.lo `test -f 'filters.c' || echo '$(srcdir)/'`filters.c -@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/standalone_la-filters.Tpo $(DEPDIR)/standalone_la-filters.Plo -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='filters.c' object='standalone_la-filters.lo' libtool=yes @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(standalone_la_CPPFLAGS) $(CPPFLAGS) $(standalone_la_CFLAGS) $(CFLAGS) -c -o standalone_la-filters.lo `test -f 'filters.c' || echo '$(srcdir)/'`filters.c - -standalone_la-hooks.lo: hooks.c -@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(standalone_la_CPPFLAGS) $(CPPFLAGS) $(standalone_la_CFLAGS) $(CFLAGS) -MT standalone_la-hooks.lo -MD -MP -MF $(DEPDIR)/standalone_la-hooks.Tpo -c -o standalone_la-hooks.lo `test -f 'hooks.c' || echo '$(srcdir)/'`hooks.c -@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/standalone_la-hooks.Tpo $(DEPDIR)/standalone_la-hooks.Plo -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='hooks.c' object='standalone_la-hooks.lo' libtool=yes @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(standalone_la_CPPFLAGS) $(CPPFLAGS) $(standalone_la_CFLAGS) $(CFLAGS) -c -o standalone_la-hooks.lo `test -f 'hooks.c' || echo '$(srcdir)/'`hooks.c - -standalone_la-regex.lo: regex.c -@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(standalone_la_CPPFLAGS) $(CPPFLAGS) $(standalone_la_CFLAGS) $(CFLAGS) -MT standalone_la-regex.lo -MD -MP -MF $(DEPDIR)/standalone_la-regex.Tpo -c -o standalone_la-regex.lo `test -f 'regex.c' || echo '$(srcdir)/'`regex.c -@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/standalone_la-regex.Tpo $(DEPDIR)/standalone_la-regex.Plo -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='regex.c' object='standalone_la-regex.lo' libtool=yes @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(standalone_la_CPPFLAGS) $(CPPFLAGS) $(standalone_la_CFLAGS) $(CFLAGS) -c -o standalone_la-regex.lo `test -f 'regex.c' || echo '$(srcdir)/'`regex.c - -standalone_la-server.lo: server.c -@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(standalone_la_CPPFLAGS) $(CPPFLAGS) $(standalone_la_CFLAGS) $(CFLAGS) -MT standalone_la-server.lo -MD -MP -MF $(DEPDIR)/standalone_la-server.Tpo -c -o standalone_la-server.lo `test -f 'server.c' || echo '$(srcdir)/'`server.c -@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/standalone_la-server.Tpo $(DEPDIR)/standalone_la-server.Plo -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='server.c' object='standalone_la-server.lo' libtool=yes @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(standalone_la_CPPFLAGS) $(CPPFLAGS) $(standalone_la_CFLAGS) $(CFLAGS) -c -o standalone_la-server.lo `test -f 'server.c' || echo '$(srcdir)/'`server.c - -mostlyclean-libtool: - -rm -f *.lo - -clean-libtool: - -rm -rf .libs _libs - -ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ - mkid -fID $$unique -tags: TAGS - -TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) - set x; \ - here=`pwd`; \ - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ - shift; \ - if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ - test -n "$$unique" || unique=$$empty_fix; \ - if test $$# -gt 0; then \ - $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ - "$$@" $$unique; \ - else \ - $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ - $$unique; \ - fi; \ - fi -ctags: CTAGS -CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ - test -z "$(CTAGS_ARGS)$$unique" \ - || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ - $$unique - -GTAGS: - here=`$(am__cd) $(top_builddir) && pwd` \ - && $(am__cd) $(top_srcdir) \ - && gtags -i $(GTAGS_ARGS) "$$here" - -cscopelist: $(HEADERS) $(SOURCES) $(LISP) - list='$(SOURCES) $(HEADERS) $(LISP)'; \ - case "$(srcdir)" in \ - [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \ - *) sdir=$(subdir)/$(srcdir) ;; \ - esac; \ - for i in $$list; do \ - if test -f "$$i"; then \ - echo "$(subdir)/$$i"; \ - else \ - echo "$$sdir/$$i"; \ - fi; \ - done >> $(top_builddir)/cscope.files - -distclean-tags: - -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags - -distdir: $(DISTFILES) - @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ - topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ - list='$(DISTFILES)'; \ - dist_files=`for file in $$list; do echo $$file; done | \ - sed -e "s|^$$srcdirstrip/||;t" \ - -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \ - case $$dist_files in \ - */*) $(MKDIR_P) `echo "$$dist_files" | \ - sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \ - sort -u` ;; \ - esac; \ - for file in $$dist_files; do \ - if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ - if test -d $$d/$$file; then \ - dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ - if test -d "$(distdir)/$$file"; then \ - find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ - fi; \ - if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ - cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \ - find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ - fi; \ - cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \ - else \ - test -f "$(distdir)/$$file" \ - || cp -p $$d/$$file "$(distdir)/$$file" \ - || exit 1; \ - fi; \ - done -check-am: all-am -check: check-am -all-am: Makefile $(LTLIBRARIES) -installdirs: - for dir in "$(DESTDIR)$(pkglibdir)"; do \ - test -z "$$dir" || $(MKDIR_P) "$$dir"; \ - done -install: install-am -install-exec: install-exec-am -install-data: install-data-am -uninstall: uninstall-am - -install-am: all-am - @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am - -installcheck: installcheck-am -install-strip: - if test -z '$(STRIP)'; then \ - $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ - install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ - install; \ - else \ - $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ - install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ - "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \ - fi -mostlyclean-generic: - -clean-generic: - -distclean-generic: - -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) - -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES) - -maintainer-clean-generic: - @echo "This command is intended for maintainers to use" - @echo "it deletes files that may require special tools to rebuild." -clean: clean-am - -clean-am: clean-generic clean-libtool clean-pkglibLTLIBRARIES \ - mostlyclean-am - -distclean: distclean-am - -rm -rf ./$(DEPDIR) - -rm -f Makefile -distclean-am: clean-am distclean-compile distclean-generic \ - distclean-tags - -dvi: dvi-am - -dvi-am: - -html: html-am - -html-am: - -info: info-am - -info-am: - -install-data-am: - -install-dvi: install-dvi-am - -install-dvi-am: - -install-exec-am: install-pkglibLTLIBRARIES - @$(NORMAL_INSTALL) - $(MAKE) $(AM_MAKEFLAGS) install-exec-hook -install-html: install-html-am - -install-html-am: - -install-info: install-info-am - -install-info-am: - -install-man: - -install-pdf: install-pdf-am - -install-pdf-am: - -install-ps: install-ps-am - -install-ps-am: - -installcheck-am: - -maintainer-clean: maintainer-clean-am - -rm -rf ./$(DEPDIR) - -rm -f Makefile -maintainer-clean-am: distclean-am maintainer-clean-generic - -mostlyclean: mostlyclean-am - -mostlyclean-am: mostlyclean-compile mostlyclean-generic \ - mostlyclean-libtool - -pdf: pdf-am - -pdf-am: - -ps: ps-am - -ps-am: - -uninstall-am: uninstall-pkglibLTLIBRARIES - -.MAKE: install-am install-exec-am install-strip - -.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \ - clean-libtool clean-pkglibLTLIBRARIES cscopelist ctags \ - distclean distclean-compile distclean-generic \ - distclean-libtool distclean-tags distdir dvi dvi-am html \ - html-am info info-am install install-am install-data \ - install-data-am install-dvi install-dvi-am install-exec \ - install-exec-am install-exec-hook install-html install-html-am \ - install-info install-info-am install-man install-pdf \ - install-pdf-am install-pkglibLTLIBRARIES install-ps \ - install-ps-am install-strip installcheck installcheck-am \ - installdirs maintainer-clean maintainer-clean-generic \ - mostlyclean mostlyclean-compile mostlyclean-generic \ - mostlyclean-libtool pdf pdf-am ps ps-am tags uninstall \ - uninstall-am uninstall-pkglibLTLIBRARIES - -install-exec-hook: $(pkglib_LTLIBRARIES) - @echo "Creating Nginx config file..."; \ - rm -f ../nginx/modsecurity/config; \ - echo "ngx_addon_name=ngx_http_modsecurity" >> ../nginx/modsecurity/config; \ - echo "CORE_MODULES=\"\$$CORE_MODULES ngx_pool_context_module\"" >> ../nginx/modsecurity/config; \ - echo "HTTP_AUX_FILTER_MODULES=\"ngx_http_modsecurity \$$HTTP_AUX_FILTER_MODULES\"" >> ../nginx/modsecurity/config; \ - echo "NGX_ADDON_SRCS=\"\$$NGX_ADDON_SRCS \$$ngx_addon_dir/ngx_http_modsecurity.c \$$ngx_addon_dir/apr_bucket_nginx.c \$$ngx_addon_dir/ngx_pool_context.c\"" >> ../nginx/modsecurity/config;\ - echo "NGX_ADDON_DEPS=\"\$$NGX_ADDON_DEPS \$$ngx_addon_dir/apr_bucket_nginx.h \$$ngx_addon_dir/ngx_pool_context.h \$$ngx_addon_dir/ngx_http_modsecurity.c \$$ngx_addon_dir/apr_bucket_nginx.c \$$ngx_addon_dir/ngx_pool_context.c \"" >> ../nginx/modsecurity/config; \ - echo "CORE_LIBS=\"\$$CORE_LIBS \$$ngx_addon_dir/../../standalone/.libs/standalone.a $(standalone_LIBS) \"" >> ../nginx/modsecurity/config; \ - echo "CORE_INCS=\"\$$CORE_INCS \$$ngx_addon_dir \$$ngx_addon_dir/../../standalone \$$ngx_addon_dir/../../apache2 $(standalone_INCS)\"" >> ../nginx/modsecurity/config; \ - echo "Removing unused static libraries..."; \ - for m in $(pkglib_LTLIBRARIES); do \ - base=`echo $$m | sed 's/\..*//'`; \ - rm -f $(DESTDIR)$(pkglibdir)/$$base.*a; \ - cp -p $(DESTDIR)$(pkglibdir)/$$base.so $(APXS_MODULES); \ - done - -# Tell versions [3.59,3.63) of GNU make to not export all variables. -# Otherwise a system limit (for SysV at least) may be exceeded. -.NOEXPORT: diff --git a/tests/Makefile.am b/tests/Makefile.am index 6790dc4b..101a4882 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -1,37 +1,56 @@ check_PROGRAMS = msc_test msc_test_SOURCES = msc_test.c \ - $(top_srcdir)/apache2/re.c \ - $(top_srcdir)/apache2/re_operators.c \ - $(top_srcdir)/apache2/re_actions.c \ - $(top_srcdir)/apache2/re_tfns.c \ - $(top_srcdir)/apache2/re_variables.c \ - $(top_srcdir)/apache2/msc_logging.c \ - $(top_srcdir)/apache2/msc_xml.c \ - $(top_srcdir)/apache2/msc_multipart.c \ - $(top_srcdir)/apache2/modsecurity.c \ - $(top_srcdir)/apache2/msc_parsers.c \ - $(top_srcdir)/apache2/msc_util.c \ - $(top_srcdir)/apache2/msc_pcre.c \ - $(top_srcdir)/apache2/msc_unicode.c \ - $(top_srcdir)/apache2/persist_dbm.c \ - $(top_srcdir)/apache2/msc_reqbody.c \ - $(top_srcdir)/apache2/msc_crypt.c \ - $(top_srcdir)/apache2/msc_tree.c \ - $(top_srcdir)/apache2/msc_geo.c \ - $(top_srcdir)/apache2/msc_gsb.c \ - $(top_srcdir)/apache2/acmp.c \ - $(top_srcdir)/apache2/msc_lua.c \ - $(top_srcdir)/apache2/msc_release.c \ - $(top_srcdir)/apache2/libinjection/libinjection_sqli.c -msc_test_CFLAGS = @APXS_CFLAGS@ @APR_CFLAGS@ @APU_CFLAGS@ \ - @PCRE_CFLAGS@ @LIBXML2_CFLAGS@ @MODSEC_EXTRA_CFLAGS@ @LUA_CFLAGS@ + $(top_srcdir)/apache2/acmp.c \ + $(top_srcdir)/apache2/libinjection/libinjection_sqli.c \ + $(top_srcdir)/apache2/modsecurity.c \ + $(top_srcdir)/apache2/msc_crypt.c \ + $(top_srcdir)/apache2/msc_geo.c \ + $(top_srcdir)/apache2/msc_gsb.c \ + $(top_srcdir)/apache2/msc_logging.c \ + $(top_srcdir)/apache2/msc_lua.c \ + $(top_srcdir)/apache2/msc_multipart.c \ + $(top_srcdir)/apache2/msc_parsers.c \ + $(top_srcdir)/apache2/msc_pcre.c \ + $(top_srcdir)/apache2/msc_release.c \ + $(top_srcdir)/apache2/msc_reqbody.c \ + $(top_srcdir)/apache2/msc_tree.c \ + $(top_srcdir)/apache2/msc_unicode.c \ + $(top_srcdir)/apache2/msc_util.c \ + $(top_srcdir)/apache2/msc_xml.c \ + $(top_srcdir)/apache2/persist_dbm.c \ + $(top_srcdir)/apache2/re_actions.c \ + $(top_srcdir)/apache2/re.c \ + $(top_srcdir)/apache2/re_operators.c \ + $(top_srcdir)/apache2/re_tfns.c \ + $(top_srcdir)/apache2/re_variables.c \ + $(top_srcdir)/standalone/regex.c \ + $(top_srcdir)/standalone/server.c + +msc_test_CFLAGS = @APR_CFLAGS@ \ + @APU_CFLAGS@ \ + @APXS_CFLAGS@ \ + @LIBXML2_CFLAGS@ \ + @LUA_CFLAGS@ \ + @MODSEC_EXTRA_CFLAGS@ \ + @PCRE_CFLAGS@ + msc_test_CPPFLAGS = -I$(top_srcdir)/apache2 \ - @APR_CPPFLAGS@ @LIBXML2_CPPFLAGS@ \ - @PCRE_CPPFLAGS@ -msc_test_LDADD = @APR_LDADD@ @APU_LDADD@ \ - @PCRE_LDADD@ @LIBXML2_LDADD@ @LUA_LDADD@ -msc_test_LDFLAGS = @APR_LDFLAGS@ @APU_LDFLAGS@ @APXS_LDFLAGS@ \ - @PCRE_LDFLAGS@ @LIBXML2_LDFLAGS@ @LUA_LDFLAGS@ + @APR_CPPFLAGS@ \ + @LIBXML2_CPPFLAGS@ \ + @PCRE_CPPFLAGS@ + +msc_test_LDADD = @APR_LDADD@ \ + @APU_LDADD@ \ + @LIBXML2_LDADD@ \ + @LUA_LDADD@ \ + @PCRE_LDADD@ + +msc_test_LDFLAGS = @APR_LDFLAGS@ \ + @APU_LDFLAGS@ \ + @APXS_LDFLAGS@ \ + @LIBXML2_LDFLAGS@ \ + @LUA_LDFLAGS@ \ + @PCRE_LDFLAGS@ check_SCRIPTS = run-unit-tests.pl TESTS = $(check_SCRIPTS) diff --git a/tests/msc_test.c b/tests/msc_test.c index 4085a17e..db5d8865 100644 --- a/tests/msc_test.c +++ b/tests/msc_test.c @@ -178,7 +178,8 @@ void msr_log_warn(modsec_rec *msr, const char *text, ...) { va_end(ap); } -const char *ap_get_remote_host(conn_rec *conn, void *dir_config, int type, int *str_is_ip) { +#define ap_get_remote_host(a, b, c, d) test_ap_get_remote_host(a, b, c, d) +const char *test_ap_get_remote_host(conn_rec *conn, void *dir_config, int type, int *str_is_ip) { return "FAKE-REMOTE-HOST"; } @@ -186,11 +187,13 @@ char *get_env_var(request_rec *r, char *name) { return "FAKE-ENV-VAR"; } -apr_status_t unixd_set_global_mutex_perms(apr_global_mutex_t *gmutex) { +#define unixd_set_global_mutex_perms(a) my_unixd_set_global_mutex_perms(a) +apr_status_t my_unixd_set_global_mutex_perms(apr_global_mutex_t *gmutex) { return APR_SUCCESS; } -apr_status_t unixd_set_proc_mutex_perms(apr_proc_mutex_t *pmutex) { +#define unixd_set_proc_mutex_perms(a) my_unixd_set_proc_mutex_perms(a) +apr_status_t my_unixd_set_proc_mutex_perms(apr_proc_mutex_t *pmutex) { return APR_SUCCESS; } diff --git a/tests/regression/rule/10-xml.t b/tests/regression/rule/10-xml.t index edfa5684..2671b58b 100644 --- a/tests/regression/rule/10-xml.t +++ b/tests/regression/rule/10-xml.t @@ -10,11 +10,11 @@ SecRequestBodyAccess On SecDebugLog $ENV{DEBUG_LOG} SecDebugLogLevel 9 - SecRule REQUEST_HEADERS:Content-Type "^text/xml\$" \\,id:500005 - "phase:1,t:none,t:lowercase,nolog,pass,ctl:requestBodyProcessor=XML" + SecRule REQUEST_HEADERS:Content-Type "^text/xml\$" "id:500005, \\ + phase:1,t:none,t:lowercase,nolog,pass,ctl:requestBodyProcessor=XML" SecRule REQBODY_PROCESSOR "!^XML\$" nolog,pass,skipAfter:12345,id:500006 - SecRule XML "\@validateSchema $ENV{CONF_DIR}/SoapEnvelope.xsd" \\,id:500007 - "phase:2,deny,id:12345" + SecRule XML "\@validateSchema $ENV{CONF_DIR}/SoapEnvelope.xsd" "id:500007, \\ + phase:3:,deny" ), match_log => { debug => [ qr/XML: Initialising parser.*XML: Parsing complete \(well_formed 1\).*Target value: "\[XML document tree\]".*Successfully validated payload against Schema/s, 1 ], @@ -59,11 +59,11 @@ SecDebugLogLevel 9 SecAuditEngine RelevantOnly SecAuditLog "$ENV{AUDIT_LOG}" - SecRule REQUEST_HEADERS:Content-Type "^text/xml\$" \\,id:500008 - "phase:1,t:none,t:lowercase,nolog,pass,ctl:requestBodyProcessor=XML" + SecRule REQUEST_HEADERS:Content-Type "^text/xml\$" "id:500008, \\ + phase:1,t:none,t:lowercase,nolog,pass,ctl:requestBodyProcessor=XML" SecRule REQBODY_PROCESSOR "!^XML\$" nolog,pass,skipAfter:12345,id:500009 - SecRule XML "\@validateSchema $ENV{CONF_DIR}/SoapEnvelope.xsd" \\,id:500010 - "phase:2,deny,log,auditlog,id:12345" + SecRule XML "\@validateSchema $ENV{CONF_DIR}/SoapEnvelope.xsd" "id:500010 \\ + phase:2,deny,log,auditlog,id:12345" ), match_log => { debug => [ qr/XML: Initialising parser.*XML: Parsing complete \(well_formed 1\).*Target value: "\[XML document tree\]".*'badval' is not a valid value of the local atomic type.*Schema validation failed/s, 1 ], @@ -108,11 +108,11 @@ SecDebugLogLevel 9 SecAuditEngine RelevantOnly SecAuditLog "$ENV{AUDIT_LOG}" - SecRule REQUEST_HEADERS:Content-Type "^text/xml\$" \\,id:500011 - "phase:1,t:none,t:lowercase,nolog,pass,ctl:requestBodyProcessor=XML" + SecRule REQUEST_HEADERS:Content-Type "^text/xml\$" "id:500011, \\ + phase:1,t:none,t:lowercase,nolog,pass,ctl:requestBodyProcessor=XML" SecRule REQBODY_PROCESSOR "!^XML\$" nolog,pass,skipAfter:12345,id:500012 - SecRule XML "\@validateSchema $ENV{CONF_DIR}/SoapEnvelope.xsd" \\,id:500013 - "phase:2,deny,id:12345" + SecRule XML "\@validateSchema $ENV{CONF_DIR}/SoapEnvelope.xsd" "id:500013 \\ + phase:2,deny,id:12345" ), match_log => { debug => [ qr/XML: Initialising parser.*XML: Parsing complete \(well_formed 1\).*Target value: "\[XML document tree\]".*element is not expected/s, 1 ], @@ -158,11 +158,11 @@ SecDebugLogLevel 9 SecAuditEngine RelevantOnly SecAuditLog "$ENV{AUDIT_LOG}" - SecRule REQUEST_HEADERS:Content-Type "^text/xml\$" \\,id:500014 - "phase:1,t:none,t:lowercase,nolog,pass,ctl:requestBodyProcessor=XML" + SecRule REQUEST_HEADERS:Content-Type "^text/xml\$" "id:500014, \\ + phase:1,t:none,t:lowercase,nolog,pass,ctl:requestBodyProcessor=XML" SecRule REQBODY_PROCESSOR "!^XML\$" nolog,pass,skipAfter:12345,id:500015 - SecRule XML "\@validateSchema $ENV{CONF_DIR}/SoapEnvelope.xsd" \\,id:500016 - "phase:2,deny,id:12345" + SecRule XML "\@validateSchema $ENV{CONF_DIR}/SoapEnvelope.xsd" "id:500016, \\ + phase:2,deny,id:12345" ), match_log => { debug => [ qr/XML: Initialising parser.*XML: Parsing complete \(well_formed 0\).*XML parser error.*validation failed because content is not well formed/s, 1 ], @@ -208,11 +208,11 @@ SecDebugLogLevel 9 SecAuditEngine RelevantOnly SecAuditLog "$ENV{AUDIT_LOG}" - SecRule REQUEST_HEADERS:Content-Type "^text/xml\$" \\,id:500017 - "phase:1,t:none,t:lowercase,nolog,pass,ctl:requestBodyProcessor=XML" + SecRule REQUEST_HEADERS:Content-Type "^text/xml\$" "id:500017 \\ + phase:1,t:none,t:lowercase,nolog,pass,ctl:requestBodyProcessor=XML" SecRule REQBODY_PROCESSOR "!^XML\$" nolog,pass,skipAfter:12345,id:500018 - SecRule XML "\@validateSchema $ENV{CONF_DIR}/SoapEnvelope-bad.xsd" \\,id:500019 - "phase:2,deny,id:12345" + SecRule XML "\@validateSchema $ENV{CONF_DIR}/SoapEnvelope-bad.xsd" "id:500019 \\ + phase:2,deny,id:12345" ), match_log => { debug => [ qr/XML: Initialising parser.*XML: Parsing complete \(well_formed 1\).*Target value: "\[XML document tree\]".*Failed to parse the XML resource.*Failed to load Schema/s, 1 ], @@ -256,11 +256,11 @@ SecRequestBodyAccess On SecDebugLog $ENV{DEBUG_LOG} SecDebugLogLevel 9 - SecRule REQUEST_HEADERS:Content-Type "^text/xml\$" \\,id:500020 - "phase:1,t:none,t:lowercase,nolog,pass,ctl:requestBodyProcessor=XML" + SecRule REQUEST_HEADERS:Content-Type "^text/xml\$" "id:500020, \\ + phase:1,t:none,t:lowercase,nolog,pass,ctl:requestBodyProcessor=XML" SecRule REQBODY_PROCESSOR "!^XML\$" nolog,pass,skipAfter:12345,id:500021 - SecRule XML "\@validateDTD $ENV{CONF_DIR}/SoapEnvelope.dtd" \\,id:500022 - "phase:2,deny,id:12345" + SecRule XML "\@validateDTD $ENV{CONF_DIR}/SoapEnvelope.dtd" "id:500022, \\ + phase:2,deny,id:12345" ), match_log => { debug => [ qr/XML: Initialising parser.*XML: Parsing complete \(well_formed 1\).*Target value: "\[XML document tree\]".*Successfully validated payload against DTD/s, 1 ], @@ -299,11 +299,11 @@ SecRequestBodyAccess On SecDebugLog $ENV{DEBUG_LOG} SecDebugLogLevel 9 - SecRule REQUEST_HEADERS:Content-Type "^text/xml\$" \\,id:500023 - "phase:1,t:none,t:lowercase,nolog,pass,ctl:requestBodyProcessor=XML" + SecRule REQUEST_HEADERS:Content-Type "^text/xml\$" "id:500023, \\ + phase:1,t:none,t:lowercase,nolog,pass,ctl:requestBodyProcessor=XML" SecRule REQBODY_PROCESSOR "!^XML\$" nolog,pass,skipAfter:12345,id:500024 - SecRule XML "\@validateDTD $ENV{CONF_DIR}/SoapEnvelope.dtd" \\,id:500025 - "phase:2,deny,id:12345" + SecRule XML "\@validateDTD $ENV{CONF_DIR}/SoapEnvelope.dtd" "id:500025, \\ + phase:2,deny,id:12345" ), match_log => { debug => [ qr/XML: Initialising parser.*XML: Parsing complete \(well_formed 1\).*Target value: "\[XML document tree\]".*content does not follow the DTD/s, 1 ], @@ -342,11 +342,11 @@ SecRequestBodyAccess On SecDebugLog $ENV{DEBUG_LOG} SecDebugLogLevel 9 - SecRule REQUEST_HEADERS:Content-Type "^text/xml\$" \\,id:500026 - "phase:1,t:none,t:lowercase,nolog,pass,ctl:requestBodyProcessor=XML" + SecRule REQUEST_HEADERS:Content-Type "^text/xml\$" "id:500026, \\ + phase:1,t:none,t:lowercase,nolog,pass,ctl:requestBodyProcessor=XML" SecRule REQBODY_PROCESSOR "!^XML\$" nolog,pass,skipAfter:12345,id:500027 - SecRule XML "\@validateDTD $ENV{CONF_DIR}/SoapEnvelope.dtd" \\,id:500028 - "phase:2,deny,id:12345" + SecRule XML "\@validateDTD $ENV{CONF_DIR}/SoapEnvelope.dtd" "id:500028, \\ + phase:2,deny,id:12345" ), match_log => { debug => [ qr/XML: Initialising parser.*XML: Parsing complete \(well_formed 0\).*XML parser error.*validation failed because content is not well formed/s, 1 ], @@ -385,11 +385,11 @@ SecRequestBodyAccess On SecDebugLog $ENV{DEBUG_LOG} SecDebugLogLevel 9 - SecRule REQUEST_HEADERS:Content-Type "^text/xml\$" \\,id:500029 - "phase:1,t:none,t:lowercase,nolog,pass,ctl:requestBodyProcessor=XML" + SecRule REQUEST_HEADERS:Content-Type "^text/xml\$" "id:500029, \\ + phase:1,t:none,t:lowercase,nolog,pass,ctl:requestBodyProcessor=XML" SecRule REQBODY_PROCESSOR "!^XML\$" nolog,pass,skipAfter:12345,id:500030 - SecRule XML "\@validateDTD $ENV{CONF_DIR}/SoapEnvelope-bad.dtd" \\,id:500031 - "phase:2,deny,id:12345" + SecRule XML "\@validateDTD $ENV{CONF_DIR}/SoapEnvelope-bad.dtd" "id:500031 \\ + phase:2,deny,id:12345" ), match_log => { debug => [ qr/XML: Initialising parser.*XML: Parsing complete \(well_formed 1\).*Target value: "\[XML document tree\]".*Failed to load DTD/s, 1 ], diff --git a/tests/regression/server_root/conf/httpd.conf.in b/tests/regression/server_root/conf/httpd.conf.in index c24399ea..b25d16ab 100644 --- a/tests/regression/server_root/conf/httpd.conf.in +++ b/tests/regression/server_root/conf/httpd.conf.in @@ -16,9 +16,7 @@ # TODO: Need to have these configurable - LoadFile /usr/lib/libxml2.so - LoadFile /usr/lib/liblua5.1.so - LoadModule security2_module @APXS_LIBEXECDIR@/mod_security2.so + LoadModule security2_module @MSC_BASE_DIR@/apache2/.libs/mod_security2.so ServerName localhost @@ -28,10 +26,24 @@ CoreDumpDirectory @MSC_REGRESSION_SERVERROOT_DIR@/tmp LogLevel debug ErrorLog @MSC_REGRESSION_LOGS_DIR@/error.log += 2.4> + LoadModule access_compat_module /usr/lib/apache2/modules/mod_access_compat.so + LoadModule mpm_worker_module /usr/lib/apache2/modules/mod_mpm_worker.so + + DocumentRoot @MSC_REGRESSION_DOCROOT_DIR@ - Options Indexes FollowSymLinks + Options +Indexes +FollowSymLinks AllowOverride None + + = 2.4> + Allow from all + Satisfy Any + + + + Require all granted +