Changeset 7795 for trunk/src/dot/proxy

Timestamp:

03/26/07 09:28:08 (22 months ago)

Author:

BradNeuberg

Message:

Created way to have JavaScript? layer 'query' to see if the PAC file has been updated yet -- if not, we tell the user to restart their browser

Location:

trunk/src/dot/proxy

Files:

• http_parse.c (modified) (2 diffs)
• local.c (modified) (3 diffs)
• local.h (modified) (1 diff)

trunk/src/dot/proxy/http_parse.c

@@ -1470 +1470 @@
 urlIsLocal(const char *url, int len)
 {
-    return (len > 0 && url[0] == '/');
+    return (len >= 13 && strstr(url, "pac_check.txt")) ||
+            (len > 0 && url[0] == '/');
 }
 
@@ -1476 +1477 @@
 urlIsSpecial(const char *url, int len)
 {
-    return (len >= 8 && memcmp(url, "/polipo/", 8) == 0);
+    return  (len >= 13 && strstr(url, "pac_check.txt")) ||
+            (len >= 8 && memcmp(url, "/polipo/", 8) == 0);
 }
 

trunk/src/dot/proxy/local.c

@@ -351 +351 @@
                      "\r\nServer: polipo"
                      "\r\nContent-Type: text/javascript");
+        }else if(isPACCheck(object) == 1){
+                hlen = snnprintf(buffer, 0, 1024,
+                     "\r\nServer: polipo"
+                     "\r\nContent-Type: text/plain");
         }else{
         hlen = snnprintf(buffer, 0, 1024,
@@ -376 +380 @@
 #ifndef NO_OFFLINE_SUPPORT
     } else if(disableOfflineSupport == 0 && 
-              matchUrl("/polipo/offline", object)) {
-            handleOfflineAPI(object, requestor);
+            matchUrl("/polipo/offline", object)) {
+        handleOfflineAPI(object, requestor);
 #endif
+    } else if(isPACCheck(object) == 1) {
+        printf("pac_check.txt was requested");
+        objectPrintf(object, 0, 
+                    "the web application is inside the PAC file");
+        object->length = object->size;        
     } else if(matchUrl("/polipo/status", object)) {
         objectPrintf(object, 0,
@@ -678 +687 @@
 }
 
+int
+isPACCheck(ObjectPtr object)
+{
+    char *testUrl;
+    printf("isPACCheck\n");
+    
+    if(disableOfflineSupport == 1)
+        return 0;
+        
+    /* object->key doesn't use a null terminator, which
+       strstr requires; copy it over and add a null
+       terminator. */
+    testUrl = (char *)malloc((unsigned)(object->key_size + 1)); 
+    memcpy(testUrl, object->key, object->key_size);
+    testUrl[object->key_size] = '\0';
+    printf("testUrl=%s\n", testUrl);
+    if(strstr(testUrl, "pac_check.txt") != NULL)
+        return 1;
+    else
+        return 0;
+}
+
 #ifdef HAVE_FORK
 static void

trunk/src/dot/proxy/local.h

@@ -48 +48 @@
                                  StreamRequestPtr srequest);
 int httpSpecialDoSideFinish(AtomPtr data, HTTPRequestPtr requestor);
+int isPACCheck(ObjectPtr object);
+