cvs: php4 /sapi/apache mod_php4.c
| From: | Sascha Schumann | Date: | Sun, 16 Sep 2001 16:03:50 +0000 |
| Subject: | cvs: php4 /sapi/apache mod_php4.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-7431@lists.php.net to get a copy of this message | ||
sas Sun Sep 16 12:03:50 2001 EDT
Modified files:
/php4/sapi/apache mod_php4.c
Log:
WS-fix and directly use ap_psprintf instead of sprintf/ap_pstrdup
Index: php4/sapi/apache/mod_php4.c
diff -u php4/sapi/apache/mod_php4.c:1.123 php4/sapi/apache/mod_php4.c:1.124
--- php4/sapi/apache/mod_php4.c:1.123 Sun Sep 16 11:45:25 2001
+++ php4/sapi/apache/mod_php4.c Sun Sep 16 12:03:49 2001
@@ -17,7 +17,7 @@
| PHP 4.0 patches by Zeev Suraski <zeev@zend.com> |
+----------------------------------------------------------------------+
*/
-/* $Id: mod_php4.c,v 1.123 2001/09/16 15:45:25 thies Exp $ */
+/* $Id: mod_php4.c,v 1.124 2001/09/16 16:03:49 sas Exp $ */
#define NO_REGEX_EXTRA_H
#ifdef WIN32
@@ -587,18 +587,17 @@
*/
static int send_parsed_php(request_rec * r)
{
- int result = send_php(r, 0, NULL);
+ int result = send_php(r, 0, NULL);
#if MEMORY_LIMIT
- {
- char mem_usage[ 32 ];
- TSRMLS_FETCH();
+ {
+ char *mem_usage;
+ TSRMLS_FETCH();
- sprintf(mem_usage,"%u", (int) AG(allocated_memory_peak));
- AG(allocated_memory_peak)=0;
- ap_table_setn(r->notes, "mod_php_memory_usage", ap_pstrdup(r->pool,
mem_usage));
-
- }
+ mem_usage = ap_psprintf(r->pool, "%u", AG(allocated_memory_peak));
+ AG(allocated_memory_peak) = 0;
+ ap_table_setn(r->notes, "mod_php_memory_usage", mem_usage);
+ }
#endif
return result;