Changeset 64 for eaccelerator/trunk/content.c

Timestamp:

04/26/05 16:48:00 (4 years ago)

Author:

zoeloelip

Message:

* This commit contains the first part of the code refactoring. In this part

the monolitic eaccelerator.c file has been split up in more logical blocks.

cache.c/cache.h contains the procedure for shm.c/session.c/content.c to add user_cache entries to the ea cache
shm.c/shm.h contains the eaccelerator shared memory functions
session.c/session.h contains the session related stuff
webui.c/webui.h contains all stuff related to the webinterface and disassembler
debug.c/debug.h contains some procedures to print debug information
content.h contains the php content caching prototype instead of eaccelerator.h

* Added --without-eaccelerator-shared-memory and --without-eaccelerator-webui configure switches

Bugfixes included:
* Patch 1188510 eaccelerator_compile_file typos
* Patch 1189792 session life time patch
* Patch 1167069 HAS_ATTRIBUTE fix with FreeBSD 4.x
* Patch 1166707 loader patch for OOP functions in PHP5 (only rapidly tested but also seemed ok to segv)
* string in eaccelerator_put_page (content.c line 162) which wasn't freed (Thanks to The_Surfer)

Files:

• eaccelerator/trunk/content.c (modified) (3 diffs)

eaccelerator/trunk/content.c

@@ -3 +3 @@
-   | eAccelerator project                                                 |
-   +----------------------------------------------------------------------+
-eAccelerator       
-sourceforge.net                                
+- 2005 eAccelerator
+net                                                   
-   +----------------------------------------------------------------------+
-   | This program is free software; you can redistribute it and/or        |
@@ -33 +33 @@
-#ifdef WITH_EACCELERATOR_CONTENT_CACHING
-
+#include "cache.h"
+#include "content.h"
-#include "SAPI.h"
-
-#define EACCELERATOR_COMPRESS_MIN 128
-
+eaccelerator_cache_place eaccelerator_content_cache_place = eaccelerator_shm_and_disk;
+
-static int (*eaccelerator_old_header_handler)(sapi_header_struct *sapi_header, sapi_headers_struct *sapi_headers TSRMLS_DC);
+
+PHP_INI_MH (eaccelerator_OnUpdateContentCachePlace)
+{
+        if (strncasecmp ("shm_and_disk", new_value, 
+                sizeof ("shm_and_disk")) == 0)
+        {
+                eaccelerator_content_cache_place = eaccelerator_shm_and_disk;
+        }
+        else if (strncasecmp ("shm", new_value, 
+                sizeof ("shm")) == 0)
+        {
+                eaccelerator_content_cache_place = eaccelerator_shm;
+        }
+        else if (strncasecmp ("shm_only", new_value, 
+                sizeof ("shm_only")) == 0)
+        {
+                eaccelerator_content_cache_place = eaccelerator_shm_only;
+        }
+        else if (strncasecmp ("disk_only", new_value, 
+                sizeof ("disk_only")) == 0)
+        {
+                eaccelerator_content_cache_place = eaccelerator_disk_only;
+        }
+        else if (strncasecmp ("none", new_value, 
+                sizeof ("none")) == 0)
+        {
+                eaccelerator_content_cache_place = eaccelerator_none;
+        }
+        return SUCCESS;
+}
-
-static int eaccelerator_check_compression(sapi_header_struct *sapi_header TSRMLS_DC) {
@@ -131 +165 @@
-      add_next_index_stringl(headers, s, h->header_len+1, 0);
-      p = p->next;
+      efree(s);
-    }
-    add_assoc_zval(&cache_array, "headers", headers);