cvs: php4 /sapi/apache mod_php4.c
| From: | Zeev Suraski | Date: | Wed, 16 May 2001 15:01:13 +0000 |
| Subject: | cvs: php4 /sapi/apache mod_php4.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-5786@lists.php.net to get a copy of this message | ||
zeev Wed May 16 08:01:13 2001 EDT
Modified files:
/php4/sapi/apache mod_php4.c
Log:
Merge memory usage into memory limit
Index: php4/sapi/apache/mod_php4.c
diff -u php4/sapi/apache/mod_php4.c:1.98 php4/sapi/apache/mod_php4.c:1.99
--- php4/sapi/apache/mod_php4.c:1.98 Wed May 16 02:01:20 2001
+++ php4/sapi/apache/mod_php4.c Wed May 16 08:01:13 2001
@@ -17,7 +17,7 @@
| PHP 4.0 patches by Zeev Suraski <zeev@zend.com> |
+----------------------------------------------------------------------+
*/
-/* $Id: mod_php4.c,v 1.98 2001/05/16 09:01:20 dbeu Exp $ */
+/* $Id: mod_php4.c,v 1.99 2001/05/16 15:01:13 zeev Exp $ */
#define NO_REGEX_EXTRA_H
#ifdef WIN32
@@ -546,12 +546,12 @@
{
int result = send_php(r, 0, NULL);
-#if MEMORY_USAGE_INFO
+#if MEMORY_LIMIT
{
char mem_usage[ 32 ];
ALS_FETCH()
- sprintf(mem_usage,"%u", (int) AG(max_allocated_memory));
+ sprintf(mem_usage,"%u", (int) AG(allocated_memory_peak));
ap_table_setn(r->notes, "mod_php_memory_usage",
ap_pstrdup(r->pool,mem_usage));
}
#endif