date:20081226

[PHP-CVS-DAILY] cvs: php-src / ChangeLog

2008-12-26 Thread changelog

changelog   Sat Dec 27 01:32:32 2008 UTC

  Modified files:  
/php-srcChangeLog 
  Log:
  ChangeLog update
  
http://cvs.php.net/viewvc.cgi/php-src/ChangeLog?r1=1.3269r2=1.3270diff_format=u
Index: php-src/ChangeLog
diff -u php-src/ChangeLog:1.3269 php-src/ChangeLog:1.3270
--- php-src/ChangeLog:1.3269Fri Dec 26 01:32:19 2008
+++ php-src/ChangeLog   Sat Dec 27 01:32:32 2008
@@ -1,3 +1,45 @@
+2008-12-26  Rob Richards  rricha...@ctindustries.net
+
+* ext/simplexml/php_simplexml.h
+  ext/simplexml/php_simplexml_exports.h
+  ext/simplexml/simplexml.c:
+  properly export functions
+
+2008-12-26  Pierre-Alain Joye  pierre@gmail.com
+
+* ext/simplexml/config.w32:
+  - MFB:
+- remove the temp hack for libxml path (fixed now)
+- do not raise a warning if the extension was not enabled anyway
+
+* (PHP_5_3)
+  ext/simplexml/config.w32:
+  - remove the temp hack for libxml path (fixed now)
+  - do not raise a warning if the extension was not enabled anyway
+
+* (PHP_5_3)
+  win32/build/config.w32:
+  - MFB:
+- usual suspects must be in the default include/lib path (thx Rob for
+  the notice!)
+- fix the --wtih-php-build doc, remove dead url, update the name of the
+  deps dir
+
+* win32/build/config.w32:
+  - usual suspects must be in the default include/lib path (thx Rob for the
+  notice!)
+  - fix the --wtih-php-build doc, remove dead url, update the name of the
+  deps dir
+
+* ext/xsl/config.w32:
+  - MFB: be sure we define the deps so the right exts are built before (dom
+  symbol error when dom and xsl are shared)
+
+* (PHP_5_3)
+  ext/xsl/config.w32:
+  - be sure we define the deps so the right exts are built before (dom 
symbol
+  error)
+
 2008-12-25  Felipe Pena  felipe...@gmail.com
 
 * ext/mbstring/tests/bug20087.phpt
@@ -20665,7 +20707,7 @@
 
 * sapi/litespeed/lsapi_main.c
   sapi/litespeed/lsapilib.c:
-  - Added missing $Id: ChangeLog,v 1.3269 2008/12/26 01:32:19 changelog 
Exp $ tags and nuked c++ comments
+  - Added missing $Id: ChangeLog,v 1.3270 2008/12/27 01:32:32 changelog 
Exp $ tags and nuked c++ comments
 
 * (PHP_5_3)
   ext/intl/locale/locale.c

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

2008-12-26 Thread Pierre-Alain Joye

pajoye  Fri Dec 26 14:05:05 2008 UTC

  Modified files:  (Branch: PHP_5_3)
/php-src/ext/xslconfig.w32 
  Log:
  - be sure we define the deps so the right exts are built before (dom symbol 
error)
  
