You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@httpd.apache.org by gb...@apache.org on 2023/03/24 08:50:19 UTC
svn commit: r1908684 - in /httpd/httpd/trunk: docs/log-message-tags/next-number modules/cache/mod_cache_disk.c
Author: gbechis
Date: Fri Mar 24 08:50:19 2023
New Revision: 1908684
URL: http://svn.apache.org/viewvc?rev=1908684&view=rev
Log:
add error message when storing data to temp file fails.
Github: closes #182
Modified:
httpd/httpd/trunk/docs/log-message-tags/next-number
httpd/httpd/trunk/modules/cache/mod_cache_disk.c
Modified: httpd/httpd/trunk/docs/log-message-tags/next-number
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/docs/log-message-tags/next-number?rev=1908684&r1=1908683&r2=1908684&view=diff
==============================================================================
--- httpd/httpd/trunk/docs/log-message-tags/next-number (original)
+++ httpd/httpd/trunk/docs/log-message-tags/next-number Fri Mar 24 08:50:19 2023
@@ -1 +1 @@
-10413
+10414
Modified: httpd/httpd/trunk/modules/cache/mod_cache_disk.c
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/cache/mod_cache_disk.c?rev=1908684&r1=1908683&r2=1908684&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/cache/mod_cache_disk.c (original)
+++ httpd/httpd/trunk/modules/cache/mod_cache_disk.c Fri Mar 24 08:50:19 2023
@@ -1033,7 +1033,14 @@ static apr_status_t write_headers(cache_
varray = apr_array_make(r->pool, 6, sizeof(char*));
tokens_to_array(r->pool, tmp, varray);
- store_array(dobj->vary.tempfd, varray);
+ rv = store_array(dobj->vary.tempfd, varray);
+ if (rv != APR_SUCCESS) {
+ ap_log_rerror(APLOG_MARK, APLOG_WARNING, rv, r, APLOGNO(10413)
+ "could not write to vary file %s",
+ dobj->vary.tempfile);
+ apr_pool_destroy(dobj->vary.pool);
+ return rv;
+ }
rv = apr_file_close(dobj->vary.tempfd);
if (rv != APR_SUCCESS) {
Re: svn commit: r1908684 - in /httpd/httpd/trunk: docs/log-message-tags/next-number modules/cache/mod_cache_disk.c
Posted by gi...@paclan.it.
On 3/28/23 12:49, Joe Orton wrote:
> On Fri, Mar 24, 2023 at 08:50:19AM -0000, gbechis@apache.org wrote:
>> Author: gbechis
>> Date: Fri Mar 24 08:50:19 2023
>> New Revision: 1908684
>>
>> URL: http://svn.apache.org/viewvc?rev=1908684&view=rev
>> Log:
>> add error message when storing data to temp file fails.
>> Github: closes #182
>
> Hi Giovanni, thanks for taking care of the PRs, that is really great to
> see.
>
> FYI when you are committing code written by someone else it is customary
> to include "Submitted by:" in the commit message to give them due
> credit, like:
>
> Submitted by: Name of Person <person example.com>
>
will do
> There are guidelines here:
> https://httpd.apache.org/dev/guidelines.html#changes-file-and-subversion-logs
>
> If you use Ruediger's apply_trunk_pr.sh script from here:
> https://svn.apache.org/repos/asf/httpd/dev-tools/github/
> it will do this automatically for you for a PR, including extracting the
> full name properly from the github metadata (which is really neat).
>
thanks, I was not aware of this script.
Giovanni
Re: svn commit: r1908684 - in /httpd/httpd/trunk: docs/log-message-tags/next-number modules/cache/mod_cache_disk.c
Posted by Joe Orton <jo...@redhat.com>.
On Fri, Mar 24, 2023 at 08:50:19AM -0000, gbechis@apache.org wrote:
> Author: gbechis
> Date: Fri Mar 24 08:50:19 2023
> New Revision: 1908684
>
> URL: http://svn.apache.org/viewvc?rev=1908684&view=rev
> Log:
> add error message when storing data to temp file fails.
> Github: closes #182
Hi Giovanni, thanks for taking care of the PRs, that is really great to
see.
FYI when you are committing code written by someone else it is customary
to include "Submitted by:" in the commit message to give them due
credit, like:
Submitted by: Name of Person <person example.com>
There are guidelines here:
https://httpd.apache.org/dev/guidelines.html#changes-file-and-subversion-logs
If you use Ruediger's apply_trunk_pr.sh script from here:
https://svn.apache.org/repos/asf/httpd/dev-tools/github/
it will do this automatically for you for a PR, including extracting the
full name properly from the github metadata (which is really neat).
Regards, Joe