projects
/
privoxy.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Change RA_MODE from 0664 to 0644
[privoxy.git]
/
jcc.c
diff --git
a/jcc.c
b/jcc.c
index
5ae051c
..
81a6938
100644
(file)
--- a/
jcc.c
+++ b/
jcc.c
@@
-1,4
+1,4
@@
-const char jcc_rcs[] = "$Id: jcc.c,v 1.37
4 2011/11/06 11:58:51
fabiankeil Exp $";
+const char jcc_rcs[] = "$Id: jcc.c,v 1.37
7 2012/03/09 16:24:36
fabiankeil Exp $";
/*********************************************************************
*
* File : $Source: /cvsroot/ijbswa/current/jcc.c,v $
/*********************************************************************
*
* File : $Source: /cvsroot/ijbswa/current/jcc.c,v $
@@
-338,7
+338,7
@@
static void sig_handler(int the_signal)
case SIGINT:
log_error(LOG_LEVEL_INFO, "exiting by signal %d .. bye", the_signal);
#if defined(unix)
case SIGINT:
log_error(LOG_LEVEL_INFO, "exiting by signal %d .. bye", the_signal);
#if defined(unix)
- if(pidfile)
+ if
(pidfile)
{
unlink(pidfile);
}
{
unlink(pidfile);
}
@@
-823,7
+823,7
@@
static void build_request_line(struct client_state *csp, const struct forward_sp
* Downgrade http version from 1.1 to 1.0
* if +downgrade action applies.
*/
* Downgrade http version from 1.1 to 1.0
* if +downgrade action applies.
*/
- if (
(csp->action->flags & ACTION_DOWNGRADE)
+ if ((csp->action->flags & ACTION_DOWNGRADE)
&& (!strcmpic(http->ver, "HTTP/1.1")))
{
freez(http->ver);
&& (!strcmpic(http->ver, "HTTP/1.1")))
{
freez(http->ver);
@@
-1861,8
+1861,9
@@
static void chat(struct client_state *csp)
*/
watch_client_socket = 0;
log_error(LOG_LEVEL_CONNECT,
*/
watch_client_socket = 0;
log_error(LOG_LEVEL_CONNECT,
- "Stopping to watch the client socket. "
- "There's already another request waiting.");
+ "Stopping to watch the client socket %d. "
+ "There's already another request waiting.",
+ csp->cfd);
continue;
}
/*
continue;
}
/*
@@
-2922,7
+2923,7
@@
int main(int argc, char **argv)
const char *pName = argv[argc_pos] + 9;
if (*pName == ':')
pName++;
const char *pName = argv[argc_pos] + 9;
if (*pName == ':')
pName++;
- exit(
(install_service(pName)) ? 0 : 1
);
+ exit(
(install_service(pName)) ? 0 : 1
);
}
else if (strncmp(argv[argc_pos], "--uninstall", 11) == 0)
{
}
else if (strncmp(argv[argc_pos], "--uninstall", 11) == 0)
{
@@
-2931,7
+2932,7
@@
int main(int argc, char **argv)
pName++;
exit((uninstall_service(pName)) ? 0 : 1);
}
pName++;
exit((uninstall_service(pName)) ? 0 : 1);
}
- else if (strcmp(argv[argc_pos], "--service"
) == 0)
+ else if (strcmp(argv[argc_pos], "--service") == 0)
{
bRunAsService = TRUE;
w32_set_service_cwd();
{
bRunAsService = TRUE;
w32_set_service_cwd();
@@
-2948,7
+2949,7
@@
int main(int argc, char **argv)
usage(argv[0]);
}
usage(argv[0]);
}
- else if(strcmp(argv[argc_pos], "--version") == 0)
+ else if
(strcmp(argv[argc_pos], "--version") == 0)
{
printf("Privoxy version " VERSION " (" HOME_PAGE_URL ")\n");
exit(0);
{
printf("Privoxy version " VERSION " (" HOME_PAGE_URL ")\n");
exit(0);
@@
-2956,19
+2957,19
@@
int main(int argc, char **argv)
#if defined(unix)
#if defined(unix)
- else if (strcmp(argv[argc_pos], "--no-daemon"
) == 0)
+ else if (strcmp(argv[argc_pos], "--no-daemon") == 0)
{
set_debug_level(LOG_LEVEL_FATAL | LOG_LEVEL_ERROR | LOG_LEVEL_INFO);
daemon_mode = 0;
}
{
set_debug_level(LOG_LEVEL_FATAL | LOG_LEVEL_ERROR | LOG_LEVEL_INFO);
daemon_mode = 0;
}
- else if (strcmp(argv[argc_pos], "--pidfile"
) == 0)
+ else if (strcmp(argv[argc_pos], "--pidfile") == 0)
{
if (++argc_pos == argc) usage(argv[0]);
pidfile = strdup(argv[argc_pos]);
}
{
if (++argc_pos == argc) usage(argv[0]);
pidfile = strdup(argv[argc_pos]);
}
- else if (strcmp(argv[argc_pos], "--user"
) == 0)
+ else if (strcmp(argv[argc_pos], "--user") == 0)
{
char *user_arg;
char *group_name;
{
char *user_arg;
char *group_name;
@@
-3005,13
+3006,13
@@
int main(int argc, char **argv)
freez(user_arg);
}
freez(user_arg);
}
- else if (strcmp(argv[argc_pos], "--pre-chroot-nslookup"
) == 0)
+ else if (strcmp(argv[argc_pos], "--pre-chroot-nslookup") == 0)
{
if (++argc_pos == argc) usage(argv[0]);
pre_chroot_nslookup_to_load_resolver = strdup(argv[argc_pos]);
}
{
if (++argc_pos == argc) usage(argv[0]);
pre_chroot_nslookup_to_load_resolver = strdup(argv[argc_pos]);
}
- else if (strcmp(argv[argc_pos], "--chroot"
) == 0)
+ else if (strcmp(argv[argc_pos], "--chroot") == 0)
{
do_chroot = 1;
}
{
do_chroot = 1;
}
@@
-3038,7
+3039,7
@@
int main(int argc, char **argv)
show_version(Argv[0]);
#if defined(unix)
show_version(Argv[0]);
#if defined(unix)
- if (
*configfile != '/'
)
+ if (
*configfile != '/'
)
{
char cwd[BUFFER_SIZE];
char *abs_file;
{
char cwd[BUFFER_SIZE];
char *abs_file;
@@
-3048,7
+3049,7
@@
int main(int argc, char **argv)
if (NULL == getcwd(cwd, sizeof(cwd)))
{
perror("failed to get current working directory");
if (NULL == getcwd(cwd, sizeof(cwd)))
{
perror("failed to get current working directory");
- exit(
1
);
+ exit(
1
);
}
/* XXX: why + 5? */
}
/* XXX: why + 5? */
@@
-3059,10
+3060,10
@@
int main(int argc, char **argv)
NULL == (abs_file = malloc(abs_file_size)))
{
perror("malloc failed");
NULL == (abs_file = malloc(abs_file_size)))
{
perror("malloc failed");
- exit(
1
);
+ exit(
1
);
}
strlcpy(abs_file, basedir, abs_file_size);
}
strlcpy(abs_file, basedir, abs_file_size);
- strlcat(abs_file, "/", abs_file_size
);
+ strlcat(abs_file, "/", abs_file_size);
strlcat(abs_file, configfile, abs_file_size);
configfile = abs_file;
}
strlcat(abs_file, configfile, abs_file_size);
configfile = abs_file;
}
@@
-3142,12
+3143,12
@@
int main(int argc, char **argv)
int fd;
pid_t pid = fork();
int fd;
pid_t pid = fork();
- if (
pid < 0
) /* error */
+ if (
pid < 0
) /* error */
{
perror("fork");
{
perror("fork");
- exit(
3
);
+ exit(
3
);
}
}
- else if (
pid != 0
) /* parent */
+ else if (
pid != 0
) /* parent */
{
int status;
pid_t wpid;
{
int status;
pid_t wpid;
@@
-3155,13
+3156,13
@@
int main(int argc, char **argv)
* must check for errors
* child died due to missing files aso
*/
* must check for errors
* child died due to missing files aso
*/
- sleep(
1
);
- wpid = waitpid(
pid, &status, WNOHANG
);
- if (
wpid != 0
)
+ sleep(
1
);
+ wpid = waitpid(
pid, &status, WNOHANG
);
+ if (
wpid != 0
)
{
{
- exit(
1
);
+ exit(
1
);
}
}
- exit(
0
);
+ exit(
0
);
}
/* child */
}
/* child */
@@
-3541,7
+3542,7
@@
static void listen_loop(void)
log_error(LOG_LEVEL_CONNECT, "accept failed: %E");
#ifdef AMIGA
log_error(LOG_LEVEL_CONNECT, "accept failed: %E");
#ifdef AMIGA
- if(!childs)
+ if
(!childs)
{
exit(1);
}
{
exit(1);
}
@@
-3700,7
+3701,7
@@
static void listen_loop(void)
NP_StackSize, 200*1024,
TAG_DONE);
#endif
NP_StackSize, 200*1024,
TAG_DONE);
#endif
- if(0 != child_id)
+ if
(0 != child_id)
{
childs++;
((struct Task *)child_id)->tc_UserData = csp;
{
childs++;
((struct Task *)child_id)->tc_UserData = csp;
@@
-3754,7
+3755,7
@@
static void listen_loop(void)
int child_status;
#if !defined(_WIN32) && !defined(__CYGWIN__)
int child_status;
#if !defined(_WIN32) && !defined(__CYGWIN__)
- wait(
&child_status
);
+ wait(
&child_status
);
/*
* Evaluate child's return code: If the child has
/*
* Evaluate child's return code: If the child has