Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

* Merged from HEAD

  • Loading branch information...
commit 22eed08548e0326d75add363434fbeb9d648b19b 1 parent a615ffa
VOS Maintainer authored
View
14 README.php5
@@ -18,7 +18,7 @@ Building php
In the php source directory, execute something similar to:
./configure \
- --prefix=/opt/software/php-5.2.10 \
+ --prefix=/usr/local/php-5.2.10 \
--enable-maintainer-zts \
--enable-embed=shared \
--with-config-file-path=. \
@@ -78,11 +78,11 @@ Building php
In the Virtuoso Open Source directory, execute the following command:
- ./configure .... --enable-php5=/opt/software/php-5.2.10 ......
+ ./configure .... --enable-php5=/usr/local/php-5.2.10 ......
or if you configured Virtuoso before in this directory:
- ./config.nice --enable-php5=/opt/software/php-5.2.10
+ ./config.nice --enable-php5=/usr/local/php-5.2.10
so the build process knows where to find the necessary PHP header files.
@@ -146,13 +146,13 @@ The virtuoso.local_dsn is by default set to "Local Virtuoso" which
is the DSN in your odbc.ini file normally associated with your local
virtuoso database.
-The virtuoso.allow_dba rejects the use of the dba uid when using
-__virt_internal_connect.
+The virtuoso.allow_dba option rejects the use of the dba uid when using
+__virt_internal_dsn().
Functions
---------
- __virt_internal_connect([optional dsn])
+ __virt_internal_dsn([optional dsn])
Normally when programming a PHP application you have to store datasource,
username and password credentials for making ODBC connections back into
@@ -160,7 +160,7 @@ the database. This can be a security risk and requires the administrator
to fix scripts manually when he wants to run a hosted application under
its own sql account.
-The __virtuoso_internal_connect function returns an ODBC connect string
+The __virt_internal_dsn() function returns an ODBC connect string
based on the VSP user that owns the Virtual Directory.
It starts by verifying that the Virtual Directory has been properly setup
View
4 binsrc/VirtuosoClient.Net/VirtuosoDataReader.cs
@@ -846,6 +846,10 @@ private object GetColumnData (int i)
return ((IConvertData)column.data).ConvertData(type);
else if (column.data is IConvertible)
return Convert.ChangeType(column.data, type);
+ else if (column.data is SqlExtendedString)
+ return column.data;
+ else if (column.data is SqlRdfBox)
+ return column.data;
else
return column.data.ToString();
}
View
2  binsrc/vsp/demo-index.html
@@ -43,7 +43,7 @@ <H2 align="center">Virtuoso Features Demonstrations</H2>
<H3>Frameworks Hosting</H3>
<P CLASS="featuretext">As a result of this feature the Virtuoso Server
Page (VSP) language is no longer the sole mechanism for developing Virtuoso
-hosted dynamic web pages. You are now able to host ASP.NET, PHP4, and
+hosted dynamic web pages. You are now able to host ASP.NET, PHP5, and
Java Server Pages in Virtuoso. Thus, ASP.NET application development no
longer mandates IIS based deployment, neither does it mandate a Windows
hosted deployment, because this feature extends deployment to Linux

0 comments on commit 22eed08

Please sign in to comment.
Something went wrong with that request. Please try again.