date:20081224

[PHP-CVS] cvs: php-src(PHP_5_3) /ext/simplexml config.w32

2008-12-24 Thread Pierre-Alain Joye

pajoye  Thu Dec 25 01:00:26 2008 UTC

  Modified files:  (Branch: PHP_5_3)
/php-src/ext/simplexml  config.w32 
  Log:
  - add libxml cflag for shared and static
  
http://cvs.php.net/viewvc.cgi/php-src/ext/simplexml/config.w32?r1=1.4.8.4&r2=1.4.8.5&diff_format=u
Index: php-src/ext/simplexml/config.w32
diff -u php-src/ext/simplexml/config.w32:1.4.8.4 
php-src/ext/simplexml/config.w32:1.4.8.5
--- php-src/ext/simplexml/config.w32:1.4.8.4Thu Dec 25 00:47:32 2008
+++ php-src/ext/simplexml/config.w32Thu Dec 25 01:00:26 2008
@@ -1,4 +1,4 @@
-// $Id: config.w32,v 1.4.8.4 2008/12/25 00:47:32 pajoye Exp $
+// $Id: config.w32,v 1.4.8.5 2008/12/25 01:00:26 pajoye Exp $
 // vim:ft=javascript
 
 ARG_WITH("simplexml", "Simple XML support", "yes");
@@ -9,9 +9,11 @@
AC_DEFINE("HAVE_SIMPLEXML", 1, "Simple XML support");
if (!PHP_SIMPLEXML_SHARED) {
ADD_FLAG("CFLAGS_SIMPLEXML", "/D LIBXML_STATIC");
-// be tricky for now, we actually need a macro like the one in m4 
(PHP_SETUP_LIBXML)
-   ADD_FLAG("CFLAGS_SIMPLEXML", "$(CFLAGS_LIBXML)");
}
+   
+   // be tricky for now, we actually need a macro like the one in m4 
(PHP_SETUP_LIBXML)
+   ADD_FLAG("CFLAGS_SIMPLEXML", "$(CFLAGS_LIBXML)");
+
if (!ADD_EXTENSION_DEP('simplexml', 'spl', true)) {
MESSAGE("\tSPL support in simplexml disabled");
}



-- 
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/simplexml config.w32

2008-12-24 Thread Pierre-Alain Joye

pajoye  Thu Dec 25 00:47:32 2008 UTC

  Modified files:  (Branch: PHP_5_3)
/php-src/ext/simplexml  config.w32 
  Log:
  - work around missing libxml include path (will be replaced by a 
PHP_SETUP_LIBXML macro)
  
http://cvs.php.net/viewvc.cgi/php-src/ext/simplexml/config.w32?r1=1.4.8.3&r2=1.4.8.4&diff_format=u
Index: php-src/ext/simplexml/config.w32
diff -u php-src/ext/simplexml/config.w32:1.4.8.3 
php-src/ext/simplexml/config.w32:1.4.8.4
--- php-src/ext/simplexml/config.w32:1.4.8.3Thu Dec 25 00:01:10 2008
+++ php-src/ext/simplexml/config.w32Thu Dec 25 00:47:32 2008
@@ -1,4 +1,4 @@
-// $Id: config.w32,v 1.4.8.3 2008/12/25 00:01:10 pajoye Exp $
+// $Id: config.w32,v 1.4.8.4 2008/12/25 00:47:32 pajoye Exp $
 // vim:ft=javascript
 
 ARG_WITH("simplexml", "Simple XML support", "yes");
@@ -9,6 +9,8 @@
AC_DEFINE("HAVE_SIMPLEXML", 1, "Simple XML support");
if (!PHP_SIMPLEXML_SHARED) {
ADD_FLAG("CFLAGS_SIMPLEXML", "/D LIBXML_STATIC");
+// be tricky for now, we actually need a macro like the one in m4 
(PHP_SETUP_LIBXML)
+   ADD_FLAG("CFLAGS_SIMPLEXML", "$(CFLAGS_LIBXML)");
}
if (!ADD_EXTENSION_DEP('simplexml', 'spl', true)) {
MESSAGE("\tSPL support in simplexml disabled");
@@ -17,5 +19,3 @@
PHP_SIMPLEXML == "no";
WARNING("simplexml not enabled; libraries and headers not found");
 }
-
-



-- 
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) /win32/build configure.tail

2008-12-24 Thread Pierre-Alain Joye

pajoye  Thu Dec 25 00:09:50 2008 UTC

  Modified files:  (Branch: PHP_5_3)
/php-src/win32/buildconfigure.tail 
  Log:
  - MFH: be sure that at least one SAPI has been selected
  
http://cvs.php.net/viewvc.cgi/php-src/win32/build/configure.tail?r1=1.1&r2=1.1.8.1&diff_format=u
Index: php-src/win32/build/configure.tail
diff -u php-src/win32/build/configure.tail:1.1 
php-src/win32/build/configure.tail:1.1.8.1
--- php-src/win32/build/configure.tail:1.1  Tue Dec  2 23:17:04 2003
+++ php-src/win32/build/configure.tail  Thu Dec 25 00:09:49 2008
@@ -1,6 +1,11 @@
 // vim:ft=javascript
-// $Id: configure.tail,v 1.1 2003/12/02 23:17:04 wez Exp $
+// $Id: configure.tail,v 1.1.8.1 2008/12/25 00:09:49 pajoye Exp $
 // tail end of configure
 
+if (sapi_enabled.length < 1) {
+   MESSAGE("");
+   ERROR("No SAPI selected, please enable at least one SAPI.");
+}
+
 generate_files();
 



-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

[PHP-CVS] cvs: php-src /win32/build configure.tail

2008-12-24 Thread Pierre-Alain Joye

pajoye  Thu Dec 25 00:09:32 2008 UTC

  Modified files:  
/php-src/win32/buildconfigure.tail 
  Log:
  - be sure that at least one SAPI has been selected
  
http://cvs.php.net/viewvc.cgi/php-src/win32/build/configure.tail?r1=1.1&r2=1.2&diff_format=u
Index: php-src/win32/build/configure.tail
diff -u php-src/win32/build/configure.tail:1.1 
php-src/win32/build/configure.tail:1.2
--- php-src/win32/build/configure.tail:1.1  Tue Dec  2 23:17:04 2003
+++ php-src/win32/build/configure.tail  Thu Dec 25 00:09:32 2008
@@ -1,6 +1,11 @@
 // vim:ft=javascript
-// $Id: configure.tail,v 1.1 2003/12/02 23:17:04 wez Exp $
+// $Id: configure.tail,v 1.2 2008/12/25 00:09:32 pajoye Exp $
 // tail end of configure
 
+if (sapi_enabled.length < 1) {
+   MESSAGE("");
+   ERROR("No SAPI selected, please enable at least one SAPI.");
+}
+
 generate_files();
 



-- 
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) /win32/build config.w32 confutils.js

