shire		Fri Aug 29 00:58:11 2008 UTC

  Modified files:              
    /pecl/apc	apc_globals.h apc_rfc1867.c php_apc.c 
  Log:
  provide apc.rfc1867_ttl configuration to help with bug #14198
  
  
http://cvs.php.net/viewvc.cgi/pecl/apc/apc_globals.h?r1=3.85&r2=3.86&diff_format=u
Index: pecl/apc/apc_globals.h
diff -u pecl/apc/apc_globals.h:3.85 pecl/apc/apc_globals.h:3.86
--- pecl/apc/apc_globals.h:3.85	Fri Aug 15 02:59:21 2008
+++ pecl/apc/apc_globals.h	Fri Aug 29 00:58:11 2008
@@ -29,7 +29,7 @@
 
  */
 
-/* $Id: apc_globals.h,v 3.85 2008/08/15 02:59:21 shire Exp $ */
+/* $Id: apc_globals.h,v 3.86 2008/08/29 00:58:11 shire Exp $ */
 
 #ifndef APC_GLOBALS_H
 #define APC_GLOBALS_H
@@ -73,6 +73,7 @@
     char* rfc1867_prefix;        /* Key prefix */
     char* rfc1867_name;          /* Name of hidden field to activate upload progress/key suffix */
     double rfc1867_freq;         /* Update frequency as percentage or bytes */
+    long rfc1867_ttl;            /* TTL for rfc1867 entries */
 #endif
     HashTable *copied_zvals;     /* my_copy recursion detection list */
     int reserved_offset;         /* offset for apc info in op_array->reserved[] */
http://cvs.php.net/viewvc.cgi/pecl/apc/apc_rfc1867.c?r1=3.17&r2=3.18&diff_format=u
Index: pecl/apc/apc_rfc1867.c
diff -u pecl/apc/apc_rfc1867.c:3.17 pecl/apc/apc_rfc1867.c:3.18
--- pecl/apc/apc_rfc1867.c:3.17	Wed Aug 13 19:51:32 2008
+++ pecl/apc/apc_rfc1867.c	Fri Aug 29 00:58:11 2008
@@ -25,7 +25,7 @@
 
  */
 
-/* $Id: apc_rfc1867.c,v 3.17 2008/08/13 19:51:32 shire Exp $*/
+/* $Id: apc_rfc1867.c,v 3.18 2008/08/29 00:58:11 shire Exp $*/
 
 #include "apc.h"
 #include "apc_globals.h"
@@ -200,7 +200,7 @@
                 add_assoc_long(track, "cancel_upload", cancel_upload);
                 add_assoc_long(track, "done", 1);
                 add_assoc_double(track, "start_time", start_time);
-                _apc_store(tracking_key, key_length, track, 3600, 0 TSRMLS_CC);
+                _apc_store(tracking_key, key_length, track, APCG(rfc1867_ttl), 0 TSRMLS_CC);
                 zval_ptr_dtor(&track);
             }
             break;
http://cvs.php.net/viewvc.cgi/pecl/apc/php_apc.c?r1=3.183&r2=3.184&diff_format=u
Index: pecl/apc/php_apc.c
diff -u pecl/apc/php_apc.c:3.183 pecl/apc/php_apc.c:3.184
--- pecl/apc/php_apc.c:3.183	Fri Aug 15 20:00:14 2008
+++ pecl/apc/php_apc.c	Fri Aug 29 00:58:11 2008
@@ -26,7 +26,7 @@
 
  */
 
-/* $Id: php_apc.c,v 3.183 2008/08/15 20:00:14 bjori Exp $ */
+/* $Id: php_apc.c,v 3.184 2008/08/29 00:58:11 shire Exp $ */
 
 #include "apc_zend.h"
 #include "apc_cache.h"
@@ -197,6 +197,7 @@
 STD_PHP_INI_ENTRY("apc.rfc1867_prefix", "upload_", PHP_INI_SYSTEM, OnUpdateStringUnempty, rfc1867_prefix, zend_apc_globals, apc_globals)
 STD_PHP_INI_ENTRY("apc.rfc1867_name", "APC_UPLOAD_PROGRESS", PHP_INI_SYSTEM, OnUpdateStringUnempty, rfc1867_name, zend_apc_globals, apc_globals)
 STD_PHP_INI_ENTRY("apc.rfc1867_freq", "0", PHP_INI_SYSTEM, OnUpdateRfc1867Freq, rfc1867_freq, zend_apc_globals, apc_globals)
+STD_PHP_INI_ENTRY("apc.rfc1867_ttl", "3600", PHP_INI_SYSTEM, OnUpdateInt, rfc1867_ttl, zend_apc_globals, apc_globals)
 #endif
 STD_PHP_INI_BOOLEAN("apc.coredump_unmap", "0", PHP_INI_SYSTEM, OnUpdateBool, coredump_unmap, zend_apc_globals, apc_globals)
 STD_PHP_INI_ENTRY("apc.preload_path", (char*)NULL,              PHP_INI_SYSTEM, OnUpdateString,       preload_path,  zend_apc_globals, apc_globals)
@@ -217,7 +218,7 @@
     php_info_print_table_row(2, "MMAP Support", "Disabled");
 #endif
     php_info_print_table_row(2, "Locking type", APC_LOCK_TYPE);
-    php_info_print_table_row(2, "Revision", "$Revision: 3.183 $");
+    php_info_print_table_row(2, "Revision", "$Revision: 3.184 $");
     php_info_print_table_row(2, "Build Date", __DATE__ " " __TIME__);
     php_info_print_table_end();
     DISPLAY_INI_ENTRIES();