diff options
| author | kkania@chromium.org <kkania@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-02-04 16:48:26 +0000 |
|---|---|---|
| committer | kkania@chromium.org <kkania@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-02-04 16:48:26 +0000 |
| commit | 9650ea1b907196736da51be053992c50152d0882 (patch) | |
| tree | 953602199162d3ac9120c816e888a820c839dc83 /third_party | |
| parent | 39be34adcfe428dd7a0ad132b23796d9be24a7fd (diff) | |
| download | chromium_src-9650ea1b907196736da51be053992c50152d0882.zip chromium_src-9650ea1b907196736da51be053992c50152d0882.tar.gz chromium_src-9650ea1b907196736da51be053992c50152d0882.tar.bz2 | |
Add method for shutting down ChromeDriver gracefully.
Merge webdriver_tests into chromedriver_tests.
BUG=none
TEST=none
Review URL: http://codereview.chromium.org/6368068
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@73809 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'third_party')
| -rw-r--r-- | third_party/mongoose/README.chromium | 3 | ||||
| -rw-r--r-- | third_party/mongoose/mongoose.c | 7 |
2 files changed, 6 insertions, 4 deletions
diff --git a/third_party/mongoose/README.chromium b/third_party/mongoose/README.chromium index c8561bf..c1bf3ca 100644 --- a/third_party/mongoose/README.chromium +++ b/third_party/mongoose/README.chromium @@ -26,3 +26,6 @@ Note: There is no make file for this project, it's compiled directly in the chrome versoin of webdriver found under the directory: src/chrome/test/webdriver +Local modifications: +-Do not check for OS_POSIX, instead just check that it is not windows. + diff --git a/third_party/mongoose/mongoose.c b/third_party/mongoose/mongoose.c index 8078e63..24874e5 100644 --- a/third_party/mongoose/mongoose.c +++ b/third_party/mongoose/mongoose.c @@ -4479,10 +4479,10 @@ get_socket(struct mg_context *ctx, struct socket *sp) ctx->num_idle++; while (ctx->sq_head == ctx->sq_tail) { ts.tv_nsec = 0; -#ifdef OS_POSIX - ts.tv_sec = time(NULL) + atoi(ctx->options[OPT_IDLE_TIME]) + 1; -#elif _WIN32 +#ifdef _WIN32 ts.tv_sec = (long) (time(NULL) + atoi(ctx->options[OPT_IDLE_TIME]) + 1); +#else + ts.tv_sec = time(NULL) + atoi(ctx->options[OPT_IDLE_TIME]) + 1; #endif if (pthread_cond_timedwait(&ctx->empty_cond, &ctx->thr_mutex, &ts) != 0) { @@ -4747,4 +4747,3 @@ mg_start(void) return (ctx); } - |