2008-12-24 Thread Pierre-Alain Joye

pajoye  Thu Dec 25 00:08:51 2008 UTC

  Modified files:  (Branch: PHP_5_3)
/php-src/win32/buildconfig.w32 confutils.js 
  Log:
   - MFH: the config summary is a must, do not allow to disable it
  
http://cvs.php.net/viewvc.cgi/php-src/win32/build/config.w32?r1=1.40.2.8.2.10.2.37&r2=1.40.2.8.2.10.2.38&diff_format=u
Index: php-src/win32/build/config.w32
diff -u php-src/win32/build/config.w32:1.40.2.8.2.10.2.37 
php-src/win32/build/config.w32:1.40.2.8.2.10.2.38
--- php-src/win32/build/config.w32:1.40.2.8.2.10.2.37   Thu Dec 18 23:21:22 2008
+++ php-src/win32/build/config.w32  Thu Dec 25 00:08:51 2008
@@ -1,5 +1,5 @@
 // vim:ft=javascript
-// $Id: config.w32,v 1.40.2.8.2.10.2.37 2008/12/18 23:21:22 pajoye Exp $
+// $Id: config.w32,v 1.40.2.8.2.10.2.38 2008/12/25 00:08:51 pajoye Exp $
 // "Master" config file; think of it as a configure.in
 // equivalent.
 
@@ -174,8 +174,8 @@
ADD_FLAG("LDFLAGS", "/incremental:no /debug /opt:ref,icf");
}
// Equivalent to Release_TSInline build -> best optimization
-   ADD_FLAG("CFLAGS", "/LD /MD /W3 /Ox /D NDebug /D NDEBUG \
-/D ZEND_WIN32_FORCE_INLINE /GF /D ZEND_DEBUG=0");
+   ADD_FLAG("CFLAGS", "/LD /MD /W3 /Ox /D NDebug /D NDEBUG /D 
ZEND_WIN32_FORCE_INLINE /GF /D ZEND_DEBUG=0");
+
// if you have VS.Net /GS hardens the binary against buffer overruns
// ADD_FLAG("CFLAGS", "/GS");
 }
@@ -370,8 +370,6 @@
 
 DEFINE('SNAPSHOT_TEMPLATE', PHP_SNAPSHOT_TEMPLATE);
 
