dallas Wed Sep 7 11:25:09 2005 EDT
Modified files:
/phpdoc/en/reference/oci8 reference.xml
Log:
Remove an extra "return".
http://cvs.php.net/diff.php/phpdoc/en/reference/oci8/reference.xml?r1=1.16&r2=1.17&ty=u
Index: phpdoc/en/reference/oci8/reference.xml
diff -u phpdoc/en/reference/oci8/reference.xml:1.16
phpdoc/en/reference/oci8/reference.xml:1.17
--- phpdoc/en/reference/oci8/reference.xml:1.16 Wed Sep 7 11:09:00 2005
+++ phpdoc/en/reference/oci8/reference.xml Wed Sep 7 11:25:08 2005
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.16 $ -->
+<!-- $Revision: 1.17 $ -->
<!-- Purpose: database.vendors -->
<!-- Membership: bundled, external -->
@@ -18,12 +18,12 @@
define variables.
</para>
</section>
-
+
<section id="oci8.requirements">
&reftitle.required;
<para>
You will need the Oracle client libraries to use this extension.
- Windows users will need at least Oracle version 8.1 to use the
+ Windows users will need at least Oracle version 8.1 to use the
<filename>php_oci8.dll</filename> dll.
</para>
<para>
@@ -31,13 +31,13 @@
is to use Oracle Instant Client, which is available from here:
<ulink
url="&url.oracle.instant.client;">&url.oracle.instant.client;</ulink>.
Instant Client does not need ORACLE_SID or ORACLE_HOME environment
- variables set. You still may need to set LD_LIBRARY_PATH and NLS_LANG,
though.
+ variables set. You still may need to set LD_LIBRARY_PATH and NLS_LANG,
though.
</para>
<para>
Before using this extension, make sure that you have set up your
Oracle environment variables properly for the Oracle user, as well
as your web daemon user. These variables should be set up
- <emphasis>before</emphasis> you start your web-server. The
+ <emphasis>before</emphasis> you start your web-server. The
variables you might need to set are as follows:
<itemizedlist>
<listitem>
@@ -79,13 +79,13 @@
<note>
<title>If your webserver doesn't start or crashes at startup</title>
<para>
- Check that Apache is linked with the pthread library:
+ Check that Apache is linked with the pthread library:
</para>
<para>
<informalexample>
<screen>
<![CDATA[
-# ldd /www/apache/bin/httpd
+# ldd /www/apache/bin/httpd
libpthread.so.0 => /lib/libpthread.so.0 (0x4001c000)
libm.so.6 => /lib/libm.so.6 (0x4002f000)
libcrypt.so.1 => /lib/libcrypt.so.1 (0x4004c000)
@@ -113,15 +113,15 @@
</informalexample>
</para>
<para>
- Please note that on some systems, like UnixWare it is libthread
- instead of libpthread. PHP and Apache have to be configured
+ Please note that on some systems, like UnixWare it is libthread
+ instead of libpthread. PHP and Apache have to be configured
with EXTRA_LIBS=-lthread.
</para>
</note>
</section>
&reference.oci8.ini;
-
+
&reference.oci8.constants;
<section id="oci8.examples">
@@ -131,7 +131,7 @@
<title>Basic query</title>
<programlisting role="php">
<![CDATA[
-<?php
+<?php
$conn = oci_connect('hr', 'hr', 'orcl');
if (!$conn) {
@@ -148,7 +148,7 @@
print htmlentities($e['message']);
exit;
}
-
+
$r = oci_execute($stid, OCI_DEFAULT);
if (!$r) {
$e = oci_error($stid);
@@ -165,10 +165,10 @@
print '</tr>';
}
print '</table>';
-
+
oci_close($conn);
?>
-]]>
+]]>
</programlisting>
</example>
</para>
@@ -202,12 +202,12 @@
oci_close($conn);
?>
-]]>
+]]>
</programlisting>
</example>
</para>
-
-
+
+
<para>
<example>
<title>Inserting data into a CLOB column</title>
@@ -269,7 +269,7 @@
'$postalcode', '$country', :error_code );end;");
// This calls stored procedure sp_newaddress, with :address_id being an
-// in/out variable and :error_code being an out variable.
+// in/out variable and :error_code being an out variable.
// Then you do the binding:
oci_bind_by_name($sth, ":address_id", $addr_id, 10);
@@ -286,56 +286,56 @@
<section id="oci8.connection">
<title>Connecting Handling</title>
<para>
- The oci8 extension provides you with 3 different functions for
- connecting to Oracle. It is up to you to use the most appropriate
- function for your application, and the information in this section is
+ The oci8 extension provides you with 3 different functions for
+ connecting to Oracle. It is up to you to use the most appropriate
+ function for your application, and the information in this section is
intended to help you make an informed choice.
</para>
<para>
- Connecting to an Oracle server is a reasonably expensive operation, in
- terms of the time that it takes to complete. The
<function>oci_pconnect</function>
- function uses a persistent cache of connections that can be re-used
- across different script requests. This means that you will typically
+ Connecting to an Oracle server is a reasonably expensive operation, in
+ terms of the time that it takes to complete. The
<function>oci_pconnect</function>
+ function uses a persistent cache of connections that can be re-used
+ across different script requests. This means that you will typically
only incur the connection overhead once per php process (or apache child).
</para>
<para>
- If your application connects to Oracle using a different set of
- credentials for each web user, the persistent cache employed by
- <function>oci_pconnect</function> will become less useful as the
- number of concurrent users increases, to the point where it may
- start to adversely affect the overall performance of your Oracle
- server due to maintaining too many idle connections. If your
- application is structured in this way, it is recommended that
+ If your application connects to Oracle using a different set of
+ credentials for each web user, the persistent cache employed by
+ <function>oci_pconnect</function> will become less useful as the
+ number of concurrent users increases, to the point where it may
+ start to adversely affect the overall performance of your Oracle
+ server due to maintaining too many idle connections. If your
+ application is structured in this way, it is recommended that
you either tune your application using the <link
linkend="ini.oci8.max_persistent">oci8.max_persistent</link> and <link
- linkend="ini.oci8.persistent_timeout">oci8.persistent_timeout</link>
- configuration settings (these will give you control over the
+ linkend="ini.oci8.persistent_timeout">oci8.persistent_timeout</link>
+ configuration settings (these will give you control over the
persistent connection cache size and lifetime) or use
<function>oci_connect</function> instead.
</para>
<para>
- Both <function>oci_connect</function> and
<function>oci_pconnect</function>
+ Both <function>oci_connect</function> and
<function>oci_pconnect</function>
employ a connection cache; if you make multiple calls to
- <function>oci_connect</function>, using the same parameters, in a
- given script, the second and subsequent calls return return the existing
- connection handle. The cache used by <function>oci_connect</function>
+ <function>oci_connect</function>, using the same parameters, in a
+ given script, the second and subsequent calls return the existing
+ connection handle. The cache used by <function>oci_connect</function>
is cleaned up at the end of the script run, or when you explicitly close
- the connection handle. <function>oci_pconnect</function> has similar
- behaviour, although its cache is maintained separately and survives
+ the connection handle. <function>oci_pconnect</function> has similar
+ behaviour, although its cache is maintained separately and survives
between requests.
</para>
<para>
- This caching feature is important to remember, because it gives the
- appearance that the two handles are not transactionally isolated (they
- are in fact the same connection handle, so there is no isolation of any
- kind). If your application needs two separate, transactionally isolated
+ This caching feature is important to remember, because it gives the
+ appearance that the two handles are not transactionally isolated (they
+ are in fact the same connection handle, so there is no isolation of any
+ kind). If your application needs two separate, transactionally isolated
connections, you should use <function>oci_new_connect</function>.
</para>
<para>
- <function>oci_new_connect</function> always creates a new connection to
- the Oracle server, regardless of what other connections might already
exist.
+ <function>oci_new_connect</function> always creates a new connection to
+ the Oracle server, regardless of what other connections might already
exist.
High traffic web applications should try to avoid using
- <function>oci_new_connect</function>, especially in the busiest sections
of
+ <function>oci_new_connect</function>, especially in the busiest sections
of
the application.
</para>
</section>
@@ -401,7 +401,7 @@
</tbody>
</tgroup>
</table>
-
+
<table>
<title>The following types are supported when retrieving columns from a
result set:</title>
<tgroup cols="2">
@@ -448,7 +448,7 @@
</tgroup>
</table>
</section>
-
+
</partintro>
&reference.oci8.functions;
