projects
/
privoxy.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
2bd48cc
)
Workaround for closing the jarfile before load_config() comes around again
author
David Schmidt
<david__schmidt@users.sourceforge.net>
Mon, 25 Mar 2002 17:04:55 +0000
(17:04 +0000)
committer
David Schmidt
<david__schmidt@users.sourceforge.net>
Mon, 25 Mar 2002 17:04:55 +0000
(17:04 +0000)
jcc.c
patch
|
blob
|
history
diff --git
a/jcc.c
b/jcc.c
index
7eb369e
..
84a7eb4
100644
(file)
--- a/
jcc.c
+++ b/
jcc.c
@@
-1,4
+1,4
@@
-const char jcc_rcs[] = "$Id: jcc.c,v 1.8
4 2002/03/24 13:25:43 swa
Exp $";
+const char jcc_rcs[] = "$Id: jcc.c,v 1.8
5 2002/03/24 15:23:33 jongfoster
Exp $";
/*********************************************************************
*
* File : $Source: /cvsroot/ijbswa/current/jcc.c,v $
/*********************************************************************
*
* File : $Source: /cvsroot/ijbswa/current/jcc.c,v $
@@
-33,6
+33,9
@@
const char jcc_rcs[] = "$Id: jcc.c,v 1.84 2002/03/24 13:25:43 swa Exp $";
*
* Revisions :
* $Log: jcc.c,v $
*
* Revisions :
* $Log: jcc.c,v $
+ * Revision 1.85 2002/03/24 15:23:33 jongfoster
+ * Name changes
+ *
* Revision 1.84 2002/03/24 13:25:43 swa
* name change related issues
*
* Revision 1.84 2002/03/24 13:25:43 swa
* name change related issues
*
@@
-2019,6
+2022,23
@@
static void listen_loop(void)
}
#endif
}
#endif
+#ifdef __OS2__
+#ifdef FEATURE_COOKIE_JAR
+ /*
+ * Need a workaround here: we have to fclose() the jarfile, or we die because it's
+ * already open. I think unload_configfile() is not being run, which should do
+ * this work. Until that can get resolved, we'll use this workaround.
+ */
+ if (csp)
+ if(csp->config)
+ if (csp->config->jar)
+ {
+ fclose(csp->config->jar);
+ csp->config->jar = NULL;
+ }
+#endif /* FEATURE_COOKIE_JAR */
+#endif /* __OS2__ */
+
if ( NULL == (csp = (struct client_state *) zalloc(sizeof(*csp))) )
{
log_error(LOG_LEVEL_FATAL, "malloc(%d) for csp failed: %E", sizeof(*csp));
if ( NULL == (csp = (struct client_state *) zalloc(sizeof(*csp))) )
{
log_error(LOG_LEVEL_FATAL, "malloc(%d) for csp failed: %E", sizeof(*csp));