-ARG_ENABLE('summary', 'Enable configuration summary', 'yes');
-
 if (PHP_DSP != "no") {
if (FSO.FolderExists("tmp")) {
FSO.DeleteFolder("tmp");
http://cvs.php.net/viewvc.cgi/php-src/win32/build/confutils.js?r1=1.60.2.1.2.8.2.31&r2=1.60.2.1.2.8.2.32&diff_format=u
Index: php-src/win32/build/confutils.js
diff -u php-src/win32/build/confutils.js:1.60.2.1.2.8.2.31 
php-src/win32/build/confutils.js:1.60.2.1.2.8.2.32
--- php-src/win32/build/confutils.js:1.60.2.1.2.8.2.31  Fri Nov 21 14:17:33 2008
+++ php-src/win32/build/confutils.jsThu Dec 25 00:08:51 2008
@@ -17,7 +17,7 @@
   +--+
 */
 
-// $Id: confutils.js,v 1.60.2.1.2.8.2.31 2008/11/21 14:17:33 pajoye Exp $
+// $Id: confutils.js,v 1.60.2.1.2.8.2.32 2008/12/25 00:08:51 pajoye Exp $
 
 var STDOUT = WScript.StdOut;
 var STDERR = WScript.StdErr;
@@ -1467,9 +1467,6 @@
 function write_summary()
 {
var ar = new Array();
-   if (PHP_SUMMARY == "no") {
-   return;
-   }
 
STDOUT.WriteBlankLines(2);
 



-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

[PHP-CVS] cvs: php-src /win32/build config.w32 confutils.js

2008-12-24 Thread Pierre-Alain Joye

pajoye  Thu Dec 25 00:03:39 2008 UTC

  Modified files:  
/php-src/win32/buildconfig.w32 confutils.js 
  Log:
  - the config summary is a must, do not allow to disable
  
http://cvs.php.net/viewvc.cgi/php-src/win32/build/config.w32?r1=1.91&r2=1.92&diff_format=u
Index: php-src/win32/build/config.w32
diff -u php-src/win32/build/config.w32:1.91 php-src/win32/build/config.w32:1.92
--- php-src/win32/build/config.w32:1.91 Thu Dec 18 23:20:44 2008
+++ php-src/win32/build/config.w32  Thu Dec 25 00:03:39 2008
@@ -1,5 +1,5 @@
 // vim:ft=javascript
-// $Id: config.w32,v 1.91 2008/12/18 23:20:44 pajoye Exp $
+// $Id: config.w32,v 1.92 2008/12/25 00:03:39 pajoye Exp $
 // "Master" config file; think of it as a configure.in
 // equivalent.
 
@@ -398,8 +398,6 @@
 
 DEFINE('SNAPSHOT_TEMPLATE', PHP_SNAPSHOT_TEMPLATE);
 
-ARG_ENABLE('summary', 'Enable configuration summary', 'yes');
-
 if (PHP_DSP != "no") {
if (FSO.FolderExists("tmp")) {
FSO.DeleteFolder("tmp");
http://cvs.php.net/viewvc.cgi/php-src/win32/build/confutils.js?r1=1.81&r2=1.82&diff_format=u
Index: php-src/win32/build/confutils.js
diff -u php-src/win32/build/confutils.js:1.81 
php-src/win32/build/confutils.js:1.82
--- php-src/win32/build/confutils.js:1.81   Fri Nov 21 14:03:23 2008
+++ php-src/win32/build/confutils.jsThu Dec 25 00:03:39 2008
@@ -17,7 +17,7 @@
   +--+
 */
 
-// $Id: confutils.js,v 1.81 2008/11/21 14:03:23 pajoye Exp $
+// $Id: confutils.js,v 1.82 2008/12/25 00:03:39 pajoye Exp $
 
 var STDOUT = WScript.StdOut;
 var STDERR = WScript.StdErr;
@@ -1462,9 +1462,6 @@
 function write_summary()
 {
var ar = new Array();
-   if (PHP_SUMMARY == "no") {
-   return;
-   }
 
STDOUT.WriteBlankLines(2);
 



-- 
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/simplexml config.w32

2008-12-24 Thread Pierre-Alain Joye

pajoye  Thu Dec 25 00:01:10 2008 UTC

  Modified files:  (Branch: PHP_5_3)
/php-src/ext/simplexml  config.w32 
  Log:
  - MFH: disable simplexml when libxml is not enabled
  
http://cvs.php.net/viewvc.cgi/php-src/ext/simplexml/config.w32?r1=1.4.8.2&r2=1.4.8.3&diff_format=u
Index: php-src/ext/simplexml/config.w32
diff -u php-src/ext/simplexml/config.w32:1.4.8.2 
php-src/ext/simplexml/config.w32:1.4.8.3
--- php-src/ext/simplexml/config.w32:1.4.8.2Thu Nov  6 00:37:13 2008
+++ php-src/ext/simplexml/config.w32Thu Dec 25 00:01:10 2008
@@ -1,10 +1,10 @@
-// $Id: config.w32,v 1.4.8.2 2008/11/06 00:37:13 colder Exp $
+// $Id: config.w32,v 1.4.8.3 2008/12/25 00:01:10 pajoye Exp $
 // vim:ft=javascript
 
 ARG_WITH("simplexml", "Simple XML support", "yes");
 
 if (PHP_SIMPLEXML == "yes" && PHP_LIBXML == "yes"
-   &&  ADD_EXTENSION_DEP('simplexml', 'libxml')) {
+   && ADD_EXTENSION_DEP('simplexml', 'libxml')) {
EXTENSION("simplexml", "simplexml.c sxe.c");
AC_DEFINE("HAVE_SIMPLEXML", 1, "Simple XML support");
if (!PHP_SIMPLEXML_SHARED) {
@@ -13,6 +13,9 @@
if (!ADD_EXTENSION_DEP('simplexml', 'spl', true)) {
MESSAGE("\tSPL support in simplexml disabled");
}
+} else {
+   PHP_SIMPLEXML == "no";
+   WARNING("simplexml not enabled; libraries and headers not found");
 }
 
 



-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

[PHP-CVS] cvs: php-src /ext/simplexml config.w32

2008-12-24 Thread Pierre-Alain Joye

pajoye  Thu Dec 25 00:00:49 2008 UTC

  Modified files:  
/php-src/ext/simplexml  config.w32 
  Log:
  - disable simplexml when libxml is not enabled
  
http://cvs.php.net/viewvc.cgi/php-src/ext/simplexml/config.w32?r1=1.5&r2=1.6&diff_format=u
Index: php-src/ext/simplexml/config.w32
diff -u php-src/ext/simplexml/config.w32:1.5 
php-src/ext/simplexml/config.w32:1.6
--- php-src/ext/simplexml/config.w32:1.5Thu Nov  6 00:36:28 2008
+++ php-src/ext/simplexml/config.w32Thu Dec 25 00:00:49 2008
@@ -1,16 +1,21 @@
-// $Id: config.w32,v 1.5 2008/11/06 00:36:28 colder Exp $
+// $Id: config.w32,v 1.6 2008/12/25 00:00:49 pajoye Exp $
 // vim:ft=javascript
 
 ARG_WITH("simplexml", "Simple XML support", "yes");
 
-if (PHP_SIMPLEXML == "yes" && PHP_LIBXML == "yes") {
+if (PHP_SIMPLEXML == "yes" && PHP_LIBXML == "yes"
+   && ADD_EXTENSION_DEP('simplexml', 'libxml')) {
EXTENSION("simplexml", "simplexml.c sxe.c");
AC_DEFINE("HAVE_SIMPLEXML", 1, "Simple XML support");
if (!PHP_SIMPLEXML_SHARED) {
ADD_FLAG("CFLAGS_SIMPLEXML", "/D LIBXML_STATIC");
}
-   ADD_EXTENSION_DEP('simplexml', 'libxml');
-   ADD_EXTENSION_DEP('simplexml', 'spl', true);
+   if (!ADD_EXTENSION_DEP('simplexml', 'spl', true)) {
+   MESSAGE("\tSPL support in simplexml disabled");
+   }
+} else {
+   PHP_SIMPLEXML == "no";
+   WARNING("simplexml not enabled; libraries and headers not found");
 }
 
 



-- 
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/sqlite3 php_sqlite3_structs.h sqlite3.c /ext/sqlite3/tests sqlite3_25_create_aggregate.phpt

2008-12-24 Thread Scott MacVicar

scottmacWed Dec 24 19:22:16 2008 UTC

  Modified files:  (Branch: PHP_5_3)
/php-src/ext/sqlite3php_sqlite3_structs.h sqlite3.c 
/php-src/ext/sqlite3/tests  sqlite3_25_create_aggregate.phpt 
  Log:
  MFH Stop using sqlite3_aggregate_count() as this is now deprecated.
  
  
  
http://cvs.php.net/viewvc.cgi/php-src/ext/sqlite3/php_sqlite3_structs.h?r1=1.1.2.5&r2=1.1.2.6&diff_format=u
Index: php-src/ext/sqlite3/php_sqlite3_structs.h
diff -u php-src/ext/sqlite3/php_sqlite3_structs.h:1.1.2.5 
php-src/ext/sqlite3/php_sqlite3_structs.h:1.1.2.6
--- php-src/ext/sqlite3/php_sqlite3_structs.h:1.1.2.5   Fri Aug  1 08:27:56 2008
+++ php-src/ext/sqlite3/php_sqlite3_structs.h   Wed Dec 24 19:22:16 2008
@@ -16,7 +16,7 @@
+--+
 */
 
-/* $Id: php_sqlite3_structs.h,v 1.1.2.5 2008/08/01 08:27:56 tony2001 Exp $ */
+/* $Id: php_sqlite3_structs.h,v 1.1.2.6 2008/12/24 19:22:16 scottmac Exp $ */
 
 #ifndef PHP_SQLITE_STRUCTS_H
 #define PHP_SQLITE_STRUCTS_H
@@ -72,6 +72,12 @@
zend_llist free_list;
 } php_sqlite3_db_object;
 
+/* Structure for SQLite Database object. */
+typedef struct _php_sqlite3_agg_context  {
+   zval *zval_context;
+   long row_count;
+} php_sqlite3_agg_context;
+
 typedef struct _php_sqlite3_stmt_object php_sqlite3_stmt;
 typedef struct _php_sqlite3_result_object php_sqlite3_result;
 
http://cvs.php.net/viewvc.cgi/php-src/ext/sqlite3/sqlite3.c?r1=1.1.2.21&r2=1.1.2.22&diff_format=u
Index: php-src/ext/sqlite3/sqlite3.c
diff -u php-src/ext/sqlite3/sqlite3.c:1.1.2.21 
php-src/ext/sqlite3/sqlite3.c:1.1.2.22
--- php-src/ext/sqlite3/sqlite3.c:1.1.2.21  Fri Nov 28 15:37:02 2008
+++ php-src/ext/sqlite3/sqlite3.c   Wed Dec 24 19:22:16 2008
@@ -16,7 +16,7 @@
+--+
 */
 
-/* $Id: sqlite3.c,v 1.1.2.21 2008/11/28 15:37:02 felipe Exp $ */
+/* $Id: sqlite3.c,v 1.1.2.22 2008/12/24 19:22:16 scottmac Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
@@ -596,7 +596,7 @@
int i;
int ret;
int fake_argc;
-   zval **agg_context = NULL;
+   php_sqlite3_agg_context *agg_context = NULL;
 
if (is_agg) {
is_agg = 2;
@@ -620,16 +620,17 @@
 
if (is_agg) {
/* summon the aggregation context */
-   agg_context = (zval**)sqlite3_aggregate_context(context, 
sizeof(zval*));
-   if (!*agg_context) {
-   MAKE_STD_ZVAL(*agg_context);
-   ZVAL_NULL(*agg_context);
+   agg_context = (php_sqlite3_agg_context 
*)sqlite3_aggregate_context(context, sizeof(php_sqlite3_agg_context));
+
+   if (!agg_context->zval_context) {
+   MAKE_STD_ZVAL(agg_context->zval_context);
+   ZVAL_NULL(agg_context->zval_context);
}
-   zargs[0] = agg_context;
+   zargs[0] = &agg_context->zval_context;
 
zargs[1] = emalloc(sizeof(zval*));
MAKE_STD_ZVAL(*zargs[1]);
-   ZVAL_LONG(*zargs[1], sqlite3_aggregate_count(context));
+   ZVAL_LONG(*zargs[1], agg_context->row_count);
}
 
for (i = 0; i < argc; i++) {
@@ -702,20 +703,20 @@
sqlite3_result_error(context, "failed to invoke 
callback", 0);
}
 
-   if (agg_context) {
-   zval_ptr_dtor(agg_context);
+   if (agg_context && agg_context->zval_context) {
+   zval_ptr_dtor(&agg_context->zval_context);
}
} else {
/* we're stepping in an aggregate; the return value goes into
 * the context */
-   if (agg_context) {
-   zval_ptr_dtor(agg_context);
+   if (agg_context && agg_context->zval_context) {
+   zval_ptr_dtor(&agg_context->zval_context);
}
if (retval) {
-   *agg_context = retval;
+   agg_context->zval_context = retval;
retval = NULL;
} else {
-   *agg_context = NULL;
+   agg_context->zval_context = NULL;
}
}
 
@@ -738,7 +739,10 @@
 static void php_sqlite3_callback_step(sqlite3_context *context, int argc, 
sqlite3_value **argv) /* {{{ */
 {
php_sqlite3_func *func = (php_sqlite3_func *)sqlite3_user_data(context);
+   php_sqlite3_agg_context *agg_context = (php_sqlite3_agg_context 
*)sqlite3_aggregate_context(context, sizeof(php_sqlite3_agg_context));
+
TSRMLS_FETCH();
+   agg_context->row_count++;
 
sqlite3_do_callback(&func->astep, func->step, argc, argv, context, 1 
TSRMLS_CC);
 }
@@ -747,7 +751,10 @@
 static void php_sqlite3_callback_final(sqlite3_context *context) /* {{{ */
 {

[PHP-CVS] cvs: php-src /ext/sqlite3 php_sqlite3_structs.h sqlite3.c /ext/sqlite3/tests sqlite3_25_create_aggregate.phpt

2008-12-24 Thread Scott MacVicar

scottmacWed Dec 24 19:21:42 2008 UTC

  Modified files:  
/php-src/ext/sqlite3php_sqlite3_structs.h sqlite3.c 
/php-src/ext/sqlite3/tests  sqlite3_25_create_aggregate.phpt 
  Log:
  Stop using sqlite3_aggregate_count() as this is now deprecated.
  
  
http://cvs.php.net/viewvc.cgi/php-src/ext/sqlite3/php_sqlite3_structs.h?r1=1.4&r2=1.5&diff_format=u
Index: php-src/ext/sqlite3/php_sqlite3_structs.h
diff -u php-src/ext/sqlite3/php_sqlite3_structs.h:1.4 
php-src/ext/sqlite3/php_sqlite3_structs.h:1.5
--- php-src/ext/sqlite3/php_sqlite3_structs.h:1.4   Fri Aug  1 08:27:46 2008
+++ php-src/ext/sqlite3/php_sqlite3_structs.h   Wed Dec 24 19:21:42 2008
@@ -16,7 +16,7 @@
+--+
 */
 
-/* $Id: php_sqlite3_structs.h,v 1.4 2008/08/01 08:27:46 tony2001 Exp $ */
+/* $Id: php_sqlite3_structs.h,v 1.5 2008/12/24 19:21:42 scottmac Exp $ */
 
 #ifndef PHP_SQLITE_STRUCTS_H
 #define PHP_SQLITE_STRUCTS_H
@@ -72,6 +72,12 @@
zend_llist free_list;
 } php_sqlite3_db_object;
 
+/* Structure for SQLite Database object. */
+typedef struct _php_sqlite3_agg_context  {
+   zval *zval_context;
+   long row_count;
+} php_sqlite3_agg_context;
+
 typedef struct _php_sqlite3_stmt_object php_sqlite3_stmt;
 typedef struct _php_sqlite3_result_object php_sqlite3_result;
 
http://cvs.php.net/viewvc.cgi/php-src/ext/sqlite3/sqlite3.c?r1=1.23&r2=1.24&diff_format=u
Index: php-src/ext/sqlite3/sqlite3.c
diff -u php-src/ext/sqlite3/sqlite3.c:1.23 php-src/ext/sqlite3/sqlite3.c:1.24
--- php-src/ext/sqlite3/sqlite3.c:1.23  Fri Nov 28 15:36:34 2008
+++ php-src/ext/sqlite3/sqlite3.c   Wed Dec 24 19:21:42 2008
@@ -16,7 +16,7 @@
+--+
 */
 
-/* $Id: sqlite3.c,v 1.23 2008/11/28 15:36:34 felipe Exp $ */
+/* $Id: sqlite3.c,v 1.24 2008/12/24 19:21:42 scottmac Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
@@ -619,7 +619,7 @@
int i;
int ret;
int fake_argc;
-   zval **agg_context = NULL;
+   php_sqlite3_agg_context *agg_context = NULL;
 
if (is_agg) {
is_agg = 2;
@@ -643,16 +643,17 @@
 
if (is_agg) {
/* summon the aggregation context */
-   agg_context = (zval**)sqlite3_aggregate_context(context, 
sizeof(zval*));
-   if (!*agg_context) {
-   MAKE_STD_ZVAL(*agg_context);
-   ZVAL_NULL(*agg_context);
+   agg_context = (php_sqlite3_agg_context 
*)sqlite3_aggregate_context(context, sizeof(php_sqlite3_agg_context));
+
+   if (!agg_context->zval_context) {
+   MAKE_STD_ZVAL(agg_context->zval_context);
+   ZVAL_NULL(agg_context->zval_context);
}
-   zargs[0] = agg_context;
+   zargs[0] = &agg_context->zval_context;
 
zargs[1] = emalloc(sizeof(zval*));
MAKE_STD_ZVAL(*zargs[1]);
-   ZVAL_LONG(*zargs[1], sqlite3_aggregate_count(context));
+   ZVAL_LONG(*zargs[1], agg_context->row_count);
}
 
for (i = 0; i < argc; i++) {
@@ -727,20 +728,20 @@
sqlite3_result_error(context, "failed to invoke 
callback", 0);
}
 
-   if (agg_context) {
-   zval_ptr_dtor(agg_context);
+   if (agg_context && agg_context->zval_context) {
+   zval_ptr_dtor(&agg_context->zval_context);
}
} else {
/* we're stepping in an aggregate; the return value goes into
 * the context */
-   if (agg_context) {
-   zval_ptr_dtor(agg_context);
+   if (agg_context && agg_context->zval_context) {
+   zval_ptr_dtor(&agg_context->zval_context);
}
if (retval) {
-   *agg_context = retval;
+   agg_context->zval_context = retval;
retval = NULL;
} else {
-   *agg_context = NULL;
+   agg_context->zval_context = NULL;
}
}
 
@@ -763,7 +764,10 @@
 static void php_sqlite3_callback_step(sqlite3_context *context, int argc, 
sqlite3_value **argv) /* {{{ */
 {
php_sqlite3_func *func = (php_sqlite3_func *)sqlite3_user_data(context);
+   php_sqlite3_agg_context *agg_context = (php_sqlite3_agg_context 
*)sqlite3_aggregate_context(context, sizeof(php_sqlite3_agg_context));
+
TSRMLS_FETCH();
+   agg_context->row_count++;
 
sqlite3_do_callback(&func->astep, func->step, argc, argv, context, 1 
TSRMLS_CC);
 }
@@ -772,7 +776,10 @@
 static void php_sqlite3_callback_final(sqlite3_context *context) /* {{{ */
 {
php_sqlite3_func *func = (php_sqlite3_func *)sqlite3_user_data(context);
+

[PHP-CVS] cvs: php-src(PHP_5_3) / NEWS

2008-12-24 Thread Scott MacVicar

scottmacWed Dec 24 18:11:41 2008 UTC

  Modified files:  (Branch: PHP_5_3)
/php-srcNEWS 
  Log:
  BFN
  
  
http://cvs.php.net/viewvc.cgi/php-src/NEWS?r1=1.2027.2.547.2.965.2.423&r2=1.2027.2.547.2.965.2.424&diff_format=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.2027.2.547.2.965.2.423 
php-src/NEWS:1.2027.2.547.2.965.2.424
--- php-src/NEWS:1.2027.2.547.2.965.2.423   Wed Dec 24 00:46:09 2008
+++ php-src/NEWSWed Dec 24 18:11:41 2008
@@ -14,6 +14,7 @@
 - Added shm_has_var() function. (Mike)
 - Add a depth parameter to json_decode() to lower the nesting depth from the
   maximum if required. (Scott)
+- Add ICU support to SQLite3 if using the bundled version. (Scott)
 
 - Fixed bug #46849 (Cloning DOMDocument doesn't clone the properties). (Rob)
 - Fixed bug #46847 (phpinfo() is missing some settings). (Hannes)
@@ -26,6 +27,8 @@
   Closure and SplFileInfo using exceptions). (Etienne)
 - Fixed bug #46268 (DateTime::modify() does not reset relative time values).
   (Derick)
+- Fixed bug #45991 (Ini files with the UTF-8 BOM are treated as invalid).
+  (Scott)
 - Fixed bug #45989 (json_decode() doesn't return NULL on certain
   invalid strings). (magicaltux, Scott)
 - Fixed bug #45791 (json_decode() doesn't convert 0e0 to a double). (Scott)



-- 
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/json json.c

2008-12-24 Thread Scott MacVicar

scottmacWed Dec 24 18:09:09 2008 UTC

  Modified files:  (Branch: PHP_5_3)
/php-src/ext/json   json.c 
  Log:
  MFH Make sure we clear out the error when the scalar version decoding works.
  
  
  
http://cvs.php.net/viewvc.cgi/php-src/ext/json/json.c?r1=1.9.2.19.2.15&r2=1.9.2.19.2.16&diff_format=u
Index: php-src/ext/json/json.c
diff -u php-src/ext/json/json.c:1.9.2.19.2.15 
php-src/ext/json/json.c:1.9.2.19.2.16
--- php-src/ext/json/json.c:1.9.2.19.2.15   Fri Dec 19 02:00:57 2008
+++ php-src/ext/json/json.c Wed Dec 24 18:09:09 2008
@@ -16,7 +16,7 @@
   +--+
 */
 
-/* $Id: json.c,v 1.9.2.19.2.15 2008/12/19 02:00:57 scottmac Exp $ */
+/* $Id: json.c,v 1.9.2.19.2.16 2008/12/24 18:09:09 scottmac Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
@@ -531,6 +531,8 @@
RETVAL_NULL();
if (str_len == 4) {
if (!strcasecmp(str, "null")) {
+   /* We need to explicitly clear the error 
because its an actual NULL and not an error */
+   jp->error_code = PHP_JSON_ERROR_NONE;
RETVAL_NULL();
} else if (!strcasecmp(str, "true")) {
RETVAL_BOOL(1);
@@ -547,6 +549,10 @@
}
}
 
+   if (Z_TYPE_P(return_value) != IS_NULL) {
+   jp->error_code = PHP_JSON_ERROR_NONE;
+   }
+
zval_dtor(z);
}
FREE_ZVAL(z);



-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

[PHP-CVS] cvs: php-src /ext/json json.c

2008-12-24 Thread Scott MacVicar

scottmacWed Dec 24 18:09:01 2008 UTC

  Modified files:  
/php-src/ext/json   json.c 
  Log:
  Make sure we clear out the error when the scalar version decoding works.
  
  
  
http://cvs.php.net/viewvc.cgi/php-src/ext/json/json.c?r1=1.45&r2=1.46&diff_format=u
Index: php-src/ext/json/json.c
diff -u php-src/ext/json/json.c:1.45 php-src/ext/json/json.c:1.46
--- php-src/ext/json/json.c:1.45Fri Dec 19 02:00:59 2008
+++ php-src/ext/json/json.c Wed Dec 24 18:09:00 2008
@@ -16,7 +16,7 @@
   +--+
 */
 
-/* $Id: json.c,v 1.45 2008/12/19 02:00:59 scottmac Exp $ */
+/* $Id: json.c,v 1.46 2008/12/24 18:09:00 scottmac Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
@@ -551,6 +551,8 @@
 
if (str_len == 4) {
if (!strcasecmp(str.s, "null")) {
+   /* We need to explicitly clear the error 
because its an actual NULL and not an error */
+   jp->error_code = PHP_JSON_ERROR_NONE;
RETVAL_NULL();
} else if (!strcasecmp(str.s, "true")) {
RETVAL_BOOL(1);
@@ -566,6 +568,10 @@
RETVAL_DOUBLE(d);
}
}
+
+   if (Z_TYPE_P(return_value) != IS_NULL) {
+   jp->error_code = PHP_JSON_ERROR_NONE;
+   }
}
else
{
@@ -578,6 +584,8 @@
 
if (str_len == 4) {
if (ZEND_U_CASE_EQUAL(IS_UNICODE, str, str_len, "null", 
sizeof("null")-1)) {
+   /* We need to explicitly clear the error 
because its an actual NULL and not an error */
+   jp->error_code = PHP_JSON_ERROR_NONE;
RETVAL_NULL();
} else if (ZEND_U_CASE_EQUAL(IS_UNICODE, str, str_len, 
"true", sizeof("true")-1)) {
RETVAL_BOOL(1);
@@ -593,6 +601,10 @@
RETVAL_DOUBLE(d);
}
}
+   
+   if (Z_TYPE_P(return_value) != IS_NULL) {
+   jp->error_code = PHP_JSON_ERROR_NONE;
+   }
}
 
FREE_ZVAL(z);



-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

[PHP-CVS] cvs: php-src /ext/imap php_imap.c

2008-12-24 Thread Felipe Pena

felipe  Wed Dec 24 13:30:49 2008 UTC

  Modified files:  
/php-src/ext/imap   php_imap.c 
  Log:
  - Fixed memory leak in imap_rfc822_parse_adrlist
  
http://cvs.php.net/viewvc.cgi/php-src/ext/imap/php_imap.c?r1=1.267&r2=1.268&diff_format=u
Index: php-src/ext/imap/php_imap.c
diff -u php-src/ext/imap/php_imap.c:1.267 php-src/ext/imap/php_imap.c:1.268
--- php-src/ext/imap/php_imap.c:1.267   Tue Dec 16 21:34:16 2008
+++ php-src/ext/imap/php_imap.c Wed Dec 24 13:30:49 2008
@@ -26,7 +26,7 @@
| PHP 4.0 updates:  Zeev Suraski|
+--+
  */
-/* $Id: php_imap.c,v 1.267 2008/12/16 21:34:16 zoe Exp $ */
+/* $Id: php_imap.c,v 1.268 2008/12/24 13:30:49 felipe Exp $ */
 
 #define IMAP41
 
@@ -2512,6 +2512,8 @@
}
add_next_index_object(return_value, tovals TSRMLS_CC);
} while ((addresstmp = addresstmp->next));
+   
+   mail_free_envelope(&env);
 }
 /* }}} */
 



-- 
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) /ext/imap php_imap.c

