You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@vcl.apache.org by bu...@apache.org on 2012/10/15 19:29:59 UTC
svn commit: r835145 - in /websites/staging/vcl/trunk/content: ./
docs/UpgradePreviousVersions/UpgradeFrom2.2to2.3.html
Author: buildbot
Date: Mon Oct 15 17:29:59 2012
New Revision: 835145
Log:
Staging update by buildbot for vcl
Modified:
websites/staging/vcl/trunk/content/ (props changed)
websites/staging/vcl/trunk/content/docs/UpgradePreviousVersions/UpgradeFrom2.2to2.3.html
Propchange: websites/staging/vcl/trunk/content/
------------------------------------------------------------------------------
--- cms:source-revision (original)
+++ cms:source-revision Mon Oct 15 17:29:59 2012
@@ -1 +1 @@
-1398403
+1398407
Modified: websites/staging/vcl/trunk/content/docs/UpgradePreviousVersions/UpgradeFrom2.2to2.3.html
==============================================================================
--- websites/staging/vcl/trunk/content/docs/UpgradePreviousVersions/UpgradeFrom2.2to2.3.html (original)
+++ websites/staging/vcl/trunk/content/docs/UpgradePreviousVersions/UpgradeFrom2.2to2.3.html Mon Oct 15 17:29:59 2012
@@ -201,44 +201,41 @@ The web code now requires access to crea
<p>f. The way the authentication functions toward the bottom of conf.php are initialized has been simplified. Make the following changes:</p>
-</li>
-</ol>
-<p><strong>REMOVE</strong></p>
-<div class="codehilite"><pre> <span class="nv">$affilValFunc</span>
- <span class="nv">$affilValFuncArgs</span>
- <span class="nv">$addUserFunc</span>
- <span class="nv">$addUserFuncArgs</span>
- <span class="nv">$updateUserFunc</span>
- <span class="nv">$updateUserFuncArgs</span>
-</pre></div>
-
-
-<p><strong>ADD</strong></p>
-<div class="codehilite"><pre> <span class="nv">$affilValFunc</span> <span class="o">=</span> <span class="n">array</span><span class="p">();</span>
- <span class="nv">$affilValFuncArgs</span> <span class="o">=</span> <span class="n">array</span><span class="p">();</span>
- <span class="nv">$addUserFunc</span> <span class="o">=</span> <span class="n">array</span><span class="p">();</span>
- <span class="nv">$addUserFuncArgs</span> <span class="o">=</span> <span class="n">array</span><span class="p">();</span>
- <span class="nv">$updateUserFunc</span> <span class="o">=</span> <span class="n">array</span><span class="p">();</span>
- <span class="nv">$updateUserFuncArgs</span> <span class="o">=</span> <span class="n">array</span><span class="p">();</span>
- <span class="k">foreach</span><span class="p">(</span><span class="nv">$authMechs</span> <span class="n">as</span> <span class="nv">$key</span> <span class="o">=></span> <span class="nv">$item</span><span class="p">)</span> <span class="p">{</span>
- <span class="k">if</span><span class="p">(</span><span class="nv">$item</span><span class="p">[</span><span class="s">'type'</span><span class="p">]</span> <span class="o">==</span> <span class="s">'ldap'</span><span class="p">)</span> <span class="p">{</span>
- <span class="nv">$affilValFunc</span><span class="p">[</span><span class="nv">$item</span><span class="p">[</span><span class="s">'affiliationid'</span><span class="p">]]</span> <span class="o">=</span> <span class="s">'validateLDAPUser'</span><span class="p">;</span>
- <span class="nv">$affilValFuncArgs</span><span class="p">[</span><span class="nv">$item</span><span class="p">[</span><span class="s">'affiliationid'</span><span class="p">]]</span> <span class="o">=</span> <span class="nv">$key</span><span class="p">;</span>
- <span class="nv">$addUserFunc</span><span class="p">[</span><span class="nv">$item</span><span class="p">[</span><span class="s">'affiliationid'</span><span class="p">]]</span> <span class="o">=</span> <span class="s">'addLDAPUser'</span><span class="p">;</span>
- <span class="nv">$addUserFuncArgs</span><span class="p">[</span><span class="nv">$item</span><span class="p">[</span><span class="s">'affiliationid'</span><span class="p">]]</span> <span class="o">=</span> <span class="nv">$key</span><span class="p">;</span>
- <span class="nv">$updateUserFunc</span><span class="p">[</span><span class="nv">$item</span><span class="p">[</span><span class="s">'affiliationid'</span><span class="p">]]</span> <span class="o">=</span> <span class="s">'updateLDAPUser'</span><span class="p">;</span>
- <span class="nv">$updateUserFuncArgs</span><span class="p">[</span><span class="nv">$item</span><span class="p">[</span><span class="s">'affiliationid'</span><span class="p">]]</span> <span class="o">=</span> <span class="nv">$key</span><span class="p">;</span>
- <span class="p">}</span>
- <span class="n">elseif</span><span class="p">(</span><span class="nv">$item</span><span class="p">[</span><span class="s">'type'</span><span class="p">]</span> <span class="o">==</span> <span class="s">'local'</span><span class="p">)</span> <span class="p">{</span>
- <span class="nv">$affilValFunc</span><span class="p">[</span><span class="nv">$item</span><span class="p">[</span><span class="s">'affiliationid'</span><span class="p">]]</span> <span class="o">=</span> <span class="n">create_function</span><span class="p">(</span><span class="s">''</span><span class="p">,</span> <span class="s">'return 0;'</span><span class="p">);</span>
- <span class="nv">$addUserFunc</span><span class="p">[</span><span class="nv">$item</span><span class="p">[</span><span class="s">'affiliationid'</span><span class="p">]]</span> <span class="o">=</span> <span class="n">create_function</span><span class="p">(</span><span class="s">''</span><span class="p">,</span> <span class="s">'return NULL;'</span><span class="p">);</span>
- <span class="nv">$updateUserFunc</span><span class="p">[</span><span class="nv">$item</span><span class="p">[</span><span class="s">'affiliationid'</span><span class="p">]]</span> <span class="o">=</span> <span class="n">create_function</span><span class="p">(</span><span class="s">''</span><span class="p">,</span> <span class="s">'return NULL;'</span><span class="p">);</span>
- <span class="p">}</span>
+<div class="codehilite"><pre> <span class="n">REMOVE</span>
+ <span class="nv">$affilValFunc</span>
+ <span class="nv">$affilValFuncArgs</span>
+ <span class="nv">$addUserFunc</span>
+ <span class="nv">$addUserFuncArgs</span>
+ <span class="nv">$updateUserFunc</span>
+ <span class="nv">$updateUserFuncArgs</span>
+
+ <span class="o">::</span><span class="p">:</span><span class="n">BashLexer</span>
+ <span class="n">ADD</span>
+ <span class="nv">$affilValFunc</span> <span class="o">=</span> <span class="n">array</span><span class="p">();</span>
+ <span class="nv">$affilValFuncArgs</span> <span class="o">=</span> <span class="n">array</span><span class="p">();</span>
+ <span class="nv">$addUserFunc</span> <span class="o">=</span> <span class="n">array</span><span class="p">();</span>
+ <span class="nv">$addUserFuncArgs</span> <span class="o">=</span> <span class="n">array</span><span class="p">();</span>
+ <span class="nv">$updateUserFunc</span> <span class="o">=</span> <span class="n">array</span><span class="p">();</span>
+ <span class="nv">$updateUserFuncArgs</span> <span class="o">=</span> <span class="n">array</span><span class="p">();</span>
+ <span class="k">foreach</span><span class="p">(</span><span class="nv">$authMechs</span> <span class="n">as</span> <span class="nv">$key</span> <span class="o">=></span> <span class="nv">$item</span><span class="p">)</span> <span class="p">{</span>
+ <span class="k">if</span><span class="p">(</span><span class="nv">$item</span><span class="p">[</span><span class="s">'type'</span><span class="p">]</span> <span class="o">==</span> <span class="s">'ldap'</span><span class="p">)</span> <span class="p">{</span>
+ <span class="nv">$affilValFunc</span><span class="p">[</span><span class="nv">$item</span><span class="p">[</span><span class="s">'affiliationid'</span><span class="p">]]</span> <span class="o">=</span> <span class="s">'validateLDAPUser'</span><span class="p">;</span>
+ <span class="nv">$affilValFuncArgs</span><span class="p">[</span><span class="nv">$item</span><span class="p">[</span><span class="s">'affiliationid'</span><span class="p">]]</span> <span class="o">=</span> <span class="nv">$key</span><span class="p">;</span>
+ <span class="nv">$addUserFunc</span><span class="p">[</span><span class="nv">$item</span><span class="p">[</span><span class="s">'affiliationid'</span><span class="p">]]</span> <span class="o">=</span> <span class="s">'addLDAPUser'</span><span class="p">;</span>
+ <span class="nv">$addUserFuncArgs</span><span class="p">[</span><span class="nv">$item</span><span class="p">[</span><span class="s">'affiliationid'</span><span class="p">]]</span> <span class="o">=</span> <span class="nv">$key</span><span class="p">;</span>
+ <span class="nv">$updateUserFunc</span><span class="p">[</span><span class="nv">$item</span><span class="p">[</span><span class="s">'affiliationid'</span><span class="p">]]</span> <span class="o">=</span> <span class="s">'updateLDAPUser'</span><span class="p">;</span>
+ <span class="nv">$updateUserFuncArgs</span><span class="p">[</span><span class="nv">$item</span><span class="p">[</span><span class="s">'affiliationid'</span><span class="p">]]</span> <span class="o">=</span> <span class="nv">$key</span><span class="p">;</span>
+ <span class="p">}</span>
+ <span class="n">elseif</span><span class="p">(</span><span class="nv">$item</span><span class="p">[</span><span class="s">'type'</span><span class="p">]</span> <span class="o">==</span> <span class="s">'local'</span><span class="p">)</span> <span class="p">{</span>
+ <span class="nv">$affilValFunc</span><span class="p">[</span><span class="nv">$item</span><span class="p">[</span><span class="s">'affiliationid'</span><span class="p">]]</span> <span class="o">=</span> <span class="n">create_function</span><span class="p">(</span><span class="s">''</span><span class="p">,</span> <span class="s">'return 0;'</span><span class="p">);</span>
+ <span class="nv">$addUserFunc</span><span class="p">[</span><span class="nv">$item</span><span class="p">[</span><span class="s">'affiliationid'</span><span class="p">]]</span> <span class="o">=</span> <span class="n">create_function</span><span class="p">(</span><span class="s">''</span><span class="p">,</span> <span class="s">'return NULL;'</span><span class="p">);</span>
+ <span class="nv">$updateUserFunc</span><span class="p">[</span><span class="nv">$item</span><span class="p">[</span><span class="s">'affiliationid'</span><span class="p">]]</span> <span class="o">=</span> <span class="n">create_function</span><span class="p">(</span><span class="s">''</span><span class="p">,</span> <span class="s">'return NULL;'</span><span class="p">);</span>
<span class="p">}</span>
+ <span class="p">}</span>
</pre></div>
-<ol>
+</li>
<li>
<p><strong>Restart httpd service</strong></p>
<div class="codehilite"><pre> <span class="n">service</span> <span class="n">httpd</span> <span class="n">start</span> <span class="ow">or</span> <span class="sr">/etc/i</span><span class="n">nit</span><span class="o">.</span><span class="n">d</span><span class="o">/</span><span class="n">httpd</span> <span class="n">start</span>