[PHP-CVS] cvs: php-src / configure.in
janiSun Jul 27 15:05:22 2008 UTC Modified files: /php-srcconfigure.in Log: - Fixed the fix for not requiring C++ always http://cvs.php.net/viewvc.cgi/php-src/configure.in?r1=1.662r2=1.663diff_format=u Index: php-src/configure.in diff -u php-src/configure.in:1.662 php-src/configure.in:1.663 --- php-src/configure.in:1.662 Fri Jul 25 12:34:54 2008 +++ php-src/configure.inSun Jul 27 15:05:22 2008 @@ -1,4 +1,4 @@ -## $Id: configure.in,v 1.662 2008/07/25 12:34:54 jani Exp $ -*- autoconf -*- +## $Id: configure.in,v 1.663 2008/07/27 15:05:22 jani Exp $ -*- autoconf -*- dnl ## Process this file with autoconf to produce a configure script. divert(1) @@ -1260,7 +1260,7 @@ undefine([AC_PROG_CXX]) AC_DEFUN([AC_PROG_CXX], []) undefine([AC_PROG_CXXCPP]) - AC_DEFUN([AC_PROG_CXXCPP], []) + AC_DEFUN([AC_PROG_CXXCPP], [php_prog_cxxcpp=disabled]) ]) AC_PROG_LIBTOOL -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
Re: [PHP-CVS] cvs: php-src(PHP_5_2) / configure.in
Jani Taskinen kirjoitti: janiSun Jul 27 15:05:48 2008 UTC Modified files: (Branch: PHP_5_2) /php-src configure.in Log: MFH:- Fixed the fix for not requiring C++ always http://cvs.php.net/viewvc.cgi/php-src/configure.in?r1=1.579.2.52.2.102r2=1.579.2.52.2.103diff_format=u Index: php-src/configure.in diff -u php-src/configure.in:1.579.2.52.2.102 php-src/configure.in:1.579.2.52.2.103 --- php-src/configure.in:1.579.2.52.2.102 Sun Jul 27 15:01:41 2008 +++ php-src/configure.inSun Jul 27 15:05:48 2008 @@ -1,4 +1,4 @@ -## $Id: configure.in,v 1.579.2.52.2.102 2008/07/27 15:01:41 jani Exp $ -*- autoconf -*- +## $Id: configure.in,v 1.579.2.52.2.103 2008/07/27 15:05:48 jani Exp $ -*- autoconf -*- dnl ## Process this file with autoconf to produce a configure script. divert(1) @@ -1312,7 +1312,7 @@ undefine([AC_PROG_CXX]) AC_DEFUN([AC_PROG_CXX], []) undefine([AC_PROG_CXXCPP]) - AC_DEFUN([AC_PROG_CXXCPP], []) + AC_DEFUN([AC_PROG_CXXCPP], [php_prog_cxxcpp=disabled]) ]) This php_prog_cxxcpp is just a dummy line to have something in the generated configure betwee then and fi :) --Jani -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_2) / configure.in
janiSun Jul 27 15:05:48 2008 UTC Modified files: (Branch: PHP_5_2) /php-srcconfigure.in Log: MFH:- Fixed the fix for not requiring C++ always http://cvs.php.net/viewvc.cgi/php-src/configure.in?r1=1.579.2.52.2.102r2=1.579.2.52.2.103diff_format=u Index: php-src/configure.in diff -u php-src/configure.in:1.579.2.52.2.102 php-src/configure.in:1.579.2.52.2.103 --- php-src/configure.in:1.579.2.52.2.102 Sun Jul 27 15:01:41 2008 +++ php-src/configure.inSun Jul 27 15:05:48 2008 @@ -1,4 +1,4 @@ -## $Id: configure.in,v 1.579.2.52.2.102 2008/07/27 15:01:41 jani Exp $ -*- autoconf -*- +## $Id: configure.in,v 1.579.2.52.2.103 2008/07/27 15:05:48 jani Exp $ -*- autoconf -*- dnl ## Process this file with autoconf to produce a configure script. divert(1) @@ -1312,7 +1312,7 @@ undefine([AC_PROG_CXX]) AC_DEFUN([AC_PROG_CXX], []) undefine([AC_PROG_CXXCPP]) - AC_DEFUN([AC_PROG_CXXCPP], []) + AC_DEFUN([AC_PROG_CXXCPP], [php_prog_cxxcpp=disabled]) ]) AC_PROG_LIBTOOL -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_3) / configure.in
janiSun Jul 27 15:05:39 2008 UTC Modified files: (Branch: PHP_5_3) /php-srcconfigure.in Log: MFH:- Fixed the fix for not requiring C++ always http://cvs.php.net/viewvc.cgi/php-src/configure.in?r1=1.579.2.52.2.77.2.25r2=1.579.2.52.2.77.2.26diff_format=u Index: php-src/configure.in diff -u php-src/configure.in:1.579.2.52.2.77.2.25 php-src/configure.in:1.579.2.52.2.77.2.26 --- php-src/configure.in:1.579.2.52.2.77.2.25 Fri Jul 25 12:36:34 2008 +++ php-src/configure.inSun Jul 27 15:05:39 2008 @@ -1,4 +1,4 @@ -## $Id: configure.in,v 1.579.2.52.2.77.2.25 2008/07/25 12:36:34 jani Exp $ -*- autoconf -*- +## $Id: configure.in,v 1.579.2.52.2.77.2.26 2008/07/27 15:05:39 jani Exp $ -*- autoconf -*- dnl ## Process this file with autoconf to produce a configure script. divert(1) @@ -1346,7 +1346,7 @@ undefine([AC_PROG_CXX]) AC_DEFUN([AC_PROG_CXX], []) undefine([AC_PROG_CXXCPP]) - AC_DEFUN([AC_PROG_CXXCPP], []) + AC_DEFUN([AC_PROG_CXXCPP], [php_prog_cxxcpp=disabled]) ]) AC_PROG_LIBTOOL -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_2) / configure.in
janiSun Jul 27 15:01:41 2008 UTC
Modified files: (Branch: PHP_5_2)
/php-srcconfigure.in
Log:
MFH: Partial sync
http://cvs.php.net/viewvc.cgi/php-src/configure.in?r1=1.579.2.52.2.101r2=1.579.2.52.2.102diff_format=u
Index: php-src/configure.in
diff -u php-src/configure.in:1.579.2.52.2.101
php-src/configure.in:1.579.2.52.2.102
--- php-src/configure.in:1.579.2.52.2.101 Fri Jul 25 12:36:59 2008
+++ php-src/configure.inSun Jul 27 15:01:41 2008
@@ -1,4 +1,4 @@
-## $Id: configure.in,v 1.579.2.52.2.101 2008/07/25 12:36:59 jani Exp $ -*-
autoconf -*-
+## $Id: configure.in,v 1.579.2.52.2.102 2008/07/27 15:01:41 jani Exp $ -*-
autoconf -*-
dnl ## Process this file with autoconf to produce a configure script.
divert(1)
@@ -11,8 +11,8 @@
dnl ## libraries and so on.
dnl ## In diversion 3 we check for compile-time options to the PHP
-dnl ## core and how to deal with different system dependencies. This
-dnl ## includes what regex library is used and whether debugging or short
+dnl ## core and how to deal with different system dependencies.
+dnl ## This includes what regex library is used and whether debugging or short
dnl ## tags are enabled, and the default behaviour of php.ini options.
dnl ## This is also where an SAPI interface is selected (choosing between
dnl ## Apache module, CGI etc.)
@@ -71,10 +71,10 @@
echo #define PHP_VERSION_ID $PHP_VERSION_ID php_version.h.new
cmp php_version.h.new $srcdir/main/php_version.h /dev/null 21
if test $? -ne 0 ; then
-rm -f $srcdir/main/php_version.h mv php_version.h.new
$srcdir/main/php_version.h \
-echo 'Updated main/php_version.h'
+ rm -f $srcdir/main/php_version.h mv php_version.h.new
$srcdir/main/php_version.h \
+ echo 'Updated main/php_version.h'
else
-rm -f php_version.h.new
+ rm -f php_version.h.new
fi
@@ -122,6 +122,21 @@
$php_shtool mkdir -p libs
rm -f libs/*
+dnl Darwin 9 hack
+dnl Because the default debugging format used by Apple's GCC on Mac OS 10.5
+dnl causes errors in all current and past versions of Autoconf, we do a little
+dnl messing with the CFLAGS here to trick it.
+php_did_darwin9_cheat=0
+case $host_alias in
+*darwin9*)
+ hasg=`echo $CFLAGS | grep -E '(^-g)|([[:space:]]-g)'`
+ if test x$hasg = x; then
+php_did_darwin9_cheat=1
+CFLAGS=$CFLAGS -gstabs
+ fi
+ ;;
+esac
+
dnl Checks for programs.
dnl -
@@ -146,10 +161,10 @@
PHP_RUNPATH_SWITCH
dnl Checks for some support/generator progs
-PHP_PROG_RE2C
PHP_PROG_AWK
PHP_PROG_BISON
PHP_PROG_LEX
+PHP_PROG_RE2C
dnl Check if bison generated files exist when bison does not..
case $php_cv_bison_version in
@@ -165,7 +180,7 @@
dnl See bug #28605
case $host_cpu in
-alpha*)
+ alpha*)
if test $GCC = yes; then
CFLAGS=$CFLAGS -mieee
else
@@ -174,16 +189,32 @@
;;
esac
+dnl activate some gcc specific optimizations for gcc = 4
+if test $GCC = yes; then
+ case $host_alias in
+ *darwin*)
+GCC_MAJOR_VERSION=`$CC -dumpversion | /usr/bin/sed -nE
'1s/([[0-9]]+)\.[[0-9]]+\..*/\1/;1p'`
+;;
+ *)
+GCC_MAJOR_VERSION=`$CC --version | $SED -n '1s/[[^0-9]]*//;1s/\..*//;1p'`
+;;
+ esac
+ if test $GCC_MAJOR_VERSION -ge 4; then
+CFLAGS=$CFLAGS -fvisibility=hidden
+ fi
+fi
+
case $host_alias in
-*solaris*)
+ *solaris*)
CPPFLAGS=$CPPFLAGS -D_POSIX_PTHREAD_SEMANTICS
if test ${enable_libgcc+set} != set test $GCC = yes; then
enable_libgcc=yes
fi
;;
-*dgux*)
-CPPFLAGS=$CPPFLAGS -D_BSD_TIMEOFDAY_FLAVOR;;
-*darwin*|*rhapsody*)
+ *dgux*)
+CPPFLAGS=$CPPFLAGS -D_BSD_TIMEOFDAY_FLAVOR
+;;
+ *darwin*|*rhapsody*)
if test -n $GCC; then
PHP_CHECK_GCC_ARG(-no-cpp-precomp, gcc_no_cpp_precomp=yes)
if test $gcc_no_cpp_precomp = yes; then
@@ -191,18 +222,21 @@
fi
fi
AC_DEFINE(BIND_8_COMPAT, 1, [Enabling BIND8 compatibility for Panther])
-php_multiple_shlib_versions_ok=yes;;
-*beos*)
+php_multiple_shlib_versions_ok=yes
+;;
+ *beos*)
beos_threads=1
-LIBS=$LIBS -lbe -lroot;;
-*mips*)
-CPPFLAGS=$CPPFLAGS -D_XPG_IV;;
-*hpux*)
+LIBS=$LIBS -lbe -lroot
+;;
+ *mips*)
+CPPFLAGS=$CPPFLAGS -D_XPG_IV
+;;
+ *hpux*)
if test $GCC = yes; then
CPPFLAGS=$CPPFLAGS -D_XOPEN_SOURCE_EXTENDED
fi
;;
-*netware*)
+ *netware*)
PHP_BUILD_PROGRAM
PHP_ADD_SOURCES(/main, internal_functions.c,,PHP_GLOBAL_OBJS)
PHP_ADD_SOURCES(win32, sendmail.c, -I$CFLAGS, PHP_GLOBAL_OBJS)
@@ -217,7 +251,7 @@
# to avoid the performance hit from the lost register
AC_MSG_CHECKING([whether to force non-PIC code in shared modules])
case $host_alias in
-i?86-*-linux*|i?86-*-freebsd*)
+ i?86-*-linux*|i?86-*-freebsd*)
if test ${with_pic+set} != set || test $with_pic = no; then
with_pic=no
AC_MSG_RESULT(yes)
@@ -225,7 +259,9 @@
AC_MSG_RESULT(no)
fi
;;
-*)
[PHP-CVS] cvs: php-src(PHP_5_3) / NEWS
sixdSun Jul 27 16:27:42 2008 UTC
Modified files: (Branch: PHP_5_3)
/php-srcNEWS
Log:
Add OCI8 changes
http://cvs.php.net/viewvc.cgi/php-src/NEWS?r1=1.2027.2.547.2.965.2.225r2=1.2027.2.547.2.965.2.226diff_format=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.2027.2.547.2.965.2.225
php-src/NEWS:1.2027.2.547.2.965.2.226
--- php-src/NEWS:1.2027.2.547.2.965.2.225 Sat Jul 26 17:59:52 2008
+++ php-src/NEWSSun Jul 27 16:27:41 2008
@@ -106,6 +106,24 @@
. Added params as optional parameter for stream_context_create(). (Sara)
. Added ability to use stream wrappers in include_path. (Gregory, Dmitry)
+- Improved OCI8 extension:
+ . Added Database Resident Connection Pooling (DRCP) and Fast
+Application Notification (FAN) support. (Oracle Corp.)
+ . Added support for Oracle External Authentication (not supported
+on Windows). (Oracle Corp.)
+ . Improve persistent connection handling of restarted DBs.
+ . Added SQLT_AFC (aka CHAR datatype) support to oci_bind_by_name.
+(Chris Jones)
+ . Fixed bug #41069 (Seg fault with query over DB link). (Chris Jones)
+ . Fixed define of SQLT_BDOUBLE and SQLT_BFLOAT constants with Oracle
+10g ORACLE_HOME builds. (Chris Jones)
+ . Changed default value of oci8.default_prefetch from 10 to 100.
+(Chris Jones)
+ . Fixed PECL bug #12431 (OCI8 ping functionality is broken). (Oracle
+Corp.)
+ . Allow building (e.g from PECL) the PHP 5.3-based OCI8 code with
+PHP 4.3.9 onwards. (Chris Jones)
+
- Improved OpenSSL extension: (Dmitry)
. Added support for OpenSSL digest and cipher functions.
. Added access to internal values of DSA, RSA and DH keys.
@@ -207,10 +225,6 @@
(David Soria Parra, Jani)
- Added support for optional values, and = as separator, in getopt(). (Hannes)
- Added lcfirst() function. (David C)
-- Added OCI8 Database Resident Connection Pooling (DRCP) and Fast
- Application Notification (FAN) support (Oracle Corp.)
-- Added OCI8 SQLT_AFC (aka CHAR datatype) support to oci_bind_by_name.
- (Chris Jones)
- Added PREG_BAD_UTF8_OFFSET_ERROR constant. (Nuno)
- Added native support for asinh(), acosh(), atanh(), log1p() and expm1().
(Kalle)
@@ -221,15 +235,14 @@
to different characters with cp1251 and cp866. (Scott)
- Fixed an issue in date() where a : was printed for the O modifier after a P
modifier was used. (Derick)
-- Fixed exec() on Windows to not eat the first and last double quotes. (Scott)
+- Fixed exec() on Windows to not eat the first and last double quotes. (Scott)
- Fixed PECL bug #12794 (PDOStatement-nextRowset() doesn¿t work). (Johannes)
-- Fixed PECL bug #12431 (OCI8 ping functionality is broken). (Oracle Corp.)
- Fixed PECL bug #12401 (Add support for ATTR_FETCH_TABLE_NAMES). (Johannes)
- Fixed bug #45622 (isset($arrayObject-p) misbehaves with ArrayObject::
ARRAY_AS_PROPS set). (robin_fernandes at uk dot ibm dot com, Arnaud)
-- Fixed bug #45614 (ArrayIterator::current(), ::key() can show 1st private
+- Fixed bug #45614 (ArrayIterator::current(), ::key() can show 1st private
prop of wrapped object). (robin_fernandes at uk dot ibm dot com, Arnaud)
- Fixed bug #45571 (ReflectionClass::export() shows superclasses' private
static methods). (robin_fernandes at uk dot ibm dot com)
@@ -261,7 +274,7 @@
(frode at coretrek dot com, Nuno)
- Fixed bug #44301 (Segfault when an exception is thrown on persistent
connections). (Martin Jansen)
-- Fixed bug #44257 (timelib_tz_lookup_table must use float for gmtoffset).
+- Fixed bug #44257 (timelib_tz_lookup_table must use float for gmtoffset).
(Derick, iuri dot fiedoruk at hp dot com).
- Fixed bug #44214 (Crash using preg_replace_callback() and global variable).
(Nuno, Scott)
@@ -297,7 +310,7 @@
- Fixed bug #42737 (preg_split('//u') triggers a E_NOTICE with newlines).
(Nuno)
- Fixed bug #42736 (xmlrpc_server_call_method() crashes). (Tony)
-- Fixed bug #42663 (gzinflate() try to allocate all memory with truncated
+- Fixed bug #42663 (gzinflate() try to allocate all memory with truncated
data). (Arnaud)
- Fixed bug #42657 (ini_get() returns incorrect value when default is NULL).
(Jani, Scott)
@@ -322,7 +335,6 @@
(Lars W)
- Fixed bug #41135 (PDO SQLite driver binds blobs as strings,
use sqlite3_bind_blob() to stop errors with null bytes). (Scott)
-- Fixed bug #41069 (OCI8: Seg fault with query over DB link) (Chris Jones)
- Fixed bug #39822 (new PDO() doesn't work with firebird). (Lars W)
- Fixed bug #39700 (NUMERIC error when result precision are 7,8 or 12-14 ).
(Lars W)
@@ -333,7 +345,7 @@
- Fixed bug #39127 (Old-style constructor fallbacks produce strange results).
(Tony)
- Fixed bug #39056 (Interbase NUMERIC data type error). (Lars W)
-- Fixed bug #39018 (Error control operator '@' fails to suppress
Uninitialized
+- Fixed bug #39018 (Error control operator '@' fails to suppress Uninitialized
string offset). (Felipe)
- Fixed bug #38468
[PHP-CVS] cvs: php-src / php.ini-dist php.ini-recommended
sixdSun Jul 27 16:35:56 2008 UTC Modified files: /php-srcphp.ini-recommended php.ini-dist Log: Sync oci8.default_prefetch example value with recent change http://cvs.php.net/viewvc.cgi/php-src/php.ini-recommended?r1=1.225r2=1.226diff_format=u Index: php-src/php.ini-recommended diff -u php-src/php.ini-recommended:1.225 php-src/php.ini-recommended:1.226 --- php-src/php.ini-recommended:1.225 Mon Jul 21 09:36:21 2008 +++ php-src/php.ini-recommended Sun Jul 27 16:35:56 2008 @@ -825,10 +825,11 @@ ; Connection: Set this to a user chosen connection class to be used ; for all pooled server requests with Oracle 11g Database Resident -; Connection Pooling (DRCP). The default name is system generated. -; To use DRCP, the database pool must be configured, and the -; connection string must also specify to use a pooled server. -;oci8.connection_class = MYPHPAPP +; Connection Pooling (DRCP). To use DRCP, this value should be set to +; the same string for all web servers running the same application, +; the database pool must be configured, and the connection string must +; specify to use a pooled server. +;oci8.connection_class = ; High Availability: Using 1 lets PHP receive Fast Application ; Notification (FAN) events generated when a database node fails. The @@ -841,7 +842,7 @@ ; Tuning: Enables statement prefetching and sets the default number of ; rows that will be fetched automatically after statement execution. -;oci8.default_prefetch = 10 +;oci8.default_prefetch = 100 ; Compatibility. Using 1 means oci_close() will not close ; oci_connect() and oci_new_connect() connections. http://cvs.php.net/viewvc.cgi/php-src/php.ini-dist?r1=1.275r2=1.276diff_format=u Index: php-src/php.ini-dist diff -u php-src/php.ini-dist:1.275 php-src/php.ini-dist:1.276 --- php-src/php.ini-dist:1.275 Mon Jul 21 09:36:21 2008 +++ php-src/php.ini-distSun Jul 27 16:35:56 2008 @@ -788,10 +788,11 @@ ; Connection: Set this to a user chosen connection class to be used ; for all pooled server requests with Oracle 11g Database Resident -; Connection Pooling (DRCP). The default name is system generated. -; To use DRCP, the database pool must be configured, and the -; connection string must also specify to use a pooled server. -;oci8.connection_class = MYPHPAPP +; Connection Pooling (DRCP). To use DRCP, this value should be set to +; the same string for all web servers running the same application, +; the database pool must be configured, and the connection string must +; specify to use a pooled server. +;oci8.connection_class = ; High Availability: Using 1 lets PHP receive Fast Application ; Notification (FAN) events generated when a database node fails. The @@ -804,7 +805,7 @@ ; Tuning: Enables statement prefetching and sets the default number of ; rows that will be fetched automatically after statement execution. -;oci8.default_prefetch = 10 +;oci8.default_prefetch = 100 ; Compatibility. Using 1 means oci_close() will not close ; oci_connect() and oci_new_connect() connections. -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_3) / php.ini-dist php.ini-recommended
sixdSun Jul 27 16:37:57 2008 UTC Modified files: (Branch: PHP_5_3) /php-srcphp.ini-recommended php.ini-dist Log: MFH: Sync oci8.default_prefetch example value with recent change http://cvs.php.net/viewvc.cgi/php-src/php.ini-recommended?r1=1.179.2.11.2.23.2.7r2=1.179.2.11.2.23.2.8diff_format=u Index: php-src/php.ini-recommended diff -u php-src/php.ini-recommended:1.179.2.11.2.23.2.7 php-src/php.ini-recommended:1.179.2.11.2.23.2.8 --- php-src/php.ini-recommended:1.179.2.11.2.23.2.7 Mon Jul 21 09:40:59 2008 +++ php-src/php.ini-recommended Sun Jul 27 16:37:57 2008 @@ -911,10 +911,11 @@ ; Connection: Set this to a user chosen connection class to be used ; for all pooled server requests with Oracle 11g Database Resident -; Connection Pooling (DRCP). The default name is system generated. -; To use DRCP, the database pool must be configured, and the -; connection string must also specify to use a pooled server. -;oci8.connection_class = MYPHPAPP +; Connection Pooling (DRCP). To use DRCP, this value should be set to +; the same string for all web servers running the same application, +; the database pool must be configured, and the connection string must +; specify to use a pooled server. +;oci8.connection_class = ; High Availability: Using 1 lets PHP receive Fast Application ; Notification (FAN) events generated when a database node fails. The @@ -927,7 +928,7 @@ ; Tuning: Enables statement prefetching and sets the default number of ; rows that will be fetched automatically after statement execution. -;oci8.default_prefetch = 10 +;oci8.default_prefetch = 100 ; Compatibility. Using 1 means oci_close() will not close ; oci_connect() and oci_new_connect() connections. http://cvs.php.net/viewvc.cgi/php-src/php.ini-dist?r1=1.231.2.10.2.22.2.7r2=1.231.2.10.2.22.2.8diff_format=u Index: php-src/php.ini-dist diff -u php-src/php.ini-dist:1.231.2.10.2.22.2.7 php-src/php.ini-dist:1.231.2.10.2.22.2.8 --- php-src/php.ini-dist:1.231.2.10.2.22.2.7Mon Jul 21 09:40:59 2008 +++ php-src/php.ini-distSun Jul 27 16:37:57 2008 @@ -860,10 +860,11 @@ ; Connection: Set this to a user chosen connection class to be used ; for all pooled server requests with Oracle 11g Database Resident -; Connection Pooling (DRCP). The default name is system generated. -; To use DRCP, the database pool must be configured, and the -; connection string must also specify to use a pooled server. -;oci8.connection_class = MYPHPAPP +; Connection Pooling (DRCP). To use DRCP, this value should be set to +; the same string for all web servers running the same application, +; the database pool must be configured, and the connection string must +; specify to use a pooled server. +;oci8.connection_class = ; High Availability: Using 1 lets PHP receive Fast Application ; Notification (FAN) events generated when a database node fails. The @@ -876,7 +877,7 @@ ; Tuning: Enables statement prefetching and sets the default number of ; rows that will be fetched automatically after statement execution. -;oci8.default_prefetch = 10 +;oci8.default_prefetch = 100 ; Compatibility. Using 1 means oci_close() will not close ; oci_connect() and oci_new_connect() connections. -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/oci8 README php_oci8.h
sixdSun Jul 27 17:48:16 2008 UTC Modified files: /php-src/ext/oci8 README php_oci8.h Log: Update README. Bump ver ready for PECL release http://cvs.php.net/viewvc.cgi/php-src/ext/oci8/README?r1=1.8r2=1.9diff_format=u Index: php-src/ext/oci8/README diff -u php-src/ext/oci8/README:1.8 php-src/ext/oci8/README:1.9 --- php-src/ext/oci8/README:1.8 Fri Jun 27 18:26:05 2008 +++ php-src/ext/oci8/README Sun Jul 27 17:48:16 2008 @@ -2,19 +2,21 @@ --- 0. Overview -1. Common requirements. -2. Installing as shared extension. -3. Installing as statically compiled extension. -4. Installing from PECL. +1. Common requirements +2. Installing as a shared extension +3. Installing as a statically compiled extension +4. Installing from PECL to an existing PHP 5. Testing OCI8 -6. DRCP and FAN Support +6. Oracle DRCP and FAN Support + 0. Overview --- The OCI8 extension allows you to access Oracle databases. It can be built using Oracle 9.2, 10.2 or 11.1 client libraries, and allows -Oracle's standard cross-version connectivity. +Oracle's standard cross-version connectivity. This release can be +used with PHP 6. The OCI8 extension is not related to or used by PDO_OCI, the PHP Data Objects (PDO) extension for Oracle. @@ -22,22 +24,41 @@ 1. Common requirements -- -This version of PHP OCI8 will build with Oracle 9.2 (or more recent) -client libraries. +This version of PHP OCI8: + + - Will build with Oracle 9.2 (or more recent) client libraries. The +same (or more recent) version of Oracle libraries used when +building OCI8 must also be used at runtime. + + - Can be used with PHP versions 4.3.9 to 5.x. + +If you build PHP with the ORACLE_HOME Oracle database or full Oracle +client libraries: + + - you MUST set at least the ORACLE_HOME environment variable and +make it visible for your web server BEFORE it starts. + + - the Oracle software must be readable by the web server. With +Oracle 10.2, see the $ORACLE_HOME/install/changePerm.sh script +included in patch releases. + +If you build PHP with Oracle Instant Client libraries from +http://www.oracle.com/technology/tech/oci/instantclient/index.html + + - either the basic or basic-lite package is required. -If you use a common Oracle Client installation that comes with the -Oracle server installation, you MUST set at least the ORACLE_HOME -environment variable and make it visible for your web-server BEFORE it -starts. - -If you use Oracle Instant Client, you don't have to set ORACLE_HOME -and many of the other environment variables to build PHP with OCI8 -support. The only variables you may have to set are: + - the devel package is required. - LD_LIBRARY_PATH - it must include the Instant Client library directory + - you don't have to set ORACLE_HOME and many of the other +environment variables to build PHP with OCI8 support. - NLS_LANG - if you want to change the default encoding used during - interaction with Oracle servers +For both ORACLE_HOME and Instant Client installs you may have to set: + + - LD_LIBRARY_PATH: it must include the $ORACLE_HOME/lib or Instant +Client library directory + + - NLS_LANG: if you want to change the default encoding used during +interaction with Oracle servers The most appropriate places to add the environment variables are: @@ -45,55 +66,100 @@ /etc/profile.local /etc/profile.d -2. Installing as shared extension -- -To install OCI8 as a shared extension (i.e. the one you should put -into your php.ini) use the following configure lines to configure PHP: +2. Installing as a shared extension +--- + +Configure OCI8 using one of the the following configure options: -a) if you use a common Oracle or Oracle Client installation: + a) if you use an Oracle server or Oracle Client installation: - ./configure --with-oci8=shared,$ORACLE_HOME + ./configure --with-oci8=shared,$ORACLE_HOME -b) with Oracle Instant Client: + b) with Oracle Instant Client: - ./configure --with-oci8=shared,instantclient,/path/to/instant/client/lib + ./configure --with-oci8=shared,instantclient,/path/to/instant/client/lib -If you use an RPM-based installation of Oracle Instant Client, your configure -line will look like this: +If you use an RPM-based installation of Oracle Instant Client, +your configure line will look like this: - ./configure --with-oci8=shared,instantclient,/usr/lib/oracle/OIC version/client/lib + ./configure --with-oci8=shared,instantclient,/usr/lib/oracle/version/client/lib -Follow the usual building procedure after that and you'll get an OCI8 -shared extension (i.e. oci8.so). Add it into the php.ini file like -this: +Follow the usual building procedure, e.g. make install. The OCI8 +shared extension oci8.so will be created. It may need to be manually +moved to the PHP extension
[PHP-CVS] cvs: php-src(PHP_5_3) /ext/oci8 README package2.xml php_oci8.h
sixdSun Jul 27 17:50:41 2008 UTC Modified files: (Branch: PHP_5_3) /php-src/ext/oci8 README php_oci8.h package2.xml Log: MFH Update README. Bump ver ready for PECL release http://cvs.php.net/viewvc.cgi/php-src/ext/oci8/README?r1=1.1.2.2.2.1.2.7r2=1.1.2.2.2.1.2.8diff_format=u Index: php-src/ext/oci8/README diff -u php-src/ext/oci8/README:1.1.2.2.2.1.2.7 php-src/ext/oci8/README:1.1.2.2.2.1.2.8 --- php-src/ext/oci8/README:1.1.2.2.2.1.2.7 Fri Jun 27 18:26:16 2008 +++ php-src/ext/oci8/README Sun Jul 27 17:50:40 2008 @@ -2,12 +2,12 @@ --- 0. Overview -1. Common requirements. -2. Installing as shared extension. -3. Installing as statically compiled extension. -4. Installing from PECL. +1. Common requirements +2. Installing as a shared extension +3. Installing as a statically compiled extension +4. Installing from PECL to an existing PHP 5. Testing OCI8 -6. DRCP and FAN Support +6. Oracle DRCP and FAN Support 0. Overview @@ -15,31 +15,50 @@ The OCI8 extension allows you to access Oracle databases. It can be built using Oracle 9.2, 10.2 or 11.1 client libraries, and allows -Oracle's standard cross-version connectivity. It can be used with PHP -versions 4.3.9 to 5.3. +Oracle's standard cross-version connectivity. This release can be +used with PHP versions 4.3.9 to 5.x. -The OCI8 extension is not related to or used by PDO_OCI, the PHP Data -Objects (PDO) extension for Oracle. +The OCI8 extension is not related to, or used by, PDO_OCI - the PHP +Data Objects (PDO) extension for Oracle. 1. Common requirements -- -This version of PHP OCI8 will build with Oracle 9.2 (or more recent) -client libraries. +This version of PHP OCI8: + + - Will build with Oracle 9.2 (or more recent) client libraries. The +same (or more recent) version of Oracle libraries used when +building OCI8 must also be used at runtime. + + - Can be used with PHP versions 4.3.9 to 5.x. + +If you build PHP with the ORACLE_HOME Oracle database or full Oracle +client libraries: + + - you MUST set at least the ORACLE_HOME environment variable and +make it visible for your web server BEFORE it starts. + + - the Oracle software must be readable by the web server. With +Oracle 10.2, see the $ORACLE_HOME/install/changePerm.sh script +included in patch releases. + +If you build PHP with Oracle Instant Client libraries from +http://www.oracle.com/technology/tech/oci/instantclient/index.html + + - either the basic or basic-lite package is required. + + - the devel package is required. -If you use a common Oracle Client installation that comes with the -Oracle server installation, you MUST set at least the ORACLE_HOME -environment variable and make it visible for your web-server BEFORE it -starts. - -If you use Oracle Instant Client, you don't have to set ORACLE_HOME -and many of the other environment variables to build PHP with OCI8 -support. The only variables you may have to set are: + - you don't have to set ORACLE_HOME and many of the other +environment variables to build PHP with OCI8 support. - LD_LIBRARY_PATH - it must include the Instant Client library directory +For both ORACLE_HOME and Instant Client installs you may have to set: - NLS_LANG - if you want to change the default encoding used during - interaction with Oracle servers + - LD_LIBRARY_PATH: it must include the $ORACLE_HOME/lib or Instant +Client library directory + + - NLS_LANG: if you want to change the default encoding used during +interaction with Oracle servers The most appropriate places to add the environment variables are: @@ -47,55 +66,100 @@ /etc/profile.local /etc/profile.d -2. Installing as shared extension -- -To install OCI8 as a shared extension (i.e. the one you should put -into your php.ini) use the following configure lines to configure PHP: +2. Installing as a shared extension +--- + +Configure OCI8 using one of the the following configure options: -a) if you use a common Oracle or Oracle Client installation: + a) if you use an Oracle server or Oracle Client installation: - ./configure --with-oci8=shared,$ORACLE_HOME + ./configure --with-oci8=shared,$ORACLE_HOME -b) with Oracle Instant Client: + b) with Oracle Instant Client: - ./configure --with-oci8=shared,instantclient,/path/to/instant/client/lib + ./configure --with-oci8=shared,instantclient,/path/to/instant/client/lib -If you use an RPM-based installation of Oracle Instant Client, your configure -line will look like this: +If you use an RPM-based installation of Oracle Instant Client, +your configure line will look like this: - ./configure --with-oci8=shared,instantclient,/usr/lib/oracle/OIC version/client/lib + ./configure --with-oci8=shared,instantclient,/usr/lib/oracle/version/client/lib -Follow the usual building procedure after that and
[PHP-CVS] cvs: php-src(PHP_5_3) / NEWS /ext/date php_date.c /ext/date/tests date-set-timestamp.phpt
derick Sun Jul 27 19:10:23 2008 UTC Added files: (Branch: PHP_5_3) /php-src/ext/date/tests date-set-timestamp.phpt Modified files: /php-srcNEWS /php-src/ext/date php_date.c Log: - MFH: Fixed DateTime::setTimestamp() and added a test for it. http://cvs.php.net/viewvc.cgi/php-src/NEWS?r1=1.2027.2.547.2.965.2.226r2=1.2027.2.547.2.965.2.227diff_format=u Index: php-src/NEWS diff -u php-src/NEWS:1.2027.2.547.2.965.2.226 php-src/NEWS:1.2027.2.547.2.965.2.227 --- php-src/NEWS:1.2027.2.547.2.965.2.226 Sun Jul 27 16:27:41 2008 +++ php-src/NEWSSun Jul 27 19:10:22 2008 @@ -178,7 +178,7 @@ . timezone_location_get() / DateTimezone::getLocation() for retrieving location information from timezones. . date_timestamp_set() / DateTime::setTimestamp() to set a Unix timestamp -without invoking the date parser. (Scott) +without invoking the date parser. (Scott, Derick) . date_timestamp_get() / DateTime::getTimestamp() to retrieve the Unix timestamp belonging to a date object. . two optional parameters to timezone_transitions_get() / http://cvs.php.net/viewvc.cgi/php-src/ext/date/php_date.c?r1=1.43.2.45.2.51.2.48r2=1.43.2.45.2.51.2.49diff_format=u Index: php-src/ext/date/php_date.c diff -u php-src/ext/date/php_date.c:1.43.2.45.2.51.2.48 php-src/ext/date/php_date.c:1.43.2.45.2.51.2.49 --- php-src/ext/date/php_date.c:1.43.2.45.2.51.2.48 Sun Jul 20 20:58:51 2008 +++ php-src/ext/date/php_date.c Sun Jul 27 19:10:22 2008 @@ -16,7 +16,7 @@ +--+ */ -/* $Id: php_date.c,v 1.43.2.45.2.51.2.48 2008/07/20 20:58:51 derick Exp $ */ +/* $Id: php_date.c,v 1.43.2.45.2.51.2.49 2008/07/27 19:10:22 derick Exp $ */ #include php.h #include php_streams.h @@ -3063,7 +3063,7 @@ } dateobj = (php_date_obj *) zend_object_store_get_object(object TSRMLS_CC); DATE_CHECK_INITIALIZED(dateobj-time, DateTime); - timelib_unixtime2gmt(dateobj-time, (timelib_sll)timestamp); + timelib_unixtime2local(dateobj-time, (timelib_sll)timestamp); timelib_update_ts(dateobj-time, NULL); } /* }}} */ http://cvs.php.net/viewvc.cgi/php-src/ext/date/tests/date-set-timestamp.phpt?view=markuprev=1.1 Index: php-src/ext/date/tests/date-set-timestamp.phpt +++ php-src/ext/date/tests/date-set-timestamp.phpt --TEST-- DateTime::setTimestamp() --INI-- date.timezone=Europe/Oslo --FILE-- ?php $d = new DateTime( '@1217184864' ); echo $d-format( Y-m-d H:i e\n ); $d = new DateTime(); $d-setTimestamp( 1217184864 ); echo $d-format( Y-m-d H:i e\n ); ? --EXPECT-- 2008-07-27 18:54 +00:00 2008-07-27 20:54 Europe/Oslo -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/date php_date.c /ext/date/tests date-set-timestamp.phpt
derick Sun Jul 27 19:09:37 2008 UTC Added files: /php-src/ext/date/tests date-set-timestamp.phpt Modified files: /php-src/ext/date php_date.c Log: - Fixed DateTime::setTimestamp() and added a test for it. http://cvs.php.net/viewvc.cgi/php-src/ext/date/php_date.c?r1=1.199r2=1.200diff_format=u Index: php-src/ext/date/php_date.c diff -u php-src/ext/date/php_date.c:1.199 php-src/ext/date/php_date.c:1.200 --- php-src/ext/date/php_date.c:1.199 Sun Jul 20 20:58:35 2008 +++ php-src/ext/date/php_date.c Sun Jul 27 19:09:36 2008 @@ -16,7 +16,7 @@ +--+ */ -/* $Id: php_date.c,v 1.199 2008/07/20 20:58:35 derick Exp $ */ +/* $Id: php_date.c,v 1.200 2008/07/27 19:09:36 derick Exp $ */ #include php.h #include php_streams.h @@ -3230,7 +3230,7 @@ } dateobj = (php_date_obj *) zend_object_store_get_object(object TSRMLS_CC); DATE_CHECK_INITIALIZED(dateobj-time, DateTime); - timelib_unixtime2gmt(dateobj-time, (timelib_sll)timestamp); + timelib_unixtime2local(dateobj-time, (timelib_sll)timestamp); timelib_update_ts(dateobj-time, NULL); } /* }}} */ http://cvs.php.net/viewvc.cgi/php-src/ext/date/tests/date-set-timestamp.phpt?view=markuprev=1.1 Index: php-src/ext/date/tests/date-set-timestamp.phpt +++ php-src/ext/date/tests/date-set-timestamp.phpt --TEST-- DateTime::setTimestamp() --INI-- date.timezone=Europe/Oslo --FILE-- ?php $d = new DateTime( '@1217184864' ); echo $d-format( Y-m-d H:i e\n ); $d = new DateTime(); $d-setTimestamp( 1217184864 ); echo $d-format( Y-m-d H:i e\n ); ? --EXPECT-- 2008-07-27 18:54 +00:00 2008-07-27 20:54 Europe/Oslo -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_2) /scripts phpize.m4
dsp Sun Jul 27 20:42:56 2008 UTC Modified files: (Branch: PHP_5_2) /php-src/scriptsphpize.m4 Log: - Fixed the fix for not requiring C++ always http://cvs.php.net/viewvc.cgi/php-src/scripts/phpize.m4?r1=1.17.2.3.2.6r2=1.17.2.3.2.7diff_format=u Index: php-src/scripts/phpize.m4 diff -u php-src/scripts/phpize.m4:1.17.2.3.2.6 php-src/scripts/phpize.m4:1.17.2.3.2.7 --- php-src/scripts/phpize.m4:1.17.2.3.2.6 Fri Jul 25 12:36:59 2008 +++ php-src/scripts/phpize.m4 Sun Jul 27 20:42:56 2008 @@ -76,7 +76,7 @@ undefine([AC_PROG_CXX]) AC_DEFUN([AC_PROG_CXX], []) undefine([AC_PROG_CXXCPP]) - AC_DEFUN([AC_PROG_CXXCPP], []) + AC_DEFUN([AC_PROG_CXXCPP], [php_prog_cxxcpp=disabled]) ]) AC_PROG_LIBTOOL -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_3) /scripts phpize.m4
dsp Sun Jul 27 20:43:41 2008 UTC Modified files: (Branch: PHP_5_3) /php-src/scriptsphpize.m4 Log: MFB: - Fixed the fix for not requiring C++ always http://cvs.php.net/viewvc.cgi/php-src/scripts/phpize.m4?r1=1.17.2.3.2.5.2.1r2=1.17.2.3.2.5.2.2diff_format=u Index: php-src/scripts/phpize.m4 diff -u php-src/scripts/phpize.m4:1.17.2.3.2.5.2.1 php-src/scripts/phpize.m4:1.17.2.3.2.5.2.2 --- php-src/scripts/phpize.m4:1.17.2.3.2.5.2.1 Fri Jul 25 12:36:34 2008 +++ php-src/scripts/phpize.m4 Sun Jul 27 20:43:40 2008 @@ -76,7 +76,7 @@ undefine([AC_PROG_CXX]) AC_DEFUN([AC_PROG_CXX], []) undefine([AC_PROG_CXXCPP]) - AC_DEFUN([AC_PROG_CXXCPP], []) + AC_DEFUN([AC_PROG_CXXCPP], [php_prog_cxxcpp=disabled]) ]) AC_PROG_LIBTOOL -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /scripts phpize.m4
dsp Sun Jul 27 20:48:26 2008 UTC Modified files: /php-src/scriptsphpize.m4 Log: MFB: - Fixed the fix for not requiring C++ always http://cvs.php.net/viewvc.cgi/php-src/scripts/phpize.m4?r1=1.27r2=1.28diff_format=u Index: php-src/scripts/phpize.m4 diff -u php-src/scripts/phpize.m4:1.27 php-src/scripts/phpize.m4:1.28 --- php-src/scripts/phpize.m4:1.27 Fri Jul 25 12:34:55 2008 +++ php-src/scripts/phpize.m4 Sun Jul 27 20:48:26 2008 @@ -76,7 +76,7 @@ undefine([AC_PROG_CXX]) AC_DEFUN([AC_PROG_CXX], []) undefine([AC_PROG_CXXCPP]) - AC_DEFUN([AC_PROG_CXXCPP], []) + AC_DEFUN([AC_PROG_CXXCPP], [php_prog_cxxcpp=disabled]) ]) AC_PROG_LIBTOOL -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
Re: [PHP-CVS] cvs: php-src(PHP_5_2) /scripts phpize.m4
Uh..thanks, I totally forgot that file.. --Jani David Soria Parra kirjoitti: dsp Sun Jul 27 20:42:56 2008 UTC Modified files: (Branch: PHP_5_2) /php-src/scripts phpize.m4 Log: - Fixed the fix for not requiring C++ always http://cvs.php.net/viewvc.cgi/php-src/scripts/phpize.m4?r1=1.17.2.3.2.6r2=1.17.2.3.2.7diff_format=u Index: php-src/scripts/phpize.m4 diff -u php-src/scripts/phpize.m4:1.17.2.3.2.6 php-src/scripts/phpize.m4:1.17.2.3.2.7 --- php-src/scripts/phpize.m4:1.17.2.3.2.6 Fri Jul 25 12:36:59 2008 +++ php-src/scripts/phpize.m4 Sun Jul 27 20:42:56 2008 @@ -76,7 +76,7 @@ undefine([AC_PROG_CXX]) AC_DEFUN([AC_PROG_CXX], []) undefine([AC_PROG_CXXCPP]) - AC_DEFUN([AC_PROG_CXXCPP], []) + AC_DEFUN([AC_PROG_CXXCPP], [php_prog_cxxcpp=disabled]) ]) AC_PROG_LIBTOOL -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_3) /ext/ming config.m4 ming.c
helly Sun Jul 27 21:32:48 2008 UTC
Modified files: (Branch: PHP_5_3)
/php-src/ext/ming config.m4 ming.c
Log:
- Allow building with ming-0.4rc1 (the latest available ming)
# Necessary to get gcov.php.net working again
http://cvs.php.net/viewvc.cgi/php-src/ext/ming/config.m4?r1=1.22.2.6.2.4r2=1.22.2.6.2.4.2.1diff_format=u
Index: php-src/ext/ming/config.m4
diff -u php-src/ext/ming/config.m4:1.22.2.6.2.4
php-src/ext/ming/config.m4:1.22.2.6.2.4.2.1
--- php-src/ext/ming/config.m4:1.22.2.6.2.4 Tue Mar 6 10:13:40 2007
+++ php-src/ext/ming/config.m4 Sun Jul 27 21:32:48 2008
@@ -1,5 +1,5 @@
dnl
-dnl $Id: config.m4,v 1.22.2.6.2.4 2007/03/06 10:13:40 tony2001 Exp $
+dnl $Id: config.m4,v 1.22.2.6.2.4.2.1 2008/07/27 21:32:48 helly Exp $
dnl
PHP_ARG_WITH(ming, for MING support,
@@ -40,9 +40,12 @@
PHP_ADD_INCLUDE($MING_INC_DIR)
PHP_ADD_LIBRARY_WITH_PATH(ming, $MING_DIR/$PHP_LIBDIR, MING_SHARED_LIBADD)
- PHP_CHECK_LIBRARY(ming, SWFPrebuiltClip, [ AC_DEFINE(HAVE_SWFPREBUILTCLIP,
1, [ ]) ], [], [])
- PHP_CHECK_LIBRARY(ming, SWFMovie_namedAnchor, [
AC_DEFINE(HAVE_SWFMOVIE_NAMEDANCHOR, 1, [ ]) ], [], [])
- PHP_CHECK_LIBRARY(ming, Ming_setSWFCompression, [
AC_DEFINE(HAVE_MING_SETSWFCOMPRESSION, 1, [ ]) ], [], [])
+ PHP_CHECK_LIBRARY(ming, SWFPrebuiltClip, [
AC_DEFINE(HAVE_SWFPREBUILTCLIP, 1, [ ]) ], [], [])
+ PHP_CHECK_LIBRARY(ming, SWFMovie_namedAnchor,[
AC_DEFINE(HAVE_SWFMOVIE_NAMEDANCHOR,1, [ ]) ], [], [])
+ PHP_CHECK_LIBRARY(ming, Ming_setSWFCompression, [
AC_DEFINE(HAVE_MING_SETSWFCOMPRESSION, 1, [ ]) ], [], [])
+ PHP_CHECK_LIBRARY(ming, SWFVideoStream_seek, [
AC_DEFINE(HAVE_SWFVIDEOSTREAM_SEEK, 1, [ ]) ], [], [])
+ PHP_CHECK_LIBRARY(ming, SWFVideoStream_setFrameMode, [
AC_DEFINE(HAVE_SWFVIDEOSTREAM_SETFRAMEMODE, 1, [ ]) ], [], [])
+ PHP_CHECK_LIBRARY(ming, SWFVideoStream_nextFrame,[
AC_DEFINE(HAVE_SWFVIDEOSTREAM_NEXTFRAME,1, [ ]) ], [], [])
old_CPPFLAGS=$CPPFLAGS
CPPFLAGS=-I$MING_INC_DIR
http://cvs.php.net/viewvc.cgi/php-src/ext/ming/ming.c?r1=1.79.2.4.2.8.2.8r2=1.79.2.4.2.8.2.9diff_format=u
Index: php-src/ext/ming/ming.c
diff -u php-src/ext/ming/ming.c:1.79.2.4.2.8.2.8
php-src/ext/ming/ming.c:1.79.2.4.2.8.2.9
--- php-src/ext/ming/ming.c:1.79.2.4.2.8.2.8Thu Jul 24 18:39:41 2008
+++ php-src/ext/ming/ming.c Sun Jul 27 21:32:48 2008
@@ -19,7 +19,7 @@
+--+
*/
-/* $Id: ming.c,v 1.79.2.4.2.8.2.8 2008/07/24 18:39:41 fmk Exp $ */
+/* $Id: ming.c,v 1.79.2.4.2.8.2.9 2008/07/27 21:32:48 helly Exp $ */
#ifdef HAVE_CONFIG_H
#include config.h
@@ -3521,6 +3521,7 @@
}
/* }}} */
+#if HAVE_SWFVIDEOSTREAM_NEXTFRAME
/* {{{ proto swfvideostream::nextFrame */
PHP_METHOD(swfvideostream, nextFrame)
{
@@ -3531,7 +3532,9 @@
RETURN_LONG(SWFVideoStream_nextFrame(getVideoStream(getThis()
TSRMLS_CC)));
}
/* }}} */
-
+#endif
+
+#if HAVE_SWFVIDEOSTREAM_SETFRAMEMODE
/* {{{ proto swfvideostream::setFrameMode */
PHP_METHOD(swfvideostream, setFrameMode)
{
@@ -3547,7 +3550,9 @@
RETURN_LONG(SWFVideoStream_setFrameMode(stream, mode));
}
/* }}} */
+#endif
+#if HAVE_SWFVIDEOSTREAM_SEEK
/* {{{ proto swfvideostream::seek(frame, whence) */
PHP_METHOD(swfvideostream, seek)
{
@@ -3563,16 +3568,22 @@
RETURN_LONG(SWFVideoStream_seek(stream, frame, whence));
}
/* }}} */
-
-
+#endif
+
static zend_function_entry swfvideostream_functions[] = {
PHP_ME(swfvideostream, __construct,NULL, 0)
PHP_ME(swfvideostream, setdimension, NULL, 0)
PHP_ME(swfvideostream, getnumframes, NULL, 0)
PHP_ME(swfvideostream, hasaudio, NULL, 0)
+#if HAVE_SWFVIDEOSTREAM_SETFRAMEMODE
PHP_ME(swfvideostream, setFrameMode, NULL, 0)
+#endif
+#if HAVE_SWFVIDEOSTREAM_NEXTFRAME
PHP_ME(swfvideostream, nextFrame, NULL, 0)
+#endif
+#if HAVE_SWFVIDEOSTREAM_SEEK
PHP_ME(swfvideostream, seek, NULL, 0)
+#endif
{ NULL, NULL, NULL }
};
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_3) /ext/mbstring/tests zend_multibyte-13.phpt ZendEngine2 zend_compile.h zend_language_scanner.l
moriyoshi Mon Jul 28 05:59:17 2008 UTC
Added files: (Branch: PHP_5_3)
/php-src/ext/mbstring/tests zend_multibyte-13.phpt
Modified files:
/ZendEngine2zend_language_scanner.l zend_compile.h
Log:
- Fix __halt_compiler() weirdness with zend-mulibyte enabled
http://cvs.php.net/viewvc.cgi/ZendEngine2/zend_language_scanner.l?r1=1.131.2.11.2.13.2.25r2=1.131.2.11.2.13.2.26diff_format=u
Index: ZendEngine2/zend_language_scanner.l
diff -u ZendEngine2/zend_language_scanner.l:1.131.2.11.2.13.2.25
ZendEngine2/zend_language_scanner.l:1.131.2.11.2.13.2.26
--- ZendEngine2/zend_language_scanner.l:1.131.2.11.2.13.2.25Sat Jul 26
15:30:25 2008
+++ ZendEngine2/zend_language_scanner.l Mon Jul 28 05:59:16 2008
@@ -21,7 +21,7 @@
+--+
*/
-/* $Id: zend_language_scanner.l,v 1.131.2.11.2.13.2.25 2008/07/26 15:30:25
dmitry Exp $ */
+/* $Id: zend_language_scanner.l,v 1.131.2.11.2.13.2.26 2008/07/28 05:59:16
moriyoshi Exp $ */
#if 0
# define YYDEBUG(s, c) printf(state: %d char: %c\n, s, c)
@@ -444,9 +444,26 @@
}
-ZEND_API int zend_get_scanned_file_offset(TSRMLS_D)
+ZEND_API size_t zend_get_scanned_file_offset(TSRMLS_D)
{
- return SCNG(yy_cursor) - SCNG(yy_start);
+ size_t offset = SCNG(yy_cursor) - SCNG(yy_start);
+#ifdef ZEND_MULTIBYTE
+size_t original_offset = offset, length = 0;
+do {
+unsigned char *p = NULL;
+SCNG(input_filter)(p, length, SCNG(script_org), offset TSRMLS_CC);
+if (!p) {
+break;
+}
+efree(p);
+if (length original_offset) {
+offset--;
+} else if (length original_offset) {
+offset++;
+}
+} while (original_offset != length);
+#endif
+return offset;
}
@@ -581,29 +598,19 @@
BEGIN_EXTERN_C()
ZEND_API void zend_multibyte_yyinput_again(zend_encoding_filter
old_input_filter, zend_encoding *old_encoding TSRMLS_DC)
{
- size_t offset, original_offset, length, free_flag, new_len;
+ size_t original_offset, offset, free_flag, new_len, length;
unsigned char *p;
- zend_encoding *new_encoding;
/* calculate current position */
offset = original_offset = YYCURSOR - SCNG(yy_start);
- if (old_input_filter original_offset 0) {
- new_encoding = SCNG(script_encoding);
+ if (old_input_filter offset 0) {
+ zend_encoding *new_encoding = SCNG(script_encoding);
+zend_encoding_filter new_filter = SCNG(input_filter);
SCNG(script_encoding) = old_encoding;
- do {
- (old_input_filter)(p, length, SCNG(script_org),
offset TSRMLS_CC);
- if (!p) {
- SCNG(script_encoding) = new_encoding;
- return;
- }
- efree(p);
- if (length original_offset) {
- offset--;
- } else if (length original_offset) {
- offset++;
- }
- } while (original_offset != length);
+SCNG(input_filter) = new_filter;
+offset = zend_get_scanned_file_offset(TSRMLS_C);
SCNG(script_encoding) = new_encoding;
+ SCNG(input_filter) = new_filter;
}
/* convert and set */
@@ -1926,7 +1933,7 @@
/* Check for ending label on the next line */
if (CG(heredoc_len) YYLIMIT - YYCURSOR !memcmp(YYCURSOR, s,
CG(heredoc_len))) {
- char *end = YYCURSOR + CG(heredoc_len);
+ unsigned char *end = YYCURSOR + CG(heredoc_len);
if (*end == ';') {
end++;
http://cvs.php.net/viewvc.cgi/ZendEngine2/zend_compile.h?r1=1.316.2.8.2.12.2.30r2=1.316.2.8.2.12.2.31diff_format=u
Index: ZendEngine2/zend_compile.h
diff -u ZendEngine2/zend_compile.h:1.316.2.8.2.12.2.30
ZendEngine2/zend_compile.h:1.316.2.8.2.12.2.31
--- ZendEngine2/zend_compile.h:1.316.2.8.2.12.2.30 Sat Jul 26 15:30:24 2008
+++ ZendEngine2/zend_compile.h Mon Jul 28 05:59:16 2008
@@ -17,7 +17,7 @@
+--+
*/
-/* $Id: zend_compile.h,v 1.316.2.8.2.12.2.30 2008/07/26 15:30:24 dmitry Exp $
*/
+/* $Id: zend_compile.h,v 1.316.2.8.2.12.2.31 2008/07/28 05:59:16 moriyoshi Exp
$ */
#ifndef ZEND_COMPILE_H
#define ZEND_COMPILE_H
@@ -357,7 +357,7 @@
ZEND_API void zend_restore_compiled_filename(char *original_compiled_filename
TSRMLS_DC);
ZEND_API char *zend_get_compiled_filename(TSRMLS_D);
ZEND_API int zend_get_compiled_lineno(TSRMLS_D);
-ZEND_API int zend_get_scanned_file_offset(TSRMLS_D);
+ZEND_API size_t zend_get_scanned_file_offset(TSRMLS_D);
void zend_resolve_class_name(znode *class_name, ulong *fetch_type, int
check_ns_name