2008-12-24 Thread Felipe Pena

felipe  Wed Dec 24 13:31:40 2008 UTC

  Modified files:  (Branch: PHP_5_2)
/php-src/ext/imap   php_imap.c 
  Log:
  - MFH: Fixed memory leak in imap_rfc822_parse_adrlist
  
http://cvs.php.net/viewvc.cgi/php-src/ext/imap/php_imap.c?r1=1.208.2.7.2.41&r2=1.208.2.7.2.42&diff_format=u
Index: php-src/ext/imap/php_imap.c
diff -u php-src/ext/imap/php_imap.c:1.208.2.7.2.41 
php-src/ext/imap/php_imap.c:1.208.2.7.2.42
--- php-src/ext/imap/php_imap.c:1.208.2.7.2.41  Wed Dec 24 11:24:38 2008
+++ php-src/ext/imap/php_imap.c Wed Dec 24 13:31:40 2008
@@ -26,7 +26,7 @@
| PHP 4.0 updates:  Zeev Suraski|
+--+
  */
-/* $Id: php_imap.c,v 1.208.2.7.2.41 2008/12/24 11:24:38 felipe Exp $ */
+/* $Id: php_imap.c,v 1.208.2.7.2.42 2008/12/24 13:31:40 felipe Exp $ */
 
 #define IMAP41
 
