com php-src: fix macro usage: sapi/apache2handler/sapi_apac he2.c
| From: | Anatol Belski | Date: | Wed, 17 Sep 2014 19:46:48 +0000 |
| Subject: | com php-src: fix macro usage: sapi/apache2handler/sapi_apac he2.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-81719@lists.php.net to get a copy of this message | ||
Commit: 341ff0dea5065176fbcb53505c2a5c845a252c8c
Author: Anatol Belski <ab@php.net> Wed, 17 Sep 2014 21:46:48 +0200
Parents: b5406ed3167512f156e74c1bbd422d26ade271fa
Branches: master
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=341ff0dea5065176fbcb53505c2a5c845a252c8c
Log:
fix macro usage
Changed paths:
M sapi/apache2handler/sapi_apache2.c
Diff:
diff --git a/sapi/apache2handler/sapi_apache2.c b/sapi/apache2handler/sapi_apache2.c
index ad5e4db...aed7741 100644
--- a/sapi/apache2handler/sapi_apache2.c
+++ b/sapi/apache2handler/sapi_apache2.c
@@ -482,7 +482,11 @@ static int php_apache_request_ctor(request_rec *r, php_struct *ctx TSRMLS_DC)
r->no_local_copy = 1;
content_length = (char *) apr_table_get(r->headers_in, "Content-Length");
- SG(request_info).content_length = (content_length ? ZEND_ATOL(content_length) : 0);
+ if (content_length) {
+ ZEND_ATOL(SG(request_info).content_length, content_length);
+ } else {
+ SG(request_info).content_length = 0;
+ }
apr_table_unset(r->headers_out, "Content-Length");
apr_table_unset(r->headers_out, "Last-Modified");