[PHP-CVS-DAILY] cvs: php-src / ChangeLog
changelog Sun Jul 27 01:31:54 2008 UTC Modified files: /php-srcChangeLog Log: ChangeLog update http://cvs.php.net/viewvc.cgi/php-src/ChangeLog?r1=1.3119r2=1.3120diff_format=u Index: php-src/ChangeLog diff -u php-src/ChangeLog:1.3119 php-src/ChangeLog:1.3120 --- php-src/ChangeLog:1.3119Sat Jul 26 01:32:03 2008 +++ php-src/ChangeLog Sun Jul 27 01:31:54 2008 @@ -1,3 +1,205 @@ +2008-07-26 Jani Taskinen [EMAIL PROTECTED] + +* ext/sqlite3/php_sqlite3.h + ext/sqlite3/php_sqlite3_structs.h + ext/sqlite3/php_sqlite3_structs.h + ext/sqlite3/sqlite3.c: + - Fix build + +* ext/sqlite3/config.m4: + - Fixed build with bundled library + +* ext/sqlite3/tests/sqlite3_12_unfinalized_stmt_cleanup.diff + ext/sqlite3/tests/sqlite3_12_unfinalized_stmt_cleanup.exp + ext/sqlite3/tests/sqlite3_12_unfinalized_stmt_cleanup.log + ext/sqlite3/tests/sqlite3_12_unfinalized_stmt_cleanup.php + ext/sqlite3/tests/sqlite3_25_create_aggregate.diff + ext/sqlite3/tests/sqlite3_25_create_aggregate.exp + ext/sqlite3/tests/sqlite3_25_create_aggregate.log + ext/sqlite3/tests/sqlite3_25_create_aggregate.php: + jfc..*SIGH* + +* (PHP_5_3) + ext/pdo_mysql/config.m4: + - Removed merge typos + +* ext/sqlite3/config.m4: + NO Winblows EOLs here!!! + +* ext/sqlite3/sqlite3.c: + fix folding tag + +* ext/standard/credits_ext.h + ext/standard/credits_ext.h: + update credits + +* ext/sqlite3/php_sqlite3.h + ext/sqlite3/sqlite3.c: + - Fix ws/cs (please do not invent your own CS...) and weird EOLs + +* header: + correct year and version + +* ext/sqlite3/CREDITS: + - Fix EOLs + +* ext/intl/CREDITS: + tune + +* ext/sqlite3/config.m4 + ext/sqlite3/config.m4: + - No tabs. + +2008-07-26 Dmitry Stogov [EMAIL PROTECTED] + +* (PHP_5_3) + ZendEngine2/zend_execute_API.c: + -** empty log message *** + +* ZendEngine2/zend_API.c + ZendEngine2/zend_API.c + ZendEngine2/zend_execute_API.c: + Added checks for destroied objects + +* ZendEngine2/tests/bug44660.phpt + ZendEngine2/tests/bug44660.phpt: + + file bug44660.phpt was initially added on branch PHP_5_3. + +* (PHP_5_3) + NEWS + ZendEngine2/zend_execute.c + ZendEngine2/zend_execute.c + ZendEngine2/tests/bug36303.phpt + ZendEngine2/tests/bug36303.phpt + ZendEngine2/tests/bug44660.phpt: + Fixed bug #44660 (Indexed and reference assignment to propery of non-object + don't trigger warning) + +* ZendEngine2/zend_execute_API.c + ZendEngine2/zend_execute_API.c: + Added support for overloaded functions (e.g. COM) in call_user_func(). + +* (PHP_5_3) + NEWS + ZendEngine2/zend_compile.c + ZendEngine2/zend_compile.c + ZendEngine2/zend_compile.h + ZendEngine2/zend_compile.h + ZendEngine2/zend_highlight.c + ZendEngine2/zend_highlight.c + ZendEngine2/zend_language_parser.y + ZendEngine2/zend_language_parser.y + ZendEngine2/zend_language_scanner.c + ZendEngine2/zend_language_scanner.c + ZendEngine2/zend_language_scanner.l + ZendEngine2/zend_language_scanner.l + ZendEngine2/zend_language_scanner_defs.h + ZendEngine2/zend_language_scanner_defs.h + ZendEngine2/zend_vm_def.h + ZendEngine2/zend_vm_def.h + ZendEngine2/zend_vm_execute.h + ZendEngine2/zend_vm_execute.h + ZendEngine2/tests/bug35655.phpt + ZendEngine2/tests/bug35655.phpt + ZendEngine2/tests/heredoc_011.phpt + ZendEngine2/tests/heredoc_011.phpt + ZendEngine2/tests/nowdoc_013.phpt + ZendEngine2/tests/nowdoc_013.phpt + ZendEngine2/tests/nowdoc_014.phpt + ZendEngine2/tests/nowdoc_014.phpt + ext/tokenizer/tokenizer.c + ext/tokenizer/tokenizer.c + ext/tokenizer/tokenizer_data.c + tests/strings/bug26703.phpt + tests/strings/bug26703.phpt: + . Added support for using static HEREDOCs to initialize static variables + and class members or constants. (Matt) + . Improved syntax highlighting and consistency for variables in + double-quoted strings and literal text in HEREDOCs and backticks. (Matt) + . Optimized interpolated strings to use one less opcode. (Matt) + +* ZendEngine2/zend_closures.c + ZendEngine2/zend_closures.c + ZendEngine2/tests/closure_023.phpt: + Fixed bug #45608 (closures don't work in static methods) + +* ZendEngine2/tests/closure_023.phpt + ZendEngine2/tests/closure_023.phpt: + + file closure_023.phpt was initially added on branch PHP_5_3. + +* ZendEngine2/zend_execute.c + ZendEngine2/zend_execute.c + ZendEngine2/zend_vm_def.h + ZendEngine2/zend_vm_def.h + ZendEngine2/zend_vm_execute.h + ZendEngine2/zend_vm_execute.h: + Fixed crashes and memory leak for objects with NULL +
[PHP-CVS] cvs: php-src /ext/spl spl_array.c /ext/spl/tests bug45622.phpt
lbarnaudSat Jul 26 12:33:34 2008 UTC
Added files:
/php-src/ext/spl/tests bug45622.phpt
Modified files:
/php-src/ext/splspl_array.c
Log:
Fix bug #45622 (isset($arrayObject-p) misbehaves with
ArrayObject::ARRAY_AS_PROPS set)
http://cvs.php.net/viewvc.cgi/php-src/ext/spl/spl_array.c?r1=1.143r2=1.144diff_format=u
Index: php-src/ext/spl/spl_array.c
diff -u php-src/ext/spl/spl_array.c:1.143 php-src/ext/spl/spl_array.c:1.144
--- php-src/ext/spl/spl_array.c:1.143 Thu Jul 24 15:51:14 2008
+++ php-src/ext/spl/spl_array.c Sat Jul 26 12:33:34 2008
@@ -16,7 +16,7 @@
+--+
*/
-/* $Id: spl_array.c,v 1.143 2008/07/24 15:51:14 lbarnaud Exp $ */
+/* $Id: spl_array.c,v 1.144 2008/07/26 12:33:34 lbarnaud Exp $ */
#ifdef HAVE_CONFIG_H
# include config.h
@@ -700,13 +700,12 @@
{
spl_array_object *intern =
(spl_array_object*)zend_object_store_get_object(object TSRMLS_CC);
- if ((intern-ar_flags SPL_ARRAY_ARRAY_AS_PROPS) != 0) {
- if (!std_object_handlers.has_property(object, member, 2
TSRMLS_CC)) {
- return spl_array_has_dimension(object, member,
has_set_exists TSRMLS_CC);
- }
- return 0; /* if prop doesn't exist at all mode 0/1 cannot
return 1 */
+ if (std_object_handlers.has_property(object, member, has_set_exists
TSRMLS_CC)) {
+ return 1;
+ } else if ((intern-ar_flags SPL_ARRAY_ARRAY_AS_PROPS) != 0) {
+ return spl_array_has_dimension(object, member, has_set_exists
TSRMLS_CC);
}
- return std_object_handlers.has_property(object, member, has_set_exists
TSRMLS_CC);
+ return 0;
} /* }}} */
static void spl_array_unset_property(zval *object, zval *member TSRMLS_DC) /*
{{{ */
http://cvs.php.net/viewvc.cgi/php-src/ext/spl/tests/bug45622.phpt?view=markuprev=1.1
Index: php-src/ext/spl/tests/bug45622.phpt
+++ php-src/ext/spl/tests/bug45622.phpt
--TEST--
SPL: Bug #45622 (isset($arrayObject-p) misbehaves with
ArrayObject::ARRAY_AS_PROPS set
--FILE--
?php
class C extends ArrayObject {
public $p = 'object property';
}
$ao = new C(array('p'='array element'));
$ao-setFlags(ArrayObject::ARRAY_AS_PROPS);
echo \n-- Access the real property:\n;
var_dump(isset($ao-p));
var_dump($ao-p);
echo \n-- Remove the real property and access the array element:\n;
unset($ao-p);
var_dump(isset($ao-p));
var_dump($ao-p);
echo \n-- Remove the array element and try access again:\n;
unset($ao-p);
var_dump(isset($ao-p));
var_dump($ao-p);
echo \n-- Re-add the real property:\n;
$ao-p = 'object property';
var_dump(isset($ao-p));
var_dump($ao-p);
?
--EXPECTF--
-- Access the real property:
bool(true)
%unicode|string%(15) object property
-- Remove the real property and access the array element:
bool(true)
%unicode|string%(13) array element
-- Remove the array element and try access again:
bool(false)
Notice: Undefined index: p in %s on line %d
NULL
-- Re-add the real property:
bool(true)
%unicode|string%(15) object property
--
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) / NEWS /ext/spl spl_array.c /ext/spl/tests bug45622.phpt
lbarnaudSat Jul 26 12:34:11 2008 UTC
Added files: (Branch: PHP_5_3)
/php-src/ext/spl/tests bug45622.phpt
Modified files:
/php-srcNEWS
/php-src/ext/splspl_array.c
Log:
MFH: Fix bug #45622 (isset($arrayObject-p) misbehaves with
ArrayObject::ARRAY_AS_PROPS set)
http://cvs.php.net/viewvc.cgi/php-src/NEWS?r1=1.2027.2.547.2.965.2.222r2=1.2027.2.547.2.965.2.223diff_format=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.2027.2.547.2.965.2.222
php-src/NEWS:1.2027.2.547.2.965.2.223
--- php-src/NEWS:1.2027.2.547.2.965.2.222 Fri Jul 25 08:27:37 2008
+++ php-src/NEWSSat Jul 26 12:34:10 2008
@@ -222,6 +222,8 @@
- 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
prop of wrapped object). (robin_fernandes at uk dot ibm dot com, Arnaud)
- Fixed bug #45571 (ReflectionClass::export() shows superclasses' private
http://cvs.php.net/viewvc.cgi/php-src/ext/spl/spl_array.c?r1=1.71.2.17.2.13.2.18r2=1.71.2.17.2.13.2.19diff_format=u
Index: php-src/ext/spl/spl_array.c
diff -u php-src/ext/spl/spl_array.c:1.71.2.17.2.13.2.18
php-src/ext/spl/spl_array.c:1.71.2.17.2.13.2.19
--- php-src/ext/spl/spl_array.c:1.71.2.17.2.13.2.18 Thu Jul 24 15:54:41 2008
+++ php-src/ext/spl/spl_array.c Sat Jul 26 12:34:10 2008
@@ -16,7 +16,7 @@
+--+
*/
-/* $Id: spl_array.c,v 1.71.2.17.2.13.2.18 2008/07/24 15:54:41 lbarnaud Exp $ */
+/* $Id: spl_array.c,v 1.71.2.17.2.13.2.19 2008/07/26 12:34:10 lbarnaud Exp $ */
#ifdef HAVE_CONFIG_H
# include config.h
@@ -695,13 +695,12 @@
{
spl_array_object *intern =
(spl_array_object*)zend_object_store_get_object(object TSRMLS_CC);
- if ((intern-ar_flags SPL_ARRAY_ARRAY_AS_PROPS) != 0) {
- if (!std_object_handlers.has_property(object, member, 2
TSRMLS_CC)) {
- return spl_array_has_dimension(object, member,
has_set_exists TSRMLS_CC);
- }
- return 0; /* if prop doesn't exist at all mode 0/1 cannot
return 1 */
+ if (std_object_handlers.has_property(object, member, has_set_exists
TSRMLS_CC)) {
+ return 1;
+ } else if ((intern-ar_flags SPL_ARRAY_ARRAY_AS_PROPS) != 0) {
+ return spl_array_has_dimension(object, member, has_set_exists
TSRMLS_CC);
}
- return std_object_handlers.has_property(object, member, has_set_exists
TSRMLS_CC);
+ return 0;
} /* }}} */
static void spl_array_unset_property(zval *object, zval *member TSRMLS_DC) /*
{{{ */
http://cvs.php.net/viewvc.cgi/php-src/ext/spl/tests/bug45622.phpt?view=markuprev=1.1
Index: php-src/ext/spl/tests/bug45622.phpt
+++ php-src/ext/spl/tests/bug45622.phpt
--TEST--
SPL: Bug #45622 (isset($arrayObject-p) misbehaves with
ArrayObject::ARRAY_AS_PROPS set
--FILE--
?php
class C extends ArrayObject {
public $p = 'object property';
}
$ao = new C(array('p'='array element'));
$ao-setFlags(ArrayObject::ARRAY_AS_PROPS);
echo \n-- Access the real property:\n;
var_dump(isset($ao-p));
var_dump($ao-p);
echo \n-- Remove the real property and access the array element:\n;
unset($ao-p);
var_dump(isset($ao-p));
var_dump($ao-p);
echo \n-- Remove the array element and try access again:\n;
unset($ao-p);
var_dump(isset($ao-p));
var_dump($ao-p);
echo \n-- Re-add the real property:\n;
$ao-p = 'object property';
var_dump(isset($ao-p));
var_dump($ao-p);
?
--EXPECTF--
-- Access the real property:
bool(true)
%unicode|string%(15) object property
-- Remove the real property and access the array element:
bool(true)
%unicode|string%(13) array element
-- Remove the array element and try access again:
bool(false)
Notice: Undefined index: p in %s on line %d
NULL
-- Re-add the real property:
bool(true)
%unicode|string%(15) object property
--
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/reflection php_reflection.c /ext/spl php_spl.c /ext/spl/tests spl_autoload_007.phpt /ext/standard/tests/array array_map_object1.phpt array_map_object3.phpt /ex
dmitry Sat Jul 26 13:14:07 2008 UTC
Modified files: (Branch: PHP_5_3)
/ZendEngine2zend_API.c zend_API.h zend_closures.c zend_compile.h
zend_execute_API.c zend_object_handlers.c
zend_vm_def.h zend_vm_execute.h
/ZendEngine2/tests bug32290.phpt objects_027.phpt
/php-src/ext/reflection php_reflection.c
/php-src/ext/splphp_spl.c
/php-src/ext/spl/tests spl_autoload_007.phpt
/php-src/ext/standard/tests/array array_map_object1.phpt
array_map_object3.phpt
/php-src/ext/standard/tests/general_functions bug40398.phpt
callbacks_001.phpt
Log:
Fixed is_callable/call_user_func mess that had done different things for very
similar arguments e.g. array(A,B) and A::B
http://cvs.php.net/viewvc.cgi/ZendEngine2/zend_API.c?r1=1.296.2.27.2.34.2.42r2=1.296.2.27.2.34.2.43diff_format=u
Index: ZendEngine2/zend_API.c
diff -u ZendEngine2/zend_API.c:1.296.2.27.2.34.2.42
ZendEngine2/zend_API.c:1.296.2.27.2.34.2.43
--- ZendEngine2/zend_API.c:1.296.2.27.2.34.2.42 Thu Jul 24 19:52:23 2008
+++ ZendEngine2/zend_API.c Sat Jul 26 13:14:00 2008
@@ -18,7 +18,7 @@
+--+
*/
-/* $Id: zend_API.c,v 1.296.2.27.2.34.2.42 2008/07/24 19:52:23 felipe Exp $ */
+/* $Id: zend_API.c,v 1.296.2.27.2.34.2.43 2008/07/26 13:14:00 dmitry Exp $ */
#include zend.h
#include zend_execute.h
@@ -2318,6 +2318,9 @@
} else {
fcc-called_scope = EG(called_scope);
fcc-calling_scope = EG(scope);
+ if (!fcc-object_pp) {
+ fcc-object_pp = EG(This) ? EG(This) : NULL;
+ }
ret = 1;
}
} else if (name_len == sizeof(parent) - 1
@@ -2329,6 +2332,9 @@
} else {
fcc-called_scope = EG(called_scope);
fcc-calling_scope = EG(scope)-parent;
+ if (!fcc-object_pp) {
+ fcc-object_pp = EG(This) ? EG(This) : NULL;
+ }
ret = 1;
}
} else if (name_len == sizeof(static) - 1
@@ -2338,10 +2344,23 @@
} else {
fcc-called_scope = EG(called_scope);
fcc-calling_scope = EG(called_scope);
+ if (!fcc-object_pp) {
+ fcc-object_pp = EG(This) ? EG(This) : NULL;
+ }
ret = 1;
}
} else if (zend_lookup_class_ex(name, name_len, 1, pce TSRMLS_CC) ==
SUCCESS) {
- fcc-called_scope = fcc-calling_scope = *pce;
+ zend_class_entry *scope = EG(active_op_array) ?
EG(active_op_array)-scope : NULL;
+
+ fcc-calling_scope = *pce;
+ if (scope !fcc-object_pp EG(This)
+ instanceof_function(Z_OBJCE_P(EG(This)), scope TSRMLS_CC)
+ instanceof_function(scope, fcc-calling_scope TSRMLS_CC)) {
+ fcc-object_pp = EG(This);
+ fcc-called_scope = Z_OBJCE_PP(fcc-object_pp);
+ } else {
+ fcc-called_scope = fcc-object_pp ?
Z_OBJCE_PP(fcc-object_pp) : fcc-calling_scope;
+ }
ret = 1;
} else {
if (error) zend_spprintf(error, 0, class '%.*s' not found,
name_len, name);
@@ -2355,8 +2374,8 @@
static int zend_is_callable_check_func(int check_flags, zval *callable,
zend_fcall_info_cache *fcc, char **error TSRMLS_DC) /* {{{ */
{
zend_class_entry *ce_org = fcc-calling_scope;
- int retval;
- char *lmname, *colon;
+ int retval = 0;
+ char *mname, *lmname, *colon;
int clen, mlen;
zend_class_entry *last_scope;
HashTable *ftable;
@@ -2375,9 +2394,11 @@
Z_STRVAL_P(callable)[1] == ':'
) {
mlen = Z_STRLEN_P(callable) - 2;
+ mname = Z_STRVAL_P(callable) + 2;
lmname = zend_str_tolower_dup(Z_STRVAL_P(callable) + 2,
mlen);
} else {
mlen = Z_STRLEN_P(callable);
+ mname = Z_STRVAL_P(callable);
lmname = zend_str_tolower_dup(Z_STRVAL_P(callable),
mlen);
}
/* Check if function with given name exists.
@@ -2397,7 +2418,6 @@
colon--;
clen = colon - Z_STRVAL_P(callable);
mlen = Z_STRLEN_P(callable) - clen - 2;
- lmname = colon + 2;
if (colon == Z_STRVAL_P(callable)) {
if (error)
Re: [PHP-CVS] cvs: php-src(PHP_5_3) /ext/reflection php_reflection.c /ext/spl php_spl.c /ext/spl/tests spl_autoload_007.phpt /ext/standard/tests/array array_map_object1.phpt array_map_object3.phpt
Hello Dmitry, Saturday, July 26, 2008, 3:14:07 PM, you wrote: dmitry Sat Jul 26 13:14:07 2008 UTC Modified files: (Branch: PHP_5_3) /ZendEngine2zend_API.c zend_API.h zend_closures.c zend_compile.h zend_execute_API.c zend_object_handlers.c zend_vm_def.h zend_vm_execute.h /ZendEngine2/tests bug32290.phpt objects_027.phpt /php-src/ext/reflection php_reflection.c /php-src/ext/splphp_spl.c /php-src/ext/spl/tests spl_autoload_007.phpt /php-src/ext/standard/tests/array array_map_object1.phpt array_map_object3.phpt /php-src/ext/standard/tests/general_functions bug40398.phpt callbacks_001.phpt Log: Fixed is_callable/call_user_func mess that had done different things for very similar arguments e.g. array(A,B) and A::B As far as I understand it zou did a nice unification of all that argument handling, just as mentioned in the submit message. However I saw that zou dropped the zend_function* invoke from struct zend_closure. This was an optimization as repeated calls no longer needed to recreate the function. Why was this dropped? Is it because something might change before the closure gets called a second time? If so how is it a closure then? Best regards, Marcus -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/sqlite3 config.m4
janiSat Jul 26 22:11:42 2008 UTC Modified files: /php-src/ext/sqlite3config.m4 Log: - No tabs. http://cvs.php.net/viewvc.cgi/php-src/ext/sqlite3/config.m4?r1=1.2r2=1.3diff_format=u Index: php-src/ext/sqlite3/config.m4 diff -u php-src/ext/sqlite3/config.m4:1.2 php-src/ext/sqlite3/config.m4:1.3 --- php-src/ext/sqlite3/config.m4:1.2 Sat Jul 26 01:23:45 2008 +++ php-src/ext/sqlite3/config.m4 Sat Jul 26 22:11:41 2008 @@ -1,4 +1,4 @@ -dnl $Id: config.m4,v 1.2 2008/07/26 01:23:45 scottmac Exp $ +dnl $Id: config.m4,v 1.3 2008/07/26 22:11:41 jani Exp $ dnl config.m4 for extension sqlite3 dnl vim:et:ts=2:sw=2 @@ -7,80 +7,80 @@ SQLite3 installation directory.], no) if test $PHP_SQLITE3 != no; then - sqlite3_extra_sources= - PHP_SQLITE3_CFLAGS= + sqlite3_extra_sources= + PHP_SQLITE3_CFLAGS= - dnl when running phpize enable_maintainer_zts is not available - if test -z $enable_maintainer_zts; then - if test -f $phpincludedir/main/php_config.h; then - ZTS=`grep '#define ZTS' $phpincludedir/main/php_config.h|$SED 's/#define ZTS//'` - if test $ZTS -eq 1; then - enable_maintainer_zts=yes - fi - fi - fi - - if test $PHP_SQLITE3 != yes; then - AC_MSG_CHECKING([for sqlite3 files in default path]) - for i in $PHP_SQLITE3 /usr/local /usr; do - if test -r $i/include/sqlite3.h; then - SQLITE3_DIR=$i - AC_MSG_RESULT(found in $i) - break - fi - done - - if test -z $SQLITE3_DIR; then - AC_MSG_RESULT([not found]) - AC_MSG_ERROR([Please reinstall the sqlite distribution from http://www.sqlite.org]) - fi - - AC_MSG_CHECKING([for SQLite 3.3.9+]) - PHP_CHECK_LIBRARY(sqlite3, sqlite3_prepare_v2, [ - AC_MSG_RESULT(found) - PHP_ADD_LIBRARY_WITH_PATH(sqlite3, $SQLITE3_DIR/$PHP_LIBDIR, SQLITE3_SHARED_LIBADD) - PHP_ADD_INCLUDE($SQLITE3_DIR/include) - ],[ - AC_MSG_RESULT([not found]) - AC_MSG_ERROR([Please install SQLite 3.3.9 first or check libsqlite3 is present]) - ],[ - -L$SQLITE3_DIR/$PHP_LIBDIR -lm - ]) - - PHP_CHECK_LIBRARY(sqlite3,sqlite3_key,[ - AC_DEFINE(HAVE_SQLITE3_KEY, 1, [have commercial sqlite3 with crypto support]) - ]) - - else - AC_MSG_CHECKING([built in sqlite3 library]) - AC_MSG_RESULT([yes]) - - sqlite3_extra_sources=libsqlite/sqlite3.c - - if test $enable_maintainer_zts = yes; then - threadsafe_flags=-DSQLITE_THREADSAFE=1 - else - threadsafe_flags=-DSQLITE_THREADSAFE=0 - fi - - if test $ZEND_DEBUG = yes; then - debug_flags=-DSQLITE_DEBUG=1 - fi - - other_flags=-DSQLITE_ENABLE_FTS3=1 -DSQLITE_CORE=1 - -dnlif test $PHP_MAJOR_VERSION -ge 6; then -dnlother_flags=$other_flags -DSQLITE_ENABLE_ICU=1 -dnlfi - - PHP_SQLITE3_CFLAGS=[EMAIL PROTECTED]@/libsqlite [EMAIL PROTECTED]@/libsqlite $other_flags $threadsafe_flags $debug_flags - fi + dnl when running phpize enable_maintainer_zts is not available + if test -z $enable_maintainer_zts; then +if test -f $phpincludedir/main/php_config.h; then + ZTS=`grep '#define ZTS' $phpincludedir/main/php_config.h|$SED 's/#define ZTS//'` + if test $ZTS -eq 1; then +enable_maintainer_zts=yes + fi +fi + fi + + if test $PHP_SQLITE3 != yes; then +AC_MSG_CHECKING([for sqlite3 files in default path]) +for i in $PHP_SQLITE3 /usr/local /usr; do + if test -r $i/include/sqlite3.h; then +SQLITE3_DIR=$i +AC_MSG_RESULT(found in $i) +break + fi +done + +if test -z $SQLITE3_DIR; then + AC_MSG_RESULT([not found]) + AC_MSG_ERROR([Please reinstall the sqlite distribution from http://www.sqlite.org]) +fi + +AC_MSG_CHECKING([for SQLite 3.3.9+]) +PHP_CHECK_LIBRARY(sqlite3, sqlite3_prepare_v2, [ + AC_MSG_RESULT(found) + PHP_ADD_LIBRARY_WITH_PATH(sqlite3, $SQLITE3_DIR/$PHP_LIBDIR, SQLITE3_SHARED_LIBADD) + PHP_ADD_INCLUDE($SQLITE3_DIR/include) +],[ + AC_MSG_RESULT([not found]) + AC_MSG_ERROR([Please install SQLite 3.3.9 first or check libsqlite3 is present]) +],[ + -L$SQLITE3_DIR/$PHP_LIBDIR -lm +]) + +PHP_CHECK_LIBRARY(sqlite3,sqlite3_key,[ +
[PHP-CVS] cvs: php-src(PHP_5_3) /ext/sqlite3 config.m4
janiSat Jul 26 22:14:52 2008 UTC Modified files: (Branch: PHP_5_3) /php-src/ext/sqlite3config.m4 Log: - No tabs. http://cvs.php.net/viewvc.cgi/php-src/ext/sqlite3/config.m4?r1=1.1.2.3r2=1.1.2.4diff_format=u Index: php-src/ext/sqlite3/config.m4 diff -u php-src/ext/sqlite3/config.m4:1.1.2.3 php-src/ext/sqlite3/config.m4:1.1.2.4 --- php-src/ext/sqlite3/config.m4:1.1.2.3 Fri Jul 25 12:04:54 2008 +++ php-src/ext/sqlite3/config.m4 Sat Jul 26 22:14:52 2008 @@ -1,86 +1,86 @@ -dnl $Id: config.m4,v 1.1.2.3 2008/07/25 12:04:54 jani Exp $ -dnl config.m4 for extension sqlite3 -dnl vim:et:ts=2:sw=2 - -PHP_ARG_WITH(sqlite3, whether to enable the SQLite3 extension, -[ --with-sqlite3[=DIR]Include SQLite3 support. DIR is the prefix to - SQLite3 installation directory.], no) - -if test $PHP_SQLITE3 != no; then - sqlite3_extra_sources= - PHP_SQLITE3_CFLAGS= - - dnl when running phpize enable_maintainer_zts is not available - if test -z $enable_maintainer_zts; then - if test -f $phpincludedir/main/php_config.h; then - ZTS=`grep '#define ZTS' $phpincludedir/main/php_config.h|$SED 's/#define ZTS//'` - if test $ZTS -eq 1; then - enable_maintainer_zts=yes - fi - fi - fi - - if test $PHP_SQLITE3 != yes; then - AC_MSG_CHECKING([for sqlite3 files in default path]) - for i in $PHP_SQLITE3 /usr/local /usr; do - if test -r $i/include/sqlite3.h; then - SQLITE3_DIR=$i - AC_MSG_RESULT(found in $i) - break - fi - done - - if test -z $SQLITE3_DIR; then - AC_MSG_RESULT([not found]) - AC_MSG_ERROR([Please reinstall the sqlite distribution from http://www.sqlite.org]) - fi - - AC_MSG_CHECKING([for SQLite 3.3.9+]) - PHP_CHECK_LIBRARY(sqlite3, sqlite3_prepare_v2, [ - AC_MSG_RESULT(found) - PHP_ADD_LIBRARY_WITH_PATH(sqlite3, $SQLITE3_DIR/$PHP_LIBDIR, SQLITE3_SHARED_LIBADD) - PHP_ADD_INCLUDE($SQLITE3_DIR/include) - ],[ - AC_MSG_RESULT([not found]) - AC_MSG_ERROR([Please install SQLite 3.3.9 first or check libsqlite3 is present]) - ],[ - -L$SQLITE3_DIR/$PHP_LIBDIR -lm - ]) - - PHP_CHECK_LIBRARY(sqlite3,sqlite3_key,[ - AC_DEFINE(HAVE_SQLITE3_KEY, 1, [have commercial sqlite3 with crypto support]) - ]) - - else - AC_MSG_CHECKING([built in sqlite3 library]) - AC_MSG_RESULT([yes]) - - sqlite3_extra_sources=libsqlite/sqlite3.c - - if test $enable_maintainer_zts = yes; then - threadsafe_flags=-DSQLITE_THREADSAFE=1 - else - threadsafe_flags=-DSQLITE_THREADSAFE=0 - fi - - if test $ZEND_DEBUG = yes; then - debug_flags=-DSQLITE_DEBUG=1 - fi - - other_flags=-DSQLITE_ENABLE_FTS3=1 -DSQLITE_CORE=1 - -dnlif test $PHP_MAJOR_VERSION -ge 6; then -dnlother_flags=$other_flags -DSQLITE_ENABLE_ICU=1 -dnlfi - - PHP_SQLITE3_CFLAGS=[EMAIL PROTECTED]@/libsqlite [EMAIL PROTECTED]@/libsqlite $other_flags $threadsafe_flags $debug_flags - fi - - AC_DEFINE(HAVE_SQLITE3,1,[ ]) - - sqlite3_sources=sqlite3.c $sqlite3_extra_sources - - PHP_NEW_EXTENSION(sqlite3, $sqlite3_sources, $ext_shared, ,$PHP_SQLITE3_CFLAGS) - PHP_SUBST(SQLITE3_SHARED_LIBADD) - -fi +dnl $Id: config.m4,v 1.1.2.4 2008/07/26 22:14:52 jani Exp $ +dnl config.m4 for extension sqlite3 +dnl vim:et:ts=2:sw=2 + +PHP_ARG_WITH(sqlite3, whether to enable the SQLite3 extension, +[ --with-sqlite3[=DIR]Include SQLite3 support. DIR is the prefix to + SQLite3 installation directory.], no) + +if test $PHP_SQLITE3 != no; then + sqlite3_extra_sources= + PHP_SQLITE3_CFLAGS= + + dnl when running phpize enable_maintainer_zts is not available + if test -z $enable_maintainer_zts; then +if test -f $phpincludedir/main/php_config.h; then + ZTS=`grep '#define ZTS' $phpincludedir/main/php_config.h|$SED 's/#define ZTS//'` + if test $ZTS -eq 1; then +enable_maintainer_zts=yes + fi +fi + fi + + if test $PHP_SQLITE3 != yes; then +AC_MSG_CHECKING([for sqlite3 files in default path]) +for i in $PHP_SQLITE3 /usr/local /usr; do + if test -r $i/include/sqlite3.h; then +SQLITE3_DIR=$i +AC_MSG_RESULT(found in $i) +break +
[PHP-CVS] cvs: php-src /ext/intl CREDITS
janiSat Jul 26 22:17:17 2008 UTC Modified files: /php-src/ext/intl CREDITS Log: tune http://cvs.php.net/viewvc.cgi/php-src/ext/intl/CREDITS?r1=1.2r2=1.3diff_format=u Index: php-src/ext/intl/CREDITS diff -u php-src/ext/intl/CREDITS:1.2 php-src/ext/intl/CREDITS:1.3 --- php-src/ext/intl/CREDITS:1.2Mon Jul 7 23:42:29 2008 +++ php-src/ext/intl/CREDITSSat Jul 26 22:17:17 2008 @@ -1,2 +1,2 @@ Internationalization -Ed Batutis, Vladimir Iordanov, Dmitry Lakhtyuk, Stanislav Malyshev, Vadim Savchuk, Kirti Velankar +Ed Batutis, Vladimir Iordanov, Dmitry Lakhtyuk, Stanislav Malyshev, Vadim Savchuk, Kirti Velankar -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/sqlite3 CREDITS
janiSat Jul 26 22:18:00 2008 UTC Modified files: /php-src/ext/sqlite3CREDITS Log: - Fix EOLs http://cvs.php.net/viewvc.cgi/php-src/ext/sqlite3/CREDITS?r1=1.2r2=1.3diff_format=u Index: php-src/ext/sqlite3/CREDITS diff -u php-src/ext/sqlite3/CREDITS:1.2 php-src/ext/sqlite3/CREDITS:1.3 --- php-src/ext/sqlite3/CREDITS:1.2 Sat Jul 26 01:23:45 2008 +++ php-src/ext/sqlite3/CREDITS Sat Jul 26 22:18:00 2008 @@ -1,2 +1,2 @@ -SQLite3 -Scott MacVicar +SQLite3 +Scott MacVicar -- 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/intl CREDITS
janiSat Jul 26 22:18:39 2008 UTC Modified files: (Branch: PHP_5_3) /php-src/ext/intl CREDITS Log: MFH:tune http://cvs.php.net/viewvc.cgi/php-src/ext/intl/CREDITS?r1=1.1.2.1r2=1.1.2.2diff_format=u Index: php-src/ext/intl/CREDITS diff -u php-src/ext/intl/CREDITS:1.1.2.1 php-src/ext/intl/CREDITS:1.1.2.2 --- php-src/ext/intl/CREDITS:1.1.2.1Mon Jul 7 22:51:02 2008 +++ php-src/ext/intl/CREDITSSat Jul 26 22:18:38 2008 @@ -1,2 +1,2 @@ Internationalization -Ed Batutis, Vladimir Iordanov, Dmitry Lakhtyuk, Stanislav Malyshev, Vadim Savchuk, Kirti Velankar +Ed Batutis, Vladimir Iordanov, Dmitry Lakhtyuk, Stanislav Malyshev, Vadim Savchuk, Kirti Velankar -- 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/standard credits_ext.h
janiSat Jul 26 22:19:43 2008 UTC Modified files: (Branch: PHP_5_3) /php-src/ext/standard credits_ext.h Log: update credits http://cvs.php.net/viewvc.cgi/php-src/ext/standard/credits_ext.h?r1=1.30.2.6.2.6.2.5r2=1.30.2.6.2.6.2.6diff_format=u Index: php-src/ext/standard/credits_ext.h diff -u php-src/ext/standard/credits_ext.h:1.30.2.6.2.6.2.5 php-src/ext/standard/credits_ext.h:1.30.2.6.2.6.2.6 --- php-src/ext/standard/credits_ext.h:1.30.2.6.2.6.2.5 Fri Jul 25 09:13:24 2008 +++ php-src/ext/standard/credits_ext.h Sat Jul 26 22:19:41 2008 @@ -35,7 +35,7 @@ CREDIT_LINE(IMAP, Rex Logan, Mark Musone, Brian Wang, Kaj-Michael Lang, Antoni Pamies Olive, Rasmus Lerdorf, Andrew Skalski, Chuck Hagenbuch, Daniel R Kalowsky); CREDIT_LINE(Input Filter, Rasmus Lerdorf, Derick Rethans, Pierre-Alain Joye, Ilia Alshanetsky); CREDIT_LINE(InterBase, Jouni Ahto, Andrew Avdeev, Ard Biesheuvel); -CREDIT_LINE(Internationalization, Ed Batutis, Vladimir Iordanov, Dmitry Lakhtyuk, Stanislav Malyshev, Vadim Savchuk, Kirti Velankar); +CREDIT_LINE(Internationalization, Ed Batutis, Vladimir Iordanov, Dmitry Lakhtyuk, Stanislav Malyshev, Vadim Savchuk, Kirti Velankar); CREDIT_LINE(JSON, Omar Kilani); CREDIT_LINE(LDAP, Amitay Isaacs, Eric Warnke, Rasmus Lerdorf, Gerrit Thomson, Stig Venaas); CREDIT_LINE(LIBXML, Christian Stocker, Rob Richards, Marcus Boerger, Wez Furlong, Shane Caraveo); -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src / header
janiSat Jul 26 22:21:12 2008 UTC Modified files: /php-srcheader Log: correct year and version http://cvs.php.net/viewvc.cgi/php-src/header?r1=1.17r2=1.18diff_format=u Index: php-src/header diff -u php-src/header:1.17 php-src/header:1.18 --- php-src/header:1.17 Sun Jan 1 13:09:48 2006 +++ php-src/header Sat Jul 26 22:21:12 2008 @@ -1,8 +1,8 @@ /* +--+ - | PHP Version 5| + | PHP Version 6| +--+ - | Copyright (c) 1997-2006 The PHP Group| + | Copyright (c) 1997-2008 The PHP Group| +--+ | This source file is subject to version 3.01 of the PHP license, | | that is bundled with this package in the file LICENSE, and is| @@ -16,4 +16,4 @@ +--+ */ -/* $Id: header,v 1.17 2006/01/01 13:09:48 sniper Exp $ */ +/* $Id: header,v 1.18 2008/07/26 22:21:12 jani Exp $ */ -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/standard credits_ext.h
janiSat Jul 26 22:40:45 2008 UTC Modified files: /php-src/ext/standard credits_ext.h Log: update credits http://cvs.php.net/viewvc.cgi/php-src/ext/standard/credits_ext.h?r1=1.44r2=1.45diff_format=u Index: php-src/ext/standard/credits_ext.h diff -u php-src/ext/standard/credits_ext.h:1.44 php-src/ext/standard/credits_ext.h:1.45 --- php-src/ext/standard/credits_ext.h:1.44 Mon Jul 7 10:38:16 2008 +++ php-src/ext/standard/credits_ext.h Sat Jul 26 22:40:45 2008 @@ -25,6 +25,7 @@ CREDIT_LINE(ereg, Rasmus Lerdorf, Jim Winstead, Jaakko Hyvätti); CREDIT_LINE(EXIF, Rasmus Lerdorf, Marcus Boerger); CREDIT_LINE(FBSQL, Frank M. Kromann); +CREDIT_LINE(fileinfo, Ilia Alshanetsky, Derick Rethans); CREDIT_LINE(Firebird/InterBase driver for PDO, Ard Biesheuvel); CREDIT_LINE(FTP, Stefan Esser, Andrew Skalski); CREDIT_LINE(GD imaging, Rasmus Lerdorf, Stig Bakken, Jim Winstead, Jouni Ahto, Ilia Alshanetsky, Pierre-Alain Joye, Marcus Boerger); @@ -34,6 +35,7 @@ CREDIT_LINE(IMAP, Rex Logan, Mark Musone, Brian Wang, Kaj-Michael Lang, Antoni Pamies Olive, Rasmus Lerdorf, Andrew Skalski, Chuck Hagenbuch, Daniel R Kalowsky); CREDIT_LINE(Input Filter, Rasmus Lerdorf, Derick Rethans, Pierre-Alain Joye, Ilia Alshanetsky); CREDIT_LINE(InterBase, Jouni Ahto, Andrew Avdeev, Ard Biesheuvel); +CREDIT_LINE(Internationalization, Ed Batutis, Vladimir Iordanov, Dmitry Lakhtyuk, Stanislav Malyshev, Vadim Savchuk, Kirti Velankar); CREDIT_LINE(JSON, Omar Kilani); CREDIT_LINE(LDAP, Amitay Isaacs, Eric Warnke, Rasmus Lerdorf, Gerrit Thomson, Stig Venaas); CREDIT_LINE(LIBXML, Christian Stocker, Rob Richards, Marcus Boerger, Wez Furlong, Shane Caraveo); @@ -44,7 +46,7 @@ CREDIT_LINE(mSQL, Zeev Suraski); CREDIT_LINE(MS SQL, Frank M. Kromann); CREDIT_LINE(Multibyte String Functions, Tsukada Takuya, Rui Hirokawa); -CREDIT_LINE(mySQL driver for PDO, George Schlossnagle, Wez Furlong, Ilia Alshanetsky); +CREDIT_LINE(MySQL driver for PDO, George Schlossnagle, Wez Furlong, Ilia Alshanetsky, Johannes Schlueter); CREDIT_LINE(MySQLi, Zak Greant, Georg Richter, Andrey Hristov, Ulf Wendel); CREDIT_LINE(MySQLnd, Georg Richter, Andrey Hristov, Ulf Wendel); CREDIT_LINE(MySQL, Zeev Suraski, Zak Greant, Georg Richter); @@ -72,6 +74,7 @@ CREDIT_LINE(SOAP, Brad Lafountain, Shane Caraveo, Dmitry Stogov); CREDIT_LINE(Sockets, Chris Vandomelen, Sterling Hughes, Daniel Beulshausen, Jason Greene); CREDIT_LINE(SPL, Marcus Boerger, Etienne Kneuss); +CREDIT_LINE(SQLite3, Scott MacVicar); CREDIT_LINE(SQLite 3.x driver for PDO, Wez Furlong); CREDIT_LINE(SQLite, Wez Furlong, Tal Peer, Marcus Boerger, Ilia Alshanetsky); CREDIT_LINE(Sybase-CT, Zeev Suraski, Tom May, Timm Friebe); -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/sqlite3 config.m4
janiSat Jul 26 23:21:02 2008 UTC Modified files: /php-src/ext/sqlite3config.m4 Log: NO Winblows EOLs here!!! http://cvs.php.net/viewvc.cgi/php-src/ext/sqlite3/config.m4?r1=1.3r2=1.4diff_format=u Index: php-src/ext/sqlite3/config.m4 diff -u php-src/ext/sqlite3/config.m4:1.3 php-src/ext/sqlite3/config.m4:1.4 --- php-src/ext/sqlite3/config.m4:1.3 Sat Jul 26 22:11:41 2008 +++ php-src/ext/sqlite3/config.m4 Sat Jul 26 23:21:02 2008 @@ -1,86 +1,86 @@ -dnl $Id: config.m4,v 1.3 2008/07/26 22:11:41 jani Exp $ -dnl config.m4 for extension sqlite3 -dnl vim:et:ts=2:sw=2 - -PHP_ARG_WITH(sqlite3, whether to enable the SQLite3 extension, -[ --with-sqlite3[=DIR]Include SQLite3 support. DIR is the prefix to - SQLite3 installation directory.], no) - -if test $PHP_SQLITE3 != no; then - sqlite3_extra_sources= - PHP_SQLITE3_CFLAGS= - - dnl when running phpize enable_maintainer_zts is not available - if test -z $enable_maintainer_zts; then -if test -f $phpincludedir/main/php_config.h; then - ZTS=`grep '#define ZTS' $phpincludedir/main/php_config.h|$SED 's/#define ZTS//'` - if test $ZTS -eq 1; then -enable_maintainer_zts=yes - fi -fi - fi - - if test $PHP_SQLITE3 != yes; then -AC_MSG_CHECKING([for sqlite3 files in default path]) -for i in $PHP_SQLITE3 /usr/local /usr; do - if test -r $i/include/sqlite3.h; then -SQLITE3_DIR=$i -AC_MSG_RESULT(found in $i) -break - fi -done - -if test -z $SQLITE3_DIR; then - AC_MSG_RESULT([not found]) - AC_MSG_ERROR([Please reinstall the sqlite distribution from http://www.sqlite.org]) -fi - -AC_MSG_CHECKING([for SQLite 3.3.9+]) -PHP_CHECK_LIBRARY(sqlite3, sqlite3_prepare_v2, [ - AC_MSG_RESULT(found) - PHP_ADD_LIBRARY_WITH_PATH(sqlite3, $SQLITE3_DIR/$PHP_LIBDIR, SQLITE3_SHARED_LIBADD) - PHP_ADD_INCLUDE($SQLITE3_DIR/include) -],[ - AC_MSG_RESULT([not found]) - AC_MSG_ERROR([Please install SQLite 3.3.9 first or check libsqlite3 is present]) -],[ - -L$SQLITE3_DIR/$PHP_LIBDIR -lm -]) - -PHP_CHECK_LIBRARY(sqlite3,sqlite3_key,[ - AC_DEFINE(HAVE_SQLITE3_KEY, 1, [have commercial sqlite3 with crypto support]) -]) - - else -AC_MSG_CHECKING([bundled sqlite3 library]) -AC_MSG_RESULT([yes]) - -sqlite3_extra_sources=libsqlite/sqlite3.c - -if test $enable_maintainer_zts = yes; then - threadsafe_flags=-DSQLITE_THREADSAFE=1 -else - threadsafe_flags=-DSQLITE_THREADSAFE=0 -fi - -if test $ZEND_DEBUG = yes; then - debug_flags=-DSQLITE_DEBUG=1 -fi - -other_flags=-DSQLITE_ENABLE_FTS3=1 -DSQLITE_CORE=1 - -dnlif test $PHP_MAJOR_VERSION -ge 6; then -dnl other_flags=$other_flags -DSQLITE_ENABLE_ICU=1 -dnlfi - -PHP_SQLITE3_CFLAGS=[EMAIL PROTECTED]@/libsqlite [EMAIL PROTECTED]@/libsqlite $other_flags $threadsafe_flags $debug_flags - fi - - AC_DEFINE(HAVE_SQLITE3,1,[ ]) - - sqlite3_sources=sqlite3.c $sqlite3_extra_sources - - PHP_NEW_EXTENSION(sqlite3, $sqlite3_sources, $ext_shared,,$PHP_SQLITE3_CFLAGS) - PHP_SUBST(SQLITE3_SHARED_LIBADD) - -fi +dnl $Id: config.m4,v 1.4 2008/07/26 23:21:02 jani Exp $ +dnl config.m4 for extension sqlite3 +dnl vim:et:ts=2:sw=2 + +PHP_ARG_WITH(sqlite3, whether to enable the SQLite3 extension, +[ --with-sqlite3[=DIR]Include SQLite3 support. DIR is the prefix to + SQLite3 installation directory.], no) + +if test $PHP_SQLITE3 != no; then + sqlite3_extra_sources= + PHP_SQLITE3_CFLAGS= + + dnl when running phpize enable_maintainer_zts is not available + if test -z $enable_maintainer_zts; then +if test -f $phpincludedir/main/php_config.h; then + ZTS=`grep '#define ZTS' $phpincludedir/main/php_config.h|$SED 's/#define ZTS//'` + if test $ZTS -eq 1; then +enable_maintainer_zts=yes + fi +fi + fi + + if test $PHP_SQLITE3 != yes; then +AC_MSG_CHECKING([for sqlite3 files in default path]) +for i in $PHP_SQLITE3 /usr/local /usr; do + if test -r $i/include/sqlite3.h; then +SQLITE3_DIR=$i +AC_MSG_RESULT(found in $i) +break + fi +done + +if test -z $SQLITE3_DIR; then + AC_MSG_RESULT([not found]) + AC_MSG_ERROR([Please reinstall the sqlite distribution from http://www.sqlite.org]) +fi + +AC_MSG_CHECKING([for SQLite 3.3.9+]) +PHP_CHECK_LIBRARY(sqlite3, sqlite3_prepare_v2, [ + AC_MSG_RESULT(found) + PHP_ADD_LIBRARY_WITH_PATH(sqlite3, $SQLITE3_DIR/$PHP_LIBDIR, SQLITE3_SHARED_LIBADD) + PHP_ADD_INCLUDE($SQLITE3_DIR/include) +],[ + AC_MSG_RESULT([not found]) + AC_MSG_ERROR([Please install SQLite 3.3.9 first or check libsqlite3 is present]) +],[ + -L$SQLITE3_DIR/$PHP_LIBDIR -lm +]) + +PHP_CHECK_LIBRARY(sqlite3,sqlite3_key,[ + AC_DEFINE(HAVE_SQLITE3_KEY, 1, [have commercial sqlite3 with crypto support]) +
[PHP-CVS] cvs: php-src /ext/sqlite3 config.m4
janiSat Jul 26 23:45:54 2008 UTC Modified files: /php-src/ext/sqlite3config.m4 Log: - Fixed build with bundled library http://cvs.php.net/viewvc.cgi/php-src/ext/sqlite3/config.m4?r1=1.4r2=1.5diff_format=u Index: php-src/ext/sqlite3/config.m4 diff -u php-src/ext/sqlite3/config.m4:1.4 php-src/ext/sqlite3/config.m4:1.5 --- php-src/ext/sqlite3/config.m4:1.4 Sat Jul 26 23:21:02 2008 +++ php-src/ext/sqlite3/config.m4 Sat Jul 26 23:45:54 2008 @@ -1,4 +1,4 @@ -dnl $Id: config.m4,v 1.4 2008/07/26 23:21:02 jani Exp $ +dnl $Id: config.m4,v 1.5 2008/07/26 23:45:54 jani Exp $ dnl config.m4 for extension sqlite3 dnl vim:et:ts=2:sw=2 @@ -72,7 +72,6 @@ dnlif test $PHP_MAJOR_VERSION -ge 6; then dnl other_flags=$other_flags -DSQLITE_ENABLE_ICU=1 dnlfi - PHP_SQLITE3_CFLAGS=[EMAIL PROTECTED]@/libsqlite [EMAIL PROTECTED]@/libsqlite $other_flags $threadsafe_flags $debug_flags fi @@ -81,6 +80,6 @@ sqlite3_sources=sqlite3.c $sqlite3_extra_sources PHP_NEW_EXTENSION(sqlite3, $sqlite3_sources, $ext_shared,,$PHP_SQLITE3_CFLAGS) + PHP_ADD_BUILD_DIR([$ext_builddir/libsqlite]) PHP_SUBST(SQLITE3_SHARED_LIBADD) - fi -- 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/phar util.c
helly Sun Jul 27 04:23:00 2008 UTC
Modified files: (Branch: PHP_5_3)
/php-src/ext/phar util.c
Log:
- Fix openssl check
http://cvs.php.net/viewvc.cgi/php-src/ext/phar/util.c?r1=1.55.2.23r2=1.55.2.24diff_format=u
Index: php-src/ext/phar/util.c
diff -u php-src/ext/phar/util.c:1.55.2.23 php-src/ext/phar/util.c:1.55.2.24
--- php-src/ext/phar/util.c:1.55.2.23 Sun Jul 20 14:42:34 2008
+++ php-src/ext/phar/util.c Sun Jul 27 04:23:00 2008
@@ -18,7 +18,7 @@
+--+
*/
-/* $Id: util.c,v 1.55.2.23 2008/07/20 14:42:34 dmitry Exp $ */
+/* $Id: util.c,v 1.55.2.24 2008/07/27 04:23:00 helly Exp $ */
#include phar_internal.h
@@ -1665,7 +1665,8 @@
read_size = (int)read_len;
}
}
- if (!EVP_VerifyFinal (md_ctx, (unsigned char *)sig,
sig_len, key)) {
+ if (EVP_VerifyFinal(md_ctx, (unsigned char *)sig,
sig_len, key) != 1) {
+ /* 1: signature verified, 0: signature does not
match, -1: failed signature operation */
EVP_MD_CTX_cleanup(md_ctx);
if (error) {
spprintf(error, 0, broken openssl
signature);
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