@@ -2225,6 +2225,8 @@
}
add_next_index_object(return_value, tovals TSRMLS_CC);
} while ((addresstmp = addresstmp->next));
+   
+   mail_free_envelope(&env);
 }
 /* }}} */
 



-- 
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/imap php_imap.c

2008-12-24 Thread Felipe Pena

felipe  Wed Dec 24 13:31:17 2008 UTC

  Modified files:  (Branch: PHP_5_3)
/php-src/ext/imap   php_imap.c 
  Log:
  - MFH: Fixed memory leak in imap_rfc822_parse_adrlist
  
http://cvs.php.net/viewvc.cgi/php-src/ext/imap/php_imap.c?r1=1.208.2.7.2.26.2.27&r2=1.208.2.7.2.26.2.28&diff_format=u
Index: php-src/ext/imap/php_imap.c
diff -u php-src/ext/imap/php_imap.c:1.208.2.7.2.26.2.27 
php-src/ext/imap/php_imap.c:1.208.2.7.2.26.2.28
--- php-src/ext/imap/php_imap.c:1.208.2.7.2.26.2.27 Tue Dec 16 21:35:01 2008
+++ php-src/ext/imap/php_imap.c Wed Dec 24 13:31:16 2008
@@ -26,7 +26,7 @@
| PHP 4.0 updates:  Zeev Suraski|
+--+
  */