http://cvs.php.net/viewvc.cgi/php-src/ext/xsl/config.w32?r1=1.9r2=1.9.6.1diff_format=u
Index: php-src/ext/xsl/config.w32
diff -u php-src/ext/xsl/config.w32:1.9 php-src/ext/xsl/config.w32:1.9.6.1
--- php-src/ext/xsl/config.w32:1.9  Sun Jul 18 13:23:33 2004
+++ php-src/ext/xsl/config.w32  Fri Dec 26 14:05:05 2008
@@ -1,10 +1,12 @@
-// $Id: config.w32,v 1.9 2004/07/18 13:23:33 rrichards Exp $
+// $Id: config.w32,v 1.9.6.1 2008/12/26 14:05:05 pajoye Exp $
 // vim: ft=javascript
 
 ARG_WITH(xsl, xsl support, no);
 
 if (PHP_XSL != no) {
-   if (PHP_DOM == yes  PHP_LIBXML == yes) {
+   if (PHP_DOM == yes  PHP_LIBXML == yes
+ADD_EXTENSION_DEP('xsl', 'libxml')
+ADD_EXTENSION_DEP('xsl', 'dom')) {
var ext_xsl_lib_found = false;
var ext_exslt_lib_found = false;
 
@@ -37,7 +39,7 @@
ADD_FLAG(LDFLAGS_XSL, 
/nodefaultlib:msvcrt);
}
}
-   ADD_EXTENSION_DEP('xsl', 'libxml');
+   
} else {
WARNING(xsl 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/xsl config.w32

2008-12-26 Thread Pierre-Alain Joye

pajoye  Fri Dec 26 14:06:29 2008 UTC

  Modified files:  
/php-src/ext/xslconfig.w32 
  Log:
  - MFB: be sure we define the deps so the right exts are built before (dom 
symbol error when dom and xsl are shared)
  
http://cvs.php.net/viewvc.cgi/php-src/ext/xsl/config.w32?r1=1.9r2=1.10diff_format=u
Index: php-src/ext/xsl/config.w32
diff -u php-src/ext/xsl/config.w32:1.9 php-src/ext/xsl/config.w32:1.10
--- php-src/ext/xsl/config.w32:1.9  Sun Jul 18 13:23:33 2004
+++ php-src/ext/xsl/config.w32  Fri Dec 26 14:06:29 2008
@@ -1,10 +1,12 @@
-// $Id: config.w32,v 1.9 2004/07/18 13:23:33 rrichards Exp $
+// $Id: config.w32,v 1.10 2008/12/26 14:06:29 pajoye Exp $
 // vim: ft=javascript
 
 ARG_WITH(xsl, xsl support, no);
 
 if (PHP_XSL != no) {
-   if (PHP_DOM == yes  PHP_LIBXML == yes) {
+   if (PHP_DOM == yes  PHP_LIBXML == yes
+ADD_EXTENSION_DEP('xsl', 'libxml')
+ADD_EXTENSION_DEP('xsl', 'dom')) {
var ext_xsl_lib_found = false;
var ext_exslt_lib_found = false;
 



-- 
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

2008-12-26 Thread Pierre-Alain Joye

pajoye  Fri Dec 26 14:10:26 2008 UTC

  Modified files:  
/php-src/win32/buildconfig.w32 
  Log:
  - usual suspects must be in the default include/lib path (thx Rob for the 
notice!)
  - fix the --wtih-php-build doc, remove dead url, update the name of the deps 
dir
  
http://cvs.php.net/viewvc.cgi/php-src/win32/build/config.w32?r1=1.92r2=1.93diff_format=u
Index: php-src/win32/build/config.w32
diff -u php-src/win32/build/config.w32:1.92 php-src/win32/build/config.w32:1.93
--- php-src/win32/build/config.w32:1.92 Thu Dec 25 00:03:39 2008
+++ php-src/win32/build/config.w32  Fri Dec 26 14:10:26 2008
@@ -1,5 +1,5 @@
 // vim:ft=javascript
-// $Id: config.w32,v 1.92 2008/12/25 00:03:39 pajoye Exp $
+// $Id: config.w32,v 1.93 2008/12/26 14:10:26 pajoye Exp $
 // Master config file; think of it as a configure.in
 // equivalent.
 
@@ -209,7 +209,7 @@
 
 // Find the php_build dir - it contains headers and libraries
 // that we need
-ARG_WITH('php-build', 'Path to where you extracted 
http://www.php.net/extra/win32build.zip. Assumes that it is a sibling of this 
source dir (..\\php_build) if not specified', 'no');
+ARG_WITH('php-build', 'Path to where you extracted the development libraries 
(http://wiki.php.net/internals/windows/libs). Assumes that it is a sibling of 
this source dir (..\\deps) if not specified', 'no');
 
 if (PHP_PHP_BUILD == 'no') {
if (FSO.FolderExists(..\\deps)) {
@@ -242,6 +242,9 @@
 var php_usual_include_suspects = PHP_PHP_BUILD+\\include;..\\deps\\include;
 var php_usual_lib_suspects = PHP_PHP_BUILD+\\lib;..\\deps\\lib;
 
+ADD_FLAG(CFLAGS, '/I ' + php_usual_include_suspects + ' ');
+ADD_FLAG(LDFLAGS, '/libpath:\\' + php_usual_lib_suspects + '\\ ');
+
 // Poke around for some headers
 function probe_basic_headers()
 {



-- 
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

2008-12-26 Thread Pierre-Alain Joye

pajoye  Fri Dec 26 14:11:44 2008 UTC

  Modified files:  (Branch: PHP_5_3)
/php-src/win32/buildconfig.w32 
  Log:
  - MFB:
- usual suspects must be in the default include/lib path (thx Rob for the 
notice!)
- fix the --wtih-php-build doc, remove dead url, update the name of the 
deps dir
  
http://cvs.php.net/viewvc.cgi/php-src/win32/build/config.w32?r1=1.40.2.8.2.10.2.38r2=1.40.2.8.2.10.2.39diff_format=u
Index: php-src/win32/build/config.w32
diff -u 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.39
--- php-src/win32/build/config.w32:1.40.2.8.2.10.2.38   Thu Dec 25 00:08:51 2008
+++ php-src/win32/build/config.w32  Fri Dec 26 14:11:44 2008
@@ -1,5 +1,5 @@
 // vim:ft=javascript
-// $Id: config.w32,v 1.40.2.8.2.10.2.38 2008/12/25 00:08:51 pajoye Exp $
+// $Id: config.w32,v 1.40.2.8.2.10.2.39 2008/12/26 14:11:44 pajoye Exp $
 // Master config file; think of it as a configure.in
 // equivalent.
 
@@ -211,7 +211,7 @@
 
 // Find the php_build dir - it contains headers and libraries
 // that we need
-ARG_WITH('php-build', 'Path to where you extracted 
http://www.php.net/extra/win32build.zip. Assumes that it is a sibling of this 
source dir (..\\php_build) if not specified', 'no');
+ARG_WITH('php-build', 'Path to where you extracted the development libraries 
(http://wiki.php.net/internals/windows/libs). Assumes that it is a sibling of 
this source dir (..\\deps) if not specified', 'no');
 
 if (PHP_PHP_BUILD == 'no') {
if (FSO.FolderExists(..\\deps)) {
@@ -241,8 +241,11 @@
 ARG_WITH('extra-includes', 'Extra include path to use when building 
everything', '');
 ARG_WITH('extra-libs', 'Extra library path to use when linking everything', 
'');
 
-var php_usual_include_suspects = PHP_PHP_BUILD+\\include;..\\deps\\include;
-var php_usual_lib_suspects = PHP_PHP_BUILD+\\lib;..\\deps\\lib;
+var php_usual_include_suspects = PHP_PHP_BUILD+\\include;
+var php_usual_lib_suspects = PHP_PHP_BUILD+\\lib;
+
+ADD_FLAG(CFLAGS, '/I ' + php_usual_include_suspects + ' ');
+ADD_FLAG(LDFLAGS, '/libpath:\\' + php_usual_lib_suspects + '\\ ');
 
 // Poke around for some headers
 function probe_basic_headers()



-- 
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-26 Thread Pierre-Alain Joye

pajoye  Fri Dec 26 14:13:38 2008 UTC

  Modified files:  (Branch: PHP_5_3)
/php-src/ext/simplexml  config.w32 
  Log:
  - remove the temp hack for libxml path (fixed now)
  - do not raise a warning if the extension was not enabled anyway
  
http://cvs.php.net/viewvc.cgi/php-src/ext/simplexml/config.w32?r1=1.4.8.5r2=1.4.8.6diff_format=u
Index: php-src/ext/simplexml/config.w32
diff -u php-src/ext/simplexml/config.w32:1.4.8.5 
php-src/ext/simplexml/config.w32:1.4.8.6
--- php-src/ext/simplexml/config.w32:1.4.8.5Thu Dec 25 01:00:26 2008
+++ php-src/ext/simplexml/config.w32Fri Dec 26 14:13:38 2008
@@ -1,23 +1,22 @@
-// $Id: config.w32,v 1.4.8.5 2008/12/25 01:00:26 pajoye Exp $
+// $Id: config.w32,v 1.4.8.6 2008/12/26 14:13:38 pajoye Exp $
 // vim:ft=javascript
 
 ARG_WITH(simplexml, Simple XML support, yes);
 
-if (PHP_SIMPLEXML == yes  PHP_LIBXML == yes
+if (PHP_SIMPLEXML == yes) {
+   if(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);
-   }
-   
-   // be tricky for now, we actually need a macro like the one in m4 
(PHP_SETUP_LIBXML)
-   ADD_FLAG(CFLAGS_SIMPLEXML, $(CFLAGS_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);
+   }
 
-   if (!ADD_EXTENSION_DEP('simplexml', 'spl', true)) {
-   MESSAGE(\tSPL support in simplexml disabled);
+   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);
}
-} 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-26 Thread Pierre-Alain Joye

pajoye  Fri Dec 26 14:16:38 2008 UTC

  Modified files:  
/php-src/ext/simplexml  config.w32 
  Log:
  - MFB:
- remove the temp hack for libxml path (fixed now)
- do not raise a warning if the extension was not enabled anyway
  
http://cvs.php.net/viewvc.cgi/php-src/ext/simplexml/config.w32?r1=1.6r2=1.7diff_format=u
Index: php-src/ext/simplexml/config.w32
diff -u php-src/ext/simplexml/config.w32:1.6 
php-src/ext/simplexml/config.w32:1.7
--- php-src/ext/simplexml/config.w32:1.6Thu Dec 25 00:00:49 2008
+++ php-src/ext/simplexml/config.w32Fri Dec 26 14:16:38 2008
@@ -1,21 +1,22 @@
-// $Id: config.w32,v 1.6 2008/12/25 00:00:49 pajoye Exp $
+// $Id: config.w32,v 1.7 2008/12/26 14:16:38 pajoye Exp $
 // vim:ft=javascript
 
 ARG_WITH(simplexml, Simple XML support, 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);
+if (PHP_SIMPLEXML == yes) {
+   if (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);
+   }
+   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);
}
-   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 php_simplexml.h php_simplexml_exports.h simplexml.c

2008-12-26 Thread Rob Richards

rrichards   Fri Dec 26 20:27:14 2008 UTC

  Modified files:  
/php-src/ext/simplexml  php_simplexml.h php_simplexml_exports.h 
simplexml.c 
  Log:
  properly export functions
  
http://cvs.php.net/viewvc.cgi/php-src/ext/simplexml/php_simplexml.h?r1=1.30r2=1.31diff_format=u
Index: php-src/ext/simplexml/php_simplexml.h
diff -u php-src/ext/simplexml/php_simplexml.h:1.30 
php-src/ext/simplexml/php_simplexml.h:1.31
--- php-src/ext/simplexml/php_simplexml.h:1.30  Wed Jul  9 21:27:10 2008
+++ php-src/ext/simplexml/php_simplexml.h   Fri Dec 26 20:27:14 2008
@@ -16,7 +16,7 @@
   +--+
 */
 
-/* $Id: php_simplexml.h,v 1.30 2008/07/09 21:27:10 colder Exp $ */
+/* $Id: php_simplexml.h,v 1.31 2008/12/26 20:27:14 rrichards Exp $ */
 
 #ifndef PHP_SIMPLEXML_H
 #define PHP_SIMPLEXML_H
@@ -77,7 +77,19 @@
 #define SIMPLEXML_G(v) (simplexml_globals.v)
 #endif
 
-ZEND_API zend_class_entry *sxe_get_element_class_entry(TSRMLS_D);
+#ifdef PHP_WIN32
+#ifdef SIMPLEXML_EXPORTS
+#define PHP_SXE_API __declspec(dllexport)
+#else
+#define PHP_SXE_API __declspec(dllimport)
+#endif /* SIMPLEXML_EXPORTS */
+#elif defined(__GNUC__)  __GNUC__ = 4
+#define PHP_SXE_API __attribute__ ((visibility(default)))
+#else
+#define PHP_SXE_API
+#endif /* PHP_WIN32 */
+
+PHP_SXE_API zend_class_entry *sxe_get_element_class_entry(TSRMLS_D);
 
 #endif
 
http://cvs.php.net/viewvc.cgi/php-src/ext/simplexml/php_simplexml_exports.h?r1=1.8r2=1.9diff_format=u
Index: php-src/ext/simplexml/php_simplexml_exports.h
diff -u php-src/ext/simplexml/php_simplexml_exports.h:1.8 
php-src/ext/simplexml/php_simplexml_exports.h:1.9
--- php-src/ext/simplexml/php_simplexml_exports.h:1.8   Mon Dec 31 07:12:14 2007
+++ php-src/ext/simplexml/php_simplexml_exports.h   Fri Dec 26 20:27:14 2008
@@ -18,7 +18,7 @@
   +--+
 */
 
-/* $Id: php_simplexml_exports.h,v 1.8 2007/12/31 07:12:14 sebastian Exp $ */
+/* $Id: php_simplexml_exports.h,v 1.9 2008/12/26 20:27:14 rrichards Exp $ */
 
 #ifndef PHP_SIMPLEXML_EXPORTS_H
 #define PHP_SIMPLEXML_EXPORTS_H
@@ -39,7 +39,7 @@
} \
 }
 
-ZEND_API zend_object_value sxe_object_new(zend_class_entry *ce TSRMLS_DC);
+PHP_SXE_API zend_object_value sxe_object_new(zend_class_entry *ce TSRMLS_DC);
 /* {{{ php_sxe_fetch_object()
  */
 static inline php_sxe_object *
http://cvs.php.net/viewvc.cgi/php-src/ext/simplexml/simplexml.c?r1=1.269r2=1.270diff_format=u
Index: php-src/ext/simplexml/simplexml.c
diff -u php-src/ext/simplexml/simplexml.c:1.269 
php-src/ext/simplexml/simplexml.c:1.270
--- php-src/ext/simplexml/simplexml.c:1.269 Wed Nov 19 01:59:07 2008
+++ php-src/ext/simplexml/simplexml.c   Fri Dec 26 20:27:14 2008
@@ -18,7 +18,7 @@
   +--+
 */
 
-/* $Id: simplexml.c,v 1.269 2008/11/19 01:59:07 colder Exp $ */
+/* $Id: simplexml.c,v 1.270 2008/12/26 20:27:14 rrichards Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include config.h
@@ -39,7 +39,7 @@
 
 zend_class_entry *sxe_class_entry = NULL;
 
-ZEND_API zend_class_entry *sxe_get_element_class_entry(TSRMLS_D) /* {{{ */
+PHP_SXE_API zend_class_entry *sxe_get_element_class_entry(TSRMLS_D) /* {{{ */
 {
return sxe_class_entry;
 }
@@ -2117,7 +2117,7 @@
 
 /* {{{ sxe_object_new()
  */
-ZEND_API zend_object_value
+PHP_SXE_API zend_object_value
 sxe_object_new(zend_class_entry *ce TSRMLS_DC)
 {
php_sxe_object*intern;
@@ -2424,7 +2424,7 @@
 }
 /* }}} */
 
-ZEND_API void php_sxe_move_forward_iterator(php_sxe_object *sxe TSRMLS_DC) /* 
{{{ */
+PHP_SXE_API void php_sxe_move_forward_iterator(php_sxe_object *sxe TSRMLS_DC) 
/* {{{ */
 {
xmlNodePtr  node = NULL;
php_sxe_object  *intern;
@@ -2634,7 +2634,7 @@
 {
php_info_print_table_start();
php_info_print_table_header(2, Simplexml support, enabled);
-   php_info_print_table_row(2, Revision, $Revision: 1.269 $);
+   php_info_print_table_row(2, Revision, $Revision: 1.270 $);
php_info_print_table_row(2, Schema support,
 #ifdef LIBXML_SCHEMAS_ENABLED
enabled);



-- 
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 php_simplexml.h php_simplexml_exports.h simplexml.c

2008-12-26 Thread Rob Richards

rrichards   Fri Dec 26 20:28:44 2008 UTC

  Modified files:  (Branch: PHP_5_3)
/php-src/ext/simplexml  php_simplexml.h php_simplexml_exports.h 
simplexml.c 
  Log:
  MFH: properly export functions
  
http://cvs.php.net/viewvc.cgi/php-src/ext/simplexml/php_simplexml.h?r1=1.20.2.2.2.3.2.3r2=1.20.2.2.2.3.2.4diff_format=u
Index: php-src/ext/simplexml/php_simplexml.h
diff -u php-src/ext/simplexml/php_simplexml.h:1.20.2.2.2.3.2.3 
php-src/ext/simplexml/php_simplexml.h:1.20.2.2.2.3.2.4
--- php-src/ext/simplexml/php_simplexml.h:1.20.2.2.2.3.2.3  Wed Jul  9 
21:27:28 2008
+++ php-src/ext/simplexml/php_simplexml.h   Fri Dec 26 20:28:43 2008
@@ -16,7 +16,7 @@
   +--+
 */
 
-/* $Id: php_simplexml.h,v 1.20.2.2.2.3.2.3 2008/07/09 21:27:28 colder Exp $ */
+/* $Id: php_simplexml.h,v 1.20.2.2.2.3.2.4 2008/12/26 20:28:43 rrichards Exp $ 
*/
 
 #ifndef PHP_SIMPLEXML_H
 #define PHP_SIMPLEXML_H
@@ -77,7 +77,19 @@
 #define SIMPLEXML_G(v) (simplexml_globals.v)
 #endif
 
-ZEND_API zend_class_entry *sxe_get_element_class_entry();
+#ifdef PHP_WIN32
+#ifdef SIMPLEXML_EXPORTS
+#define PHP_SXE_API __declspec(dllexport)
+#else
+#define PHP_SXE_API __declspec(dllimport)
+#endif /* SIMPLEXML_EXPORTS */
+#elif defined(__GNUC__)  __GNUC__ = 4
+#define PHP_SXE_API __attribute__ ((visibility(default)))
+#else
+#define PHP_SXE_API
+#endif /* PHP_WIN32 */
+
+PHP_SXE_API zend_class_entry *sxe_get_element_class_entry();
 
 #endif
 
http://cvs.php.net/viewvc.cgi/php-src/ext/simplexml/php_simplexml_exports.h?r1=1.3.2.3.2.1.2.1r2=1.3.2.3.2.1.2.2diff_format=u
Index: php-src/ext/simplexml/php_simplexml_exports.h
diff -u php-src/ext/simplexml/php_simplexml_exports.h:1.3.2.3.2.1.2.1 
php-src/ext/simplexml/php_simplexml_exports.h:1.3.2.3.2.1.2.2
--- php-src/ext/simplexml/php_simplexml_exports.h:1.3.2.3.2.1.2.1   Mon Dec 
31 07:17:13 2007
+++ php-src/ext/simplexml/php_simplexml_exports.h   Fri Dec 26 20:28:43 2008
@@ -18,7 +18,7 @@
   +--+
 */
 
-/* $Id: php_simplexml_exports.h,v 1.3.2.3.2.1.2.1 2007/12/31 07:17:13 
sebastian Exp $ */
+/* $Id: php_simplexml_exports.h,v 1.3.2.3.2.1.2.2 2008/12/26 20:28:43 
rrichards Exp $ */
 
 #ifndef PHP_SIMPLEXML_EXPORTS_H
 #define PHP_SIMPLEXML_EXPORTS_H
@@ -39,7 +39,7 @@
} \
 }
 
-ZEND_API zend_object_value sxe_object_new(zend_class_entry *ce TSRMLS_DC);
+PHP_SXE_API zend_object_value sxe_object_new(zend_class_entry *ce TSRMLS_DC);
 /* {{{ php_sxe_fetch_object()
  */
 static inline php_sxe_object *
http://cvs.php.net/viewvc.cgi/php-src/ext/simplexml/simplexml.c?r1=1.151.2.22.2.35.2.28r2=1.151.2.22.2.35.2.29diff_format=u
Index: php-src/ext/simplexml/simplexml.c
diff -u php-src/ext/simplexml/simplexml.c:1.151.2.22.2.35.2.28 
php-src/ext/simplexml/simplexml.c:1.151.2.22.2.35.2.29
--- php-src/ext/simplexml/simplexml.c:1.151.2.22.2.35.2.28  Wed Nov 19 
02:00:53 2008
+++ php-src/ext/simplexml/simplexml.c   Fri Dec 26 20:28:43 2008
@@ -18,7 +18,7 @@
   +--+
 */
 
-/* $Id: simplexml.c,v 1.151.2.22.2.35.2.28 2008/11/19 02:00:53 colder Exp $ */
+/* $Id: simplexml.c,v 1.151.2.22.2.35.2.29 2008/12/26 20:28:43 rrichards Exp $ 
*/
 
 #ifdef HAVE_CONFIG_H
 #include config.h
@@ -40,7 +40,7 @@
 
 zend_class_entry *sxe_class_entry = NULL;
 
-ZEND_API zend_class_entry *sxe_get_element_class_entry() /* {{{ */
+PHP_SXE_API zend_class_entry *sxe_get_element_class_entry() /* {{{ */
 {
return sxe_class_entry;
 }
@@ -2082,7 +2082,7 @@
 
 /* {{{ sxe_object_new()
  */
-ZEND_API zend_object_value
+PHP_SXE_API zend_object_value
 sxe_object_new(zend_class_entry *ce TSRMLS_DC)
 {
php_sxe_object*intern;
@@ -2344,7 +2344,7 @@
 }
 /* }}} */
 
-ZEND_API void php_sxe_move_forward_iterator(php_sxe_object *sxe TSRMLS_DC) /* 
{{{ */
+PHP_SXE_API void php_sxe_move_forward_iterator(php_sxe_object *sxe TSRMLS_DC) 
/* {{{ */
 {
xmlNodePtr  node = NULL;
php_sxe_object  *intern;
@@ -2555,7 +2555,7 @@
 {
php_info_print_table_start();
php_info_print_table_header(2, Simplexml support, enabled);
-   php_info_print_table_row(2, Revision, $Revision: 
1.151.2.22.2.35.2.28 $);
+   php_info_print_table_row(2, Revision, $Revision: 
1.151.2.22.2.35.2.29 $);
php_info_print_table_row(2, Schema support,
 #ifdef LIBXML_SCHEMAS_ENABLED
enabled);



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

[PHP-CVS] cvs: php-src /ext/hash/tests hash_copy_001.phpt

2008-12-26 Thread Felipe Pena

felipe  Sat Dec 27 01:04:09 2008 UTC

  Modified files:  
/php-src/ext/hash/tests hash_copy_001.phpt 
  Log:
  - Fix test
  
http://cvs.php.net/viewvc.cgi/php-src/ext/hash/tests/hash_copy_001.phpt?r1=1.4r2=1.5diff_format=u
Index: php-src/ext/hash/tests/hash_copy_001.phpt
diff -u php-src/ext/hash/tests/hash_copy_001.phpt:1.4 
php-src/ext/hash/tests/hash_copy_001.phpt:1.5
--- php-src/ext/hash/tests/hash_copy_001.phpt:1.4   Mon Aug 18 14:28:57 2008
+++ php-src/ext/hash/tests/hash_copy_001.phpt   Sat Dec 27 01:04:09 2008
@@ -77,6 +77,10 @@
 unicode(8) e5cfc160
 unicode(8) 69147a4e
 unicode(8) 69147a4e
+unicode(128) 
aa39bc97c2bbcb0d79bbebfddca0bf8d769c7919c9e537e456efb5fc67f33f161758dd9da3ddcec7bbbd9c04553a03f74d2dbd26175dd75c353e9300674caa4e
+unicode(128) 
aa39bc97c2bbcb0d79bbebfddca0bf8d769c7919c9e537e456efb5fc67f33f161758dd9da3ddcec7bbbd9c04553a03f74d2dbd26175dd75c353e9300674caa4e
+unicode(128) 
2ecbea42273e1e18affc7ef028674c8e55f9382f36de21e5fc38af76e4a7231d0a92feca9bdf586ac18d8a5bdd82be8a1cb1e9186871d6ff785c76a9090ac774
+unicode(128) 
2ecbea42273e1e18affc7ef028674c8e55f9382f36de21e5fc38af76e4a7231d0a92feca9bdf586ac18d8a5bdd82be8a1cb1e9186871d6ff785c76a9090ac774
 unicode(32) 86362472c8895e68e223ef8b3711d8d9
 unicode(32) 86362472c8895e68e223ef8b3711d8d9
 unicode(40) fabdf6905f3ba18a3c93d6a16b91e31f7222a7a4
@@ -157,6 +161,10 @@
 unicode(8) 59f8d3d2
 unicode(8) 69147a4e
 unicode(8) 3ee63999
+unicode(128) 
aa39bc97c2bbcb0d79bbebfddca0bf8d769c7919c9e537e456efb5fc67f33f161758dd9da3ddcec7bbbd9c04553a03f74d2dbd26175dd75c353e9300674caa4e
+unicode(128) 
709b9196710f035e3602649fdae94f939775fa6a5a0bf01f9884d8af54579cafa01a81ee23d511b85d7fb11c4d827e4309953e3c844b8d66a80c57b6eaf2d8c1
+unicode(128) 
2ecbea42273e1e18affc7ef028674c8e55f9382f36de21e5fc38af76e4a7231d0a92feca9bdf586ac18d8a5bdd82be8a1cb1e9186871d6ff785c76a9090ac774
+unicode(128) 
272fd2209f237b9be674eb4917eda0bd978908d56190e62aec283585d6325d8fcbba2b616dd7ba90f93cc5ecdede7185d17a06467b2a17b5c836ee115974ca20
 unicode(32) 86362472c8895e68e223ef8b3711d8d9
 unicode(32) ebeeeb05c18af1e53d2d127b561d5e0d
 unicode(40) fabdf6905f3ba18a3c93d6a16b91e31f7222a7a4



-- 
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/hash/tests hash_copy_001.phpt

2008-12-26 Thread Felipe Pena

felipe  Sat Dec 27 01:05:07 2008 UTC

  Modified files:  (Branch: PHP_5_3)
/php-src/ext/hash/tests hash_copy_001.phpt 
  Log:
  - MFH: Fix test
  
http://cvs.php.net/viewvc.cgi/php-src/ext/hash/tests/hash_copy_001.phpt?r1=1.1.2.4r2=1.1.2.5diff_format=u
Index: php-src/ext/hash/tests/hash_copy_001.phpt
diff -u php-src/ext/hash/tests/hash_copy_001.phpt:1.1.2.4 
php-src/ext/hash/tests/hash_copy_001.phpt:1.1.2.5
--- php-src/ext/hash/tests/hash_copy_001.phpt:1.1.2.4   Mon Aug 18 14:29:55 2008
+++ php-src/ext/hash/tests/hash_copy_001.phpt   Sat Dec 27 01:05:07 2008
@@ -77,6 +77,10 @@
 string(8) e5cfc160
 string(8) 69147a4e
 string(8) 69147a4e
+string(128) 
aa39bc97c2bbcb0d79bbebfddca0bf8d769c7919c9e537e456efb5fc67f33f161758dd9da3ddcec7bbbd9c04553a03f74d2dbd26175dd75c353e9300674caa4e
+string(128) 
aa39bc97c2bbcb0d79bbebfddca0bf8d769c7919c9e537e456efb5fc67f33f161758dd9da3ddcec7bbbd9c04553a03f74d2dbd26175dd75c353e9300674caa4e
+string(128) 
2ecbea42273e1e18affc7ef028674c8e55f9382f36de21e5fc38af76e4a7231d0a92feca9bdf586ac18d8a5bdd82be8a1cb1e9186871d6ff785c76a9090ac774
+string(128) 
2ecbea42273e1e18affc7ef028674c8e55f9382f36de21e5fc38af76e4a7231d0a92feca9bdf586ac18d8a5bdd82be8a1cb1e9186871d6ff785c76a9090ac774
 string(32) 86362472c8895e68e223ef8b3711d8d9
 string(32) 86362472c8895e68e223ef8b3711d8d9
 string(40) fabdf6905f3ba18a3c93d6a16b91e31f7222a7a4
@@ -157,6 +161,10 @@
 string(8) 59f8d3d2
 string(8) 69147a4e
 string(8) 3ee63999
+string(128) 
aa39bc97c2bbcb0d79bbebfddca0bf8d769c7919c9e537e456efb5fc67f33f161758dd9da3ddcec7bbbd9c04553a03f74d2dbd26175dd75c353e9300674caa4e
+string(128) 
709b9196710f035e3602649fdae94f939775fa6a5a0bf01f9884d8af54579cafa01a81ee23d511b85d7fb11c4d827e4309953e3c844b8d66a80c57b6eaf2d8c1
+string(128) 
2ecbea42273e1e18affc7ef028674c8e55f9382f36de21e5fc38af76e4a7231d0a92feca9bdf586ac18d8a5bdd82be8a1cb1e9186871d6ff785c76a9090ac774
+string(128) 
272fd2209f237b9be674eb4917eda0bd978908d56190e62aec283585d6325d8fcbba2b616dd7ba90f93cc5ecdede7185d17a06467b2a17b5c836ee115974ca20
 string(32) 86362472c8895e68e223ef8b3711d8d9
 string(32) ebeeeb05c18af1e53d2d127b561d5e0d
 string(40) fabdf6905f3ba18a3c93d6a16b91e31f7222a7a4



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

[PHP-CVS] cvs: php-src /ext/simplexml php_simplexml.h

2008-12-26 Thread Rob Richards

rrichards   Sat Dec 27 01:07:18 2008 UTC

  Modified files:  
/php-src/ext/simplexml  php_simplexml.h 
  Log:
  force export on win32 to workaround win32 conig issues
  
http://cvs.php.net/viewvc.cgi/php-src/ext/simplexml/php_simplexml.h?r1=1.31r2=1.32diff_format=u
Index: php-src/ext/simplexml/php_simplexml.h
diff -u php-src/ext/simplexml/php_simplexml.h:1.31 
php-src/ext/simplexml/php_simplexml.h:1.32
--- php-src/ext/simplexml/php_simplexml.h:1.31  Fri Dec 26 20:27:14 2008
+++ php-src/ext/simplexml/php_simplexml.h   Sat Dec 27 01:07:18 2008
@@ -16,7 +16,7 @@
   +--+
 */
 
-/* $Id: php_simplexml.h,v 1.31 2008/12/26 20:27:14 rrichards Exp $ */
+/* $Id: php_simplexml.h,v 1.32 2008/12/27 01:07:18 rrichards Exp $ */
 
 #ifndef PHP_SIMPLEXML_H
 #define PHP_SIMPLEXML_H
@@ -77,17 +77,7 @@
 #define SIMPLEXML_G(v) (simplexml_globals.v)
 #endif
 
-#ifdef PHP_WIN32
-#ifdef SIMPLEXML_EXPORTS
-#define PHP_SXE_API __declspec(dllexport)
-#else
-#define PHP_SXE_API __declspec(dllimport)
-#endif /* SIMPLEXML_EXPORTS */
-#elif defined(__GNUC__)  __GNUC__ = 4
-#define PHP_SXE_API __attribute__ ((visibility(default)))
-#else
-#define PHP_SXE_API
-#endif /* PHP_WIN32 */
+#define PHP_SXE_API ZEND_DLEXPORT
 
 PHP_SXE_API zend_class_entry *sxe_get_element_class_entry(TSRMLS_D);
 



-- 
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 php_simplexml.h

2008-12-26 Thread Rob Richards

rrichards   Sat Dec 27 01:07:49 2008 UTC

  Modified files:  (Branch: PHP_5_3)
/php-src/ext/simplexml  php_simplexml.h 
  Log:
  MFH: force export on win32 to workaround win32 conig issues
  
http://cvs.php.net/viewvc.cgi/php-src/ext/simplexml/php_simplexml.h?r1=1.20.2.2.2.3.2.4r2=1.20.2.2.2.3.2.5diff_format=u
Index: php-src/ext/simplexml/php_simplexml.h
diff -u php-src/ext/simplexml/php_simplexml.h:1.20.2.2.2.3.2.4 
php-src/ext/simplexml/php_simplexml.h:1.20.2.2.2.3.2.5
--- php-src/ext/simplexml/php_simplexml.h:1.20.2.2.2.3.2.4  Fri Dec 26 
20:28:43 2008
+++ php-src/ext/simplexml/php_simplexml.h   Sat Dec 27 01:07:49 2008
@@ -16,7 +16,7 @@
   +--+
 */
 
-/* $Id: php_simplexml.h,v 1.20.2.2.2.3.2.4 2008/12/26 20:28:43 rrichards Exp $ 
*/
+/* $Id: php_simplexml.h,v 1.20.2.2.2.3.2.5 2008/12/27 01:07:49 rrichards Exp $ 
*/
 
 #ifndef PHP_SIMPLEXML_H
 #define PHP_SIMPLEXML_H
@@ -77,17 +77,7 @@
 #define SIMPLEXML_G(v) (simplexml_globals.v)
 #endif
 
-#ifdef PHP_WIN32
-#ifdef SIMPLEXML_EXPORTS
-#define PHP_SXE_API __declspec(dllexport)
-#else
-#define PHP_SXE_API __declspec(dllimport)
-#endif /* SIMPLEXML_EXPORTS */
-#elif defined(__GNUC__)  __GNUC__ = 4
-#define PHP_SXE_API __attribute__ ((visibility(default)))
-#else
-#define PHP_SXE_API
-#endif /* PHP_WIN32 */
+#define PHP_SXE_API ZEND_DLEXPORT
 
 PHP_SXE_API zend_class_entry *sxe_get_element_class_entry();
 



-- 
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/sysvsem/tests sysv.phpt

2008-12-26 Thread Felipe Pena

felipe  Sat Dec 27 01:19:49 2008 UTC

  Modified files:  (Branch: PHP_5_3)
/php-src/ext/sysvsem/tests  sysv.phpt 
  Log:
  - Fix test
  
http://cvs.php.net/viewvc.cgi/php-src/ext/sysvsem/tests/sysv.phpt?r1=1.2r2=1.2.8.1diff_format=u
Index: php-src/ext/sysvsem/tests/sysv.phpt
diff -u php-src/ext/sysvsem/tests/sysv.phpt:1.2 
php-src/ext/sysvsem/tests/sysv.phpt:1.2.8.1
--- php-src/ext/sysvsem/tests/sysv.phpt:1.2 Wed Apr 16 02:21:30 2003
+++ php-src/ext/sysvsem/tests/sysv.phpt Sat Dec 27 01:19:49 2008
@@ -103,12 +103,12 @@
 Start.
 Got semaphore Resource id #%i.
 Success aquire semaphore Resource id #%i.
-Success to attach shared memory : %i.
+Success to attach shared memory : %s.
 Write var1 to shared memory.
 Write var2 to shared memory.
 Read var1=Variable 1.
 Read var2=Variable 2.
-Semaphore Resource id #%i released.
+Semaphore Resource id #%s released.
 Shared memory successfully removed from SysV.
 semaphore removed successfully from SysV.
 End.



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

[PHP-CVS] cvs: php-src /ext/standard array.c /ext/standard/tests/array bug46873.phpt

2008-12-26 Thread Arnaud Le Blanc

lbarnaudSat Dec 27 03:06:16 2008 UTC

  Added files: 
/php-src/ext/standard/tests/array   bug46873.phpt 

  Modified files:  
/php-src/ext/standard   array.c 
  Log:
  Fixed bug #46873 (extract($foo) crashes if $foo['foo'] exists)
  
  
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/array.c?r1=1.468r2=1.469diff_format=u
Index: php-src/ext/standard/array.c
diff -u php-src/ext/standard/array.c:1.468 php-src/ext/standard/array.c:1.469
--- php-src/ext/standard/array.c:1.468  Fri Dec 12 19:19:04 2008
+++ php-src/ext/standard/array.cSat Dec 27 03:06:16 2008
@@ -21,7 +21,7 @@
+--+
 */
 
-/* $Id: array.c,v 1.468 2008/12/12 19:19:04 andrei Exp $ */
+/* $Id: array.c,v 1.469 2008/12/27 03:06:16 lbarnaud Exp $ */
 
 #include php.h
 #include php_ini.h
@@ -1372,6 +1372,13 @@
zend_rebuild_symbol_table(TSRMLS_C);
}
 
+   /* var_array is passed by ref for the needs of EXTR_REFS (needs to
+* work on the original array to create refs to its members)
+* simulate pass_by_value if EXTR_REFS is not used */
+   if (!extract_refs) {
+   SEPARATE_ARG_IF_REF(var_array);
+   }
+
zend_hash_internal_pointer_reset_ex(Z_ARRVAL_P(var_array), pos);
while (zend_hash_get_current_data_ex(Z_ARRVAL_P(var_array), (void 
**)entry, pos) == SUCCESS) {
zval final_name;
@@ -1484,6 +1491,10 @@
zend_hash_move_forward_ex(Z_ARRVAL_P(var_array), pos);
}
 
+   if (!extract_refs) {
+   zval_ptr_dtor(var_array);
+   }
+
RETURN_LONG(count);
 }
 /* }}} */

http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/array/bug46873.phpt?view=markuprev=1.1
Index: php-src/ext/standard/tests/array/bug46873.phpt
+++ php-src/ext/standard/tests/array/bug46873.phpt
--TEST--
Bug #46873 (extract($foo) crashes if $foo['foo'] exists)
--FILE--
?php
$foo = array('foo' = 1, 'bar' = 2, 'test' = 3);
extract($foo);
var_dump($foo, $bar, $test);
?
--EXPECT--
int(1)
int(2)
int(3)



-- 
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 array.c /ext/standard/tests/array bug46873.phpt

2008-12-26 Thread Arnaud Le Blanc

lbarnaudSat Dec 27 03:06:57 2008 UTC

  Added files: (Branch: PHP_5_3)
/php-src/ext/standard/tests/array   bug46873.phpt 

  Modified files:  
/php-src/ext/standard   array.c 
  Log:
  MFH: Fixed bug #46873 (extract($foo) crashes if $foo['foo'] exists)
  
  
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/array.c?r1=1.308.2.21.2.37.2.48r2=1.308.2.21.2.37.2.49diff_format=u
Index: php-src/ext/standard/array.c
diff -u php-src/ext/standard/array.c:1.308.2.21.2.37.2.48 
php-src/ext/standard/array.c:1.308.2.21.2.37.2.49
--- php-src/ext/standard/array.c:1.308.2.21.2.37.2.48   Fri Dec 12 19:20:49 2008
+++ php-src/ext/standard/array.cSat Dec 27 03:06:57 2008
@@ -21,7 +21,7 @@
+--+
 */
 
-/* $Id: array.c,v 1.308.2.21.2.37.2.48 2008/12/12 19:20:49 andrei Exp $ */
+/* $Id: array.c,v 1.308.2.21.2.37.2.49 2008/12/27 03:06:57 lbarnaud Exp $ */
 
 #include php.h
 #include php_ini.h
@@ -1283,6 +1283,13 @@
zend_rebuild_symbol_table(TSRMLS_C);
}
 
+   /* var_array is passed by ref for the needs of EXTR_REFS (needs to
+* work on the original array to create refs to its members)
+* simulate pass_by_value if EXTR_REFS is not used */
+   if (!extract_refs) {
+   SEPARATE_ARG_IF_REF(var_array);
+   }
+
zend_hash_internal_pointer_reset_ex(Z_ARRVAL_P(var_array), pos);
while (zend_hash_get_current_data_ex(Z_ARRVAL_P(var_array), (void 
**)entry, pos) == SUCCESS) {
zval final_name;
@@ -1382,6 +1389,10 @@
zend_hash_move_forward_ex(Z_ARRVAL_P(var_array), pos);
}
 
+   if (!extract_refs) {
+   zval_ptr_dtor(var_array);
+   }
+
RETURN_LONG(count);
 }
 /* }}} */

http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/array/bug46873.phpt?view=markuprev=1.1
Index: php-src/ext/standard/tests/array/bug46873.phpt
+++ php-src/ext/standard/tests/array/bug46873.phpt
--TEST--
Bug #46873 (extract($foo) crashes if $foo['foo'] exists)
--FILE--
?php
$foo = array('foo' = 1, 'bar' = 2, 'test' = 3);
extract($foo);
var_dump($foo, $bar, $test);
?
--EXPECT--
int(1)
int(2)
int(3)



-- 
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 /ext/standard array.c /ext/standard/tests/array bug46873.phpt

2008-12-26 Thread Arnaud Le Blanc

lbarnaudSat Dec 27 03:07:46 2008 UTC

  Added files: (Branch: PHP_5_2)
/php-src/ext/standard/tests/array   bug46873.phpt 

  Modified files:  
/php-src/ext/standard   array.c 
/php-srcNEWS 
  Log:
  MFH: Fixed bug #46873 (extract($foo) crashes if $foo['foo'] exists)
  
  
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/array.c?r1=1.308.2.21.2.61r2=1.308.2.21.2.62diff_format=u
Index: php-src/ext/standard/array.c
diff -u php-src/ext/standard/array.c:1.308.2.21.2.61 
php-src/ext/standard/array.c:1.308.2.21.2.62
--- php-src/ext/standard/array.c:1.308.2.21.2.61Thu Dec 25 11:05:19 2008
+++ php-src/ext/standard/array.cSat Dec 27 03:07:45 2008
@@ -21,7 +21,7 @@
+--+
 */
 
-/* $Id: array.c,v 1.308.2.21.2.61 2008/12/25 11:05:19 felipe Exp $ */
+/* $Id: array.c,v 1.308.2.21.2.62 2008/12/27 03:07:45 lbarnaud Exp $ */
 
 #include php.h
 #include php_ini.h
@@ -1334,7 +1334,7 @@
Imports variables into symbol table from an array */
 PHP_FUNCTION(extract)
 {
-   zval **var_array, **z_extract_type, **prefix;
+   zval **var_array, *orig_var_array, **z_extract_type, **prefix;
zval **entry, *data;
char *var_name;
smart_str final_name = {0};
@@ -1391,7 +1391,15 @@
php_error_docref(NULL TSRMLS_CC, E_WARNING, First argument 
should be an array);
return;
}
-   
+
+   /* var_array is passed by ref for the needs of EXTR_REFS (needs to
+* work on the original array to create refs to its members)
+* simulate pass_by_value if EXTR_REFS is not used */
+   if (!extract_refs) {
+   orig_var_array = *var_array;
+   SEPARATE_ARG_IF_REF((*var_array));
+   }
+
zend_hash_internal_pointer_reset_ex(Z_ARRVAL_PP(var_array), pos);
while (zend_hash_get_current_data_ex(Z_ARRVAL_PP(var_array), (void 
**)entry, pos) == SUCCESS) {
key_type = zend_hash_get_current_key_ex(Z_ARRVAL_PP(var_array), 
var_name, var_name_len, num_key, 0, pos);
@@ -1491,6 +1499,10 @@
zend_hash_move_forward_ex(Z_ARRVAL_PP(var_array), pos);
}
 
+   if (!extract_refs) {
+   zval_ptr_dtor(var_array);
+   *var_array = orig_var_array;
+   }
smart_str_free(final_name);
 
RETURN_LONG(count);
http://cvs.php.net/viewvc.cgi/php-src/NEWS?r1=1.2027.2.547.2.1368r2=1.2027.2.547.2.1369diff_format=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.2027.2.547.2.1368 php-src/NEWS:1.2027.2.547.2.1369
--- php-src/NEWS:1.2027.2.547.2.1368Wed Dec 24 11:32:45 2008
+++ php-src/NEWSSat Dec 27 03:07:46 2008
@@ -14,6 +14,7 @@
 - Fixed bug #46889 (Memory leak in strtotime()). (Derick)
 - Fixed bug #46887 (Invalid calls to php_error_docref()).
   (oeriksson at mandriva dot com, Ilia)
+- Fixed bug #46873 (extract($foo) crashes if $foo['foo'] exists). (Arnaud)
 - Fixed bug #46798 (Crash in mssql extension when retrieving a NULL value
   inside a binary or image column type). (Ilia)
 - Fixed bug #46782 (fastcgi.c parse error). (Matt)

http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/array/bug46873.phpt?view=markuprev=1.1
Index: php-src/ext/standard/tests/array/bug46873.phpt
+++ php-src/ext/standard/tests/array/bug46873.phpt
--TEST--
Bug #46873 (extract($foo) crashes if $foo['foo'] exists)
--FILE--
?php
$foo = array('foo' = 1, 'bar' = 2, 'test' = 3);
extract($foo);
var_dump($foo, $bar, $test);
?
--EXPECT--
int(1)
int(2)
int(3)



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

[PHP-CVS] cvs: php-src /ext/standard string.c /ext/standard/tests/strings explode.phpt

2008-12-26 Thread Brian Shire

shire   Sat Dec 27 05:13:30 2008 UTC

  Modified files:  
/php-src/ext/standard   string.c 
/php-src/ext/standard/tests/strings explode.phpt 
  Log:
  fix explode behavior to respect negative limit when string is empty.
  
  
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/string.c?r1=1.686r2=1.687diff_format=u
Index: php-src/ext/standard/string.c
diff -u php-src/ext/standard/string.c:1.686 php-src/ext/standard/string.c:1.687
--- php-src/ext/standard/string.c:1.686 Mon Nov 24 19:31:02 2008
+++ php-src/ext/standard/string.c   Sat Dec 27 05:13:29 2008
@@ -18,7 +18,7 @@
+--+
  */
 
-/* $Id: string.c,v 1.686 2008/11/24 19:31:02 lbarnaud Exp $ */
+/* $Id: string.c,v 1.687 2008/12/27 05:13:29 shire Exp $ */
 
 /* Synced with php 3.0 revision 1.193 1999-06-16 [ssb] */
 
@@ -1294,10 +1294,12 @@
array_init(return_value);
 
if ( str_len == 0 ) {
-   if ( str_type == IS_UNICODE ) {
-   add_next_index_unicodel(return_value, USTR_MAKE(), 
sizeof()-1, 0);
-   } else {
-   add_next_index_stringl(return_value, , sizeof()-1, 
1);
+   if (limit = 0 || argc == 2) {
+   if ( str_type == IS_UNICODE ) {
+   add_next_index_unicodel(return_value, 
USTR_MAKE(), sizeof()-1, 0);
+   } else {
+   add_next_index_stringl(return_value, , 
sizeof()-1, 1);
+   }
}
return;
}
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/strings/explode.phpt?r1=1.9r2=1.10diff_format=u
Index: php-src/ext/standard/tests/strings/explode.phpt
diff -u php-src/ext/standard/tests/strings/explode.phpt:1.9 
php-src/ext/standard/tests/strings/explode.phpt:1.10
--- php-src/ext/standard/tests/strings/explode.phpt:1.9 Tue May 27 10:50:45 2008
+++ php-src/ext/standard/tests/strings/explode.phpt Sat Dec 27 05:13:30 2008
@@ -18,6 +18,7 @@
 var_dump(@explode(NULL, a));
 var_dump(@explode(abc, acb));
 var_dump(@explode(somestring, otherstring));
+var_dump(@explode(somestring, otherstring, -1));
 var_dump(@explode(a, aa));
 var_dump(@explode(==, str_repeat(-=.ord(0).=-, 10)));
 var_dump(@explode(=, str_repeat(-=.ord(0).=-, 10)));
@@ -64,6 +65,8 @@
   [0]=
   unicode(11) otherstring
 }
+array(0) {
+}
 array(7) {
   [0]=
   unicode(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/standard string.c /ext/standard/tests/strings explode.phpt

2008-12-26 Thread Brian Shire

shire   Sat Dec 27 05:15:51 2008 UTC

  Modified files:  (Branch: PHP_5_3)
/php-src/ext/standard   string.c 
/php-src/ext/standard/tests/strings explode.phpt 
  Log:
  MFH: fix explode behavior to respect negative limit when string is empty.
  
  
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/string.c?r1=1.445.2.14.2.69.2.38r2=1.445.2.14.2.69.2.39diff_format=u
Index: php-src/ext/standard/string.c
diff -u php-src/ext/standard/string.c:1.445.2.14.2.69.2.38 
php-src/ext/standard/string.c:1.445.2.14.2.69.2.39
--- php-src/ext/standard/string.c:1.445.2.14.2.69.2.38  Fri Nov 21 19:16:50 2008
+++ php-src/ext/standard/string.c   Sat Dec 27 05:15:51 2008
@@ -18,7 +18,7 @@
+--+
  */
 
-/* $Id: string.c,v 1.445.2.14.2.69.2.38 2008/11/21 19:16:50 felipe Exp $ */
+/* $Id: string.c,v 1.445.2.14.2.69.2.39 2008/12/27 05:15:51 shire Exp $ */
 
 /* Synced with php 3.0 revision 1.193 1999-06-16 [ssb] */
 
@@ -1018,7 +1018,9 @@
array_init(return_value);
 
if (! Z_STRLEN_PP(str)) {
-   add_next_index_stringl(return_value, , sizeof() - 1, 1);
+   if (limit = 0 || argc == 2) {
+   add_next_index_stringl(return_value, , sizeof() - 
1, 1);
+   } 
return;
}
 
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/strings/explode.phpt?r1=1.4.4.1.2.1r2=1.4.4.1.2.2diff_format=u
Index: php-src/ext/standard/tests/strings/explode.phpt
diff -u php-src/ext/standard/tests/strings/explode.phpt:1.4.4.1.2.1 
php-src/ext/standard/tests/strings/explode.phpt:1.4.4.1.2.2
--- php-src/ext/standard/tests/strings/explode.phpt:1.4.4.1.2.1 Tue Dec 18 
10:53:39 2007
+++ php-src/ext/standard/tests/strings/explode.phpt Sat Dec 27 05:15:51 2008
@@ -17,6 +17,7 @@
 var_dump(@explode(NULL, a));
 var_dump(@explode(abc, acb));
 var_dump(@explode(somestring, otherstring));
+var_dump(@explode(somestring, otherstring, -1));
 var_dump(@explode(a, aa));
 var_dump(@explode(==, str_repeat(-=.ord(0).=-, 10)));
 var_dump(@explode(=, str_repeat(-=.ord(0).=-, 10)));
@@ -63,6 +64,8 @@
   [0]=
   string(11) otherstring
 }
+array(0) {
+}
 array(7) {
   [0]=
   string(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 /ext/standard string.c /ext/standard/tests/strings explode.phpt

2008-12-26 Thread Brian Shire

shire   Sat Dec 27 05:20:27 2008 UTC

  Modified files:  (Branch: PHP_5_2)
/php-srcNEWS 
/php-src/ext/standard   string.c 
/php-src/ext/standard/tests/strings explode.phpt 
  Log:
  MFH: fix explode behavior to respect negative limit when string is empty.
  
  
http://cvs.php.net/viewvc.cgi/php-src/NEWS?r1=1.2027.2.547.2.1369r2=1.2027.2.547.2.1370diff_format=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.2027.2.547.2.1369 php-src/NEWS:1.2027.2.547.2.1370
--- php-src/NEWS:1.2027.2.547.2.1369Sat Dec 27 03:07:46 2008
+++ php-src/NEWSSat Dec 27 05:20:27 2008
@@ -1,6 +1,7 @@
 PHPNEWS
 |||
 ?? ??? 2009, PHP 5.2.9
+- Fixed explode() behavior to respect negative limit when string is empty. 
(shire)
 - Added optional sorting type flag parameter to array_unique(), default is
   SORT_REGULAR. (Andrei)
 - Fixed security issue in imagerotate(), background colour isn't validated
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/string.c?r1=1.445.2.14.2.77r2=1.445.2.14.2.78diff_format=u
Index: php-src/ext/standard/string.c
diff -u php-src/ext/standard/string.c:1.445.2.14.2.77 
php-src/ext/standard/string.c:1.445.2.14.2.78
--- php-src/ext/standard/string.c:1.445.2.14.2.77   Wed Nov  5 18:55:02 2008
+++ php-src/ext/standard/string.c   Sat Dec 27 05:20:27 2008
@@ -18,7 +18,7 @@
+--+
  */
 
-/* $Id: string.c,v 1.445.2.14.2.77 2008/11/05 18:55:02 felipe Exp $ */
+/* $Id: string.c,v 1.445.2.14.2.78 2008/12/27 05:20:27 shire Exp $ */
 
 /* Synced with php 3.0 revision 1.193 1999-06-16 [ssb] */
 
@@ -1033,7 +1033,9 @@
array_init(return_value);
 
if (! Z_STRLEN_PP(str)) {
-   add_next_index_stringl(return_value, , sizeof() - 1, 1);
+   if (limit = 0 || argc == 2) {
+   add_next_index_stringl(return_value, , sizeof() - 
1, 1);
+   } 
return;
}
 
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/strings/explode.phpt?r1=1.4.4.2r2=1.4.4.3diff_format=u
Index: php-src/ext/standard/tests/strings/explode.phpt
diff -u php-src/ext/standard/tests/strings/explode.phpt:1.4.4.2 
php-src/ext/standard/tests/strings/explode.phpt:1.4.4.3
--- php-src/ext/standard/tests/strings/explode.phpt:1.4.4.2 Wed Dec 19 
08:45:16 2007
+++ php-src/ext/standard/tests/strings/explode.phpt Sat Dec 27 05:20:27 2008
@@ -17,6 +17,7 @@
 var_dump(@explode(NULL, a));
 var_dump(@explode(abc, acb));
 var_dump(@explode(somestring, otherstring));
+var_dump(@explode(somestring, otherstring, -1));
 var_dump(@explode(a, aa));
 var_dump(@explode(==, str_repeat(-=.ord(0).=-, 10)));
 var_dump(@explode(=, str_repeat(-=.ord(0).=-, 10)));
@@ -63,6 +64,8 @@
   [0]=
   string(11) otherstring
 }
+array(0) {
+}
 array(7) {
   [0]=
   string(0) 



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

[PHP-CVS-DAILY] cvs: php-src / ChangeLog

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

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

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

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

[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 /ext/simplexml php_simplexml.h php_simplexml_exports.h simplexml.c

[PHP-CVS] cvs: php-src(PHP_5_3) /ext/simplexml php_simplexml.h php_simplexml_exports.h simplexml.c

[PHP-CVS] cvs: php-src /ext/hash/tests hash_copy_001.phpt

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

[PHP-CVS] cvs: php-src /ext/simplexml php_simplexml.h

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

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

[PHP-CVS] cvs: php-src /ext/standard array.c /ext/standard/tests/array bug46873.phpt

[PHP-CVS] cvs: php-src(PHP_5_3) /ext/standard array.c /ext/standard/tests/array bug46873.phpt

[PHP-CVS] cvs: php-src(PHP_5_2) / NEWS /ext/standard array.c /ext/standard/tests/array bug46873.phpt

[PHP-CVS] cvs: php-src /ext/standard string.c /ext/standard/tests/strings explode.phpt

[PHP-CVS] cvs: php-src(PHP_5_3) /ext/standard string.c /ext/standard/tests/strings explode.phpt

[PHP-CVS] cvs: php-src(PHP_5_2) / NEWS /ext/standard string.c /ext/standard/tests/strings explode.phpt

20 matches

Site Navigation

Mail list logo

Footer information