Date: Tue, 30 Sep 2014 13:19:16 +0000 (UTC) From: Mathieu Arnold <mat@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r369595 - in head/www/mod_auth_cookie_mysql2: . files Message-ID: <201409301319.s8UDJGmn086244@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: mat Date: Tue Sep 30 13:19:16 2014 New Revision: 369595 URL: http://svnweb.freebsd.org/changeset/ports/369595 QAT: https://qat.redports.org/buildarchive/r369595/ Log: Fix with apache 2.4. Sponsored by: Absolight Added: head/www/mod_auth_cookie_mysql2/files/ head/www/mod_auth_cookie_mysql2/files/patch-mod_auth_cookie_sql2.c (contents, props changed) Modified: head/www/mod_auth_cookie_mysql2/Makefile Modified: head/www/mod_auth_cookie_mysql2/Makefile ============================================================================== --- head/www/mod_auth_cookie_mysql2/Makefile Tue Sep 30 13:10:06 2014 (r369594) +++ head/www/mod_auth_cookie_mysql2/Makefile Tue Sep 30 13:19:16 2014 (r369595) @@ -13,7 +13,7 @@ MAINTAINER= apache@FreeBSD.org COMMENT= Allows authentication against MySQL database via secure cookie USE_MYSQL= yes -USE_APACHE= 22 +USE_APACHE= 22+ AP_FAST_BUILD= yes AP_GENPLIST= yes Added: head/www/mod_auth_cookie_mysql2/files/patch-mod_auth_cookie_sql2.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/www/mod_auth_cookie_mysql2/files/patch-mod_auth_cookie_sql2.c Tue Sep 30 13:19:16 2014 (r369595) @@ -0,0 +1,29 @@ +--- mod_auth_cookie_sql2.c.orig 2009-06-17 23:28:01 UTC ++++ mod_auth_cookie_sql2.c +@@ -182,7 +182,11 @@ + ap_log_rerror(APLOG_MARK, APLOG_ERR|APLOG_NOERRNO, 0, r, ERRTAG "valid cookie found, data: %s", cookies); + #endif + ++#if MODULE_MAGIC_NUMBER_MAJOR >= 20111130 ++ db_ret=check_against_db(conf, r, conf->cookiename, value, username,r->useragent_ip, conf->sql_addon, tc); ++#else + db_ret=check_against_db(conf, r, conf->cookiename, value, username,r->connection->remote_ip, conf->sql_addon, tc); ++#endif + } + } + } +@@ -205,7 +209,13 @@ + *value = '\0'; + value++; + +- if ((db_ret=check_against_db(conf, r, cookies, value, username, r->connection->remote_ip, conf->sql_addon, tc)) == RET_AUTHORIZED) { ++ if ((db_ret=check_against_db(conf, r, cookies, value, username, ++#if MODULE_MAGIC_NUMBER_MAJOR >= 20111130 ++ r->useragent_ip, ++#else ++ r->connection->remote_ip, ++#endif ++ conf->sql_addon, tc)) == RET_AUTHORIZED) { + // found valid cookie + + #ifdef AUTH_COOKIE_SQL2_DEBUG
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201409301319.s8UDJGmn086244>