-/* $Id: php_imap.c,v 1.208.2.7.2.26.2.27 2008/12/16 21:35:01 zoe Exp $ */
+/* $Id: php_imap.c,v 1.208.2.7.2.26.2.28 2008/12/24 13:31:16 felipe Exp $ */
 
 #define IMAP41
 
@@ -2524,6 +2524,8 @@
}
add_next_index_object(return_value, tovals TSRMLS_CC);
} while ((addresstmp = addresstmp->next));
+   
+   mail_free_envelope(&env);
 }
 /* }}} */
 



-- 
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) /ext/imap php_imap.c

2008-12-24 Thread Felipe Pena

felipe  Wed Dec 24 11:24:38 2008 UTC

  Modified files:  (Branch: PHP_5_2)
/php-src/ext/imap   php_imap.c 
  Log:
  - Fixed bug #46918 (imap_rfc822_parse_adrlist host part not filled in 
correctly) [only in this branch]
  
http://cvs.php.net/viewvc.cgi/php-src/ext/imap/php_imap.c?r1=1.208.2.7.2.40&r2=1.208.2.7.2.41&diff_format=u
Index: php-src/ext/imap/php_imap.c
diff -u php-src/ext/imap/php_imap.c:1.208.2.7.2.40 
php-src/ext/imap/php_imap.c:1.208.2.7.2.41
--- php-src/ext/imap/php_imap.c:1.208.2.7.2.40  Tue Dec 16 21:35:42 2008
+++ php-src/ext/imap/php_imap.c Wed Dec 24 11:24:38 2008
@@ -26,7 +26,7 @@
| PHP 4.0 updates:  Zeev Suraski|
+--+
  */
