diff options
Diffstat (limited to 'rubbos/app/httpd-2.0.64/os/win32')
| -rw-r--r-- | rubbos/app/httpd-2.0.64/os/win32/BaseAddr.ref | 64 | ||||
| -rw-r--r-- | rubbos/app/httpd-2.0.64/os/win32/ap_regkey.c | 644 | ||||
| -rw-r--r-- | rubbos/app/httpd-2.0.64/os/win32/modules.c | 48 | ||||
| -rw-r--r-- | rubbos/app/httpd-2.0.64/os/win32/os.h | 120 | ||||
| -rw-r--r-- | rubbos/app/httpd-2.0.64/os/win32/util_win32.c | 147 |
5 files changed, 0 insertions, 1023 deletions
diff --git a/rubbos/app/httpd-2.0.64/os/win32/BaseAddr.ref b/rubbos/app/httpd-2.0.64/os/win32/BaseAddr.ref deleted file mode 100644 index f63c7bef..00000000 --- a/rubbos/app/httpd-2.0.64/os/win32/BaseAddr.ref +++ /dev/null @@ -1,64 +0,0 @@ -; os/win32/BaseAddr.ref contains the central repository -; of all module base addresses -; to avoid relocation - -; WARNING: Update this file by reviewing the image size -; of the debug-generated dll files; release images -; should fit in the larger debug-sized space. - -; modulename base-address max-size - -libhttpd.dll 0x6FF00000 0x000A0000 -mod_auth_anon.so 0x6FEF0000 0x00010000 -mod_auth_digest.so 0x6FED0000 0x00020000 -mod_cern_meta.so 0x6FEC0000 0x00010000 -mod_expires.so 0x6FEB0000 0x00010000 -mod_headers.so 0x6FEA0000 0x00010000 -mod_info.so 0x6FE90000 0x00010000 -mod_rewrite.so 0x6FE70000 0x00020000 -mod_speling.so 0x6FE60000 0x00010000 -mod_status.so 0x6FE50000 0x00010000 -mod_usertrack.so 0x6FE40000 0x00010000 -mod_file_cache.so 0x6FE20000 0x00020000 -mod_auth_dbm.so 0x6FE10000 0x00010000 -mod_unique_id.so 0x6FE00000 0x00010000 -mod_vhost_alias.so 0x6FDF0000 0x00010000 -mod_mime_magic.so 0x6FDE0000 0x00010000 -mod_dav.so 0x6FDC0000 0x00020000 -mod_dav_fs.so 0x6FDB0000 0x00010000 -mod_proxy.so 0x6FDA0000 0x00010000 -mod_proxy_connect.so 0x6FD90000 0x00010000 -mod_proxy_ftp.so 0x6FD80000 0x00010000 -mod_proxy_http.so 0x6FD70000 0x00010000 -mod_ssl.so 0x6FD00000 0x00070000 -mod_access.so 0x6FCF0000 0x00010000 -mod_actions.so 0x6FCE0000 0x00010000 -mod_alias.so 0x6FCD0000 0x00010000 -mod_asis.so 0x6FCC0000 0x00010000 -mod_auth.so 0x6FCB0000 0x00010000 -mod_autoindex.so 0x6FCA0000 0x00010000 -mod_cgi.so 0x6FC90000 0x00010000 -mod_dir.so 0x6FC80000 0x00010000 -mod_env.so 0x6FC70000 0x00010000 -mod_imap.so 0x6FC60000 0x00010000 -mod_include.so 0x6FC50000 0x00010000 -mod_isapi.so 0x6FC40000 0x00010000 -mod_log_config.so 0x6FC30000 0x00010000 -mod_mime.so 0x6FC20000 0x00010000 -mod_negotiation.so 0x6FC10000 0x00010000 -mod_setenvif.so 0x6FC00000 0x00010000 -mod_userdir.so 0x6FBF0000 0x00010000 -mod_cache.so 0x6FBE0000 0x00010000 -mod_disk_cache.so 0x6FBD0000 0x00010000 -mod_mem_cache.so 0x6FBC0000 0x00010000 -mod_deflate.so 0x6FBA0000 0x00020000 -mod_ext_filter.so 0x6FB90000 0x00010000 -mod_charset_lite.so 0x6FB80000 0x00010000 -mod_logio.so 0x6FB70000 0x00010000 -util_ldap.so 0x6FB60000 0x00010000 -mod_auth_ldap.so 0x6FB50000 0x00010000 -mod_log_forensic.so 0x6FB40000 0x00010000 -mod_bucketeer.so 0x6FB30000 0x00010000 -mod_echo.so 0x6FB20000 0x00010000 -mod_version.so 0x6FB10000 0x00010000 -mod_dumpio.so 0x6FB00000 0x00010000 diff --git a/rubbos/app/httpd-2.0.64/os/win32/ap_regkey.c b/rubbos/app/httpd-2.0.64/os/win32/ap_regkey.c deleted file mode 100644 index 2f464460..00000000 --- a/rubbos/app/httpd-2.0.64/os/win32/ap_regkey.c +++ /dev/null @@ -1,644 +0,0 @@ -/* Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -#ifdef WIN32 - -#include "apr.h" -#include "arch/win32/apr_arch_file_io.h" -#include "arch/win32/apr_arch_misc.h" -#include "ap_regkey.h" - -struct ap_regkey_t { - apr_pool_t *pool; - HKEY hkey; -}; - - -AP_DECLARE(const ap_regkey_t *) ap_regkey_const(int i) -{ - static struct ap_regkey_t ap_regkey_consts[7] = - { - {NULL, HKEY_CLASSES_ROOT}, - {NULL, HKEY_CURRENT_CONFIG}, - {NULL, HKEY_CURRENT_USER}, - {NULL, HKEY_LOCAL_MACHINE}, - {NULL, HKEY_USERS}, - {NULL, HKEY_PERFORMANCE_DATA}, - {NULL, HKEY_DYN_DATA} - }; - return ap_regkey_consts + i; -} - - -apr_status_t regkey_cleanup(void *key) -{ - ap_regkey_t *regkey = key; - - if (regkey->hkey && regkey->hkey != INVALID_HANDLE_VALUE) { - RegCloseKey(regkey->hkey); - regkey->hkey = INVALID_HANDLE_VALUE; - } - return APR_SUCCESS; -} - - -AP_DECLARE(apr_status_t) ap_regkey_open(ap_regkey_t **newkey, - const ap_regkey_t *parentkey, - const char *keyname, - apr_int32_t flags, - apr_pool_t *pool) -{ - DWORD access = KEY_QUERY_VALUE; - DWORD exists; - HKEY hkey; - LONG rc; - - if (flags & APR_READ) - access |= KEY_READ; - if (flags & APR_WRITE) - access |= KEY_WRITE; - -#if APR_HAS_UNICODE_FS - IF_WIN_OS_IS_UNICODE - { - apr_size_t keylen = strlen(keyname) + 1; - apr_size_t wkeylen = 256; - apr_wchar_t wkeyname[256]; - apr_status_t rv = apr_conv_utf8_to_ucs2(keyname, &keylen, wkeyname, &wkeylen); - if (rv != APR_SUCCESS) - return rv; - else if (keylen) - return APR_ENAMETOOLONG; - - if (flags & APR_CREATE) - rc = RegCreateKeyExW(parentkey->hkey, wkeyname, 0, NULL, 0, - access, NULL, &hkey, &exists); - else - rc = RegOpenKeyExW(parentkey->hkey, wkeyname, 0, access, &hkey); - } -#endif /* APR_HAS_UNICODE_FS */ -#if APR_HAS_ANSI_FS - ELSE_WIN_OS_IS_ANSI - { - if (flags & APR_CREATE) - rc = RegCreateKeyEx(parentkey->hkey, keyname, 0, NULL, 0, - access, NULL, &hkey, &exists); - else - rc = RegOpenKeyEx(parentkey->hkey, keyname, 0, access, &hkey); - } -#endif - if (rc != ERROR_SUCCESS) { - return APR_FROM_OS_ERROR(rc); - } - if ((flags & APR_EXCL) && (exists == REG_OPENED_EXISTING_KEY)) { - RegCloseKey(hkey); - return APR_EEXIST; - } - - *newkey = apr_palloc(pool, sizeof(**newkey)); - (*newkey)->pool = pool; - (*newkey)->hkey = hkey; - apr_pool_cleanup_register((*newkey)->pool, (void *)(*newkey), - regkey_cleanup, apr_pool_cleanup_null); - return APR_SUCCESS; -} - - -AP_DECLARE(apr_status_t) ap_regkey_close(ap_regkey_t *regkey) -{ - apr_status_t stat; - if ((stat = regkey_cleanup(regkey)) == APR_SUCCESS) { - apr_pool_cleanup_kill(regkey->pool, regkey, regkey_cleanup); - } - return stat; -} - - -AP_DECLARE(apr_status_t) ap_regkey_remove(const ap_regkey_t *parent, - const char *keyname, - apr_pool_t *pool) -{ - LONG rc; - -#if APR_HAS_UNICODE_FS - IF_WIN_OS_IS_UNICODE - { - apr_size_t keylen = strlen(keyname) + 1; - apr_size_t wkeylen = 256; - apr_wchar_t wkeyname[256]; - apr_status_t rv = apr_conv_utf8_to_ucs2(keyname, &keylen, wkeyname, &wkeylen); - if (rv != APR_SUCCESS) - return rv; - else if (keylen) - return APR_ENAMETOOLONG; - rc = RegDeleteKeyW(parent->hkey, wkeyname); - } -#endif /* APR_HAS_UNICODE_FS */ -#if APR_HAS_ANSI_FS - ELSE_WIN_OS_IS_ANSI - { - /* We need to determine if subkeys exist on Win9x, to provide - * consistent behavior with NT, which returns access denied - * if subkeys exist when attempting to delete a key. - */ - DWORD subkeys; - HKEY hkey; - rc = RegOpenKeyEx(parent->hkey, keyname, 0, KEY_READ, &hkey); - if (rc != ERROR_SUCCESS) - return APR_FROM_OS_ERROR(rc); - rc = RegQueryInfoKey(hkey, NULL, NULL, NULL, &subkeys, NULL, NULL, - NULL, NULL, NULL, NULL, NULL); - RegCloseKey(hkey); - if (rc != ERROR_SUCCESS) - return APR_FROM_OS_ERROR(rc); - else if (subkeys) - return APR_FROM_OS_ERROR(ERROR_ACCESS_DENIED); - rc = RegDeleteKey(parent->hkey, keyname); - } -#endif - if (rc != ERROR_SUCCESS) { - return APR_FROM_OS_ERROR(rc); - } - return APR_SUCCESS; -} - - -AP_DECLARE(apr_status_t) ap_regkey_value_get(char **result, - ap_regkey_t *key, - const char *valuename, - apr_pool_t *pool) -{ - /* Retrieve a registry string value, and explode any envvars - * that the system has configured (e.g. %SystemRoot%/someapp.exe) - */ - LONG rc; - DWORD type; - DWORD size = 0; - -#if APR_HAS_UNICODE_FS - IF_WIN_OS_IS_UNICODE - { - apr_size_t valuelen = strlen(valuename) + 1; - apr_size_t wvallen = 256; - apr_wchar_t wvalname[256]; - apr_wchar_t *wvalue; - apr_status_t rv; - rv = apr_conv_utf8_to_ucs2(valuename, &valuelen, wvalname, &wvallen); - if (rv != APR_SUCCESS) - return rv; - else if (valuelen) - return APR_ENAMETOOLONG; - /* Read to NULL buffer to determine value size */ - rc = RegQueryValueExW(key->hkey, wvalname, 0, &type, NULL, &size); - if (rc != ERROR_SUCCESS) { - return APR_FROM_OS_ERROR(rc); - } - if ((size < 2) || (type != REG_SZ && type != REG_EXPAND_SZ)) { - return APR_FROM_OS_ERROR(ERROR_INVALID_PARAMETER); - } - - wvalue = apr_palloc(pool, size); - /* Read value based on size query above */ - rc = RegQueryValueExW(key->hkey, wvalname, 0, &type, - (LPBYTE)wvalue, &size); - if (rc != ERROR_SUCCESS) { - return APR_FROM_OS_ERROR(rc); - } - if (type == REG_EXPAND_SZ) { - apr_wchar_t zbuf[1]; - size = ExpandEnvironmentStringsW(wvalue, zbuf, 0); - if (size) { - apr_wchar_t *tmp = wvalue; - /* The size returned by ExpandEnvironmentStringsW is wchars */ - wvalue = apr_palloc(pool, size * 2); - size = ExpandEnvironmentStringsW(tmp, wvalue, size); - } - } - else { - /* count wchars from RegQueryValueExW, rather than bytes */ - size /= 2; - } - /* ###: deliberately overallocate all but the trailing null. - * We could precalculate the exact buffer here instead, the question - * is a matter of storage v.s. cpu cycles. - */ - valuelen = (size - 1) * 3 + 1; - *result = apr_palloc(pool, valuelen); - rv = apr_conv_ucs2_to_utf8(wvalue, &size, *result, &valuelen); - if (rv != APR_SUCCESS) - return rv; - else if (size) - return APR_ENAMETOOLONG; - } -#endif /* APR_HAS_UNICODE_FS */ -#if APR_HAS_ANSI_FS - ELSE_WIN_OS_IS_ANSI - { - /* Read to NULL buffer to determine value size */ - rc = RegQueryValueEx(key->hkey, valuename, 0, &type, NULL, &size); - if (rc != ERROR_SUCCESS) - return APR_FROM_OS_ERROR(rc); - - if ((size < 1) || (type != REG_SZ && type != REG_EXPAND_SZ)) { - return APR_FROM_OS_ERROR(ERROR_INVALID_PARAMETER); - } - - *result = apr_palloc(pool, size); - /* Read value based on size query above */ - rc = RegQueryValueEx(key->hkey, valuename, 0, &type, *result, &size); - if (rc != ERROR_SUCCESS) - return APR_FROM_OS_ERROR(rc); - - if (type == REG_EXPAND_SZ) { - /* Advise ExpandEnvironmentStrings that we have a zero char - * buffer to force computation of the required length. - */ - char zbuf[1]; - size = ExpandEnvironmentStrings(*result, zbuf, 0); - if (size) { - char *tmp = *result; - *result = apr_palloc(pool, size); - size = ExpandEnvironmentStrings(tmp, *result, size); - } - } - } -#endif - return APR_SUCCESS; -} - - -AP_DECLARE(apr_status_t) ap_regkey_value_set(ap_regkey_t *key, - const char *valuename, - const char *value, - apr_int32_t flags, - apr_pool_t *pool) -{ - /* Retrieve a registry string value, and explode any envvars - * that the system has configured (e.g. %SystemRoot%/someapp.exe) - */ - LONG rc; - DWORD size = strlen(value) + 1; - DWORD type = (flags & AP_REGKEY_EXPAND) ? REG_EXPAND_SZ : REG_SZ; - -#if APR_HAS_UNICODE_FS - IF_WIN_OS_IS_UNICODE - { - apr_size_t alloclen; - apr_size_t valuelen = strlen(valuename) + 1; - apr_size_t wvallen = 256; - apr_wchar_t wvalname[256]; - apr_wchar_t *wvalue; - apr_status_t rv; - rv = apr_conv_utf8_to_ucs2(valuename, &valuelen, wvalname, &wvallen); - if (rv != APR_SUCCESS) - return rv; - else if (valuelen) - return APR_ENAMETOOLONG; - - wvallen = alloclen = size; - wvalue = apr_palloc(pool, alloclen * 2); - rv = apr_conv_utf8_to_ucs2(value, &size, wvalue, &wvallen); - if (rv != APR_SUCCESS) - return rv; - else if (size) - return APR_ENAMETOOLONG; - - /* The size is the number of wchars consumed by apr_conv_utf8_to_ucs2 - * converted to bytes; the trailing L'\0' continues to be counted. - */ - size = (alloclen - wvallen) * 2; - rc = RegSetValueExW(key->hkey, wvalname, 0, type, - (LPBYTE)wvalue, size); - if (rc != ERROR_SUCCESS) - return APR_FROM_OS_ERROR(rc); - } -#endif /* APR_HAS_UNICODE_FS */ -#if APR_HAS_ANSI_FS - ELSE_WIN_OS_IS_ANSI - { - rc = RegSetValueEx(key->hkey, valuename, 0, type, value, size); - if (rc != ERROR_SUCCESS) - return APR_FROM_OS_ERROR(rc); - } -#endif - return APR_SUCCESS; -} - - -AP_DECLARE(apr_status_t) ap_regkey_value_raw_get(void **result, - apr_size_t *resultsize, - apr_int32_t *resulttype, - ap_regkey_t *key, - const char *valuename, - apr_pool_t *pool) -{ - /* Retrieve a registry string value, and explode any envvars - * that the system has configured (e.g. %SystemRoot%/someapp.exe) - */ - LONG rc; - -#if APR_HAS_UNICODE_FS - IF_WIN_OS_IS_UNICODE - { - apr_size_t valuelen = strlen(valuename) + 1; - apr_size_t wvallen = 256; - apr_wchar_t wvalname[256]; - apr_status_t rv; - rv = apr_conv_utf8_to_ucs2(valuename, &valuelen, wvalname, &wvallen); - if (rv != APR_SUCCESS) - return rv; - else if (valuelen) - return APR_ENAMETOOLONG; - /* Read to NULL buffer to determine value size */ - rc = RegQueryValueExW(key->hkey, wvalname, 0, resulttype, - NULL, resultsize); - if (rc != ERROR_SUCCESS) { - return APR_FROM_OS_ERROR(rc); - } - - /* Read value based on size query above */ - *result = apr_palloc(pool, *resultsize); - rc = RegQueryValueExW(key->hkey, wvalname, 0, resulttype, - (LPBYTE)*result, resultsize); - } -#endif /* APR_HAS_UNICODE_FS */ -#if APR_HAS_ANSI_FS - ELSE_WIN_OS_IS_ANSI - { - /* Read to NULL buffer to determine value size */ - rc = RegQueryValueEx(key->hkey, valuename, 0, resulttype, - NULL, resultsize); - if (rc != ERROR_SUCCESS) - return APR_FROM_OS_ERROR(rc); - - /* Read value based on size query above */ - *result = apr_palloc(pool, *resultsize); - rc = RegQueryValueEx(key->hkey, valuename, 0, resulttype, - (LPBYTE)*result, resultsize); - if (rc != ERROR_SUCCESS) - return APR_FROM_OS_ERROR(rc); - } -#endif - if (rc != ERROR_SUCCESS) { - return APR_FROM_OS_ERROR(rc); - } - - return APR_SUCCESS; -} - - -AP_DECLARE(apr_status_t) ap_regkey_value_raw_set(ap_regkey_t *key, - const char *valuename, - const void *value, - apr_size_t valuesize, - apr_int32_t valuetype, - apr_pool_t *pool) -{ - LONG rc; - -#if APR_HAS_UNICODE_FS - IF_WIN_OS_IS_UNICODE - { - apr_size_t valuelen = strlen(valuename) + 1; - apr_size_t wvallen = 256; - apr_wchar_t wvalname[256]; - apr_status_t rv; - rv = apr_conv_utf8_to_ucs2(valuename, &valuelen, wvalname, &wvallen); - if (rv != APR_SUCCESS) - return rv; - else if (valuelen) - return APR_ENAMETOOLONG; - - rc = RegSetValueExW(key->hkey, wvalname, 0, valuetype, - (LPBYTE)value, valuesize); - } -#endif /* APR_HAS_UNICODE_FS */ -#if APR_HAS_ANSI_FS - ELSE_WIN_OS_IS_ANSI - { - rc = RegSetValueEx(key->hkey, valuename, 0, valuetype, - (LPBYTE)value, valuesize); - } -#endif - if (rc != ERROR_SUCCESS) { - return APR_FROM_OS_ERROR(rc); - } - return APR_SUCCESS; -} - - -AP_DECLARE(apr_status_t) ap_regkey_value_array_get(apr_array_header_t **result, - ap_regkey_t *key, - const char *valuename, - apr_pool_t *pool) -{ - /* Retrieve a registry string value, and explode any envvars - * that the system has configured (e.g. %SystemRoot%/someapp.exe) - */ - apr_status_t rv; - void *value; - char *buf; - char *tmp; - DWORD type; - DWORD size = 0; - - rv = ap_regkey_value_raw_get(&value, &size, &type, key, valuename, pool); - if (rv != APR_SUCCESS) { - return rv; - } - else if (type != REG_MULTI_SZ) { - return APR_EINVAL; - } - -#if APR_HAS_UNICODE_FS - IF_WIN_OS_IS_UNICODE - { - apr_size_t alloclen; - apr_size_t valuelen = strlen(valuename) + 1; - apr_size_t wvallen = 256; - apr_wchar_t *wvalue = (apr_wchar_t *)value; - - /* ###: deliberately overallocate plus two extra nulls. - * We could precalculate the exact buffer here instead, the question - * is a matter of storage v.s. cpu cycles. - */ - size /= 2; - alloclen = valuelen = size * 3 + 2; - buf = apr_palloc(pool, valuelen); - rv = apr_conv_ucs2_to_utf8(value, &size, buf, &valuelen); - if (rv != APR_SUCCESS) - return rv; - else if (size) - return APR_ENAMETOOLONG; - buf[(alloclen - valuelen)] = '\0'; - buf[(alloclen - valuelen) + 1] = '\0'; - } -#endif /* APR_HAS_UNICODE_FS */ -#if APR_HAS_ANSI_FS - ELSE_WIN_OS_IS_ANSI - { - /* Small possiblity the array is either unterminated - * or single NULL terminated. Avert. - */ - buf = (char *)value; - if (size < 2 || buf[size - 1] != '\0' || buf[size - 2] != '\0') { - buf = apr_palloc(pool, size + 2); - memcpy(buf, value, size); - buf[size + 1] = '\0'; - buf[size] = '\0'; - } - } -#endif - - size = 0; /* Element Count */ - for (tmp = buf; *tmp; ++tmp) { - ++size; - while (*tmp) { - ++tmp; - } - } - - *result = apr_array_make(pool, size, sizeof(char *)); - for (tmp = buf; *tmp; ++tmp) { - char **newelem = (char **) apr_array_push(*result); - *newelem = tmp; - while (*tmp) { - ++tmp; - } - } - - return APR_SUCCESS; -} - - -AP_DECLARE(apr_status_t) ap_regkey_value_array_set(ap_regkey_t *key, - const char *valuename, - int nelts, - const char * const * elts, - apr_pool_t *pool) -{ - /* Retrieve a registry string value, and explode any envvars - * that the system has configured (e.g. %SystemRoot%/someapp.exe) - */ - int i; - const void *value; - apr_size_t bufsize; - -#if APR_HAS_UNICODE_FS - IF_WIN_OS_IS_UNICODE - { - apr_status_t rv; - apr_wchar_t *buf; - apr_wchar_t *tmp; - apr_size_t bufrem; - - bufsize = 1; /* For trailing second null */ - for (i = 0; i < nelts; ++i) { - bufsize += strlen(elts[i]) + 1; - } - if (!nelts) { - ++bufsize; - } - - bufrem = bufsize; - buf = apr_palloc(pool, bufsize * 2); - tmp = buf; - for (i = 0; i < nelts; ++i) { - apr_size_t eltsize = strlen(elts[i]) + 1; - apr_size_t size = eltsize; - rv = apr_conv_utf8_to_ucs2(elts[i], &size, tmp, &bufrem); - if (rv != APR_SUCCESS) - return rv; - else if (size) - return APR_ENAMETOOLONG; - tmp += eltsize; - } - if (!nelts) { - --bufrem; - (*tmp++) = L'\0'; - } - --bufrem; - *tmp = L'\0'; /* Trailing second null */ - - bufsize = (bufsize - bufrem) * 2; - value = (void*)buf; - } -#endif /* APR_HAS_UNICODE_FS */ -#if APR_HAS_ANSI_FS - ELSE_WIN_OS_IS_ANSI - { - char *buf; - char *tmp; - - bufsize = 1; /* For trailing second null */ - for (i = 0; i < nelts; ++i) { - bufsize += strlen(elts[i]) + 1; - } - if (!nelts) { - ++bufsize; - } - buf = apr_palloc(pool, bufsize); - tmp = buf; - for (i = 0; i < nelts; ++i) { - apr_size_t len = strlen(elts[i]) + 1; - memcpy(tmp, elts[i], len); - tmp += len; - } - if (!nelts) { - (*tmp++) = '\0'; - } - *tmp = '\0'; /* Trailing second null */ - value = buf; - } -#endif - return ap_regkey_value_raw_set(key, valuename, value, - bufsize, REG_MULTI_SZ, pool); -} - - -AP_DECLARE(apr_status_t) ap_regkey_value_remove(const ap_regkey_t *key, - const char *valuename, - apr_pool_t *pool) -{ - LONG rc; - -#if APR_HAS_UNICODE_FS - IF_WIN_OS_IS_UNICODE - { - apr_size_t valuelen = strlen(valuename) + 1; - apr_size_t wvallen = 256; - apr_wchar_t wvalname[256]; - apr_status_t rv = apr_conv_utf8_to_ucs2(valuename, &valuelen, wvalname, &wvallen); - if (rv != APR_SUCCESS) - return rv; - else if (valuelen) - return APR_ENAMETOOLONG; - rc = RegDeleteValueW(key->hkey, wvalname); - } -#endif /* APR_HAS_UNICODE_FS */ -#if APR_HAS_ANSI_FS - ELSE_WIN_OS_IS_ANSI - { - rc = RegDeleteValue(key->hkey, valuename); - } -#endif - if (rc != ERROR_SUCCESS) { - return APR_FROM_OS_ERROR(rc); - } - return APR_SUCCESS; -} - -#endif /* defined WIN32 */ diff --git a/rubbos/app/httpd-2.0.64/os/win32/modules.c b/rubbos/app/httpd-2.0.64/os/win32/modules.c deleted file mode 100644 index bf0deb6b..00000000 --- a/rubbos/app/httpd-2.0.64/os/win32/modules.c +++ /dev/null @@ -1,48 +0,0 @@ -/* Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -/* modules.c --- major modules compiled into Apache for Win32. - * Only insert an entry for a module if it must be compiled into - * the core server - */ - -#define CORE_PRIVATE -#include "httpd.h" -#include "http_config.h" - -extern module core_module; -extern module win32_module; -extern module mpm_winnt_module; -extern module http_module; -extern module so_module; - -AP_DECLARE_DATA module *ap_prelinked_modules[] = { - &core_module, - &win32_module, - &mpm_winnt_module, - &http_module, - &so_module, - NULL -}; - -AP_DECLARE_DATA module *ap_preloaded_modules[] = { - &core_module, - &win32_module, - &mpm_winnt_module, - &http_module, - &so_module, - NULL -}; diff --git a/rubbos/app/httpd-2.0.64/os/win32/os.h b/rubbos/app/httpd-2.0.64/os/win32/os.h deleted file mode 100644 index 56fc8b6f..00000000 --- a/rubbos/app/httpd-2.0.64/os/win32/os.h +++ /dev/null @@ -1,120 +0,0 @@ -/* Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -#ifdef WIN32 - -#ifndef AP_OS_H -#define AP_OS_H -/* Delegate windows include to the apr.h header, if USER or GDI declarations - * are required (for a window rather than console application), include - * windows.h prior to any other Apache header files. - */ -#include "apr_pools.h" - -#include <io.h> -#include <fcntl.h> - -#define PLATFORM "Win32" - -/* going away shortly... */ -#define HAVE_DRIVE_LETTERS -#define HAVE_UNC_PATHS -#define CASE_BLIND_FILESYSTEM - -#define APACHE_MPM_DIR "server/mpm/winnt" /* generated on unix */ - -#include <stddef.h> - -#ifdef __cplusplus -extern "C" { -#endif - -/* BIG RED WARNING: exit() is mapped to allow us to capture the exit - * status. This header must only be included from modules linked into - * the ApacheCore.dll - since it's a horrible behavior to exit() from - * any module outside the main() block, and we -will- assume it's a - * fatal error. - */ - -AP_DECLARE_DATA extern int real_exit_code; - -#define exit(status) ((exit)((real_exit_code==2) ? (real_exit_code = (status)) \ - : ((real_exit_code = 0), (status)))) - - -#ifdef AP_DECLARE_EXPORT - -/* Defined in util_win32.c and available only to the core module for - * win32 MPM design. - */ - -AP_DECLARE(apr_status_t) ap_os_proc_filepath(char **binpath, apr_pool_t *p); - -typedef enum { - AP_DLL_WINBASEAPI = 0, // kernel32 From WinBase.h - AP_DLL_WINADVAPI = 1, // advapi32 From WinBase.h - AP_DLL_WINSOCKAPI = 2, // mswsock From WinSock.h - AP_DLL_WINSOCK2API = 3, // ws2_32 From WinSock2.h - AP_DLL_defined = 4 // must define as last idx_ + 1 -} ap_dlltoken_e; - -FARPROC ap_load_dll_func(ap_dlltoken_e fnLib, char* fnName, int ordinal); - -PSECURITY_ATTRIBUTES GetNullACL(); -void CleanNullACL(void *sa); - -int set_listeners_noninheritable(apr_pool_t *p); - - -#define AP_DECLARE_LATE_DLL_FUNC(lib, rettype, calltype, fn, ord, args, names) \ - typedef rettype (calltype *ap_winapi_fpt_##fn) args; \ - static ap_winapi_fpt_##fn ap_winapi_pfn_##fn = NULL; \ - __inline rettype ap_winapi_##fn args \ - { if (!ap_winapi_pfn_##fn) \ - ap_winapi_pfn_##fn = (ap_winapi_fpt_##fn) ap_load_dll_func(lib, #fn, ord); \ - return (*(ap_winapi_pfn_##fn)) names; }; \ - -/* Win2K kernel only */ -AP_DECLARE_LATE_DLL_FUNC(AP_DLL_WINADVAPI, BOOL, WINAPI, ChangeServiceConfig2A, 0, ( - SC_HANDLE hService, - DWORD dwInfoLevel, - LPVOID lpInfo), - (hService, dwInfoLevel, lpInfo)); -#undef ChangeServiceConfig2 -#define ChangeServiceConfig2 ap_winapi_ChangeServiceConfig2A - -/* WinNT kernel only */ -AP_DECLARE_LATE_DLL_FUNC(AP_DLL_WINBASEAPI, BOOL, WINAPI, CancelIo, 0, ( - IN HANDLE hFile), - (hFile)); -#undef CancelIo -#define CancelIo ap_winapi_CancelIo - -/* Win9x kernel only */ -AP_DECLARE_LATE_DLL_FUNC(AP_DLL_WINBASEAPI, DWORD, WINAPI, RegisterServiceProcess, 0, ( - DWORD dwProcessId, - DWORD dwType), - (dwProcessId, dwType)); -#define RegisterServiceProcess ap_winapi_RegisterServiceProcess - -#endif /* def AP_DECLARE_EXPORT */ - -#ifdef __cplusplus -} -#endif - -#endif /* ndef AP_OS_H */ -#endif /* def WIN32 */ diff --git a/rubbos/app/httpd-2.0.64/os/win32/util_win32.c b/rubbos/app/httpd-2.0.64/os/win32/util_win32.c deleted file mode 100644 index c6c38404..00000000 --- a/rubbos/app/httpd-2.0.64/os/win32/util_win32.c +++ /dev/null @@ -1,147 +0,0 @@ -/* Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -#include "apr_strings.h" -#include "arch/win32/apr_arch_file_io.h" -#include "arch/win32/apr_arch_misc.h" - -#include "httpd.h" -#include "http_log.h" - -#include <stdarg.h> -#include <time.h> -#include <stdlib.h> - - -AP_DECLARE(apr_status_t) ap_os_proc_filepath(char **binpath, apr_pool_t *p) -{ - apr_wchar_t wbinpath[APR_PATH_MAX]; - -#if APR_HAS_UNICODE_FS - IF_WIN_OS_IS_UNICODE - { - apr_size_t binlen; - apr_size_t wbinlen; - apr_status_t rv; - if (!GetModuleFileNameW(NULL, wbinpath, sizeof(wbinpath) - / sizeof(apr_wchar_t))) { - return apr_get_os_error(); - } - wbinlen = wcslen(wbinpath) + 1; - binlen = (wbinlen - 1) * 3 + 1; - *binpath = apr_palloc(p, binlen); - rv = apr_conv_ucs2_to_utf8(wbinpath, &wbinlen, *binpath, &binlen); - if (rv != APR_SUCCESS) - return rv; - else if (wbinlen) - return APR_ENAMETOOLONG; - } -#endif /* APR_HAS_UNICODE_FS */ -#if APR_HAS_ANSI_FS - ELSE_WIN_OS_IS_ANSI - { - /* share the same scratch buffer */ - char *pathbuf = (char*) wbinpath; - if (!GetModuleFileName(NULL, pathbuf, sizeof(wbinpath))) { - return apr_get_os_error(); - } - *binpath = apr_pstrdup(p, pathbuf); - } -#endif - return APR_SUCCESS; -} - - -AP_DECLARE(apr_status_t) ap_os_create_privileged_process( - const request_rec *r, - apr_proc_t *newproc, const char *progname, - const char * const *args, - const char * const *env, - apr_procattr_t *attr, apr_pool_t *p) -{ - return apr_proc_create(newproc, progname, args, env, attr, p); -} - - -/* This code is stolen from misc/win32/misc.c and apr_private.h - * This helper code resolves late bound entry points - * missing from one or more releases of the Win32 API... - * but it sure would be nice if we didn't duplicate this code - * from the APR ;-) - */ -static const char* const lateDllName[DLL_defined] = { - "kernel32", "advapi32", "mswsock", "ws2_32" }; -static HMODULE lateDllHandle[DLL_defined] = { - NULL, NULL, NULL, NULL }; - - -FARPROC ap_load_dll_func(ap_dlltoken_e fnLib, char* fnName, int ordinal) -{ - if (!lateDllHandle[fnLib]) { - lateDllHandle[fnLib] = LoadLibrary(lateDllName[fnLib]); - if (!lateDllHandle[fnLib]) - return NULL; - } - if (ordinal) - return GetProcAddress(lateDllHandle[fnLib], (char *) ordinal); - else - return GetProcAddress(lateDllHandle[fnLib], fnName); -} - - -/* To share the semaphores with other processes, we need a NULL ACL - * Code from MS KB Q106387 - */ -PSECURITY_ATTRIBUTES GetNullACL() -{ - PSECURITY_DESCRIPTOR pSD; - PSECURITY_ATTRIBUTES sa; - - sa = (PSECURITY_ATTRIBUTES) LocalAlloc(LPTR, sizeof(SECURITY_ATTRIBUTES)); - sa->nLength = sizeof(sizeof(SECURITY_ATTRIBUTES)); - - pSD = (PSECURITY_DESCRIPTOR) LocalAlloc(LPTR, SECURITY_DESCRIPTOR_MIN_LENGTH); - sa->lpSecurityDescriptor = pSD; - - if (pSD == NULL || sa == NULL) { - return NULL; - } - apr_set_os_error(0); - if (!InitializeSecurityDescriptor(pSD, SECURITY_DESCRIPTOR_REVISION) - || apr_get_os_error()) { - LocalFree( pSD ); - LocalFree( sa ); - return NULL; - } - if (!SetSecurityDescriptorDacl(pSD, TRUE, (PACL) NULL, FALSE) - || apr_get_os_error()) { - LocalFree( pSD ); - LocalFree( sa ); - return NULL; - } - - sa->bInheritHandle = FALSE; - return sa; -} - - -void CleanNullACL(void *sa) -{ - if (sa) { - LocalFree(((PSECURITY_ATTRIBUTES)sa)->lpSecurityDescriptor); - LocalFree(sa); - } -} |