mirror of
https://github.com/BepInEx/mono.git
synced 2026-11-17 01:41:17 -10:00
Compare commits
6
Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
3bb68f1bdd | ||
|
|
8578364a0a | ||
|
|
3b67ab4312 | ||
|
|
7e26594b5a | ||
|
|
9352ce2a9c | ||
|
|
bcca015eee |
No files matched your search
@@ -88,7 +88,7 @@ void Page_Load(object sender, EventArgs e)
|
||||
Page.DataBind();
|
||||
|
||||
ProfileViolations = new BasicProfileViolationCollection ();
|
||||
WebServicesInteroperability.CheckConformance (WsiClaims.BP10, descriptions, ProfileViolations);
|
||||
WebServicesInteroperability.CheckConformance (WsiProfiles.BasicProfile1_1, descriptions, ProfileViolations);
|
||||
}
|
||||
|
||||
void BuildOperationInfo ()
|
||||
|
||||
@@ -1,3 +1,8 @@
|
||||
2006-11-21 Gonzalo Paniagua Javier <[email protected]>
|
||||
|
||||
* WebServiceCompiler.cs: add the type to the cache after getting it
|
||||
from the compiled assembly.
|
||||
|
||||
2006-11-16 Marek Habersack <[email protected]>
|
||||
|
||||
* ForceCopyBuildProvider.cs: Added the build provider for
|
||||
|
||||
@@ -124,6 +124,7 @@ namespace System.Web.Compilation
|
||||
|
||||
results.TempFiles.Delete ();
|
||||
type = assembly.GetType (parser.ClassName, true);
|
||||
CachingCompiler.InsertTypeFileDep (type, parser.PhysicalPath);
|
||||
return type;
|
||||
}
|
||||
|
||||
|
||||
@@ -1,3 +1,8 @@
|
||||
2006-11-25 Gonzalo Paniagua Javier <[email protected]>
|
||||
|
||||
* HttpServerUtility.cs: don't prepend extra '?' when the original url
|
||||
already has a query string. Fixes bug #80042.
|
||||
|
||||
2006-11-16 Gonzalo Paniagua Javier <[email protected]>
|
||||
|
||||
* HttpApplication.cs: don't leak the directory name for non-local
|
||||
|
||||
@@ -135,7 +135,10 @@ namespace System.Web {
|
||||
}
|
||||
} finally {
|
||||
request.SetCurrentExePath (oldFilePath);
|
||||
request.QueryStringRaw = oldQuery;
|
||||
if (oldQuery != null && oldQuery != "" && oldQuery != request.QueryStringRaw) {
|
||||
oldQuery = oldQuery.Substring (1); // Ignore initial '?'
|
||||
request.QueryStringRaw = oldQuery; // which is added here.
|
||||
}
|
||||
response.SetTextWriter (previous);
|
||||
if (!preserveQuery)
|
||||
request.SetForm (oldForm);
|
||||
|
||||
@@ -1,3 +1,8 @@
|
||||
2006-11-21 Gonzalo Paniagua Javier <[email protected]>
|
||||
|
||||
* HttpWebRequest.cs: add 2 more methods that are not supposed to have
|
||||
a body. Fixes bug #80001.
|
||||
|
||||
2006-11-15 Andrew Skiba <[email protected]>
|
||||
|
||||
* WebHeaderCollection.cs: add stubs for new 2.0 properties.
|
||||
|
||||
@@ -170,7 +170,8 @@ namespace System.Net
|
||||
|
||||
internal bool InternalAllowBuffering {
|
||||
get {
|
||||
return (allowBuffering && (method != "HEAD" && method != "GET"));
|
||||
return (allowBuffering && (method != "HEAD" && method != "GET" &&
|
||||
method != "MKCOL" && method != "CONNECT"));
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -1,3 +1,8 @@
|
||||
2006-11-27 Atsushi Enomoto <[email protected]>
|
||||
|
||||
* CompareInfo.cs : fixed wrong || with && for OrdinalIgnoreCase.
|
||||
Fixed bug #80056.
|
||||
|
||||
2006-11-10 Marek Safar <[email protected]>
|
||||
|
||||
* CultureInfo.cs (TextInfo): Construct a culture when is
|
||||
|
||||
@@ -467,7 +467,7 @@ namespace System.Globalization
|
||||
{
|
||||
return UseManagedCollation &&
|
||||
#if NET_2_0
|
||||
((CompareOptions.Ordinal & opt) == 0 ||
|
||||
((CompareOptions.Ordinal & opt) == 0 &&
|
||||
(CompareOptions.OrdinalIgnoreCase & opt) == 0) ?
|
||||
#else
|
||||
(CompareOptions.Ordinal & opt) == 0 ?
|
||||
@@ -535,7 +535,7 @@ namespace System.Globalization
|
||||
{
|
||||
return UseManagedCollation &&
|
||||
#if NET_2_0
|
||||
((CompareOptions.Ordinal & opt) == 0 ||
|
||||
((CompareOptions.Ordinal & opt) == 0 &&
|
||||
(CompareOptions.OrdinalIgnoreCase & opt) == 0) ?
|
||||
#else
|
||||
(CompareOptions.Ordinal & opt) == 0 ?
|
||||
|
||||
@@ -1,3 +1,24 @@
|
||||
2006-11-23 Dick Porter <[email protected]>
|
||||
|
||||
* process-private.h (struct _WapiHandle_process): Add 'waited'
|
||||
parameter
|
||||
|
||||
* processes.c (process_wait): Check the 'waited' parameter not the
|
||||
signalled state when testing if a process has already been waited
|
||||
for, as the child process itself may set signalled when exiting.
|
||||
Fixes bug 79885.
|
||||
|
||||
* wapi-private.h (_WAPI_HANDLE_VERSION): Bump shared data version
|
||||
|
||||
* shared.c: Now the shared data version has been incremented we
|
||||
can set the counter semaphore initial value correctly
|
||||
|
||||
2006-11-22 Dick Porter <[email protected]>
|
||||
|
||||
* processes.c (process_wait): Cope when the background process
|
||||
reaper gets the process we were waiting for. Special case for
|
||||
waiting for our own process to exit. Fixes bug 77736.
|
||||
|
||||
2006-11-16 Miguel de Icaza <[email protected]>
|
||||
|
||||
* processes.c (ShellExecuteEx): If we fail to create a process in
|
||||
|
||||
@@ -31,6 +31,7 @@ struct _WapiHandle_process
|
||||
gchar proc_name[_WAPI_PROC_NAME_MAX_LEN];
|
||||
size_t min_working_set;
|
||||
size_t max_working_set;
|
||||
gboolean waited;
|
||||
};
|
||||
|
||||
extern void _wapi_process_reap (void);
|
||||
|
||||
+80
-29
@@ -80,6 +80,10 @@ static gboolean process_set_termination_details (gpointer handle, int status)
|
||||
process_handle->exitstatus = WEXITSTATUS(status);
|
||||
}
|
||||
_wapi_time_t_to_filetime (time(NULL), &process_handle->exit_time);
|
||||
|
||||
/* Don't set process_handle->waited here, it needs to only
|
||||
* happen in the parent when wait() has been called.
|
||||
*/
|
||||
|
||||
#ifdef DEBUG
|
||||
g_message ("%s: Setting handle %p signalled", __func__, handle);
|
||||
@@ -108,17 +112,17 @@ static gboolean waitfor_pid (gpointer test, gpointer user_data)
|
||||
int status;
|
||||
pid_t ret;
|
||||
|
||||
if (_wapi_handle_issignalled (test)) {
|
||||
/* We've already done this one */
|
||||
return (FALSE);
|
||||
}
|
||||
|
||||
ok = _wapi_lookup_handle (test, WAPI_HANDLE_PROCESS,
|
||||
(gpointer *)&process);
|
||||
if (ok == FALSE) {
|
||||
/* The handle must have been too old and was reaped */
|
||||
return (FALSE);
|
||||
}
|
||||
|
||||
if (process->waited) {
|
||||
/* We've already done this one */
|
||||
return(FALSE);
|
||||
}
|
||||
|
||||
do {
|
||||
ret = waitpid (process->id, &status, WNOHANG);
|
||||
@@ -138,6 +142,8 @@ static gboolean waitfor_pid (gpointer test, gpointer user_data)
|
||||
g_message ("%s: Process %d finished", __func__, ret);
|
||||
#endif
|
||||
|
||||
process->waited = TRUE;
|
||||
|
||||
*(int *)user_data = status;
|
||||
|
||||
return (TRUE);
|
||||
@@ -185,16 +191,6 @@ static guint32 process_wait (gpointer handle, guint32 timeout)
|
||||
#ifdef DEBUG
|
||||
g_message ("%s: Waiting for process %p", __func__, handle);
|
||||
#endif
|
||||
|
||||
if (_wapi_handle_issignalled (handle)) {
|
||||
/* We've already done this one */
|
||||
#ifdef DEBUG
|
||||
g_message ("%s: Process %p already signalled", __func__,
|
||||
handle);
|
||||
#endif
|
||||
|
||||
return (WAIT_OBJECT_0);
|
||||
}
|
||||
|
||||
ok = _wapi_lookup_handle (handle, WAPI_HANDLE_PROCESS,
|
||||
(gpointer *)&process_handle);
|
||||
@@ -204,6 +200,16 @@ static guint32 process_wait (gpointer handle, guint32 timeout)
|
||||
return(WAIT_FAILED);
|
||||
}
|
||||
|
||||
if (process_handle->waited) {
|
||||
/* We've already done this one */
|
||||
#ifdef DEBUG
|
||||
g_message ("%s: Process %p already signalled", __func__,
|
||||
handle);
|
||||
#endif
|
||||
|
||||
return (WAIT_OBJECT_0);
|
||||
}
|
||||
|
||||
pid = process_handle->id;
|
||||
|
||||
#ifdef DEBUG
|
||||
@@ -211,9 +217,15 @@ static guint32 process_wait (gpointer handle, guint32 timeout)
|
||||
#endif
|
||||
|
||||
if (timeout == INFINITE) {
|
||||
while ((ret = waitpid (pid, &status, 0)) != pid) {
|
||||
if (ret == (pid_t)-1 && errno != EINTR) {
|
||||
return(WAIT_FAILED);
|
||||
if (pid == _wapi_getpid ()) {
|
||||
do {
|
||||
Sleep (10000);
|
||||
} while(1);
|
||||
} else {
|
||||
while ((ret = waitpid (pid, &status, 0)) != pid) {
|
||||
if (ret == (pid_t)-1 && errno != EINTR) {
|
||||
return(WAIT_FAILED);
|
||||
}
|
||||
}
|
||||
}
|
||||
} else if (timeout == 0) {
|
||||
@@ -224,18 +236,47 @@ static guint32 process_wait (gpointer handle, guint32 timeout)
|
||||
}
|
||||
} else {
|
||||
/* Poll in a loop */
|
||||
do {
|
||||
ret = waitpid (pid, &status, WNOHANG);
|
||||
if (ret == pid) {
|
||||
break;
|
||||
} else if (ret == (pid_t)-1 && errno != EINTR) {
|
||||
return(WAIT_FAILED);
|
||||
}
|
||||
if (pid == _wapi_getpid ()) {
|
||||
Sleep (timeout);
|
||||
return(WAIT_TIMEOUT);
|
||||
} else {
|
||||
do {
|
||||
ret = waitpid (pid, &status, WNOHANG);
|
||||
#ifdef DEBUG
|
||||
g_message ("%s: waitpid returns: %d, timeout is %d", __func__, ret, timeout);
|
||||
#endif
|
||||
|
||||
if (ret == pid) {
|
||||
break;
|
||||
} else if (ret == (pid_t)-1 &&
|
||||
errno != EINTR) {
|
||||
#ifdef DEBUG
|
||||
g_message ("%s: waitpid failure: %s",
|
||||
__func__,
|
||||
g_strerror (errno));
|
||||
#endif
|
||||
|
||||
_wapi_handle_spin (100);
|
||||
timeout -= 100;
|
||||
} while (timeout > 0);
|
||||
if (errno == ECHILD &&
|
||||
process_handle->waited) {
|
||||
/* The background
|
||||
* process reaper must
|
||||
* have got this one
|
||||
*/
|
||||
#ifdef DEBUG
|
||||
g_message ("%s: Process %p already reaped", __func__, handle);
|
||||
#endif
|
||||
|
||||
return(WAIT_OBJECT_0);
|
||||
} else {
|
||||
return(WAIT_FAILED);
|
||||
}
|
||||
}
|
||||
|
||||
_wapi_handle_spin (100);
|
||||
timeout -= 100;
|
||||
} while (timeout > 0);
|
||||
}
|
||||
|
||||
if (timeout <= 0) {
|
||||
return(WAIT_TIMEOUT);
|
||||
}
|
||||
@@ -251,7 +292,8 @@ static guint32 process_wait (gpointer handle, guint32 timeout)
|
||||
SetLastError (ERROR_OUTOFMEMORY);
|
||||
return (WAIT_FAILED);
|
||||
}
|
||||
|
||||
process_handle->waited = TRUE;
|
||||
|
||||
return(WAIT_OBJECT_0);
|
||||
}
|
||||
|
||||
@@ -268,6 +310,8 @@ static void process_set_defaults (struct _WapiHandle_process *process_handle)
|
||||
process_handle->min_working_set = 204800;
|
||||
process_handle->max_working_set = 1413120;
|
||||
|
||||
process_handle->waited = FALSE;
|
||||
|
||||
_wapi_time_t_to_filetime (time (NULL), &process_handle->create_time);
|
||||
}
|
||||
|
||||
@@ -914,6 +958,11 @@ cleanup:
|
||||
g_strfreev (env_strings);
|
||||
}
|
||||
|
||||
#ifdef DEBUG
|
||||
g_message ("%s: returning handle %p for pid %d", __func__, handle,
|
||||
pid);
|
||||
#endif
|
||||
|
||||
return(ret);
|
||||
}
|
||||
|
||||
@@ -955,6 +1004,8 @@ static void process_set_current (void)
|
||||
const char *handle_env;
|
||||
struct _WapiHandle_process process_handle = {0};
|
||||
|
||||
mono_once (&process_ops_once, process_ops_init);
|
||||
|
||||
handle_env = g_getenv ("_WAPI_PROCESS_HANDLE_OFFSET");
|
||||
g_unsetenv ("_WAPI_PROCESS_HANDLE_OFFSET");
|
||||
|
||||
|
||||
+2
-13
@@ -292,12 +292,11 @@ void _wapi_shm_semaphores_init ()
|
||||
for (i = 0; i < _WAPI_SHARED_SEM_COUNT; i++) {
|
||||
def_vals[i] = 1;
|
||||
}
|
||||
#ifdef NEXT_VERSION_INC
|
||||
|
||||
/* Process count must start at '0' - the 1 for all the others
|
||||
* sets the semaphore to "unlocked"
|
||||
*/
|
||||
def_vals[_WAPI_SHARED_SEM_PROCESS_COUNT] = 0;
|
||||
#endif
|
||||
|
||||
defs.array = def_vals;
|
||||
|
||||
@@ -438,19 +437,9 @@ void _wapi_shm_semaphores_remove (void)
|
||||
|
||||
proc_count = semctl (_wapi_sem_id, _WAPI_SHARED_SEM_PROCESS_COUNT,
|
||||
GETVAL);
|
||||
#ifdef NEXT_VERSION_INC
|
||||
|
||||
g_assert (proc_count > 0);
|
||||
if (proc_count == 1) {
|
||||
#else
|
||||
/* Compatibility - the semaphore was initialised to '1' (which
|
||||
* normally means 'unlocked'. Instead of fixing that right
|
||||
* now, which would mean a shared file version increment, just
|
||||
* cope with the value starting too high for now. Fix this
|
||||
* next time I have to change the file version.
|
||||
*/
|
||||
g_assert (proc_count > 1);
|
||||
if (proc_count == 2) {
|
||||
#endif
|
||||
/* Just us, so blow away the semaphores and the shared
|
||||
* files
|
||||
*/
|
||||
|
||||
@@ -24,8 +24,7 @@
|
||||
/* Increment this whenever an incompatible change is made to the
|
||||
* shared handle structure.
|
||||
*/
|
||||
/* Next time I change this, remember to fix the process count in shared.c */
|
||||
#define _WAPI_HANDLE_VERSION 10
|
||||
#define _WAPI_HANDLE_VERSION 11
|
||||
|
||||
typedef enum {
|
||||
WAPI_HANDLE_UNUSED=0,
|
||||
|
||||
@@ -1,3 +1,7 @@
|
||||
2006-11-23 Dick Porter <[email protected]>
|
||||
|
||||
* wapihandles.c (mini_wapi_seminfo): No need to adjust the counter
|
||||
semaphore display now we've fixed the initial value
|
||||
|
||||
Thu Nov 16 14:07:18 CET 2006 Paolo Molaro <[email protected]>
|
||||
|
||||
|
||||
@@ -272,7 +272,7 @@ int mini_wapi_seminfo (int argc, char **argv)
|
||||
sem_explain (sem_id, vals,
|
||||
_WAPI_SHARED_SEM_PROCESS_COUNT_LOCK);
|
||||
g_print ("Count: %d\n",
|
||||
vals[_WAPI_SHARED_SEM_PROCESS_COUNT] - 1);
|
||||
vals[_WAPI_SHARED_SEM_PROCESS_COUNT]);
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
Reference in new issue
Block a user