gmane.comp.apache.cvs http://blog.gmane.org/gmane.comp.apache.cvs hourly 1 1901-01-01T00:00+00:00 Gmane http://gmane.org/img/gmane-25t.png http://gmane.org svn commit: r1486269 - /httpd/httpd/trunk/modules/lua/lua_request.c http://comments.gmane.org/gmane.comp.apache.cvs/36900 <pre>Author: fuankg Date: Sat May 25 01:14:45 2013 New Revision: 1486269 URL: http://svn.apache.org/r1486269 Log: Whoops - one empty line too much. Modified: httpd/httpd/trunk/modules/lua/lua_request.c Modified: httpd/httpd/trunk/modules/lua/lua_request.c URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/lua/lua_request.c?rev=1486269&amp;r1=1486268&amp;r2=1486269&amp;view=diff ============================================================================== --- httpd/httpd/trunk/modules/lua/lua_request.c (original) +++ httpd/httpd/trunk/modules/lua/lua_request.c Sat May 25 01:14:45 2013 &lt; at &gt;&lt; at &gt; -1574,6 +1574,7 &lt; at &gt;&lt; at &gt; static int lua_ap_usleep(lua_State *L) } /* END dispatch methods for request_rec fields */ + static int req_dispatch(lua_State *L) { apr_hash_t *dispatch; </pre> fuankg< at >apache.org 2013-05-25T01:14:46 svn commit: r1486266 - /httpd/httpd/trunk/modules/lua/lua_request.c http://comments.gmane.org/gmane.comp.apache.cvs/36899 <pre>Author: fuankg Date: Sat May 25 00:59:12 2013 New Revision: 1486266 URL: http://svn.apache.org/r1486266 Log: Removed a bunch of empty lines. Modified: httpd/httpd/trunk/modules/lua/lua_request.c Modified: httpd/httpd/trunk/modules/lua/lua_request.c URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/lua/lua_request.c?rev=1486266&amp;r1=1486265&amp;r2=1486266&amp;view=diff ============================================================================== --- httpd/httpd/trunk/modules/lua/lua_request.c (original) +++ httpd/httpd/trunk/modules/lua/lua_request.c Sat May 25 00:59:12 2013 &lt; at &gt;&lt; at &gt; -1343,7 +1343,6 &lt; at &gt;&lt; at &gt; static int lua_ap_server_info(lua_State */ static int lua_ap_set_context_info(lua_State *L) { - request_rec *r; const char *prefix; const char *document_root; &lt; at &gt;&lt; at &gt; -1369,7 +1368,6 &lt; at &gt;&lt; at &gt; static int lua_ap_set_context_info(lua_S */ static int lua_ap_os_escape_path(lua_State *L) { - char *returnValue; request_rec *r; const char *path; &lt; at &gt;&lt; at &gt; -1395,7 +1393,6 &lt; at &gt;&lt; at &gt; static int lua_ap_os_escape_path(lua_Sta */ static int lua_ap_escape_logitem(lua_State *L) { - char *returnValue; request_rec *r; const char *str; &lt; at &gt;&lt; at &gt; -1418,7 +1415,6 &lt; at &gt;&lt; at &gt; static int lua_ap_escape_logitem(lua_Sta */ static int lua_ap_strcmp_match(lua_State *L) { - int returnValue; const char *str; const char *expected; &lt; at &gt;&lt; at &gt; -1446,7 +1442,6 &lt; at &gt;&lt; at &gt; static int lua_ap_strcmp_match(lua_State */ static int lua_ap_set_keepalive(lua_State *L) { - int returnValue; request_rec *r; luaL_checktype(L, 1, LUA_TUSERDATA); &lt; at &gt;&lt; at &gt; -1467,7 +1462,6 &lt; at &gt;&lt; at &gt; static int lua_ap_set_keepalive(lua_Stat */ static int lua_ap_make_etag(lua_State *L) { - char *returnValue; request_rec *r; int force_weak; &lt; at &gt;&lt; at &gt; -1490,7 +1484,6 &lt; at &gt;&lt; at &gt; static int lua_ap_make_etag(lua_State *L */ static int lua_ap_send_interim_response(lua_State *L) { - request_rec *r; int send_headers = 0; luaL_checktype(L, 1, LUA_TUSERDATA); &lt; at &gt;&lt; at &gt; -1512,7 +1505,6 &lt; at &gt;&lt; at &gt; static int lua_ap_send_interim_response( */ static int lua_ap_custom_response(lua_State *L) { - request_rec *r; int status; const char *string; &lt; at &gt;&lt; at &gt; -1535,7 +1527,6 &lt; at &gt;&lt; at &gt; static int lua_ap_custom_response(lua_St */ static int lua_ap_exists_config_define(lua_State *L) { - int returnValue; const char *name; luaL_checktype(L, 1, LUA_TSTRING); &lt; at &gt;&lt; at &gt; -1547,7 +1538,6 &lt; at &gt;&lt; at &gt; static int lua_ap_exists_config_define(l static int lua_ap_get_server_name_for_url(lua_State *L) { - const char *servername; request_rec *r; luaL_checktype(L, 1, LUA_TUSERDATA); &lt; at &gt;&lt; at &gt; -1557,10 +1547,7 &lt; at &gt;&lt; at &gt; static int lua_ap_get_server_name_for_ur return 1; } - - -/** - * ap_state_query (int query_code) item starts a new field */ +/* ap_state_query (int query_code) item starts a new field */ static int lua_ap_state_query(lua_State *L) { &lt; at &gt;&lt; at &gt; -1579,7 +1566,6 &lt; at &gt;&lt; at &gt; static int lua_ap_state_query(lua_State */ static int lua_ap_usleep(lua_State *L) { - apr_interval_time_t msec; luaL_checktype(L, 1, LUA_TNUMBER); msec = (apr_interval_time_t)lua_tonumber(L, 1); &lt; at &gt;&lt; at &gt; -1588,7 +1574,6 &lt; at &gt;&lt; at &gt; static int lua_ap_usleep(lua_State *L) } /* END dispatch methods for request_rec fields */ - static int req_dispatch(lua_State *L) { apr_hash_t *dispatch; </pre> fuankg< at >apache.org 2013-05-25T00:59:12 svn commit: r1486265 - /httpd/httpd/trunk/modules/lua/lua_request.c http://comments.gmane.org/gmane.comp.apache.cvs/36898 <pre>Author: fuankg Date: Sat May 25 00:56:22 2013 New Revision: 1486265 URL: http://svn.apache.org/r1486265 Log: Changed r.sleep(s) to r.usleep(ms). Modified: httpd/httpd/trunk/modules/lua/lua_request.c Modified: httpd/httpd/trunk/modules/lua/lua_request.c URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/lua/lua_request.c?rev=1486265&amp;r1=1486264&amp;r2=1486265&amp;view=diff ============================================================================== --- httpd/httpd/trunk/modules/lua/lua_request.c (original) +++ httpd/httpd/trunk/modules/lua/lua_request.c Sat May 25 00:56:22 2013 &lt; at &gt;&lt; at &gt; -1573,12 +1573,16 &lt; at &gt;&lt; at &gt; static int lua_ap_state_query(lua_State return 1; } -static int lua_ap_sleep(lua_State *L) +/* + * lua_ap_usleep; r:usleep(microseconds) + * - Sleep for the specified number of microseconds. + */ +static int lua_ap_usleep(lua_State *L) { apr_interval_time_t msec; luaL_checktype(L, 1, LUA_TNUMBER); - msec = (apr_interval_time_t)(lua_tonumber(L, 1) * 1000000); + msec = (apr_interval_time_t)lua_tonumber(L, 1); apr_sleep(msec); return 0; } &lt; at &gt;&lt; at &gt; -2037,8 +2041,8 &lt; at &gt;&lt; at &gt; AP_LUA_DECLARE(void) ap_lua_load_request makefun(&amp;lua_ap_getdir, APL_REQ_FUNTYPE_LUACFUN, p)); apr_hash_set(dispatch, "regex", APR_HASH_KEY_STRING, makefun(&amp;lua_ap_regex, APL_REQ_FUNTYPE_LUACFUN, p)); - apr_hash_set(dispatch, "sleep", APR_HASH_KEY_STRING, - makefun(&amp;lua_ap_sleep, APL_REQ_FUNTYPE_LUACFUN, p)); + apr_hash_set(dispatch, "usleep", APR_HASH_KEY_STRING, + makefun(&amp;lua_ap_usleep, APL_REQ_FUNTYPE_LUACFUN, p)); apr_hash_set(dispatch, "base64_encode", APR_HASH_KEY_STRING, makefun(&amp;lua_apr_b64encode, APL_REQ_FUNTYPE_LUACFUN, p)); apr_hash_set(dispatch, "base64_decode", APR_HASH_KEY_STRING, </pre> fuankg< at >apache.org 2013-05-25T00:56:23 svn commit: r1486262 - in /httpd/httpd/branches/2.4.x: STATUS include/ap_release.h http://comments.gmane.org/gmane.comp.apache.cvs/36897 <pre>Author: fuankg Date: Sat May 25 00:38:15 2013 New Revision: 1486262 URL: http://svn.apache.org/r1486262 Log: Make AP_SERVER_ADD_STRING define-able from CFLAGS. backport of r1481955. Reviewed by: minfrin, humbedooh Modified: httpd/httpd/branches/2.4.x/STATUS httpd/httpd/branches/2.4.x/include/ap_release.h Modified: httpd/httpd/branches/2.4.x/STATUS URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/STATUS?rev=1486262&amp;r1=1486261&amp;r2=1486262&amp;view=diff ============================================================================== --- httpd/httpd/branches/2.4.x/STATUS (original) +++ httpd/httpd/branches/2.4.x/STATUS Sat May 25 00:38:15 2013 &lt; at &gt;&lt; at &gt; -115,11 +115,6 &lt; at &gt;&lt; at &gt; PATCHES ACCEPTED TO BACKPORT FROM TRUNK: 2.4.x patch: trunk patch works (minus CHANGES) +1: minfrin, jim, jorton - * ap_release.h: Make AP_SERVER_ADD_STRING define-able from CFLAGS. - trunk patch: http://svn.apache.org/r1481955 - 2.4.x patch: trunk works (with fuzz) - +1: fuankg, minfrin, humbedooh - PATCHES PROPOSED TO BACKPORT FROM TRUNK: [ New proposals should be added at the end of the list ] Modified: httpd/httpd/branches/2.4.x/include/ap_release.h URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/include/ap_release.h?rev=1486262&amp;r1=1486261&amp;r2=1486262&amp;view=diff ============================================================================== --- httpd/httpd/branches/2.4.x/include/ap_release.h (original) +++ httpd/httpd/branches/2.4.x/include/ap_release.h Sat May 25 00:38:15 2013 &lt; at &gt;&lt; at &gt; -47,13 +47,15 &lt; at &gt;&lt; at &gt; #define AP_SERVER_MINORVERSION_NUMBER 4 #define AP_SERVER_PATCHLEVEL_NUMBER 5 #define AP_SERVER_DEVBUILD_BOOLEAN 1 -#define AP_SERVER_ADD_STRING "-dev" /* Synchronize the above with docs/manual/style/version.ent */ #if !AP_SERVER_DEVBUILD_BOOLEAN -#undef AP_SERVER_ADD_STRING #define AP_SERVER_ADD_STRING "" +#else +#ifndef AP_SERVER_ADD_STRING +#define AP_SERVER_ADD_STRING "-dev" +#endif #endif /* keep old macros as well */ </pre> fuankg< at >apache.org 2013-05-25T00:38:15 svn commit: r1486261 - /httpd/httpd/branches/2.4.x/STATUS http://comments.gmane.org/gmane.comp.apache.cvs/36896 <pre>Author: fuankg Date: Sat May 25 00:31:40 2013 New Revision: 1486261 URL: http://svn.apache.org/r1486261 Log: promote. Modified: httpd/httpd/branches/2.4.x/STATUS Modified: httpd/httpd/branches/2.4.x/STATUS URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/STATUS?rev=1486261&amp;r1=1486260&amp;r2=1486261&amp;view=diff ============================================================================== --- httpd/httpd/branches/2.4.x/STATUS (original) +++ httpd/httpd/branches/2.4.x/STATUS Sat May 25 00:31:40 2013 &lt; at &gt;&lt; at &gt; -115,6 +115,10 &lt; at &gt;&lt; at &gt; PATCHES ACCEPTED TO BACKPORT FROM TRUNK: 2.4.x patch: trunk patch works (minus CHANGES) +1: minfrin, jim, jorton + * ap_release.h: Make AP_SERVER_ADD_STRING define-able from CFLAGS. + trunk patch: http://svn.apache.org/r1481955 + 2.4.x patch: trunk works (with fuzz) + +1: fuankg, minfrin, humbedooh PATCHES PROPOSED TO BACKPORT FROM TRUNK: [ New proposals should be added at the end of the list ] &lt; at &gt;&lt; at &gt; -312,11 +316,6 &lt; at &gt;&lt; at &gt; PATCHES PROPOSED TO BACKPORT FROM TRUNK: 2.4.x patch: trunk works, modulo CHANGES +1: jim, minfrin - * ap_release.h: Make AP_SERVER_ADD_STRING define-able from CFLAGS. - trunk patch: http://svn.apache.org/r1481955 - 2.4.x patch: trunk works (with fuzz) - +1: fuankg, minfrin, humbedooh - * mod_proxy_http: Make the proxy-interim-response environment variable effective by formally overriding origin server behaviour. trunk patch: http://svn.apache.org/r1483027 </pre> fuankg< at >apache.org 2013-05-25T00:31:40 svn commit: r1486253 - /httpd/httpd/branches/2.4.x/STATUS http://comments.gmane.org/gmane.comp.apache.cvs/36895 <pre>Author: humbedooh Date: Fri May 24 23:29:56 2013 New Revision: 1486253 URL: http://svn.apache.org/r1486253 Log: vote + promote (with fuzz) Modified: httpd/httpd/branches/2.4.x/STATUS Modified: httpd/httpd/branches/2.4.x/STATUS URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/STATUS?rev=1486253&amp;r1=1486252&amp;r2=1486253&amp;view=diff ============================================================================== --- httpd/httpd/branches/2.4.x/STATUS (original) +++ httpd/httpd/branches/2.4.x/STATUS Fri May 24 23:29:56 2013 &lt; at &gt;&lt; at &gt; -89,6 +89,31 &lt; at &gt;&lt; at &gt; RELEASE SHOWSTOPPERS: PATCHES ACCEPTED TO BACKPORT FROM TRUNK: [ start all new proposals below, under PATCHES PROPOSED. ] + + * mod_dav: Make sure that when we prepare an If URL for Etag comparison, + we compare unencoded paths. PR 53910 + trunk patch: http://svn.apache.org/r1470940 + http://svn.apache.org/r1477530 + 2.4.x patch: trunk patch works (minus CHANGES) + +1: minfrin, jim, jorton + + * mod_dav: Sending a If or If-Match header with an invalid ETag doesn't + result in a 412 Precondition Failed. PR54610 + trunk patch: http://svn.apache.org/r1476604 + 2.4.x patch: trunk patch works (minus CHANGES) + +1: minfrin, jim, jorton + + * mod_dav: When a PROPPATCH attempts to remove a non-existent dead + property on a resource for which there is no dead property in the same + namespace httpd segfaults. PR 52559 + trunk patch: http://svn.apache.org/r1476642 + 2.4.x patch: trunk patch works (minus CHANGES) + +1: minfrin, jim, jorton + + * mod_dav: Do not fail PROPPATCH when prop namespace is not known. PR 52559 + trunk patch: http://svn.apache.org/r1476644 + 2.4.x patch: trunk patch works (minus CHANGES) + +1: minfrin, jim, jorton PATCHES PROPOSED TO BACKPORT FROM TRUNK: &lt; at &gt;&lt; at &gt; -182,30 +207,6 &lt; at &gt;&lt; at &gt; PATCHES PROPOSED TO BACKPORT FROM TRUNK: 2.4.x patch: trunk patches work +1: jim - * mod_dav: Make sure that when we prepare an If URL for Etag comparison, - we compare unencoded paths. PR 53910 - trunk patch: http://svn.apache.org/r1470940 - http://svn.apache.org/r1477530 - 2.4.x patch: trunk patch works (minus CHANGES) - +1: minfrin, jim, jorton - - * mod_dav: Sending a If or If-Match header with an invalid ETag doesn't - result in a 412 Precondition Failed. PR54610 - trunk patch: http://svn.apache.org/r1476604 - 2.4.x patch: trunk patch works (minus CHANGES) - +1: minfrin, jim, jorton - - * mod_dav: When a PROPPATCH attempts to remove a non-existent dead - property on a resource for which there is no dead property in the same - namespace httpd segfaults. PR 52559 - trunk patch: http://svn.apache.org/r1476642 - 2.4.x patch: trunk patch works (minus CHANGES) - +1: minfrin, jim, jorton - - * mod_dav: Do not fail PROPPATCH when prop namespace is not known. PR 52559 - trunk patch: http://svn.apache.org/r1476644 - 2.4.x patch: trunk patch works (minus CHANGES) - +1: minfrin, jim, jorton * core, mod_ssl: Lift the restriction that prevents mod_ssl taking full advantage of the event MPM. Enable the ability for a module &lt; at &gt;&lt; at &gt; -314,7 +315,7 &lt; at &gt;&lt; at &gt; PATCHES PROPOSED TO BACKPORT FROM TRUNK: * ap_release.h: Make AP_SERVER_ADD_STRING define-able from CFLAGS. trunk patch: http://svn.apache.org/r1481955 2.4.x patch: trunk works (with fuzz) - +1: fuankg, minfrin + +1: fuankg, minfrin, humbedooh * mod_proxy_http: Make the proxy-interim-response environment variable effective by formally overriding origin server behaviour. </pre> humbedooh< at >apache.org 2013-05-24T23:29:57 svn commit: r1486158 - /httpd/httpd/branches/2.4.x/STATUS http://comments.gmane.org/gmane.comp.apache.cvs/36894 <pre>Author: fuankg Date: Fri May 24 18:35:59 2013 New Revision: 1486158 URL: http://svn.apache.org/r1486158 Log: Remove my blocking vote. Modified: httpd/httpd/branches/2.4.x/STATUS Modified: httpd/httpd/branches/2.4.x/STATUS URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/STATUS?rev=1486158&amp;r1=1486157&amp;r2=1486158&amp;view=diff ============================================================================== --- httpd/httpd/branches/2.4.x/STATUS (original) +++ httpd/httpd/branches/2.4.x/STATUS Fri May 24 18:35:59 2013 &lt; at &gt;&lt; at &gt; -128,10 +128,13 &lt; at &gt;&lt; at &gt; PATCHES PROPOSED TO BACKPORT FROM TRUNK: (the list goes on...) 2.4.x patch: http://www.humbedooh.com/mod_lua_sync.patch (+CHANGES) +1: humbedooh, jim - -1: fuankg - I think that I found some issues on NetWare which should be - solved before the backport happens; I need a bit more time - for testing on Windows too, and if there same issues I will - asap post them to list (or turn my -1 to +1) ... + +0.5: fuankg - all issues I found so far are meanwhile fixed either by + humbedooh or by myself; I did spend a bunch of hours during + last weeks to test as much as possible, and I believe its + now good enough provided that we copy the whole current trunk + code over; but nevertheless I feel that I have only tested + half of all new stuff, and therefore the +0.5 - I would like + to have someone else add a vote too. * mod_auth_basic: Add a generic mechanism to fake basic authentication using the ap_expr parser. This allows the administrator to construct </pre> fuankg< at >apache.org 2013-05-24T18:35:59 svn commit: r1486032 - /httpd/httpd/branches/2.2.x/STATUS http://comments.gmane.org/gmane.comp.apache.cvs/36893 <pre>Author: minfrin Date: Fri May 24 12:17:05 2013 New Revision: 1486032 URL: http://svn.apache.org/r1486032 Log: Withdraw proposal. Modified: httpd/httpd/branches/2.2.x/STATUS Modified: httpd/httpd/branches/2.2.x/STATUS URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.2.x/STATUS?rev=1486032&amp;r1=1486031&amp;r2=1486032&amp;view=diff ============================================================================== --- httpd/httpd/branches/2.2.x/STATUS (original) +++ httpd/httpd/branches/2.2.x/STATUS Fri May 24 12:17:05 2013 &lt; at &gt;&lt; at &gt; -215,12 +215,6 &lt; at &gt;&lt; at &gt; PATCHES PROPOSED TO BACKPORT FROM TRUNK: 2.2.x patch: trunk patch works (minus CHANGES) +1: minfrin - * mod_dav: PROPPATCH delete (svn propdel) silently discards errors. - PR 53525 - trunk patch: http://svn.apache.org/r1476627 - 2.2.x patch: trunk patch works (minus CHANGES) - +1: minfrin - * mod_dav: When a PROPPATCH attempts to remove a non-existent dead property on a resource for which there is no dead property in the same namespace httpd segfaults. PR 52559 </pre> minfrin< at >apache.org 2013-05-24T12:17:05 svn commit: r1486027 - /httpd/httpd/trunk/modules/dav/main/props.c http://comments.gmane.org/gmane.comp.apache.cvs/36892 <pre>Author: minfrin Date: Fri May 24 12:02:28 2013 New Revision: 1486027 URL: http://svn.apache.org/r1486027 Log: Clarify the existing behavior. Modified: httpd/httpd/trunk/modules/dav/main/props.c Modified: httpd/httpd/trunk/modules/dav/main/props.c URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/dav/main/props.c?rev=1486027&amp;r1=1486026&amp;r2=1486027&amp;view=diff ============================================================================== --- httpd/httpd/trunk/modules/dav/main/props.c (original) +++ httpd/httpd/trunk/modules/dav/main/props.c Fri May 24 12:02:28 2013 &lt; at &gt;&lt; at &gt; -1044,6 +1044,10 &lt; at &gt;&lt; at &gt; DAV_DECLARE_NONSTD(void) dav_prop_exec(d /* ** Delete the property. Ignore errors -- the property is there, or ** we are deleting it for a second time. + ** + ** http://tools.ietf.org/html/rfc4918#section-14.23 says + ** "Specifying the removal of a property that does not exist is + ** not an error" */ /* ### but what about other errors? */ (void) (*propdb-&gt;db_hooks-&gt;remove)(propdb-&gt;db, &amp;name); </pre> minfrin< at >apache.org 2013-05-24T12:02:28 svn commit: r1486026 - in /httpd/httpd/trunk: CHANGES modules/dav/main/props.c http://comments.gmane.org/gmane.comp.apache.cvs/36891 <pre>Author: minfrin Date: Fri May 24 11:59:51 2013 New Revision: 1486026 URL: http://svn.apache.org/r1486026 Log: Reverting as per veto in http://svn.apache.org/r1486021. Modified: httpd/httpd/trunk/CHANGES httpd/httpd/trunk/modules/dav/main/props.c Modified: httpd/httpd/trunk/CHANGES URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/CHANGES?rev=1486026&amp;r1=1486025&amp;r2=1486026&amp;view=diff ============================================================================== --- httpd/httpd/trunk/CHANGES [utf-8] (original) +++ httpd/httpd/trunk/CHANGES [utf-8] Fri May 24 11:59:51 2013 &lt; at &gt;&lt; at &gt; -112,9 +112,6 &lt; at &gt;&lt; at &gt; Changes with Apache 2.5.0 namespace httpd segfaults. PR 52559 [Diego Santa Cruz &lt;diego.santaCruz spinetix.com&gt;] - *) mod_dav: PROPPATCH delete (svn propdel) silently discards errors. - PR 53525 [Arwin Arni &lt;arwin collab.net&gt;] - *) mod_dav: Ensure URI is correctly uriencoded on return. PR 54611 [Timothy Wood &lt;tjw omnigroup.com&gt;] Modified: httpd/httpd/trunk/modules/dav/main/props.c URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/dav/main/props.c?rev=1486026&amp;r1=1486025&amp;r2=1486026&amp;view=diff ============================================================================== --- httpd/httpd/trunk/modules/dav/main/props.c (original) +++ httpd/httpd/trunk/modules/dav/main/props.c Fri May 24 11:59:51 2013 &lt; at &gt;&lt; at &gt; -1042,9 +1042,11 &lt; at &gt;&lt; at &gt; DAV_DECLARE_NONSTD(void) dav_prop_exec(d else if (ctx-&gt;operation == DAV_PROP_OP_DELETE) { /* - ** Delete the property. + ** Delete the property. Ignore errors -- the property is there, or + ** we are deleting it for a second time. */ - err = (*propdb-&gt;db_hooks-&gt;remove)(propdb-&gt;db, &amp;name); + /* ### but what about other errors? */ + (void) (*propdb-&gt;db_hooks-&gt;remove)(propdb-&gt;db, &amp;name); } } </pre> minfrin< at >apache.org 2013-05-24T11:59:51 svn commit: r1486025 - /httpd/httpd/branches/2.4.x/STATUS http://comments.gmane.org/gmane.comp.apache.cvs/36890 <pre>Author: jorton Date: Fri May 24 11:58:16 2013 New Revision: 1486025 URL: http://svn.apache.org/r1486025 Log: Last but not least... Modified: httpd/httpd/branches/2.4.x/STATUS Modified: httpd/httpd/branches/2.4.x/STATUS URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/STATUS?rev=1486025&amp;r1=1486024&amp;r2=1486025&amp;view=diff ============================================================================== --- httpd/httpd/branches/2.4.x/STATUS (original) +++ httpd/httpd/branches/2.4.x/STATUS Fri May 24 11:58:16 2013 &lt; at &gt;&lt; at &gt; -331,7 +331,7 &lt; at &gt;&lt; at &gt; PATCHES PROPOSED TO BACKPORT FROM TRUNK: URI that is not configured for DAV will trigger a segfault. trunk patch: http://svn.apache.org/r1485668 2.4.x patch: trunk works, modulo CHANGES - +1: minfrin, covener + +1: minfrin, covener, jorton A list of further possible backports can be found at: </pre> jorton< at >apache.org 2013-05-24T11:58:17 svn commit: r1486023 - /httpd/httpd/branches/2.4.x/STATUS http://comments.gmane.org/gmane.comp.apache.cvs/36889 <pre>Author: minfrin Date: Fri May 24 11:56:14 2013 New Revision: 1486023 URL: http://svn.apache.org/r1486023 Log: Withdraw proposal. Modified: httpd/httpd/branches/2.4.x/STATUS Modified: httpd/httpd/branches/2.4.x/STATUS URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/STATUS?rev=1486023&amp;r1=1486022&amp;r2=1486023&amp;view=diff ============================================================================== --- httpd/httpd/branches/2.4.x/STATUS (original) +++ httpd/httpd/branches/2.4.x/STATUS Fri May 24 11:56:14 2013 &lt; at &gt;&lt; at &gt; -192,14 +192,6 &lt; at &gt;&lt; at &gt; PATCHES PROPOSED TO BACKPORT FROM TRUNK: 2.4.x patch: trunk patch works (minus CHANGES) +1: minfrin, jim, jorton - * mod_dav: PROPPATCH delete (svn propdel) silently discards errors. - PR 53525 - trunk patch: http://svn.apache.org/r1476627 - 2.4.x patch: trunk patch works (minus CHANGES) - +1: minfrin, jim - -1: jorton: this is a regression, PROPPATCH/remove *should* succeed for - properties which don't exist, http://tools.ietf.org/html/rfc4918#section-14.23 - * mod_dav: When a PROPPATCH attempts to remove a non-existent dead property on a resource for which there is no dead property in the same namespace httpd segfaults. PR 52559 </pre> minfrin< at >apache.org 2013-05-24T11:56:15 svn commit: r1486021 - /httpd/httpd/branches/2.4.x/STATUS http://comments.gmane.org/gmane.comp.apache.cvs/36888 <pre>Author: jorton Date: Fri May 24 11:46:50 2013 New Revision: 1486021 URL: http://svn.apache.org/r1486021 Log: mod_dav patch review. Modified: httpd/httpd/branches/2.4.x/STATUS Modified: httpd/httpd/branches/2.4.x/STATUS URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/STATUS?rev=1486021&amp;r1=1486020&amp;r2=1486021&amp;view=diff ============================================================================== --- httpd/httpd/branches/2.4.x/STATUS (original) +++ httpd/httpd/branches/2.4.x/STATUS Fri May 24 11:46:50 2013 &lt; at &gt;&lt; at &gt; -184,31 +184,33 &lt; at &gt;&lt; at &gt; PATCHES PROPOSED TO BACKPORT FROM TRUNK: trunk patch: http://svn.apache.org/r1470940 http://svn.apache.org/r1477530 2.4.x patch: trunk patch works (minus CHANGES) - +1: minfrin, jim + +1: minfrin, jim, jorton * mod_dav: Sending a If or If-Match header with an invalid ETag doesn't result in a 412 Precondition Failed. PR54610 trunk patch: http://svn.apache.org/r1476604 2.4.x patch: trunk patch works (minus CHANGES) - +1: minfrin, jim + +1: minfrin, jim, jorton * mod_dav: PROPPATCH delete (svn propdel) silently discards errors. PR 53525 trunk patch: http://svn.apache.org/r1476627 2.4.x patch: trunk patch works (minus CHANGES) +1: minfrin, jim + -1: jorton: this is a regression, PROPPATCH/remove *should* succeed for + properties which don't exist, http://tools.ietf.org/html/rfc4918#section-14.23 * mod_dav: When a PROPPATCH attempts to remove a non-existent dead property on a resource for which there is no dead property in the same namespace httpd segfaults. PR 52559 trunk patch: http://svn.apache.org/r1476642 2.4.x patch: trunk patch works (minus CHANGES) - +1: minfrin, jim + +1: minfrin, jim, jorton * mod_dav: Do not fail PROPPATCH when prop namespace is not known. PR 52559 trunk patch: http://svn.apache.org/r1476644 2.4.x patch: trunk patch works (minus CHANGES) - +1: minfrin, jim + +1: minfrin, jim, jorton * core, mod_ssl: Lift the restriction that prevents mod_ssl taking full advantage of the event MPM. Enable the ability for a module &lt; at &gt;&lt; at &gt; -225,7 +227,7 &lt; at &gt;&lt; at &gt; PATCHES PROPOSED TO BACKPORT FROM TRUNK: dav_join_error() function. PR 54145. trunk patch: http://svn.apache.org/r1464241 2.4.x patch: http://people.apache.org/~minfrin/httpd-mod_dav-errorhandling.patch - +1: minfrin, jim + +1: minfrin, jim, jorton * mod_cache: Invalidate cached entities in response to RFC2616 Section 13.10 Invalidation After Updates or Deletions. PR 15868 </pre> jorton< at >apache.org 2013-05-24T11:46:51 svn commit: r1485772 - /httpd/httpd/trunk/modules/http/http_filters.c http://comments.gmane.org/gmane.comp.apache.cvs/36887 <pre>Author: minfrin Date: Thu May 23 16:31:01 2013 New Revision: 1485772 URL: http://svn.apache.org/r1485772 Log: Ensure that any meta buckets are stripped while parsing a chunk. Modified: httpd/httpd/trunk/modules/http/http_filters.c Modified: httpd/httpd/trunk/modules/http/http_filters.c URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/http/http_filters.c?rev=1485772&amp;r1=1485771&amp;r2=1485772&amp;view=diff ============================================================================== --- httpd/httpd/trunk/modules/http/http_filters.c (original) +++ httpd/httpd/trunk/modules/http/http_filters.c Thu May 23 16:31:01 2013 &lt; at &gt;&lt; at &gt; -331,9 +331,9 &lt; at &gt;&lt; at &gt; apr_status_t ap_http_filter(ap_filter_t APR_BRIGADE_INSERT_TAIL(b, e); return APR_SUCCESS; } - apr_brigade_cleanup(b); do { + apr_brigade_cleanup(b); again = 0; /* until further notice */ /* read and handle the brigade */ </pre> minfrin< at >apache.org 2013-05-23T16:31:01 svn commit: r1485769 - /httpd/httpd/branches/2.2.x/STATUS http://comments.gmane.org/gmane.comp.apache.cvs/36886 <pre>Author: minfrin Date: Thu May 23 16:25:25 2013 New Revision: 1485769 URL: http://svn.apache.org/r1485769 Log: Propose. Modified: httpd/httpd/branches/2.2.x/STATUS Modified: httpd/httpd/branches/2.2.x/STATUS URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.2.x/STATUS?rev=1485769&amp;r1=1485768&amp;r2=1485769&amp;view=diff ============================================================================== --- httpd/httpd/branches/2.2.x/STATUS (original) +++ httpd/httpd/branches/2.2.x/STATUS Thu May 23 16:25:25 2013 &lt; at &gt;&lt; at &gt; -246,6 +246,11 &lt; at &gt;&lt; at &gt; PATCHES PROPOSED TO BACKPORT FROM TRUNK: 2.2.x patch: trunk works +1: minfrin + * mod_cache: Fix uninitialized tmppath variable. PR 54949 + trunk patch: Variable removed from trunk in http://svn.apache.org/r1407381 + 2.2.x patch: http://people.apache.org/~minfrin/httpd-mod_cache-tmppath.patch + +1: minfrin + PATCHES/ISSUES THAT ARE STALLED </pre> minfrin< at >apache.org 2013-05-23T16:25:25 svn commit: r1485766 - /httpd/httpd/branches/2.2.x/STATUS http://comments.gmane.org/gmane.comp.apache.cvs/36885 <pre>Author: minfrin Date: Thu May 23 16:20:26 2013 New Revision: 1485766 URL: http://svn.apache.org/r1485766 Log: Let v2.2 users enjoy the goodness. Propose. Modified: httpd/httpd/branches/2.2.x/STATUS Modified: httpd/httpd/branches/2.2.x/STATUS URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.2.x/STATUS?rev=1485766&amp;r1=1485765&amp;r2=1485766&amp;view=diff ============================================================================== --- httpd/httpd/branches/2.2.x/STATUS (original) +++ httpd/httpd/branches/2.2.x/STATUS Thu May 23 16:20:26 2013 &lt; at &gt;&lt; at &gt; -240,6 +240,12 &lt; at &gt;&lt; at &gt; PATCHES PROPOSED TO BACKPORT FROM TRUNK: 2.2.x patch: trunk works, modulo CHANGES +1: minfrin + * core: speed up (for common cases) and reduce memory usage of ap_escape_logitem + This should save 70-100 bytes in the request pool for a default config. + trunk patch: http://svn.apache.org/r1485409 + 2.2.x patch: trunk works + +1: minfrin + PATCHES/ISSUES THAT ARE STALLED </pre> minfrin< at >apache.org 2013-05-23T16:20:26 svn commit: r1485753 - /httpd/httpd/branches/2.4.x/docs/manual/upgrading.html.en http://comments.gmane.org/gmane.comp.apache.cvs/36884 <pre>Author: covener Date: Thu May 23 15:24:47 2013 New Revision: 1485753 URL: http://svn.apache.org/r1485753 Log: xforms Modified: httpd/httpd/branches/2.4.x/docs/manual/upgrading.html.en Modified: httpd/httpd/branches/2.4.x/docs/manual/upgrading.html.en URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/docs/manual/upgrading.html.en?rev=1485753&amp;r1=1485752&amp;r2=1485753&amp;view=diff ============================================================================== --- httpd/httpd/branches/2.4.x/docs/manual/upgrading.html.en (original) +++ httpd/httpd/branches/2.4.x/docs/manual/upgrading.html.en Thu May 23 15:24:47 2013 &lt; at &gt;&lt; at &gt; -326,6 +326,13 &lt; at &gt;&lt; at &gt; Allow from example.org has been moved into &lt;code class="module"&gt;&lt;a href="./mod/mod_authn_core.html"&gt;mod_authn_core&lt;/a&gt;&lt;/code&gt;. &lt;/li&gt; + &lt;li&gt;The RewriteLog and RewriteLogLevel directives have been removed. + This functionality is now provided by configuring the appropriate + level of logging for the &lt;code class="module"&gt;&lt;a href="./mod/mod_rewrite.html"&gt;mod_rewrite&lt;/a&gt;&lt;/code&gt; module using + the &lt;code class="directive"&gt;&lt;a href="./mod/core.html#loglevel"&gt;LogLevel&lt;/a&gt;&lt;/code&gt; directive. + See also the &lt;a href="mod/mod_rewrite.html#logging"&gt;mod_rewrite logging&lt;/a&gt; + section.&lt;/li&gt; + &lt;/ul&gt; &lt;/div&gt;&lt;div class="top"&gt;&lt;a href="#page-header"&gt;&lt;img alt="top" src="./images/up.gif" /&gt;&lt;/a&gt;&lt;/div&gt; </pre> covener< at >apache.org 2013-05-23T15:24:47 svn commit: r1485752 - /httpd/httpd/branches/2.4.x/docs/manual/upgrading.xml http://comments.gmane.org/gmane.comp.apache.cvs/36883 <pre>Author: covener Date: Thu May 23 15:23:51 2013 New Revision: 1485752 URL: http://svn.apache.org/r1485752 Log: mention RewriteLog/RewriteLogLevel going away in 2.4 upgrading doc. Submitted by: Sean Timmins Committed by: covener Modified: httpd/httpd/branches/2.4.x/docs/manual/upgrading.xml Modified: httpd/httpd/branches/2.4.x/docs/manual/upgrading.xml URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/docs/manual/upgrading.xml?rev=1485752&amp;r1=1485751&amp;r2=1485752&amp;view=diff ============================================================================== --- httpd/httpd/branches/2.4.x/docs/manual/upgrading.xml (original) +++ httpd/httpd/branches/2.4.x/docs/manual/upgrading.xml Thu May 23 15:23:51 2013 &lt; at &gt;&lt; at &gt; -353,6 +353,13 &lt; at &gt;&lt; at &gt; Allow from example.org has been moved into &lt;module&gt;mod_authn_core&lt;/module&gt;. &lt;/li&gt; + &lt;li&gt;The RewriteLog and RewriteLogLevel directives have been removed. + This functionality is now provided by configuring the appropriate + level of logging for the &lt;module&gt;mod_rewrite&lt;/module&gt; module using + the &lt;directive module="core"&gt;LogLevel&lt;/directive&gt; directive. + See also the &lt;a href="mod/mod_rewrite.html#logging"&gt;mod_rewrite logging&lt;/a&gt; + section.&lt;/li&gt; + &lt;/ul&gt; &lt;/section&gt; </pre> covener< at >apache.org 2013-05-23T15:23:52 svn commit: r1485749 - /httpd/httpd/branches/2.4.x/STATUS http://comments.gmane.org/gmane.comp.apache.cvs/36882 <pre>Author: minfrin Date: Thu May 23 15:00:37 2013 New Revision: 1485749 URL: http://svn.apache.org/r1485749 Log: Vote. Modified: httpd/httpd/branches/2.4.x/STATUS Modified: httpd/httpd/branches/2.4.x/STATUS URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/STATUS?rev=1485749&amp;r1=1485748&amp;r2=1485749&amp;view=diff ============================================================================== --- httpd/httpd/branches/2.4.x/STATUS (original) +++ httpd/httpd/branches/2.4.x/STATUS Thu May 23 15:00:37 2013 &lt; at &gt;&lt; at &gt; -312,7 +312,7 &lt; at &gt;&lt; at &gt; PATCHES PROPOSED TO BACKPORT FROM TRUNK: http://svn.apache.org/viewvc?view=revision&amp;revision=1483190 http://svn.apache.org/viewvc?view=revision&amp;revision=1484343 2.4.x patch: trunk works, modulo CHANGES - +1: jim + +1: jim, minfrin * ap_release.h: Make AP_SERVER_ADD_STRING define-able from CFLAGS. trunk patch: http://svn.apache.org/r1481955 </pre> minfrin< at >apache.org 2013-05-23T15:00:37 svn commit: r1485743 - /httpd/httpd/branches/2.4.x/STATUS http://comments.gmane.org/gmane.comp.apache.cvs/36881 <pre>Author: minfrin Date: Thu May 23 14:41:40 2013 New Revision: 1485743 URL: http://svn.apache.org/r1485743 Log: Vote. Modified: httpd/httpd/branches/2.4.x/STATUS Modified: httpd/httpd/branches/2.4.x/STATUS URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/STATUS?rev=1485743&amp;r1=1485742&amp;r2=1485743&amp;view=diff ============================================================================== --- httpd/httpd/branches/2.4.x/STATUS (original) +++ httpd/httpd/branches/2.4.x/STATUS Thu May 23 14:41:40 2013 &lt; at &gt;&lt; at &gt; -317,7 +317,7 &lt; at &gt;&lt; at &gt; PATCHES PROPOSED TO BACKPORT FROM TRUNK: * ap_release.h: Make AP_SERVER_ADD_STRING define-able from CFLAGS. trunk patch: http://svn.apache.org/r1481955 2.4.x patch: trunk works (with fuzz) - +1: fuankg + +1: fuankg, minfrin * mod_proxy_http: Make the proxy-interim-response environment variable effective by formally overriding origin server behaviour. </pre> minfrin< at >apache.org 2013-05-23T14:41:40 svn commit: r1485737 - in /httpd/httpd/branches/2.4.x: ./ CHANGES STATUS modules/aaa/mod_authn_file.c modules/aaa/mod_authz_groupfile.c http://comments.gmane.org/gmane.comp.apache.cvs/36880 <pre>Author: minfrin Date: Thu May 23 14:35:33 2013 New Revision: 1485737 URL: http://svn.apache.org/r1485737 Log: mod_authn_file, mod_authz_groupfile: remove an unused and undocumented "standard" optional parameter for 'AuthGroupFile' and 'AuthUserFile' trunk patch: http://svn.apache.org/r1484398 Submitted by: jailletc36 Reviewed by: covener, minfrin Modified: httpd/httpd/branches/2.4.x/ (props changed) httpd/httpd/branches/2.4.x/CHANGES httpd/httpd/branches/2.4.x/STATUS httpd/httpd/branches/2.4.x/modules/aaa/mod_authn_file.c httpd/httpd/branches/2.4.x/modules/aaa/mod_authz_groupfile.c Propchange: httpd/httpd/branches/2.4.x/ ------------------------------------------------------------------------------ Merged /httpd/httpd/trunk:r1484398 Modified: httpd/httpd/branches/2.4.x/CHANGES URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/CHANGES?rev=1485737&amp;r1=1485736&amp;r2=1485737&amp;view=diff ============================================================================== --- httpd/httpd/branches/2.4.x/CHANGES [utf-8] (original) +++ httpd/httpd/branches/2.4.x/CHANGES [utf-8] Thu May 23 14:35:33 2013 &lt; at &gt;&lt; at &gt; -2,6 +2,10 &lt; at &gt;&lt; at &gt; Changes with Apache 2.4.5 + *) 'AuthGroupFile' and 'AuthUserFile' do not accept anymore the optional + 'standard' keyword . It was unused and not documented. + PR54463 [Tianyin Xu &lt;tixu cs.ucsd.edu&gt; and Christophe Jaillet] + *) core: Do not over allocate memory within 'ap_rgetline_core' for the common case. [Christophe Jaillet] Modified: httpd/httpd/branches/2.4.x/STATUS URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/STATUS?rev=1485737&amp;r1=1485736&amp;r2=1485737&amp;view=diff ============================================================================== --- httpd/httpd/branches/2.4.x/STATUS (original) +++ httpd/httpd/branches/2.4.x/STATUS Thu May 23 14:35:33 2013 &lt; at &gt;&lt; at &gt; -90,12 +90,6 &lt; at &gt;&lt; at &gt; RELEASE SHOWSTOPPERS: PATCHES ACCEPTED TO BACKPORT FROM TRUNK: [ start all new proposals below, under PATCHES PROPOSED. ] - * mod_authn_file, mod_authz_groupfile: remove an unused and undocumented - "standard" optional parameter for 'AuthGroupFile' and 'AuthUserFile' - trunk patch: http://svn.apache.org/r1484398 - 2.4.x patch: trunk works, modulo CHANGES - +1: jailletc36, covener, minfrin - PATCHES PROPOSED TO BACKPORT FROM TRUNK: [ New proposals should be added at the end of the list ] Modified: httpd/httpd/branches/2.4.x/modules/aaa/mod_authn_file.c URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/modules/aaa/mod_authn_file.c?rev=1485737&amp;r1=1485736&amp;r2=1485737&amp;view=diff ============================================================================== --- httpd/httpd/branches/2.4.x/modules/aaa/mod_authn_file.c (original) +++ httpd/httpd/branches/2.4.x/modules/aaa/mod_authn_file.c Thu May 23 14:35:33 2013 &lt; at &gt;&lt; at &gt; -45,21 +45,11 &lt; at &gt;&lt; at &gt; static void *create_authn_file_dir_confi return conf; } -static const char *set_authn_file_slot(cmd_parms *cmd, void *offset, - const char *f, const char *t) -{ - if (t &amp;&amp; strcmp(t, "standard")) { - return apr_pstrcat(cmd-&gt;pool, "Invalid auth file type: ", t, NULL); - } - - return ap_set_file_slot(cmd, offset, f); -} - static const command_rec authn_file_cmds[] = { - AP_INIT_TAKE12("AuthUserFile", set_authn_file_slot, - (void *)APR_OFFSETOF(authn_file_config_rec, pwfile), - OR_AUTHCFG, "text file containing user IDs and passwords"), + AP_INIT_TAKE1("AuthUserFile", ap_set_file_slot, + (void *)APR_OFFSETOF(authn_file_config_rec, pwfile), + OR_AUTHCFG, "text file containing user IDs and passwords"), {NULL} }; Modified: httpd/httpd/branches/2.4.x/modules/aaa/mod_authz_groupfile.c URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/modules/aaa/mod_authz_groupfile.c?rev=1485737&amp;r1=1485736&amp;r2=1485737&amp;view=diff ============================================================================== --- httpd/httpd/branches/2.4.x/modules/aaa/mod_authz_groupfile.c (original) +++ httpd/httpd/branches/2.4.x/modules/aaa/mod_authz_groupfile.c Thu May 23 14:35:33 2013 &lt; at &gt;&lt; at &gt; -70,22 +70,12 &lt; at &gt;&lt; at &gt; static void *create_authz_groupfile_dir_ return conf; } -static const char *set_authz_groupfile_slot(cmd_parms *cmd, void *offset, const char *f, - const char *t) -{ - if (t &amp;&amp; strcmp(t, "standard")) { - return apr_pstrcat(cmd-&gt;pool, "Invalid auth file type: ", t, NULL); - } - - return ap_set_file_slot(cmd, offset, f); -} - static const command_rec authz_groupfile_cmds[] = { - AP_INIT_TAKE12("AuthGroupFile", set_authz_groupfile_slot, - (void *)APR_OFFSETOF(authz_groupfile_config_rec, groupfile), - OR_AUTHCFG, - "text file containing group names and member user IDs"), + AP_INIT_TAKE1("AuthGroupFile", ap_set_file_slot, + (void *)APR_OFFSETOF(authz_groupfile_config_rec, groupfile), + OR_AUTHCFG, + "text file containing group names and member user IDs"), {NULL} }; </pre> minfrin< at >apache.org 2013-05-23T14:35:33 Search Engine Search the mailing list at Gmane query http://search.gmane.org/?group=$group=gmane.comp.apache.cvs