Fix the locking of gmtime()

[privoxy.git] / parsers.c

diff --git a/parsers.c b/parsers.c
index 4517c1a..11d28c7 100644 (file)
--- a/parsers.c
+++ b/parsers.c
@@ -1208,7 +1208,7 @@ jb_err sed_https(struct client_state *csp)
    struct list headers;
 
    /*
    struct list headers;
 
    /*

-    * Temporarly replace csp->headers with csp->https_headers
+    * Temporarily replace csp->headers with csp->https_headers

     * to trick sed() into filtering the https headers.
     */
    headers.first = csp->headers->first;
     * to trick sed() into filtering the https headers.
     */
    headers.first = csp->headers->first;


@@ -1225,7 +1225,7 @@ jb_err sed_https(struct client_state *csp)
 
    /*
     * We want client header filters and taggers
 
    /*
     * We want client header filters and taggers

-    * so temporarly remove the flag.
+    * so temporarily remove the flag.

     */
    csp->flags &= ~CSP_FLAG_CLIENT_HEADER_PARSING_DONE;
    err = sed(csp, FILTER_CLIENT_HEADERS);
     */
    csp->flags &= ~CSP_FLAG_CLIENT_HEADER_PARSING_DONE;
    err = sed(csp, FILTER_CLIENT_HEADERS);


@@ -2459,7 +2459,7 @@ static jb_err server_content_encoding(struct client_state *csp, char **header)
  *
  * Description :  Remove the Content-Encoding header if the
  *                decompression was successful and the content
  *
  * Description :  Remove the Content-Encoding header if the
  *                decompression was successful and the content

- *                has been modifed.
+ *                has been modified.

  *
  * Parameters  :
  *          1  :  csp = Current client state (buffers, headers, etc...)
  *
  * Parameters  :
  *          1  :  csp = Current client state (buffers, headers, etc...)


@@ -2774,20 +2774,24 @@ static jb_err server_last_modified(struct client_state *csp, char **header)
 #elif defined(MUTEX_LOCKS_AVAILABLE)
             privoxy_mutex_lock(&gmtime_mutex);
             timeptr = gmtime(&last_modified);
 #elif defined(MUTEX_LOCKS_AVAILABLE)
             privoxy_mutex_lock(&gmtime_mutex);
             timeptr = gmtime(&last_modified);

-            privoxy_mutex_unlock(&gmtime_mutex);

 #else
             timeptr = gmtime(&last_modified);
 #endif
             if ((NULL == timeptr) || !strftime(newheader,
                   sizeof(newheader), "%a, %d %b %Y %H:%M:%S GMT", timeptr))
             {
 #else
             timeptr = gmtime(&last_modified);
 #endif
             if ((NULL == timeptr) || !strftime(newheader,
                   sizeof(newheader), "%a, %d %b %Y %H:%M:%S GMT", timeptr))
             {

+#if !defined(HAVE_GMTIME_R) && defined(MUTEX_LOCKS_AVAILABLE)
+               privoxy_mutex_unlock(&gmtime_mutex);
+#endif

                log_error(LOG_LEVEL_ERROR,
                   "Randomizing '%s' failed. Crunching the header without replacement.",
                   *header);
                freez(*header);
                return JB_ERR_OK;
             }
                log_error(LOG_LEVEL_ERROR,
                   "Randomizing '%s' failed. Crunching the header without replacement.",
                   *header);
                freez(*header);
                return JB_ERR_OK;
             }

-
+#if !defined(HAVE_GMTIME_R) && defined(MUTEX_LOCKS_AVAILABLE)
+            privoxy_mutex_unlock(&gmtime_mutex);
+#endif

             freez(*header);
             *header = strdup("Last-Modified: ");
             string_append(header, newheader);
             freez(*header);
             *header = strdup("Last-Modified: ");
             string_append(header, newheader);


