cvs: php4 /sapi/apache2filter sapi_apache2.c
| From: | Aaron Bannert | Date: | Fri, 12 Apr 2002 22:25:30 +0000 |
| Subject: | cvs: php4 /sapi/apache2filter sapi_apache2.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-11100@lists.php.net to get a copy of this message | ||
aaron Fri Apr 12 18:25:30 2002 EDT
Modified files:
/php4/sapi/apache2filter sapi_apache2.c
Log:
Fix a typo and a build error detected by the lovely HPUX11 ANSI C compiler.
Index: php4/sapi/apache2filter/sapi_apache2.c
diff -u php4/sapi/apache2filter/sapi_apache2.c:1.68 php4/sapi/apache2filter/sapi_apache2.c:1.69
--- php4/sapi/apache2filter/sapi_apache2.c:1.68 Thu Apr 11 16:34:56 2002
+++ php4/sapi/apache2filter/sapi_apache2.c Fri Apr 12 18:25:29 2002
@@ -257,7 +257,7 @@
long old_index;
apr_bucket *b;
const char *str;
- apr_ssize_t n;
+ apr_size_t n;
apr_status_t rv;
TSRMLS_FETCH();
@@ -322,10 +322,12 @@
{
php_request_shutdown(NULL);
-#undef safe_free
-#define safe_free(x) ((x)?free((x)):0)
- safe_free(SG(request_info).query_string);
- safe_free(SG(request_info).request_uri);
+ if (SG(request_info).query_string) {
+ free(SG(request_info).query_string);
+ }
+ if (SG(request_info).query_string) {
+ free(SG(request_info).request_uri);
+ }
}
static int php_output_filter(ap_filter_t *f, apr_bucket_brigade *bb)