From: Daniel Gruno Date: Fri, 27 Apr 2012 20:24:30 +0000 (+0000) Subject: Update syntax highlighting X-Git-Tag: 2.5.0-alpha~6959 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=3d7e2c4f71840bf0799a921342d58df4edda76ed;p=thirdparty%2Fapache%2Fhttpd.git Update syntax highlighting git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1331576 13f79535-47bb-0310-9956-ffa450edef68 --- diff --git a/docs/manual/howto/cgi.html.en b/docs/manual/howto/cgi.html.en index f02e9c2c657..73f20f2151c 100644 --- a/docs/manual/howto/cgi.html.en +++ b/docs/manual/howto/cgi.html.en @@ -65,9 +65,10 @@ directive has not been commented out. A correctly configured directive may look like this: -

+ 

       LoadModule cgi_module modules/mod_cgi.so
-
+ +

ScriptAlias

@@ -84,9 +85,10 @@

The ScriptAlias directive looks like:

-

+ 

         ScriptAlias /cgi-bin/ /usr/local/apache2/cgi-bin/
-
+ +

The example shown is from your default httpd.conf configuration file, if you installed Apache in the default @@ -139,13 +141,12 @@ file, to specify that CGI execution was permitted in a particular directory:

-

- <Directory /usr/local/apache2/htdocs/somedir>
- - Options +ExecCGI
- - </Directory> -

+ 
+<Directory /usr/local/apache2/htdocs/somedir>
+    Options +ExecCGI
+</Directory>
+
+

The above directive tells Apache to permit the execution of CGI files. You will also need to tell the server what @@ -153,9 +154,10 @@ files with the cgi or pl extension as CGI programs:

-

+ 

         AddHandler cgi-script .cgi .pl
-
+ +

.htaccess files

@@ -173,27 +175,25 @@ .cgi in users' directories, you can use the following configuration.

-

- <Directory /home/*/public_html>
- - Options +ExecCGI
- AddHandler cgi-script .cgi
- - </Directory> -

+ 
+<Directory /home/*/public_html>
+    Options +ExecCGI
+    AddHandler cgi-script .cgi
+</Directory>
+
+

If you wish designate a cgi-bin subdirectory of a user's directory where everything will be treated as a CGI program, you can use the following.

-

- <Directory /home/*/public_html/cgi-bin>
- - Options ExecCGI
- SetHandler cgi-script
- - </Directory> -

+ 
+<Directory /home/*/public_html/cgi-bin>
+    Options ExecCGI
+    SetHandler cgi-script
+</Directory>
+
+ @@ -340,9 +340,10 @@ print "Hello, World."; interpreter (often perl) indicated in the first line of your CGI program, which will look something like:

-

+ 

         #!/usr/bin/perl
-
+ +

Make sure that this is in fact the path to the interpreter.

diff --git a/docs/manual/howto/cgi.xml b/docs/manual/howto/cgi.xml index a2e0840f4a4..fcd70e6c5dd 100644 --- a/docs/manual/howto/cgi.xml +++ b/docs/manual/howto/cgi.xml @@ -64,9 +64,9 @@ directive has not been commented out. A correctly configured directive may look like this: - + LoadModule cgi_module modules/mod_cgi.so - +
ScriptAlias @@ -83,9 +83,9 @@

The ScriptAlias directive looks like:

- + ScriptAlias /cgi-bin/ /usr/local/apache2/cgi-bin/ - +

The example shown is from your default httpd.conf configuration file, if you installed Apache in the default @@ -145,13 +145,11 @@ file, to specify that CGI execution was permitted in a particular directory:

- - <Directory /usr/local/apache2/htdocs/somedir>
- - Options +ExecCGI
- - </Directory> - + +<Directory /usr/local/apache2/htdocs/somedir> + Options +ExecCGI +</Directory> +

The above directive tells Apache to permit the execution of CGI files. You will also need to tell the server what @@ -160,9 +158,9 @@ files with the cgi or pl extension as CGI programs:

- + AddHandler cgi-script .cgi .pl - +
@@ -180,27 +178,23 @@ .cgi in users' directories, you can use the following configuration.

- - <Directory /home/*/public_html>
- - Options +ExecCGI
- AddHandler cgi-script .cgi
- - </Directory> - + +<Directory /home/*/public_html> + Options +ExecCGI + AddHandler cgi-script .cgi +</Directory> +

If you wish designate a cgi-bin subdirectory of a user's directory where everything will be treated as a CGI program, you can use the following.

- - <Directory /home/*/public_html/cgi-bin>
- - Options ExecCGI
- SetHandler cgi-script
- - </Directory> - + +<Directory /home/*/public_html/cgi-bin> + Options ExecCGI + SetHandler cgi-script +</Directory> +
@@ -346,9 +340,9 @@ print "Hello, World."; interpreter (often perl) indicated in the first line of your CGI program, which will look something like:

- + #!/usr/bin/perl - +

Make sure that this is in fact the path to the interpreter.