@@ -3478,20 +3482,24 @@ static jb_err client_if_modified_since(struct client_state *csp, char **header)
 #elif defined(MUTEX_LOCKS_AVAILABLE)
             privoxy_mutex_lock(&gmtime_mutex);
             timeptr = gmtime(&tm);
 #elif defined(MUTEX_LOCKS_AVAILABLE)
             privoxy_mutex_lock(&gmtime_mutex);
             timeptr = gmtime(&tm);

-            privoxy_mutex_unlock(&gmtime_mutex);

 #else
             timeptr = gmtime(&tm);
 #endif
             if ((NULL == timeptr) || !strftime(newheader,
                   sizeof(newheader), "%a, %d %b %Y %H:%M:%S GMT", timeptr))
             {
 #else
             timeptr = gmtime(&tm);
 #endif
             if ((NULL == timeptr) || !strftime(newheader,
                   sizeof(newheader), "%a, %d %b %Y %H:%M:%S GMT", timeptr))
             {

+#if !defined(HAVE_GMTIME_R) && defined(MUTEX_LOCKS_AVAILABLE)
+               privoxy_mutex_unlock(&gmtime_mutex);
+#endif

                log_error(LOG_LEVEL_ERROR,
                   "Randomizing '%s' failed. Crunching the header without replacement.",
                   *header);
                freez(*header);
                return JB_ERR_OK;
             }
                log_error(LOG_LEVEL_ERROR,
                   "Randomizing '%s' failed. Crunching the header without replacement.",
                   *header);
                freez(*header);
                return JB_ERR_OK;
             }

-
+#if !defined(HAVE_GMTIME_R) && defined(MUTEX_LOCKS_AVAILABLE)
+            privoxy_mutex_unlock(&gmtime_mutex);
+#endif

             freez(*header);
             *header = strdup("If-Modified-Since: ");
             string_append(header, newheader);
             freez(*header);
             *header = strdup("If-Modified-Since: ");
             string_append(header, newheader);


@@ -4039,17 +4047,22 @@ static void add_cookie_expiry_date(char **cookie, time_t lifetime)
 #elif defined(MUTEX_LOCKS_AVAILABLE)
    privoxy_mutex_lock(&gmtime_mutex);
    timeptr = gmtime(&expiry_date);
 #elif defined(MUTEX_LOCKS_AVAILABLE)
    privoxy_mutex_lock(&gmtime_mutex);
    timeptr = gmtime(&expiry_date);

-   privoxy_mutex_unlock(&gmtime_mutex);

 #else
    timeptr = gmtime(&expiry_date);
 #endif
 
    if (NULL == timeptr)
    {
 #else
    timeptr = gmtime(&expiry_date);
 #endif
 
    if (NULL == timeptr)
    {

+#if !defined(HAVE_GMTIME_R) && defined(MUTEX_LOCKS_AVAILABLE)
+      privoxy_mutex_unlock(&gmtime_mutex);
+#endif

       log_error(LOG_LEVEL_FATAL,
          "Failed to get the time in add_cooky_expiry_date()");
    }
    strftime(tmp, sizeof(tmp), "; expires=%a, %d-%b-%Y %H:%M:%S GMT", timeptr);
       log_error(LOG_LEVEL_FATAL,
          "Failed to get the time in add_cooky_expiry_date()");
    }
    strftime(tmp, sizeof(tmp), "; expires=%a, %d-%b-%Y %H:%M:%S GMT", timeptr);

+#if !defined(HAVE_GMTIME_R) && defined(MUTEX_LOCKS_AVAILABLE)
+   privoxy_mutex_unlock(&gmtime_mutex);
+#endif

    if (JB_ERR_OK != string_append(cookie, tmp))
    {
       log_error(LOG_LEVEL_FATAL, "Out of memory in add_cooky_expiry()");
    if (JB_ERR_OK != string_append(cookie, tmp))
    {
       log_error(LOG_LEVEL_FATAL, "Out of memory in add_cooky_expiry()");