-/* $Id: php_imap.c,v 1.208.2.7.2.40 2008/12/16 21:35:42 zoe Exp $ */
+/* $Id: php_imap.c,v 1.208.2.7.2.41 2008/12/24 11:24:38 felipe Exp $ */
 
 #define IMAP41
 
@@ -2201,7 +2201,7 @@
 
/* rfc822_parse_adrlist() modifies passed string. Copy it. */
str_copy = estrndup(Z_STRVAL_PP(str), Z_STRLEN_PP(str));
-   rfc822_parse_adrlist(&env->to, str_copy, defaulthost);
+   rfc822_parse_adrlist(&env->to, str_copy, Z_STRVAL_PP(defaulthost));
efree(str_copy);
 
array_init(return_value);



-- 
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) /ext/imap/tests bug46918.phpt

2008-12-24 Thread Felipe Pena

felipe  Wed Dec 24 11:51:29 2008 UTC

  Added files: (Branch: PHP_5_2)
/php-src/ext/imap/tests bug46918.phpt 
  Log:
  - New test
  

http://cvs.php.net/viewvc.cgi/php-src/ext/imap/tests/bug46918.phpt?view=markup&rev=1.1
Index: php-src/ext/imap/tests/bug46918.phpt
+++ php-src/ext/imap/tests/bug46918.phpt
--TEST--
Bug #46918 (imap_rfc822_parse_adrlist host part not filled in correctly)
--FILE--
,
  sh...@example.ac.uk,
  blobby,
  "ian,eiloart",
  <@example.com:f...@example.ac.uk>,
  f...@#,
  i...@-example.com,
  i...@one@two';
$add_arr = imap_rfc822_parse_adrlist($adds, 'example.com');
var_export($add_arr);

?>
--EXPECT--
array (
  0 => 
  stdClass::__set_state(array(
 'mailbox' => 'iane',
 'host' => 'example.ac.uk',
 'personal' => 'ian eiloart',
  )),
  1 => 
  stdClass::__set_state(array(
 'mailbox' => 'shuf6',
 'host' => 'example.ac.uk',
  )),
  2 => 
  stdClass::__set_state(array(
 'mailbox' => 'blobby',
 'host' => 'example.com',
  )),
  3 => 
  stdClass::__set_state(array(
 'mailbox' => 'ian',
 'host' => 'example.ac.uk',
 'personal' => 'ian,eiloart',
  )),
  4 => 
  stdClass::__set_state(array(
 'mailbox' => 'foo',
 'host' => 'example.ac.uk',
 'adl' => '@example.com',
  )),
  5 => 
  stdClass::__set_state(array(
 'mailbox' => 'foo',
 'host' => '#',
  )),
  6 => 
  stdClass::__set_state(array(
 'mailbox' => 'ian',
 'host' => '-example.com',
  )),
  7 => 
  stdClass::__set_state(array(
 'mailbox' => 'ian',
 'host' => 'one',
  )),
  8 => 
  stdClass::__set_state(array(
 'mailbox' => 'UNEXPECTED_DATA_AFTER_ADDRESS',
 'host' => '.SYNTAX-ERROR.',
  )),
)
Notice: Unknown: Unexpected characters at end of address: @two (errflg=3) in 
Unknown on line 0



-- 
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/imap/tests bug46918.phpt

2008-12-24 Thread Felipe Pena

felipe  Wed Dec 24 11:51:04 2008 UTC

  Added files: (Branch: PHP_5_3)
/php-src/ext/imap/tests bug46918.phpt 
  Log:
  - New test
  

http://cvs.php.net/viewvc.cgi/php-src/ext/imap/tests/bug46918.phpt?view=markup&rev=1.1
Index: php-src/ext/imap/tests/bug46918.phpt
+++ php-src/ext/imap/tests/bug46918.phpt
--TEST--
Bug #46918 (imap_rfc822_parse_adrlist host part not filled in correctly)
--FILE--
,
  sh...@example.ac.uk,
  blobby,
  "ian,eiloart",
  <@example.com:f...@example.ac.uk>,
  f...@#,
  i...@-example.com,
  i...@one@two';
$add_arr = imap_rfc822_parse_adrlist($adds, 'example.com');
var_export($add_arr);

?>
--EXPECT--
array (
  0 => 
  stdClass::__set_state(array(
 'mailbox' => 'iane',
 'host' => 'example.ac.uk',
 'personal' => 'ian eiloart',
  )),
  1 => 
  stdClass::__set_state(array(
 'mailbox' => 'shuf6',
 'host' => 'example.ac.uk',
  )),
  2 => 
  stdClass::__set_state(array(
 'mailbox' => 'blobby',
 'host' => 'example.com',
  )),
  3 => 
  stdClass::__set_state(array(
 'mailbox' => 'ian',
 'host' => 'example.ac.uk',
 'personal' => 'ian,eiloart',
  )),
  4 => 
  stdClass::__set_state(array(
 'mailbox' => 'foo',
 'host' => 'example.ac.uk',
 'adl' => '@example.com',
  )),
  5 => 
  stdClass::__set_state(array(
 'mailbox' => 'foo',
 'host' => '#',
  )),
  6 => 
  stdClass::__set_state(array(
 'mailbox' => 'ian',
 'host' => '-example.com',
  )),
  7 => 
  stdClass::__set_state(array(
 'mailbox' => 'ian',
 'host' => 'one',
  )),
  8 => 
  stdClass::__set_state(array(
 'mailbox' => 'UNEXPECTED_DATA_AFTER_ADDRESS',
 'host' => '.SYNTAX-ERROR.',
  )),
)
Notice: Unknown: Unexpected characters at end of address: @two (errflg=3) in 
Unknown on line 0



-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

[PHP-CVS] cvs: php-src /ext/imap/tests bug46918.phpt

2008-12-24 Thread Felipe Pena

felipe  Wed Dec 24 11:50:43 2008 UTC

  Added files: 
/php-src/ext/imap/tests bug46918.phpt 
  Log:
  - New test
  

http://cvs.php.net/viewvc.cgi/php-src/ext/imap/tests/bug46918.phpt?view=markup&rev=1.1
Index: php-src/ext/imap/tests/bug46918.phpt
+++ php-src/ext/imap/tests/bug46918.phpt
--TEST--
Bug #46918 (imap_rfc822_parse_adrlist host part not filled in correctly)
--FILE--
,
  sh...@example.ac.uk,
  blobby,
  "ian,eiloart",
  <@example.com:f...@example.ac.uk>,
  f...@#,
  i...@-example.com,
  i...@one@two';
$add_arr = imap_rfc822_parse_adrlist($adds, 'example.com');
var_export($add_arr);

?>
--EXPECT--
array (
  0 => 
  stdClass::__set_state(array(
 'mailbox' => 'iane',
 'host' => 'example.ac.uk',
 'personal' => 'ian eiloart',
  )),
  1 => 
  stdClass::__set_state(array(
 'mailbox' => 'shuf6',
 'host' => 'example.ac.uk',
  )),
  2 => 
  stdClass::__set_state(array(
 'mailbox' => 'blobby',
 'host' => 'example.com',
  )),
  3 => 
  stdClass::__set_state(array(
 'mailbox' => 'ian',
 'host' => 'example.ac.uk',
 'personal' => 'ian,eiloart',
  )),
  4 => 
  stdClass::__set_state(array(
 'mailbox' => 'foo',
 'host' => 'example.ac.uk',
 'adl' => '@example.com',
  )),
  5 => 
  stdClass::__set_state(array(
 'mailbox' => 'foo',
 'host' => '#',
  )),
  6 => 
  stdClass::__set_state(array(
 'mailbox' => 'ian',
 'host' => '-example.com',
  )),
  7 => 
  stdClass::__set_state(array(
 'mailbox' => 'ian',
 'host' => 'one',
  )),
  8 => 
  stdClass::__set_state(array(
 'mailbox' => 'UNEXPECTED_DATA_AFTER_ADDRESS',
 'host' => '.SYNTAX-ERROR.',
  )),
)
Notice: Unknown: Unexpected characters at end of address: @two (errflg=3) in 
Unknown on line 0



-- 
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) / NEWS

2008-12-24 Thread Felipe Pena

felipe  Wed Dec 24 11:32:45 2008 UTC

  Modified files:  (Branch: PHP_5_2)
/php-srcNEWS 
  Log:
  BFN
  
http://cvs.php.net/viewvc.cgi/php-src/NEWS?r1=1.2027.2.547.2.1367&r2=1.2027.2.547.2.1368&diff_format=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.2027.2.547.2.1367 php-src/NEWS:1.2027.2.547.2.1368
--- php-src/NEWS:1.2027.2.547.2.1367Fri Dec 19 02:13:41 2008
+++ php-src/NEWSWed Dec 24 11:32:45 2008
@@ -9,6 +9,8 @@
 
 - Fixed segfault when malformed string passed to json_decode(). (Scott)
 
+- Fixed bug #46918 (imap_rfc822_parse_adrlist host part not filled in 
correctly).
+  (Felipe)
 - Fixed bug #46889 (Memory leak in strtotime()). (Derick)
 - Fixed bug #46887 (Invalid calls to php_error_docref()).
   (oeriksson at mandriva dot com, Ilia)



-- 
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/zip php_zip.h

2008-12-24 Thread Pierre-Alain Joye

pajoye  Wed Dec 24 11:08:14 2008 UTC

  Modified files:  (Branch: PHP_5_3)
/php-src/ext/zipphp_zip.h 
  Log:
  - version and WS
  
http://cvs.php.net/viewvc.cgi/php-src/ext/zip/php_zip.h?r1=1.10.2.3.2.8&r2=1.10.2.3.2.9&diff_format=u
Index: php-src/ext/zip/php_zip.h
diff -u php-src/ext/zip/php_zip.h:1.10.2.3.2.8 
php-src/ext/zip/php_zip.h:1.10.2.3.2.9
--- php-src/ext/zip/php_zip.h:1.10.2.3.2.8  Wed Nov 12 11:41:21 2008
+++ php-src/ext/zip/php_zip.h   Wed Dec 24 11:08:14 2008
@@ -16,7 +16,7 @@
   +--+
 */
 
-/* $Id: php_zip.h,v 1.10.2.3.2.8 2008/11/12 11:41:21 pajoye Exp $ */
+/* $Id: php_zip.h,v 1.10.2.3.2.9 2008/12/24 11:08:14 pajoye Exp $ */
 
 #ifndef PHP_ZIP_H
 #define PHP_ZIP_H
@@ -30,7 +30,7 @@
 
 #include "lib/zip.h"
 
-#define PHP_ZIP_VERSION_STRING "1.8.11"
+#define PHP_ZIP_VERSION_STRING "1.9.1"
 
 #if ((PHP_MAJOR_VERSION >= 5 && PHP_MINOR_VERSION >= 2) || PHP_MAJOR_VERSION 
>= 6)
 # define PHP_ZIP_USE_OO 1
@@ -45,7 +45,7 @@
 
 /* {{{ OPENBASEDIR_CHECKPATH(filename) */
 #if (PHP_MAJOR_VERSION < 6)
-#define OPENBASEDIR_CHECKPATH(filename) \
+# define OPENBASEDIR_CHECKPATH(filename) \
(PG(safe_mode) && (!php_checkuid(filename, NULL, 
CHECKUID_CHECK_FILE_AND_DIR))) || php_check_open_basedir(filename TSRMLS_CC)
 #else
 #define OPENBASEDIR_CHECKPATH(filename) \



-- 
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/simplexml config.w32

[PHP-CVS] cvs: php-src(PHP_5_3) /ext/simplexml config.w32

[PHP-CVS] cvs: php-src(PHP_5_3) /win32/build configure.tail

[PHP-CVS] cvs: php-src /win32/build configure.tail

[PHP-CVS] cvs: php-src(PHP_5_3) /win32/build config.w32 confutils.js

[PHP-CVS] cvs: php-src /win32/build config.w32 confutils.js

[PHP-CVS] cvs: php-src(PHP_5_3) /ext/simplexml config.w32

[PHP-CVS] cvs: php-src /ext/simplexml config.w32

[PHP-CVS] cvs: php-src(PHP_5_3) /ext/sqlite3 php_sqlite3_structs.h sqlite3.c /ext/sqlite3/tests sqlite3_25_create_aggregate.phpt

[PHP-CVS] cvs: php-src /ext/sqlite3 php_sqlite3_structs.h sqlite3.c /ext/sqlite3/tests sqlite3_25_create_aggregate.phpt

[PHP-CVS] cvs: php-src(PHP_5_3) / NEWS

[PHP-CVS] cvs: php-src(PHP_5_3) /ext/json json.c

[PHP-CVS] cvs: php-src /ext/json json.c

[PHP-CVS] cvs: php-src /ext/imap php_imap.c

[PHP-CVS] cvs: php-src(PHP_5_2) /ext/imap php_imap.c

[PHP-CVS] cvs: php-src(PHP_5_3) /ext/imap php_imap.c

[PHP-CVS] cvs: php-src(PHP_5_2) /ext/imap php_imap.c

[PHP-CVS] cvs: php-src(PHP_5_2) /ext/imap/tests bug46918.phpt

[PHP-CVS] cvs: php-src(PHP_5_3) /ext/imap/tests bug46918.phpt

[PHP-CVS] cvs: php-src /ext/imap/tests bug46918.phpt

[PHP-CVS] cvs: php-src(PHP_5_2) / NEWS

[PHP-CVS] cvs: php-src(PHP_5_3) /ext/zip php_zip.h

22 matches

Site Navigation

Mail list logo

Footer information