date:20070831

[PHP-CVS] cvs: php-src /ext/pdo_oci/tests pdo_oci_attr_autocommit_1.phpt pdo_oci_attr_autocommit_2.phpt pdo_oci_attr_autocommit_3.phpt pdo_oci_attr_case.phpt pdo_oci_attr_client.phpt pdo_oci_attr_driv

2007-08-31 Thread Christopher Jones

sixdFri Aug 31 21:11:52 2007 UTC

  Modified files:  
/php-src/ext/pdo_oci/tests  pdo_oci_attr_autocommit_1.phpt 
pdo_oci_attr_autocommit_2.phpt 
pdo_oci_attr_autocommit_3.phpt 
pdo_oci_attr_case.phpt 
pdo_oci_attr_client.phpt 
pdo_oci_attr_drivername.phpt 
pdo_oci_attr_nulls_1.phpt 
pdo_oci_attr_prefetch_1.phpt 
pdo_oci_attr_prefetch_2.phpt 
pdo_oci_attr_server.phpt 
  Log:
  MFB New tests for getAttribute
  http://cvs.php.net/viewvc.cgi/php-src/ext/pdo_oci/tests/pdo_oci_attr_autocommit_1.phpt?r1=1.1&r2=1.2&diff_format=u
Index: php-src/ext/pdo_oci/tests/pdo_oci_attr_autocommit_1.phpt
diff -u /dev/null php-src/ext/pdo_oci/tests/pdo_oci_attr_autocommit_1.phpt:1.2
--- /dev/null   Fri Aug 31 21:11:52 2007
+++ php-src/ext/pdo_oci/tests/pdo_oci_attr_autocommit_1.phptFri Aug 31 
21:11:52 2007
@@ -0,0 +1,64 @@
+--TEST--
+PDO_OCI: Attribute: Basic autocommit functionality
+--SKIPIF--
+
+--FILE--
+setAttribute(PDO::ATTR_ERRMODE, PDO::ERRMODE_SILENT);
+$dbh->exec("drop table pdo_ac_tab");
+$dbh->setAttribute(PDO::ATTR_ERRMODE, PDO::ERRMODE_EXCEPTION);
+
+print "PDO::ATTR_AUTOCOMMIT: Default: ";
+var_dump($dbh->getAttribute(PDO::ATTR_AUTOCOMMIT));
+
+echo "Change setting to false - ";
+
+$dbh->setAttribute(PDO::ATTR_AUTOCOMMIT, false);
+
+print "PDO::ATTR_AUTOCOMMIT: ";
+var_dump($dbh->getAttribute(PDO::ATTR_AUTOCOMMIT));
+
+echo "Change setting back to true - ";
+
+$dbh->setAttribute(PDO::ATTR_AUTOCOMMIT, true);
+
+print "PDO::ATTR_AUTOCOMMIT: ";
+var_dump($dbh->getAttribute(PDO::ATTR_AUTOCOMMIT));
+
+// Use 2nd connection to check that autocommit does commit
+
+echo "Insert data\n";
+$dbh->exec("create table pdo_ac_tab (col1 varchar2(20))");
+$dbh->exec("insert into pdo_ac_tab (col1) values ('some data')");
+
+$dbh2 = PDOTest::factory();
+
+echo "Second connection should be able to see committed data\n";
+$s = $dbh2->prepare("select col1 from pdo_ac_tab");
+$s->execute();
+while ($r = $s->fetch()) {
+echo "Data is: " . $r[0] . "\n";
+}
+
+$dbh->exec("drop table pdo_ac_tab");
+
+echo "Done\n";
+
+?>
+--EXPECT--
+PDO::ATTR_AUTOCOMMIT: Default: bool(true)
+Change setting to false - PDO::ATTR_AUTOCOMMIT: bool(false)
+Change setting back to true - PDO::ATTR_AUTOCOMMIT: bool(true)
+Insert data
+Second connection should be able to see committed data
+Data is: some data
+Done
\ No newline at end of file
http://cvs.php.net/viewvc.cgi/php-src/ext/pdo_oci/tests/pdo_oci_attr_autocommit_2.phpt?r1=1.1&r2=1.2&diff_format=u
Index: php-src/ext/pdo_oci/tests/pdo_oci_attr_autocommit_2.phpt
diff -u /dev/null php-src/ext/pdo_oci/tests/pdo_oci_attr_autocommit_2.phpt:1.2
--- /dev/null   Fri Aug 31 21:11:52 2007
+++ php-src/ext/pdo_oci/tests/pdo_oci_attr_autocommit_2.phptFri Aug 31 
21:11:52 2007
@@ -0,0 +1,127 @@
+--TEST--
+PDO_OCI: Attribute: beginTransaction and native transactions
+--SKIPIF--
+
+--FILE--
+setAttribute(PDO::ATTR_ERRMODE, PDO::ERRMODE_SILENT);
+$dbh->exec("drop table pdo_ac_tab");
+$dbh->setAttribute(PDO::ATTR_ERRMODE, PDO::ERRMODE_EXCEPTION);
+
+$dbh->exec("create table pdo_ac_tab (col1 varchar2(25))");
+
+echo "Test 1 Check beginTransaction insertion\n";
+
+$dbh->beginTransaction();
+try {
+   $dbh->exec("insert into pdo_ac_tab (col1) values ('data 1')");
+   $dbh->exec("insert into pdo_ac_tab (col1) values ('data 2')");
+   $dbh->commit();
+}
+catch (PDOException $e) {
+   echo "Caught unexpected exception at line " . __LINE__ . "\n";
+   echo $e->getMessage() . "\n";
+   $dbh->rollback();
+}
+
+echo "Test 2 Cause an exception and test beginTransaction rollback\n";
+
+$dbh->beginTransaction();
+try {
+   $dbh->exec("insert into pdo_ac_tab (col1) values ('not committed #1')");
+   $dbh->exec("insert into pdo_ac_tab (col1) values ('data that is too 
long to fit and will barf')");
+   $dbh->commit();
+}
+catch (PDOException $e) {
+   echo "Caught expected exception at line " . __LINE__ . "\n";
+   echo $e->getMessage() . "\n";
+   $dbh->rollback();
+}
+
+echo "Test 3 Setting ATTR_AUTOCOMMIT to true will commit and end the 
transaction\n";
+
+$dbh->exec("insert into pdo_ac_tab (col1) values ('data 3')");
+$dbh->setAttribute(PDO::ATTR_AUTOCOMMIT, true);
+print "PDO::ATTR_AUTOCOMMIT: ";
+var_dump($dbh->getAttribute(PDO::ATTR_AUTOCOMMIT));
+try {
+   $dbh->rollback();
+}
+catch (PDOException $e) {
+   echo "Caught expected exception at line " . __LINE__ . "\n";
+   echo $e->getMessage() . "\n";
+}
+
+echo "Test 4 Setting ATTR_AUTOCOMMIT to false will commit and end the 
transaction\n";
+
+$dbh->beginTransaction();
+$dbh->exec("insert into pdo_ac_tab (col1) values ('data 4')");
+$dbh->setAttribute(PDO::ATTR_AUTOCOMMIT, false);
+print "PDO::ATTR

[PHP-CVS] cvs: php-src /ext/pdo_oci config.m4 oci_driver.c oci_statement.c php_pdo_oci_int.h

2007-08-31 Thread Christopher Jones

sixdFri Aug 31 21:11:03 2007 UTC

  Modified files:  
/php-src/ext/pdo_ociconfig.m4 oci_driver.c oci_statement.c 
php_pdo_oci_int.h 
  Log:
  MFB Add $dbh->getAttribute() support for ATTR_SERVER_VERSION, 
ATTR_SERVER_INFO, ATTR_CLIENT_VERSION, ATTR_AUTOCOMMIT. Sync WS between PHP 5 & 
6 and add a couple of casts.
  http://cvs.php.net/viewvc.cgi/php-src/ext/pdo_oci/config.m4?r1=1.22&r2=1.23&diff_format=u
Index: php-src/ext/pdo_oci/config.m4
diff -u php-src/ext/pdo_oci/config.m4:1.22 php-src/ext/pdo_oci/config.m4:1.23
--- php-src/ext/pdo_oci/config.m4:1.22  Fri Aug 17 13:33:07 2007
+++ php-src/ext/pdo_oci/config.m4   Fri Aug 31 21:11:03 2007
@@ -1,4 +1,4 @@
-dnl $Id: config.m4,v 1.22 2007/08/17 13:33:07 sixd Exp $
+dnl $Id: config.m4,v 1.23 2007/08/31 21:11:03 sixd Exp $
 
 if test "$PHP_PDO" != "no"; then
 
@@ -24,7 +24,7 @@
   PDO_OCI_VERSION=8.1
 fi
   else
-AC_MSG_ERROR(Oracle-OCI needed libraries not found under $PDO_OCI_DIR)
+AC_MSG_ERROR(Oracle OCI libraries not found under $PDO_OCI_DIR)
   fi
   AC_MSG_RESULT($PDO_OCI_VERSION)
 ]) 

   
@@ -54,7 +54,7 @@
 ])
 
 PHP_ARG_WITH(pdo-oci, Oracle OCI support for PDO,
-[  --with-pdo-oci[=DIR]  PDO: Oracle-OCI support. DIR defaults to 
\$ORACLE_HOME.
+[  --with-pdo-oci[=DIR]  PDO: Oracle OCI support. DIR defaults to 
\$ORACLE_HOME.
 Use --with-pdo-oci=instantclient,prefix,version 
 for an Oracle Instant Client SDK. 
 For Linux with 10.2.0.3 RPMs (for example) use:
@@ -67,12 +67,12 @@
   else
 PDO_OCI_DIR=$PHP_PDO_OCI
   fi
-  AC_MSG_RESULT($PDO_OCI_DIR :$PHP_PDO_OCI:)
+  AC_MSG_RESULT($PHP_PDO_OCI)
 
   AC_MSG_CHECKING([if that is sane])
   if test -z "$PDO_OCI_DIR"; then
 AC_MSG_ERROR([
-You need to tell me where to find your oracle SDK, or set ORACLE_HOME.
+You need to tell me where to find your Oracle Instant Client SDK, or set 
ORACLE_HOME.
 ])
   else
 AC_MSG_RESULT([yes])
@@ -251,6 +251,8 @@
   [
 PHP_ADD_EXTENSION_DEP(pdo_oci, pdo)
   ])
+
+  AC_DEFINE_UNQUOTED(PHP_PDO_OCI_CLIENT_VERSION, "$PDO_OCI_VERSION", [ ])
 fi
 
 fi
http://cvs.php.net/viewvc.cgi/php-src/ext/pdo_oci/oci_driver.c?r1=1.33&r2=1.34&diff_format=u
Index: php-src/ext/pdo_oci/oci_driver.c
diff -u php-src/ext/pdo_oci/oci_driver.c:1.33 
php-src/ext/pdo_oci/oci_driver.c:1.34
--- php-src/ext/pdo_oci/oci_driver.c:1.33   Tue Jul  3 05:47:53 2007
+++ php-src/ext/pdo_oci/oci_driver.cFri Aug 31 21:11:03 2007
@@ -16,7 +16,7 @@
   +--+
 */
 
-/* $Id: oci_driver.c,v 1.33 2007/07/03 05:47:53 sixd Exp $ */
+/* $Id: oci_driver.c,v 1.34 2007/08/31 21:11:03 sixd Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
@@ -31,6 +31,8 @@
 #include "php_pdo_oci_int.h"
 #include "Zend/zend_exceptions.h"
 
+static inline ub4 pdo_oci_sanitize_prefetch(long prefetch);
+
 static int pdo_oci_fetch_error_func(pdo_dbh_t *dbh, pdo_stmt_t *stmt, zval 
*info TSRMLS_DC) /* {{{ */
 {
pdo_oci_db_handle *H = (pdo_oci_db_handle *)dbh->driver_data;
@@ -282,14 +284,14 @@
 
}
 
-   prefetch = 1024 * pdo_attr_lval(driver_options, PDO_ATTR_PREFETCH, 100 
TSRMLS_CC);
+   prefetch = pdo_oci_sanitize_prefetch(pdo_attr_lval(driver_options, 
PDO_ATTR_PREFETCH, PDO_OCI_PREFETCH_DEFAULT TSRMLS_CC));
if (prefetch) {
H->last_err = OCIAttrSet(S->stmt, OCI_HTYPE_STMT, &prefetch, 0,
-   OCI_ATTR_PREFETCH_MEMORY, H->err);
+
OCI_ATTR_PREFETCH_ROWS, H->err);
if (!H->last_err) {
-   prefetch /= 1024;
+   prefetch *= PDO_OCI_PREFETCH_ROWSIZE;
H->last_err = OCIAttrSet(S->stmt, OCI_HTYPE_STMT, 
&prefetch, 0,
-   OCI_ATTR_PREFETCH_ROWS, H->err);
+
OCI_ATTR_PREFETCH_MEMORY, H->err);
}
}
 
@@ -448,6 +450,69 @@
 }
 /* }}} */
 
+static int oci_handle_get_attribute(pdo_dbh_t *dbh, long attr, zval 
*return_value TSRMLS_DC)  /* {{{ */
+{
+   pdo_oci_db_handle *H = (pdo_oci_db_handle *)dbh->driver_data;
+
+   switch (attr) {
+   case PDO_ATTR_SERVER_VERSION:
+   case PDO_ATTR_SERVER_INFO:
+   {
+   text infostr[512];
+   char verstr[15];
+   ub4  vernum;
+   
+   if (OCIServerRelease(H->svc, H->err, infostr, 
(ub4)sizeof(infostr), (ub1)OCI_HTYPE_SVCCTX, &vernum))
+   {
+   ZVAL_STRING(return_value, "<>", 1);
+

[PHP-CVS] cvs: php-src(PHP_5_2) /ext/pdo_oci/tests pdo_oci_attr_autocommit_1.phpt pdo_oci_attr_autocommit_2.phpt pdo_oci_attr_autocommit_3.phpt pdo_oci_attr_case.phpt pdo_oci_attr_client.phpt pdo_oci_

2007-08-31 Thread Christopher Jones

sixdFri Aug 31 21:09:43 2007 UTC

  Added files: (Branch: PHP_5_2)
/php-src/ext/pdo_oci/tests  pdo_oci_attr_autocommit_1.phpt 
pdo_oci_attr_autocommit_2.phpt 
pdo_oci_attr_autocommit_3.phpt 
pdo_oci_attr_case.phpt 
pdo_oci_attr_client.phpt 
pdo_oci_attr_drivername.phpt 
pdo_oci_attr_nulls_1.phpt 
pdo_oci_attr_prefetch_1.phpt 
pdo_oci_attr_prefetch_2.phpt 
pdo_oci_attr_server.phpt 
  Log:
  New tests for getAttribute
  

http://cvs.php.net/viewvc.cgi/php-src/ext/pdo_oci/tests/pdo_oci_attr_autocommit_1.phpt?view=markup&rev=1.1
Index: php-src/ext/pdo_oci/tests/pdo_oci_attr_autocommit_1.phpt
+++ php-src/ext/pdo_oci/tests/pdo_oci_attr_autocommit_1.phpt

http://cvs.php.net/viewvc.cgi/php-src/ext/pdo_oci/tests/pdo_oci_attr_autocommit_2.phpt?view=markup&rev=1.1
Index: php-src/ext/pdo_oci/tests/pdo_oci_attr_autocommit_2.phpt
+++ php-src/ext/pdo_oci/tests/pdo_oci_attr_autocommit_2.phpt

http://cvs.php.net/viewvc.cgi/php-src/ext/pdo_oci/tests/pdo_oci_attr_autocommit_3.phpt?view=markup&rev=1.1
Index: php-src/ext/pdo_oci/tests/pdo_oci_attr_autocommit_3.phpt
+++ php-src/ext/pdo_oci/tests/pdo_oci_attr_autocommit_3.phpt

http://cvs.php.net/viewvc.cgi/php-src/ext/pdo_oci/tests/pdo_oci_attr_case.phpt?view=markup&rev=1.1
Index: php-src/ext/pdo_oci/tests/pdo_oci_attr_case.phpt
+++ php-src/ext/pdo_oci/tests/pdo_oci_attr_case.phpt

http://cvs.php.net/viewvc.cgi/php-src/ext/pdo_oci/tests/pdo_oci_attr_client.phpt?view=markup&rev=1.1
Index: php-src/ext/pdo_oci/tests/pdo_oci_attr_client.phpt
+++ php-src/ext/pdo_oci/tests/pdo_oci_attr_client.phpt

http://cvs.php.net/viewvc.cgi/php-src/ext/pdo_oci/tests/pdo_oci_attr_drivername.phpt?view=markup&rev=1.1
Index: php-src/ext/pdo_oci/tests/pdo_oci_attr_drivername.phpt
+++ php-src/ext/pdo_oci/tests/pdo_oci_attr_drivername.phpt

http://cvs.php.net/viewvc.cgi/php-src/ext/pdo_oci/tests/pdo_oci_attr_nulls_1.phpt?view=markup&rev=1.1
Index: php-src/ext/pdo_oci/tests/pdo_oci_attr_nulls_1.phpt
+++ php-src/ext/pdo_oci/tests/pdo_oci_attr_nulls_1.phpt

http://cvs.php.net/viewvc.cgi/php-src/ext/pdo_oci/tests/pdo_oci_attr_prefetch_1.phpt?view=markup&rev=1.1
Index: php-src/ext/pdo_oci/tests/pdo_oci_attr_prefetch_1.phpt
+++ php-src/ext/pdo_oci/tests/pdo_oci_attr_prefetch_1.phpt

http://cvs.php.net/viewvc.cgi/php-src/ext/pdo_oci/tests/pdo_oci_attr_prefetch_2.phpt?view=markup&rev=1.1
Index: php-src/ext/pdo_oci/tests/pdo_oci_attr_prefetch_2.phpt
+++ php-src/ext/pdo_oci/tests/pdo_oci_attr_prefetch_2.phpt

http://cvs.php.net/viewvc.cgi/php-src/ext/pdo_oci/tests/pdo_oci_attr_server.phpt?view=markup&rev=1.1
Index: php-src/ext/pdo_oci/tests/pdo_oci_attr_server.phpt
+++ php-src/ext/pdo_oci/tests/pdo_oci_attr_server.phpt

-- 
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/pdo_oci config.m4 oci_driver.c oci_statement.c php_pdo_oci_int.h

2007-08-31 Thread Christopher Jones

sixdFri Aug 31 21:08:48 2007 UTC

  Modified files:  (Branch: PHP_5_2)
/php-src/ext/pdo_ociconfig.m4 oci_driver.c oci_statement.c 
php_pdo_oci_int.h 
  Log:
  Add $dbh->getAttribute() support for ATTR_SERVER_VERSION, ATTR_SERVER_INFO, 
ATTR_CLIENT_VERSION, ATTR_AUTOCOMMIT. Sync WS between PHP 5 & 6 and add a 
couple of casts.
  http://cvs.php.net/viewvc.cgi/php-src/ext/pdo_oci/config.m4?r1=1.14.2.5.2.5&r2=1.14.2.5.2.6&diff_format=u
Index: php-src/ext/pdo_oci/config.m4
diff -u php-src/ext/pdo_oci/config.m4:1.14.2.5.2.5 
php-src/ext/pdo_oci/config.m4:1.14.2.5.2.6
--- php-src/ext/pdo_oci/config.m4:1.14.2.5.2.5  Fri Aug 17 13:30:36 2007
+++ php-src/ext/pdo_oci/config.m4   Fri Aug 31 21:08:48 2007
@@ -1,4 +1,4 @@
-dnl $Id: config.m4,v 1.14.2.5.2.5 2007/08/17 13:30:36 sixd Exp $
+dnl $Id: config.m4,v 1.14.2.5.2.6 2007/08/31 21:08:48 sixd Exp $
 
 if test "$PHP_PDO" != "no"; then
 
@@ -24,7 +24,7 @@
   PDO_OCI_VERSION=8.1
 fi
   else
-AC_MSG_ERROR(Oracle-OCI needed libraries not found under $PDO_OCI_DIR)
+AC_MSG_ERROR(Oracle OCI libraries not found under $PDO_OCI_DIR)
   fi
   AC_MSG_RESULT($PDO_OCI_VERSION)
 ]) 

   
@@ -54,7 +54,7 @@
 ])
 
 PHP_ARG_WITH(pdo-oci, Oracle OCI support for PDO,
-[  --with-pdo-oci[=DIR]  PDO: Oracle-OCI support. DIR defaults to 
\$ORACLE_HOME.
+[  --with-pdo-oci[=DIR]  PDO: Oracle OCI support. DIR defaults to 
\$ORACLE_HOME.
 Use --with-pdo-oci=instantclient,prefix,version 
 for an Oracle Instant Client SDK. 
 For Linux with 10.2.0.3 RPMs (for example) use:
@@ -67,12 +67,12 @@
   else
 PDO_OCI_DIR=$PHP_PDO_OCI
   fi
-  AC_MSG_RESULT($PDO_OCI_DIR :$PHP_PDO_OCI:)
+  AC_MSG_RESULT($PHP_PDO_OCI)
 
   AC_MSG_CHECKING([if that is sane])
   if test -z "$PDO_OCI_DIR"; then
 AC_MSG_ERROR([
-You need to tell me where to find your oracle SDK, or set ORACLE_HOME.
+You need to tell me where to find your Oracle Instant Client SDK, or set 
ORACLE_HOME.
 ])
   else
 AC_MSG_RESULT([yes])
@@ -251,6 +251,8 @@
   [
 PHP_ADD_EXTENSION_DEP(pdo_oci, pdo)
   ])
+
+  AC_DEFINE_UNQUOTED(PHP_PDO_OCI_CLIENT_VERSION, "$PDO_OCI_VERSION", [ ])
 fi
 
 fi
http://cvs.php.net/viewvc.cgi/php-src/ext/pdo_oci/oci_driver.c?r1=1.24.2.4.2.6&r2=1.24.2.4.2.7&diff_format=u
Index: php-src/ext/pdo_oci/oci_driver.c
diff -u php-src/ext/pdo_oci/oci_driver.c:1.24.2.4.2.6 
php-src/ext/pdo_oci/oci_driver.c:1.24.2.4.2.7
--- php-src/ext/pdo_oci/oci_driver.c:1.24.2.4.2.6   Tue Jul  3 04:32:26 2007
+++ php-src/ext/pdo_oci/oci_driver.cFri Aug 31 21:08:48 2007
@@ -16,7 +16,7 @@
   +--+
 */
 
-/* $Id: oci_driver.c,v 1.24.2.4.2.6 2007/07/03 04:32:26 sixd Exp $ */
+/* $Id: oci_driver.c,v 1.24.2.4.2.7 2007/08/31 21:08:48 sixd Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
@@ -31,6 +31,8 @@
 #include "php_pdo_oci_int.h"
 #include "Zend/zend_exceptions.h"
 
+static inline ub4 pdo_oci_sanitize_prefetch(long prefetch);
+
 static int pdo_oci_fetch_error_func(pdo_dbh_t *dbh, pdo_stmt_t *stmt, zval 
*info TSRMLS_DC) /* {{{ */
 {
pdo_oci_db_handle *H = (pdo_oci_db_handle *)dbh->driver_data;
@@ -285,14 +287,14 @@
 
}
 
-   prefetch = 1024 * pdo_attr_lval(driver_options, PDO_ATTR_PREFETCH, 100 
TSRMLS_CC);
+   prefetch = pdo_oci_sanitize_prefetch(pdo_attr_lval(driver_options, 
PDO_ATTR_PREFETCH, PDO_OCI_PREFETCH_DEFAULT TSRMLS_CC));
if (prefetch) {
H->last_err = OCIAttrSet(S->stmt, OCI_HTYPE_STMT, &prefetch, 0,
-   OCI_ATTR_PREFETCH_MEMORY, H->err);
+   OCI_ATTR_PREFETCH_ROWS, H->err);
if (!H->last_err) {
-   prefetch /= 1024;
+   prefetch *= PDO_OCI_PREFETCH_ROWSIZE;
H->last_err = OCIAttrSet(S->stmt, OCI_HTYPE_STMT, 
&prefetch, 0,
-   OCI_ATTR_PREFETCH_ROWS, H->err);
+   OCI_ATTR_PREFETCH_MEMORY, H->err);
}
}
 
@@ -446,6 +448,69 @@
} else {
return 0;
}
+   
+}
+/* }}} */
+
+static int oci_handle_get_attribute(pdo_dbh_t *dbh, long attr, zval 
*return_value TSRMLS_DC)  /* {{{ */
+{
+   pdo_oci_db_handle *H = (pdo_oci_db_handle *)dbh->driver_data;
+
+   switch (attr) {
+   case PDO_ATTR_SERVER_VERSION:
+   case PDO_ATTR_SERVER_INFO:
+   {
+   text infostr[512];
+   char verstr[15];
+   ub4  vernum;
+   
+   if (OCIServerRelease(H->svc, H->err, infostr, 
(ub4)sizeof(infostr), (ub1)OCI_HTYPE_SVCCTX, &vernum))
+

[PHP-CVS] cvs: php-src /sapi/cgi cgi_main.c

2007-08-31 Thread Dmitry Stogov

dmitry  Fri Aug 31 12:18:04 2007 UTC

  Modified files:  
/php-src/sapi/cgi   cgi_main.c 
  Log:
  Fixed bug #42453 (CGI SAPI does not shut down cleanly with -i/-m/-v cmdline 
options)
  
  
http://cvs.php.net/viewvc.cgi/php-src/sapi/cgi/cgi_main.c?r1=1.330&r2=1.331&diff_format=u
Index: php-src/sapi/cgi/cgi_main.c
diff -u php-src/sapi/cgi/cgi_main.c:1.330 php-src/sapi/cgi/cgi_main.c:1.331
--- php-src/sapi/cgi/cgi_main.c:1.330   Wed Aug  8 23:55:42 2007
+++ php-src/sapi/cgi/cgi_main.c Fri Aug 31 12:18:04 2007
@@ -21,7 +21,7 @@
+--+
 */
 
-/* $Id: cgi_main.c,v 1.330 2007/08/08 23:55:42 stas Exp $ */
+/* $Id: cgi_main.c,v 1.331 2007/08/31 12:18:04 dmitry Exp $ */
 
 #include "php.h"
 #include "php_globals.h"
@@ -1410,9 +1410,9 @@
php_output_tearup();
SG(headers_sent) = 1;
php_cgi_usage(argv[0]);
-   php_output_teardown();
-   exit(1);
-   break;
+   php_output_end_all(TSRMLS_C);
+   exit_status = 0;
+   goto out;
}
}
php_optind = orig_optind;
@@ -1438,8 +1438,9 @@
php_output_tearup();
SG(headers_sent) = 1;
php_printf("You cannot use both -n and 
-c switch. Use -h for help.\n");
-   php_output_teardown();
-   exit(1);
+   php_output_end_all(TSRMLS_C);
+   exit_status = 1;
+   goto out;
}
 
while ((c = php_getopt(argc, argv, OPTIONS, 
&php_optarg, &php_optind, 0)) != -1) {
@@ -1480,9 +1481,9 @@

SG(request_info).no_headers = 1;
}

php_print_info(0x TSRMLS_CC);
-   php_output_teardown();
-   exit(0);
-   break;
+   
php_request_shutdown((void *) 0);
+   exit_status = 0;
+   goto out;
 
case 'l': /* syntax check mode */
no_headers = 1;
@@ -1497,9 +1498,9 @@
php_printf("\n[Zend 
Modules]\n");

print_extensions(TSRMLS_C);
php_printf("\n");
-   php_output_teardown();
-   exit(0);
-   break;
+   
php_output_end_all(TSRMLS_C);
+   exit_status = 0;
+   goto out;
 
 #if 0 /* not yet operational, see also below ... */
case '': /* generate indented source 
mode*/
@@ -1527,9 +1528,9 @@
 #else
php_printf("PHP %s (%s) 
(built: %s %s)\nCopyright (c) 1997-2007 The PHP Group\n%s", PHP_VERSION, 
sapi_module.name, __DATE__, __TIME__, get_zend_version());
 #endif
-   php_output_teardown();
-   exit(0);
-   break;
+   
php_request_shutdown((void *) 0);
+   exit_status = 0;
+   goto out;
 
case 'w':
behavior = 
PHP_MODE_STRIP;
@@ -1802,6 +1803,7 @@
exit_status = 255;
} zend_end_try();
 
+out:
SG(server_context) = NULL;
php_module_shutdown(TSRMLS_C);
sapi_shutdown();

-- 
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 /sapi/cgi cgi_main.c

2007-08-31 Thread Dmitry Stogov

dmitry  Fri Aug 31 12:17:52 2007 UTC

  Modified files:  (Branch: PHP_5_2)
/php-srcNEWS 
/php-src/sapi/cgi   cgi_main.c 
  Log:
  Fixed bug #42453 (CGI SAPI does not shut down cleanly with -i/-m/-v cmdline 
options)
  
  
http://cvs.php.net/viewvc.cgi/php-src/NEWS?r1=1.2027.2.547.2.920&r2=1.2027.2.547.2.921&diff_format=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.2027.2.547.2.920 php-src/NEWS:1.2027.2.547.2.921
--- php-src/NEWS:1.2027.2.547.2.920 Fri Aug 31 10:48:45 2007
+++ php-src/NEWSFri Aug 31 12:17:52 2007
@@ -5,6 +5,8 @@
 
 - Fixed bug #42462 (Segmentation when trying to set an attribute in a 
   DOMElement). (Rob)
+- Fixed bug #42453 (CGI SAPI does not shut down cleanly with -i/-m/-v cmdline
+  options). (Dmitry)
 - Fixed bug #42452 (PDO classes do not expose Reflection API information).
   (Hannes)
 - Fixed bug #42359 (xsd:list type not parsed). (Dmitry)
http://cvs.php.net/viewvc.cgi/php-src/sapi/cgi/cgi_main.c?r1=1.267.2.15.2.46&r2=1.267.2.15.2.47&diff_format=u
Index: php-src/sapi/cgi/cgi_main.c
diff -u php-src/sapi/cgi/cgi_main.c:1.267.2.15.2.46 
php-src/sapi/cgi/cgi_main.c:1.267.2.15.2.47
--- php-src/sapi/cgi/cgi_main.c:1.267.2.15.2.46 Wed Aug  8 23:51:57 2007
+++ php-src/sapi/cgi/cgi_main.c Fri Aug 31 12:17:52 2007
@@ -21,7 +21,7 @@
+--+
 */
 
-/* $Id: cgi_main.c,v 1.267.2.15.2.46 2007/08/08 23:51:57 stas Exp $ */
+/* $Id: cgi_main.c,v 1.267.2.15.2.47 2007/08/31 12:17:52 dmitry Exp $ */
 
 #include "php.h"
 #include "php_globals.h"
@@ -1471,8 +1471,8 @@
SG(headers_sent) = 1;
php_cgi_usage(argv[0]);
php_end_ob_buffers(1 TSRMLS_CC);
-   exit(1);
-   break;
+   exit_status = 0;
+   goto out;
}
}
php_optind = orig_optind;
@@ -1511,7 +1511,8 @@
SG(headers_sent) = 1;
php_printf("You cannot use both -n and -c 
switch. Use -h for help.\n");
php_end_ob_buffers(1 TSRMLS_CC);
-   exit(1);
+   exit_status = 1;
+   goto out;
}
 
while ((c = php_getopt(argc, argv, OPTIONS, 
&php_optarg, &php_optind, 0)) != -1) {
@@ -1552,9 +1553,9 @@

SG(request_info).no_headers = 1;
}
php_print_info(0x 
TSRMLS_CC);
-   php_end_ob_buffers(1 TSRMLS_CC);
-   exit(0);
-   break;
+   php_request_shutdown((void *) 
0);
+   exit_status = 0;
+   goto out;
 
case 'l': /* syntax check mode */
no_headers = 1;
@@ -1571,8 +1572,8 @@
print_extensions(TSRMLS_C);
php_printf("\n");
php_end_ob_buffers(1 TSRMLS_CC);
-   exit(0);
-   break;
+   exit_status = 0;
+   goto out;
 
 #if 0 /* not yet operational, see also below ... */
case '': /* generate indented source mode*/
@@ -1600,9 +1601,9 @@
 #else
php_printf("PHP %s (%s) (built: 
%s %s)\nCopyright (c) 1997-2007 The PHP Group\n%s", PHP_VERSION, 
sapi_module.name, __DATE__, __TIME__, get_zend_version());
 #endif
-   php_end_ob_buffers(1 TSRMLS_CC);
-   exit(0);
-   break;
+   php_request_shutdown((void *) 
0);
+   exit_status = 0;
+   goto out;
 
case 'w':
behavior = PHP_MODE_STRIP;
@@ -1890,6 +1891,7 @@
exit_status = 255;
} zend_end_try();
 
+out:
SG(server_context) = NULL;
php_module_shutdown(TSRMLS_C);
sapi_shutdown();

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

[PHP-CVS] cvs: php-src /ext/soap php_schema.c soap.c /ext/soap/tests/bugs bug42359.phpt bug42359.wsdl

2007-08-31 Thread Dmitry Stogov

dmitry  Fri Aug 31 10:48:57 2007 UTC

  Modified files:  
/php-src/ext/soap   php_schema.c soap.c 
/php-src/ext/soap/tests/bugsbug42359.phpt bug42359.wsdl 
  Log:
  Fixed bug #42359 (xsd:list type not parsed)
  
  http://cvs.php.net/viewvc.cgi/php-src/ext/soap/php_schema.c?r1=1.70&r2=1.71&diff_format=u
Index: php-src/ext/soap/php_schema.c
diff -u php-src/ext/soap/php_schema.c:1.70 php-src/ext/soap/php_schema.c:1.71
--- php-src/ext/soap/php_schema.c:1.70  Thu Feb 15 17:00:52 2007
+++ php-src/ext/soap/php_schema.c   Fri Aug 31 10:48:57 2007
@@ -17,7 +17,7 @@
   |  Dmitry Stogov <[EMAIL PROTECTED]> |
   +--+
 */
-/* $Id: php_schema.c,v 1.70 2007/02/15 17:00:52 dmitry Exp $ */
+/* $Id: php_schema.c,v 1.71 2007/08/31 10:48:57 dmitry Exp $ */
 
 #include "php_soap.h"
 #include "libxml/uri.h"
@@ -453,7 +453,14 @@
newType = emalloc(sizeof(sdlType));
memset(newType, 0, sizeof(sdlType));
 
-   newType->name = estrdup("anonymous");
+   {
+   smart_str anonymous = {0};
+   
+   smart_str_appendl(&anonymous, "anonymous", 
sizeof("anonymous")-1);
+   smart_str_append_long(&anonymous, 
zend_hash_num_elements(sdl->types));
+   smart_str_0(&anonymous);
+   newType->name = anonymous.c;
+   }
newType->namens = estrdup((char*)tns->children->content);
 
if (cur_type->elements == NULL) {
@@ -463,6 +470,7 @@
zend_hash_next_index_insert(cur_type->elements, &newType, 
sizeof(sdlTypePtr), (void **)&tmp);
 
schema_simpleType(sdl, tns, trav, newType);
+
trav = trav->next;
}
if (trav != NULL) {
@@ -541,7 +549,14 @@
newType = emalloc(sizeof(sdlType));
memset(newType, 0, sizeof(sdlType));
 
-   newType->name = estrdup("anonymous");
+   {
+   smart_str anonymous = {0};
+   
+   smart_str_appendl(&anonymous, "anonymous", 
sizeof("anonymous")-1);
+   smart_str_append_long(&anonymous, 
zend_hash_num_elements(sdl->types));
+   smart_str_0(&anonymous);
+   newType->name = anonymous.c;
+   }
newType->namens = 
estrdup((char*)tns->children->content);
 
if (cur_type->elements == NULL) {
@@ -1879,7 +1894,14 @@
}
dummy_type = emalloc(sizeof(sdlType));
memset(dummy_type, 0, sizeof(sdlType));
-   dummy_type->name = estrdup("anonymous");
+   {
+   smart_str anonymous = {0};
+   
+   smart_str_appendl(&anonymous, "anonymous", 
sizeof("anonymous")-1);
+   smart_str_append_long(&anonymous, 
zend_hash_num_elements(sdl->types));
+   smart_str_0(&anonymous);
+   dummy_type->name = anonymous.c;
+   }
dummy_type->namens = 
estrdup((char*)tns->children->content);
schema_simpleType(sdl, tns, trav, dummy_type);
newAttr->encode = dummy_type->encode;
http://cvs.php.net/viewvc.cgi/php-src/ext/soap/soap.c?r1=1.227&r2=1.228&diff_format=u
Index: php-src/ext/soap/soap.c
diff -u php-src/ext/soap/soap.c:1.227 php-src/ext/soap/soap.c:1.228
--- php-src/ext/soap/soap.c:1.227   Fri Aug 31 09:36:14 2007
+++ php-src/ext/soap/soap.c Fri Aug 31 10:48:57 2007
@@ -17,7 +17,7 @@
   |  Dmitry Stogov <[EMAIL PROTECTED]> |
   +--+
 */
-/* $Id: soap.c,v 1.227 2007/08/31 09:36:14 dmitry Exp $ */
+/* $Id: soap.c,v 1.228 2007/08/31 10:48:57 dmitry Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
@@ -3253,8 +3253,8 @@
while (zend_hash_get_current_data_ex(sdl->types, (void 
**)&type, &pos) != FAILURE) {
type_to_string((*type), &buf, 0);
add_next_index_rt_stringl(return_value, buf.c, 
buf.len, 1);
-   zend_hash_move_forward_ex(sdl->types, &pos);
smart_str_free(&buf);
+   zend_hash_move_forward_ex(sdl->types, &pos);
}
}
}
@@ -5016,8 +5016,6 @@
 
switch (type->kind) {
case XSD_TYPEKIND_SIMPLE:
-   case XSD_TYPEKIND_LIST:
-

[PHP-CVS] cvs: php-src(PHP_5_2) / NEWS /ext/soap php_schema.c soap.c /ext/soap/tests/bugs bug42359.phpt bug42359.wsdl

2007-08-31 Thread Dmitry Stogov

dmitry  Fri Aug 31 10:48:45 2007 UTC

  Added files: (Branch: PHP_5_2)
/php-src/ext/soap/tests/bugsbug42359.phpt bug42359.wsdl 

  Modified files:  
/php-srcNEWS 
/php-src/ext/soap   php_schema.c soap.c 
  Log:
  Fixed bug #42359 (xsd:list type not parsed)
  
  
http://cvs.php.net/viewvc.cgi/php-src/NEWS?r1=1.2027.2.547.2.919&r2=1.2027.2.547.2.920&diff_format=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.2027.2.547.2.919 php-src/NEWS:1.2027.2.547.2.920
--- php-src/NEWS:1.2027.2.547.2.919 Fri Aug 31 09:36:01 2007
+++ php-src/NEWSFri Aug 31 10:48:45 2007
@@ -7,6 +7,7 @@
   DOMElement). (Rob)
 - Fixed bug #42452 (PDO classes do not expose Reflection API information).
   (Hannes)
+- Fixed bug #42359 (xsd:list type not parsed). (Dmitry)
 - Fixed bug #42326 (SoapServer crash). (Dmitry)
 - Fixed bug #42086 (SoapServer return Procedure '' not present for WSIBasic
   compliant wsdl). (Dmitry)
http://cvs.php.net/viewvc.cgi/php-src/ext/soap/php_schema.c?r1=1.58.2.6.2.5&r2=1.58.2.6.2.6&diff_format=u
Index: php-src/ext/soap/php_schema.c
diff -u php-src/ext/soap/php_schema.c:1.58.2.6.2.5 
php-src/ext/soap/php_schema.c:1.58.2.6.2.6
--- php-src/ext/soap/php_schema.c:1.58.2.6.2.5  Thu Feb 15 17:01:29 2007
+++ php-src/ext/soap/php_schema.c   Fri Aug 31 10:48:45 2007
@@ -17,7 +17,7 @@
   |  Dmitry Stogov <[EMAIL PROTECTED]> |
   +--+
 */
-/* $Id: php_schema.c,v 1.58.2.6.2.5 2007/02/15 17:01:29 dmitry Exp $ */
+/* $Id: php_schema.c,v 1.58.2.6.2.6 2007/08/31 10:48:45 dmitry Exp $ */
 
 #include "php_soap.h"
 #include "libxml/uri.h"
@@ -453,7 +453,14 @@
newType = emalloc(sizeof(sdlType));
memset(newType, 0, sizeof(sdlType));
 
-   newType->name = estrdup("anonymous");
+   {
+   smart_str anonymous = {0};
+   
+   smart_str_appendl(&anonymous, "anonymous", 
sizeof("anonymous")-1);
+   smart_str_append_long(&anonymous, 
zend_hash_num_elements(sdl->types));
+   smart_str_0(&anonymous);
+   newType->name = anonymous.c;
+   }
newType->namens = estrdup((char*)tns->children->content);
 
if (cur_type->elements == NULL) {
@@ -463,6 +470,7 @@
zend_hash_next_index_insert(cur_type->elements, &newType, 
sizeof(sdlTypePtr), (void **)&tmp);
 
schema_simpleType(sdl, tns, trav, newType);
+
trav = trav->next;
}
if (trav != NULL) {
@@ -541,7 +549,14 @@
newType = emalloc(sizeof(sdlType));
memset(newType, 0, sizeof(sdlType));
 
-   newType->name = estrdup("anonymous");
+   {
+   smart_str anonymous = {0};
+   
+   smart_str_appendl(&anonymous, "anonymous", 
sizeof("anonymous")-1);
+   smart_str_append_long(&anonymous, 
zend_hash_num_elements(sdl->types));
+   smart_str_0(&anonymous);
+   newType->name = anonymous.c;
+   }
newType->namens = 
estrdup((char*)tns->children->content);
 
if (cur_type->elements == NULL) {
@@ -1879,7 +1894,14 @@
}
dummy_type = emalloc(sizeof(sdlType));
memset(dummy_type, 0, sizeof(sdlType));
-   dummy_type->name = estrdup("anonymous");
+   {
+   smart_str anonymous = {0};
+   
+   smart_str_appendl(&anonymous, "anonymous", 
sizeof("anonymous")-1);
+   smart_str_append_long(&anonymous, 
zend_hash_num_elements(sdl->types));
+   smart_str_0(&anonymous);
+   dummy_type->name = anonymous.c;
+   }
dummy_type->namens = 
estrdup((char*)tns->children->content);
schema_simpleType(sdl, tns, trav, dummy_type);
newAttr->encode = dummy_type->encode;
http://cvs.php.net/viewvc.cgi/php-src/ext/soap/soap.c?r1=1.156.2.28.2.28&r2=1.156.2.28.2.29&diff_format=u
Index: php-src/ext/soap/soap.c
diff -u php-src/ext/soap/soap.c:1.156.2.28.2.28 
php-src/ext/soap/soap.c:1.156.2.28.2.29
--- php-src/ext/soap/soap.c:1.156.2.28.2.28 Fri Aug 31 09:36:02 2007
+++ php-src/ext/soap/soap.c Fri Aug 31 10:48:45 2007
@@ -17,7 +17,7 @@
   |  Dmitry Stogov <[EMAIL PROTECTED]> |
   +--+
 */
-/* $Id: soap.c,v 1.156.2.28.2.28 2007/08/31

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

2007-08-31 Thread Jani Taskinen

janiFri Aug 31 10:46:19 2007 UTC

  Modified files:  (Branch: PHP_5_2)
/php-src/ext/standard   basic_functions.c 
  Log:
  MFH: ws + protos
  
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/basic_functions.c?r1=1.725.2.31.2.61&r2=1.725.2.31.2.62&diff_format=u
Index: php-src/ext/standard/basic_functions.c
diff -u php-src/ext/standard/basic_functions.c:1.725.2.31.2.61 
php-src/ext/standard/basic_functions.c:1.725.2.31.2.62
--- php-src/ext/standard/basic_functions.c:1.725.2.31.2.61  Thu Aug 16 
23:05:43 2007
+++ php-src/ext/standard/basic_functions.c  Fri Aug 31 10:46:19 2007
@@ -17,7 +17,7 @@
+--+
  */
 
-/* $Id: basic_functions.c,v 1.725.2.31.2.61 2007/08/16 23:05:43 jani Exp $ */
+/* $Id: basic_functions.c,v 1.725.2.31.2.62 2007/08/31 10:46:19 jani Exp $ */
 
 #include "php.h"
 #include "php_streams.h"
@@ -6113,13 +6113,14 @@
 }
 /* }}} */
 
-
+/* {{{ php_simple_ini_parser_cb
+ */
 static void php_simple_ini_parser_cb(zval *arg1, zval *arg2, int 
callback_type, zval *arr)
 {
zval *element;
 
switch (callback_type) {
-   
+
case ZEND_INI_PARSER_ENTRY:
if (!arg2) {
/* bare string - nothing to do */
@@ -6129,7 +6130,7 @@
*element = *arg2;
zval_copy_ctor(element);
INIT_PZVAL(element);
-   zend_symtable_update(Z_ARRVAL_P(arr), Z_STRVAL_P(arg1), 
Z_STRLEN_P(arg1)+1, &element, sizeof(zval *), NULL);
+   zend_symtable_update(Z_ARRVAL_P(arr), Z_STRVAL_P(arg1), 
Z_STRLEN_P(arg1) + 1, &element, sizeof(zval *), NULL);
break;
 
case ZEND_INI_PARSER_POP_ENTRY:
@@ -6141,7 +6142,7 @@
break;
}
 
-   if (!(Z_STRLEN_P(arg1) > 1 && Z_STRVAL_P(arg1)[0]=='0') 
&& is_numeric_string(Z_STRVAL_P(arg1), Z_STRLEN_P(arg1), NULL, NULL, 0) == 
IS_LONG) {
+   if (!(Z_STRLEN_P(arg1) > 1 && Z_STRVAL_P(arg1)[0] == 
'0') && is_numeric_string(Z_STRVAL_P(arg1), Z_STRLEN_P(arg1), NULL, NULL, 0) == 
IS_LONG) {
ulong key = (ulong) zend_atoi(Z_STRVAL_P(arg1), 
Z_STRLEN_P(arg1));
if (zend_hash_index_find(Z_ARRVAL_P(arr), key, 
(void **) &find_hash) == FAILURE) {
ALLOC_ZVAL(hash);
@@ -6153,12 +6154,12 @@
hash = *find_hash;
}
} else {
-   if (zend_hash_find(Z_ARRVAL_P(arr), 
Z_STRVAL_P(arg1), Z_STRLEN_P(arg1)+1, (void **) &find_hash) == FAILURE) {
+   if (zend_hash_find(Z_ARRVAL_P(arr), 
Z_STRVAL_P(arg1), Z_STRLEN_P(arg1) + 1, (void **) &find_hash) == FAILURE) {
ALLOC_ZVAL(hash);
INIT_PZVAL(hash);
array_init(hash);
 
-   zend_hash_update(Z_ARRVAL_P(arr), 
Z_STRVAL_P(arg1), Z_STRLEN_P(arg1)+1, &hash, sizeof(zval *), NULL);
+   zend_hash_update(Z_ARRVAL_P(arr), 
Z_STRVAL_P(arg1), Z_STRLEN_P(arg1) + 1, &hash, sizeof(zval *), NULL);
} else {
hash = *find_hash;
}
@@ -6174,7 +6175,7 @@
*element = *arg2;
zval_copy_ctor(element);
INIT_PZVAL(element);
-   add_next_index_zval(hash, element); 
+   add_next_index_zval(hash, element);
}
break;
 
@@ -6182,7 +6183,10 @@
break;
}
 }
+/* }}} */
 
+/* {{{ php_ini_parser_cb_with_sections
+ */
 static void php_ini_parser_cb_with_sections(zval *arg1, zval *arg2, int 
callback_type, zval *arr)
 {
TSRMLS_FETCH();
@@ -6190,7 +6194,7 @@
if (callback_type == ZEND_INI_PARSER_SECTION) {
MAKE_STD_ZVAL(BG(active_ini_file_section));
array_init(BG(active_ini_file_section));
-   zend_symtable_update(Z_ARRVAL_P(arr), Z_STRVAL_P(arg1), 
Z_STRLEN_P(arg1)+1, &BG(active_ini_file_section), sizeof(zval *), NULL);
+   zend_symtable_update(Z_ARRVAL_P(arr), Z_STRVAL_P(arg1), 
Z_STRLEN_P(arg1) + 1, &BG(active_ini_file_section), sizeof(zval *), NULL);
} else if (arg2) {
zval *active_arr;
 
@@ -6203,7 +6207,7 @@
php_simple_ini_parser_cb(arg1, arg2, callback_type, active_arr);
}
 }
-
+/* }}} */
 
 /* {{{ proto array parse_ini_file(string filename [, bool process_sections])
Parse configuration file */
@@ -6226,9 +6230,9 @@

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

2007-08-31 Thread Jani Taskinen

janiFri Aug 31 10:45:54 2007 UTC

  Modified files:  
/php-src/ext/standard   basic_functions.c 
  Log:
  ws
  
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/basic_functions.c?r1=1.869&r2=1.870&diff_format=u
Index: php-src/ext/standard/basic_functions.c
diff -u php-src/ext/standard/basic_functions.c:1.869 
php-src/ext/standard/basic_functions.c:1.870
--- php-src/ext/standard/basic_functions.c:1.869Fri Aug 24 13:50:52 2007
+++ php-src/ext/standard/basic_functions.c  Fri Aug 31 10:45:54 2007
@@ -17,7 +17,7 @@
+--+
  */
 
-/* $Id: basic_functions.c,v 1.869 2007/08/24 13:50:52 dmitry Exp $ */
+/* $Id: basic_functions.c,v 1.870 2007/08/31 10:45:54 jani Exp $ */
 
 #include "php.h"
 #include "php_streams.h"
@@ -6058,13 +6058,15 @@
 }
 /* }}} */
 
-static void php_simple_ini_parser_cb(zval *arg1, zval *arg2, int 
callback_type, zval *arr) /* {{{ */
+/* {{{ php_simple_ini_parser_cb
+ */
+static void php_simple_ini_parser_cb(zval *arg1, zval *arg2, int 
callback_type, zval *arr)
 {
zval *element, name;
TSRMLS_FETCH();
 
switch (callback_type) {
-   
+
case ZEND_INI_PARSER_ENTRY:
if (!arg2) {
/* bare string - nothing to do */
@@ -6083,7 +6085,7 @@
convert_to_unicode_with_converter(element, 
UG(utf8_conv));
convert_to_unicode_with_converter(&name, 
UG(utf8_conv));
}
-   zend_u_symtable_update(Z_ARRVAL_P(arr), ZEND_STR_TYPE, 
Z_UNIVAL(name), Z_UNILEN(name)+1, &element, sizeof(zval *), NULL);
+   zend_u_symtable_update(Z_ARRVAL_P(arr), ZEND_STR_TYPE, 
Z_UNIVAL(name), Z_UNILEN(name) + 1, &element, sizeof(zval *), NULL);
zval_dtor(&name);
break;
 
@@ -6096,7 +6098,7 @@
break;
}
 
-   if (!(Z_STRLEN_P(arg1) > 1 && Z_STRVAL_P(arg1)[0]=='0') 
&& is_numeric_string(Z_STRVAL_P(arg1), Z_STRLEN_P(arg1), NULL, NULL, 0) == 
IS_LONG) {
+   if (!(Z_STRLEN_P(arg1) > 1 && Z_STRVAL_P(arg1)[0] == 
'0') && is_numeric_string(Z_STRVAL_P(arg1), Z_STRLEN_P(arg1), NULL, NULL, 0) == 
IS_LONG) {
ulong key = (ulong) zend_atoi(Z_STRVAL_P(arg1), 
Z_STRLEN_P(arg1));
if (zend_hash_index_find(Z_ARRVAL_P(arr), key, 
(void **) &find_hash) == FAILURE) {
ALLOC_ZVAL(hash);
@@ -6158,7 +6160,9 @@
 }
 /* }}} */
 
-static void php_ini_parser_cb_with_sections(zval *arg1, zval *arg2, int 
callback_type, zval *arr) /* {{{ */
+/* {{{ php_ini_parser_cb_with_sections
+ */
+static void php_ini_parser_cb_with_sections(zval *arg1, zval *arg2, int 
callback_type, zval *arr)
 {
zval name;
TSRMLS_FETCH();
@@ -6173,7 +6177,7 @@
if (UG(unicode)) {
convert_to_unicode_with_converter(&name, UG(utf8_conv));
}
-   zend_u_symtable_update(Z_ARRVAL_P(arr), ZEND_STR_TYPE, 
Z_UNIVAL(name), Z_UNILEN(name)+1, &BG(active_ini_file_section), sizeof(zval *), 
NULL);
+   zend_u_symtable_update(Z_ARRVAL_P(arr), ZEND_STR_TYPE, 
Z_UNIVAL(name), Z_UNILEN(name) + 1, &BG(active_ini_file_section), sizeof(zval 
*), NULL);
zval_dtor(&name);
} else if (arg2) {
zval *active_arr;
@@ -6223,7 +6227,7 @@
memset(&fh, 0, sizeof(fh));
fh.filename = filename;
fh.type = ZEND_HANDLE_FILENAME;
-   
+
array_init(return_value);
zend_parse_ini_file(&fh, 0, ini_parser_cb, return_value);
 }

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

[PHP-CVS] cvs: php-src /ext/soap soap.c /ext/soap/tests/bugs bug42086.phpt bug42086.wsdl

2007-08-31 Thread Dmitry Stogov

dmitry  Fri Aug 31 09:36:14 2007 UTC

  Modified files:  
/php-src/ext/soap   soap.c 
/php-src/ext/soap/tests/bugsbug42086.phpt bug42086.wsdl 
  Log:
  Fixed bug #42086 (SoapServer return Procedure '' not present for WSIBasic 
compliant wsdl)
  
  http://cvs.php.net/viewvc.cgi/php-src/ext/soap/soap.c?r1=1.226&r2=1.227&diff_format=u
Index: php-src/ext/soap/soap.c
diff -u php-src/ext/soap/soap.c:1.226 php-src/ext/soap/soap.c:1.227
--- php-src/ext/soap/soap.c:1.226   Wed Aug  1 10:39:49 2007
+++ php-src/ext/soap/soap.c Fri Aug 31 09:36:14 2007
@@ -17,7 +17,7 @@
   |  Dmitry Stogov <[EMAIL PROTECTED]> |
   +--+
 */
-/* $Id: soap.c,v 1.226 2007/08/01 10:39:49 dmitry Exp $ */
+/* $Id: soap.c,v 1.227 2007/08/31 09:36:14 dmitry Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
@@ -3655,7 +3655,17 @@
}
trav = trav->next;
}
-   if (num_of_params > 0) {
+
+   if (num_of_params == 1 &&
+   function &&
+   function->binding &&
+   function->binding->bindingType == BINDING_SOAP &&
+   
((sdlSoapBindingFunctionPtr)function->bindingAttributes)->style == 
SOAP_DOCUMENT &&
+   (function->requestParameters == NULL ||
+zend_hash_num_elements(function->requestParameters) == 0) 
&&
+   strcmp(params->name, function->functionName) == 0) {
+   num_of_params = 0;
+   } else if (num_of_params > 0) {
tmp_parameters = safe_emalloc(num_of_params, 
sizeof(zval *), 0);
 
trav = params;
@@ -3696,7 +3706,11 @@
if (function && function->binding && function->binding->bindingType == 
BINDING_SOAP) {
sdlSoapBindingFunctionPtr fnb = 
(sdlSoapBindingFunctionPtr)function->bindingAttributes;
if (fnb->style == SOAP_DOCUMENT) {
-   function = NULL;
+   if (func->children != NULL ||
+   (function->requestParameters != NULL &&
+
zend_hash_num_elements(function->requestParameters) > 0)) {
+   function = NULL;
+   }
}
}
if (sdl != NULL && function == NULL) {
http://cvs.php.net/viewvc.cgi/php-src/ext/soap/tests/bugs/bug42086.phpt?r1=1.1&r2=1.2&diff_format=u
Index: php-src/ext/soap/tests/bugs/bug42086.phpt
diff -u /dev/null php-src/ext/soap/tests/bugs/bug42086.phpt:1.2
--- /dev/null   Fri Aug 31 09:36:14 2007
+++ php-src/ext/soap/tests/bugs/bug42086.phpt   Fri Aug 31 09:36:14 2007
@@ -0,0 +1,31 @@
+--TEST--
+Bug #42086 (SoapServer return Procedure '' not present for WSIBasic compliant 
wsdl)
+--SKIPIF--
+
+--INI--
+soap.wsdl_cache_enabled=0
+--FILE--
+
+http://schemas.xmlsoap.org/soap/envelope/";>
+EOF;
+
+class firstFunctionWithoutParamResponse {
+   public $param;
+}
+
+function firstFunctionWithoutParam() {
+   $ret = new firstFunctionWithoutParamResponse();
+   $ret->param =   "firstFunctionWithoutParam";
+   return $ret;
+}
+   
+$server = new SoapServer(dirname(__FILE__).'/bug42086.wsdl',
+   array('features'=>SOAP_SINGLE_ELEMENT_ARRAYS));
+$server->addFunction('firstFunctionWithoutParam');
+$server->handle($request);
+?>
+--EXPECT--
+
+http://schemas.xmlsoap.org/soap/envelope/";>firstFunctionWithoutParam
http://cvs.php.net/viewvc.cgi/php-src/ext/soap/tests/bugs/bug42086.wsdl?r1=1.1&r2=1.2&diff_format=u
Index: php-src/ext/soap/tests/bugs/bug42086.wsdl
diff -u /dev/null php-src/ext/soap/tests/bugs/bug42086.wsdl:1.2
--- /dev/null   Fri Aug 31 09:36:14 2007
+++ php-src/ext/soap/tests/bugs/bug42086.wsdl   Fri Aug 31 09:36:14 2007
@@ -0,0 +1,141 @@
+
+
+
+
+http://xml.avaya.com/ws/device-management/distributed-enterprise";
 
xmlns:typens="http://xml.avaya.com/ws/device-management/distributed-enterprise"; 
xmlns:xsd="http://www.w3.org/2001/XMLSchema"; 
xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/"; 
xmlns:soapenc="http://schemas.xmlsoap.org/soap/encoding/"; 
xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/"; 
xmlns="http://schemas.xmlsoap.org/wsdl/";>
+   
+   http://www.w3.org/2001/XMLSchema"; 
targetNamespace="http://xml.avaya.com/ws/device-management/distributed-enterprise";>
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+

[PHP-CVS] cvs: php-src(PHP_5_2) / NEWS /ext/soap soap.c /ext/soap/tests/bugs bug42086.phpt bug42086.wsdl

2007-08-31 Thread Dmitry Stogov

dmitry  Fri Aug 31 09:36:02 2007 UTC

  Added files: (Branch: PHP_5_2)
/php-src/ext/soap/tests/bugsbug42086.phpt bug42086.wsdl 

  Modified files:  
/php-srcNEWS 
/php-src/ext/soap   soap.c 
  Log:
  Fixed bug #42086 (SoapServer return Procedure '' not present for WSIBasic 
compliant wsdl)
  
  
http://cvs.php.net/viewvc.cgi/php-src/NEWS?r1=1.2027.2.547.2.918&r2=1.2027.2.547.2.919&diff_format=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.2027.2.547.2.918 php-src/NEWS:1.2027.2.547.2.919
--- php-src/NEWS:1.2027.2.547.2.918 Fri Aug 31 08:07:27 2007
+++ php-src/NEWSFri Aug 31 09:36:01 2007
@@ -8,6 +8,8 @@
 - Fixed bug #42452 (PDO classes do not expose Reflection API information).
   (Hannes)
 - Fixed bug #42326 (SoapServer crash). (Dmitry)
+- Fixed bug #42086 (SoapServer return Procedure '' not present for WSIBasic
+  compliant wsdl). (Dmitry)
 
 30 Aug 2007, PHP 5.2.4
 - Removed --enable-versioning configure option. (Jani)
http://cvs.php.net/viewvc.cgi/php-src/ext/soap/soap.c?r1=1.156.2.28.2.27&r2=1.156.2.28.2.28&diff_format=u
Index: php-src/ext/soap/soap.c
diff -u php-src/ext/soap/soap.c:1.156.2.28.2.27 
php-src/ext/soap/soap.c:1.156.2.28.2.28
--- php-src/ext/soap/soap.c:1.156.2.28.2.27 Wed Aug  1 10:39:33 2007
+++ php-src/ext/soap/soap.c Fri Aug 31 09:36:02 2007
@@ -17,7 +17,7 @@
   |  Dmitry Stogov <[EMAIL PROTECTED]> |
   +--+
 */
-/* $Id: soap.c,v 1.156.2.28.2.27 2007/08/01 10:39:33 dmitry Exp $ */
+/* $Id: soap.c,v 1.156.2.28.2.28 2007/08/31 09:36:02 dmitry Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
@@ -3248,7 +3248,17 @@
}
trav = trav->next;
}
-   if (num_of_params > 0) {
+
+   if (num_of_params == 1 &&
+   function &&
+   function->binding &&
+   function->binding->bindingType == BINDING_SOAP &&
+   
((sdlSoapBindingFunctionPtr)function->bindingAttributes)->style == 
SOAP_DOCUMENT &&
+   (function->requestParameters == NULL ||
+zend_hash_num_elements(function->requestParameters) == 0) 
&&
+   strcmp(params->name, function->functionName) == 0) {
+   num_of_params = 0;
+   } else if (num_of_params > 0) {
tmp_parameters = safe_emalloc(num_of_params, 
sizeof(zval *), 0);
 
trav = params;
@@ -3289,7 +3299,11 @@
if (function && function->binding && function->binding->bindingType == 
BINDING_SOAP) {
sdlSoapBindingFunctionPtr fnb = 
(sdlSoapBindingFunctionPtr)function->bindingAttributes;
if (fnb->style == SOAP_DOCUMENT) {
-   function = NULL;
+   if (func->children != NULL ||
+   (function->requestParameters != NULL &&
+
zend_hash_num_elements(function->requestParameters) > 0)) {
+   function = NULL;
+   }
}
}
if (sdl != NULL && function == NULL) {

http://cvs.php.net/viewvc.cgi/php-src/ext/soap/tests/bugs/bug42086.phpt?view=markup&rev=1.1
Index: php-src/ext/soap/tests/bugs/bug42086.phpt
+++ php-src/ext/soap/tests/bugs/bug42086.phpt

http://cvs.php.net/viewvc.cgi/php-src/ext/soap/tests/bugs/bug42086.wsdl?view=markup&rev=1.1
Index: php-src/ext/soap/tests/bugs/bug42086.wsdl
+++ php-src/ext/soap/tests/bugs/bug42086.wsdl

-- 
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) /main main.c

2007-08-31 Thread Jani Taskinen

janiFri Aug 31 08:35:37 2007 UTC

  Modified files:  (Branch: PHP_5_2)
/php-src/main   main.c 
  Log:
  MFH: ws
  
http://cvs.php.net/viewvc.cgi/php-src/main/main.c?r1=1.640.2.23.2.53&r2=1.640.2.23.2.54&diff_format=u
Index: php-src/main/main.c
diff -u php-src/main/main.c:1.640.2.23.2.53 php-src/main/main.c:1.640.2.23.2.54
--- php-src/main/main.c:1.640.2.23.2.53 Fri Aug  3 01:30:21 2007
+++ php-src/main/main.c Fri Aug 31 08:35:37 2007
@@ -18,7 +18,7 @@
+--+
 */
 
-/* $Id: main.c,v 1.640.2.23.2.53 2007/08/03 01:30:21 stas Exp $ */
+/* $Id: main.c,v 1.640.2.23.2.54 2007/08/31 08:35:37 jani Exp $ */
 
 /* {{{ includes
  */
@@ -432,11 +432,12 @@
PHP_INI_ENTRY("disable_functions",  "", 
PHP_INI_SYSTEM, NULL)
PHP_INI_ENTRY("disable_classes","", 
PHP_INI_SYSTEM, NULL)
 
-   STD_PHP_INI_BOOLEAN("allow_url_fopen",  "1",
PHP_INI_SYSTEM, OnUpdateBool,   allow_url_fopen,
php_core_globals,   core_globals)
-   STD_PHP_INI_BOOLEAN("allow_url_include","0",
PHP_INI_SYSTEM, OnUpdateBool,   allow_url_include,  
php_core_globals,   core_globals)
-   STD_PHP_INI_BOOLEAN("always_populate_raw_post_data","0",
PHP_INI_SYSTEM|PHP_INI_PERDIR,  OnUpdateBool,   
always_populate_raw_post_data,  php_core_globals,   
core_globals)
-   STD_PHP_INI_ENTRY("realpath_cache_size", "16K", PHP_INI_SYSTEM, 
OnUpdateLong, realpath_cache_size_limit, virtual_cwd_globals, cwd_globals)
-   STD_PHP_INI_ENTRY("realpath_cache_ttl", "120", PHP_INI_SYSTEM, 
OnUpdateLong, realpath_cache_ttl, virtual_cwd_globals, cwd_globals)
+   STD_PHP_INI_BOOLEAN("allow_url_fopen",  "1",
PHP_INI_SYSTEM, OnUpdateBool,   allow_url_fopen,
php_core_globals,   core_globals)
+   STD_PHP_INI_BOOLEAN("allow_url_include","0",
PHP_INI_SYSTEM, OnUpdateBool,   allow_url_include,  
php_core_globals,   core_globals)
+   STD_PHP_INI_BOOLEAN("always_populate_raw_post_data","0",
PHP_INI_SYSTEM|PHP_INI_PERDIR,  OnUpdateBool,   always_populate_raw_post_data,  
php_core_globals,   core_globals)
+
+   STD_PHP_INI_ENTRY("realpath_cache_size","16K",  
PHP_INI_SYSTEM, OnUpdateLong,   realpath_cache_size_limit,  
virtual_cwd_globals,cwd_globals)
+   STD_PHP_INI_ENTRY("realpath_cache_ttl", "120",  
PHP_INI_SYSTEM, OnUpdateLong,   realpath_cache_ttl, 
virtual_cwd_globals,cwd_globals)
 PHP_INI_END()
 /* }}} */
 

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

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

2007-08-31 Thread Jani Taskinen

janiFri Aug 31 08:35:07 2007 UTC

  Modified files:  
/php-src/main   main.c 
  Log:
  ws
  
http://cvs.php.net/viewvc.cgi/php-src/main/main.c?r1=1.745&r2=1.746&diff_format=u
Index: php-src/main/main.c
diff -u php-src/main/main.c:1.745 php-src/main/main.c:1.746
--- php-src/main/main.c:1.745   Tue Aug 28 12:12:02 2007
+++ php-src/main/main.c Fri Aug 31 08:35:07 2007
@@ -18,7 +18,7 @@
+--+
 */
 
-/* $Id: main.c,v 1.745 2007/08/28 12:12:02 derick Exp $ */
+/* $Id: main.c,v 1.746 2007/08/31 08:35:07 jani Exp $ */
 
 /* {{{ includes
  */
@@ -528,12 +528,12 @@
PHP_INI_ENTRY("disable_functions",  "", 
PHP_INI_SYSTEM, NULL)
PHP_INI_ENTRY("disable_classes","", 
PHP_INI_SYSTEM, NULL)
 
-   STD_PHP_INI_BOOLEAN("allow_url_fopen",  "1",
PHP_INI_ALL,OnUpdateAllowUrl,   
allow_url_fopen_list,   php_core_globals,   core_globals)
-   STD_PHP_INI_BOOLEAN("allow_url_include","0",
PHP_INI_ALL,OnUpdateAllowUrl,   
allow_url_include_list,  php_core_globals,  core_globals)
-   STD_PHP_INI_BOOLEAN("always_populate_raw_post_data","0",
PHP_INI_SYSTEM|PHP_INI_PERDIR,  OnUpdateBool,   
always_populate_raw_post_data,  php_core_globals,   
core_globals)
-   STD_PHP_INI_ENTRY("realpath_cache_size", "16K", PHP_INI_SYSTEM, 
OnUpdateLong, realpath_cache_size_limit, virtual_cwd_globals, cwd_globals)
-   STD_PHP_INI_ENTRY("realpath_cache_ttl", "120", PHP_INI_SYSTEM, 
OnUpdateLong, realpath_cache_ttl, virtual_cwd_globals, cwd_globals)
+   STD_PHP_INI_BOOLEAN("allow_url_fopen",  "1",
PHP_INI_ALL,OnUpdateAllowUrl,   allow_url_fopen_list,   
php_core_globals,   core_globals)
+   STD_PHP_INI_BOOLEAN("allow_url_include","0",
PHP_INI_ALL,OnUpdateAllowUrl,   allow_url_include_list, 
php_core_globals,   core_globals)
+   STD_PHP_INI_BOOLEAN("always_populate_raw_post_data","0",
PHP_INI_SYSTEM|PHP_INI_PERDIR,  OnUpdateBool,   always_populate_raw_post_data,  
php_core_globals,   core_globals)
 
+   STD_PHP_INI_ENTRY("realpath_cache_size","16K",  
PHP_INI_SYSTEM, OnUpdateLong,   realpath_cache_size_limit,  
virtual_cwd_globals,cwd_globals)
+   STD_PHP_INI_ENTRY("realpath_cache_ttl", "120",  
PHP_INI_SYSTEM, OnUpdateLong,   realpath_cache_ttl, 
virtual_cwd_globals,cwd_globals)
 PHP_INI_END()
 /* }}} */
 

-- 
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) /main php_ini.c

2007-08-31 Thread Jani Taskinen

janiFri Aug 31 08:16:13 2007 UTC

  Modified files:  (Branch: PHP_5_2)
/php-src/main   php_ini.c 
  Log:
  MFH: ws fixes
  
http://cvs.php.net/viewvc.cgi/php-src/main/php_ini.c?r1=1.136.2.4.2.14&r2=1.136.2.4.2.15&diff_format=u
Index: php-src/main/php_ini.c
diff -u php-src/main/php_ini.c:1.136.2.4.2.14 
php-src/main/php_ini.c:1.136.2.4.2.15
--- php-src/main/php_ini.c:1.136.2.4.2.14   Fri Aug 31 08:09:50 2007
+++ php-src/main/php_ini.c  Fri Aug 31 08:16:13 2007
@@ -16,7 +16,7 @@
+--+
  */
 
-/* $Id: php_ini.c,v 1.136.2.4.2.14 2007/08/31 08:09:50 jani Exp $ */
+/* $Id: php_ini.c,v 1.136.2.4.2.15 2007/08/31 08:16:13 jani Exp $ */
 
 #include "php.h"
 #include "ext/standard/info.h"
@@ -75,7 +75,7 @@
} else {
display_string = "no value";
display_string_length = sizeof("no 
value") - 1;
-   }   
+   }
}
} else if (ini_entry->value && ini_entry->value[0]) {
display_string = ini_entry->value;
@@ -88,7 +88,7 @@
} else {
display_string = "no value";
display_string_length = sizeof("no value") - 1;
-   }   
+   }
}
 
if (esc_html) {
@@ -123,7 +123,7 @@
PUTS(" => ");
php_ini_displayer_cb(ini_entry, ZEND_INI_DISPLAY_ORIG);
PUTS("\n");
-   }   
+   }
return 0;
 }
 /* }}} */
@@ -137,7 +137,7 @@
 
if (module) {
module_number = module->module_number;
-   } else { 
+   } else {
module_number = 0;
}
php_info_print_table_start();
@@ -176,14 +176,14 @@
}
if (!strcasecmp(Z_STRVAL_P(arg1), "extension")) 
{ /* load function module */
zval copy;
-   
+
copy = *arg2;
zval_copy_ctor(©);
copy.refcount = 0;
-   
zend_llist_add_element(&extension_lists.functions, ©); 
+   
zend_llist_add_element(&extension_lists.functions, ©);
} else if (!strcasecmp(Z_STRVAL_P(arg1), 
ZEND_EXTENSION_TOKEN)) { /* load Zend extension */
char *extension_name = 
estrndup(Z_STRVAL_P(arg2), Z_STRLEN_P(arg2));
-   
+

zend_llist_add_element(&extension_lists.engine, &extension_name);
} else {
zend_hash_update(&configuration_hash, 
Z_STRVAL_P(arg1), Z_STRLEN_P(arg1) + 1, arg2, sizeof(zval), (void **) &entry);
@@ -215,7 +215,7 @@
*element = *arg2;
zval_copy_ctor(element);
INIT_PZVAL(element);
-   add_next_index_zval(hash, element); 

+   add_next_index_zval(hash, element);
}
break;
 
@@ -247,7 +247,7 @@
 /* {{{ pvalue_config_destructor
  */
 static void pvalue_config_destructor(zval *pvalue)
-{   
+{
if (Z_TYPE_P(pvalue) == IS_STRING) {
free(Z_STRVAL_P(pvalue));
}
@@ -280,9 +280,9 @@
}
 
zend_llist_init(&extension_lists.engine, sizeof(char *), 
(llist_dtor_func_t) free_estring, 1);
-   zend_llist_init(&extension_lists.functions, sizeof(zval), 
(llist_dtor_func_t)  ZVAL_DESTRUCTOR, 1);
+   zend_llist_init(&extension_lists.functions, sizeof(zval), 
(llist_dtor_func_t) ZVAL_DESTRUCTOR, 1);
zend_llist_init(&scanned_ini_list, sizeof(char *), (llist_dtor_func_t) 
free_estring, 1);
-   
+
safe_mode_state = PG(safe_mode);
open_basedir = PG(open_basedir);
 
@@ -380,7 +380,7 @@
}
} else if 
(!VCWD_REALPATH(sapi_module.executable_location, binary_location) || 
VCWD_ACCESS(binary_location, X_OK)) {
efree(binary_location);
-   binary_location = NULL;  
+   binary_location = NULL;
}
} else {
binary_location = NULL;
@@ -388,7 +388,7 @@
 #endif
if (binary_location) {
char *separator_location = strrchr(binary_location, 
DEFAULT_SLASH);
-

[PHP-CVS] cvs: php-src /main php_ini.c

2007-08-31 Thread Jani Taskinen

janiFri Aug 31 08:13:07 2007 UTC

  Modified files:  
/php-src/main   php_ini.c 
  Log:
  ws fixes
  
http://cvs.php.net/viewvc.cgi/php-src/main/php_ini.c?r1=1.155&r2=1.156&diff_format=u
Index: php-src/main/php_ini.c
diff -u php-src/main/php_ini.c:1.155 php-src/main/php_ini.c:1.156
--- php-src/main/php_ini.c:1.155Fri Aug 31 08:09:41 2007
+++ php-src/main/php_ini.c  Fri Aug 31 08:13:07 2007
@@ -16,7 +16,7 @@
+--+
  */
 
-/* $Id: php_ini.c,v 1.155 2007/08/31 08:09:41 jani Exp $ */
+/* $Id: php_ini.c,v 1.156 2007/08/31 08:13:07 jani Exp $ */
 
 #include "php.h"
 #include "ext/standard/info.h"
@@ -75,7 +75,7 @@
} else {
display_string = "no value";
display_string_length = sizeof("no 
value") - 1;
-   }   
+   }
}
} else if (ini_entry->value && ini_entry->value[0]) {
display_string = ini_entry->value;
@@ -88,7 +88,7 @@
} else {
display_string = "no value";
display_string_length = sizeof("no value") - 1;
-   }   
+   }
}
 
if (esc_html) {
@@ -123,7 +123,7 @@
PUTS(" => ");
php_ini_displayer_cb(ini_entry, ZEND_INI_DISPLAY_ORIG);
PUTS("\n");
-   }   
+   }
return 0;
 }
 /* }}} */
@@ -137,7 +137,7 @@
 
if (module) {
module_number = module->module_number;
-   } else { 
+   } else {
module_number = 0;
}
php_info_print_table_start();
@@ -176,14 +176,14 @@
}
if (!strcasecmp(Z_STRVAL_P(arg1), "extension")) 
{ /* load function module */
zval copy;
-   
+
copy = *arg2;
zval_copy_ctor(©);
copy.refcount = 0;
-   
zend_llist_add_element(&extension_lists.functions, ©); 
+   
zend_llist_add_element(&extension_lists.functions, ©);
} else if (!strcasecmp(Z_STRVAL_P(arg1), 
ZEND_EXTENSION_TOKEN)) { /* load Zend extension */
char *extension_name = 
estrndup(Z_STRVAL_P(arg2), Z_STRLEN_P(arg2));
-   
+

zend_llist_add_element(&extension_lists.engine, &extension_name);
} else {
zend_hash_update(&configuration_hash, 
Z_STRVAL_P(arg1), Z_STRLEN_P(arg1) + 1, arg2, sizeof(zval), (void **) &entry);
@@ -215,7 +215,7 @@
*element = *arg2;
zval_copy_ctor(element);
INIT_PZVAL(element);
-   add_next_index_zval(hash, element); 

+   add_next_index_zval(hash, element);
}
break;
 
@@ -247,7 +247,7 @@
 /* {{{ pvalue_config_destructor
  */
 static void pvalue_config_destructor(zval *pvalue)
-{   
+{
if (Z_TYPE_P(pvalue) == IS_STRING) {
free(Z_STRVAL_P(pvalue));
}
@@ -279,9 +279,9 @@
}
 
zend_llist_init(&extension_lists.engine, sizeof(char *), 
(llist_dtor_func_t) free_estring, 1);
-   zend_llist_init(&extension_lists.functions, sizeof(zval), 
(llist_dtor_func_t)  ZVAL_DESTRUCTOR, 1);
+   zend_llist_init(&extension_lists.functions, sizeof(zval), 
(llist_dtor_func_t) ZVAL_DESTRUCTOR, 1);
zend_llist_init(&scanned_ini_list, sizeof(char *), (llist_dtor_func_t) 
free_estring, 1);
-   
+
open_basedir = PG(open_basedir);
 
if (sapi_module.php_ini_path_override) {
@@ -378,7 +378,7 @@
}
} else if 
(!VCWD_REALPATH(sapi_module.executable_location, binary_location) || 
VCWD_ACCESS(binary_location, X_OK)) {
efree(binary_location);
-   binary_location = NULL;  
+   binary_location = NULL;
}
} else {
binary_location = NULL;
@@ -386,7 +386,7 @@
 #endif
if (binary_location) {
char *separator_location = strrchr(binary_location, 
DEFAULT_SLASH);
-   
+
if (separator_location && separator_locat

[PHP-CVS] cvs: php-src(PHP_5_2) /main php_ini.c

2007-08-31 Thread Jani Taskinen

janiFri Aug 31 08:09:50 2007 UTC

  Modified files:  (Branch: PHP_5_2)
/php-src/main   php_ini.c 
  Log:
  MFH
  
http://cvs.php.net/viewvc.cgi/php-src/main/php_ini.c?r1=1.136.2.4.2.13&r2=1.136.2.4.2.14&diff_format=u
Index: php-src/main/php_ini.c
diff -u php-src/main/php_ini.c:1.136.2.4.2.13 
php-src/main/php_ini.c:1.136.2.4.2.14
--- php-src/main/php_ini.c:1.136.2.4.2.13   Sat May 19 12:53:06 2007
+++ php-src/main/php_ini.c  Fri Aug 31 08:09:50 2007
@@ -16,7 +16,7 @@
+--+
  */
 
-/* $Id: php_ini.c,v 1.136.2.4.2.13 2007/05/19 12:53:06 tony2001 Exp $ */
+/* $Id: php_ini.c,v 1.136.2.4.2.14 2007/08/31 08:09:50 jani Exp $ */
 
 #include "php.h"
 #include "ext/standard/info.h"
@@ -596,7 +596,7 @@
 
 /* {{{ cfg_get_entry
  */
-zval *cfg_get_entry(char *name, uint name_length)
+PHPAPI zval *cfg_get_entry(char *name, uint name_length)
 {
zval *tmp;
 
@@ -613,7 +613,7 @@
 PHPAPI int cfg_get_long(char *varname, long *result)
 {
zval *tmp, var;
-   
+
if (zend_hash_find(&configuration_hash, varname, strlen(varname) + 1, 
(void **) &tmp) == FAILURE) {
*result = 0;
return FAILURE;
@@ -631,7 +631,7 @@
 PHPAPI int cfg_get_double(char *varname, double *result)
 {
zval *tmp, var;
-   
+
if (zend_hash_find(&configuration_hash, varname, strlen(varname) + 1, 
(void **) &tmp) == FAILURE) {
*result = (double) 0;
return FAILURE;

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

[PHP-CVS] cvs: php-src /main php_ini.c

2007-08-31 Thread Jani Taskinen

janiFri Aug 31 08:09:41 2007 UTC

  Modified files:  
/php-src/main   php_ini.c 
  Log:
  ws + apify cfg_get_entry
  
http://cvs.php.net/viewvc.cgi/php-src/main/php_ini.c?r1=1.154&r2=1.155&diff_format=u
Index: php-src/main/php_ini.c
diff -u php-src/main/php_ini.c:1.154 php-src/main/php_ini.c:1.155
--- php-src/main/php_ini.c:1.154Sat May 19 12:52:31 2007
+++ php-src/main/php_ini.c  Fri Aug 31 08:09:41 2007
@@ -16,7 +16,7 @@
+--+
  */
 
-/* $Id: php_ini.c,v 1.154 2007/05/19 12:52:31 tony2001 Exp $ */
+/* $Id: php_ini.c,v 1.155 2007/08/31 08:09:41 jani Exp $ */
 
 #include "php.h"
 #include "ext/standard/info.h"
@@ -592,7 +592,7 @@
 
 /* {{{ cfg_get_entry
  */
-zval *cfg_get_entry(char *name, uint name_length)
+PHPAPI zval *cfg_get_entry(char *name, uint name_length)
 {
zval *tmp;
 
@@ -609,7 +609,7 @@
 PHPAPI int cfg_get_long(char *varname, long *result)
 {
zval *tmp, var;
-   
+
if (zend_hash_find(&configuration_hash, varname, strlen(varname) + 1, 
(void **) &tmp) == FAILURE) {
*result = 0;
return FAILURE;
@@ -627,7 +627,7 @@
 PHPAPI int cfg_get_double(char *varname, double *result)
 {
zval *tmp, var;
-   
+
if (zend_hash_find(&configuration_hash, varname, strlen(varname) + 1, 
(void **) &tmp) == FAILURE) {
*result = (double) 0;
return FAILURE;

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

[PHP-CVS] cvs: php-src /ext/soap php_encoding.c /ext/soap/tests/bugs bug42326.phpt bug42326.wsdl

2007-08-31 Thread Dmitry Stogov

dmitry  Fri Aug 31 08:07:46 2007 UTC

  Modified files:  
/php-src/ext/soap   php_encoding.c 
/php-src/ext/soap/tests/bugsbug42326.phpt bug42326.wsdl 
  Log:
  Fixed bug #42326 (SoapServer crash)
  
  
http://cvs.php.net/viewvc.cgi/php-src/ext/soap/php_encoding.c?r1=1.161&r2=1.162&diff_format=u
Index: php-src/ext/soap/php_encoding.c
diff -u php-src/ext/soap/php_encoding.c:1.161 
php-src/ext/soap/php_encoding.c:1.162
--- php-src/ext/soap/php_encoding.c:1.161   Wed Aug 22 14:18:28 2007
+++ php-src/ext/soap/php_encoding.c Fri Aug 31 08:07:46 2007
@@ -17,7 +17,7 @@
   |  Dmitry Stogov <[EMAIL PROTECTED]> |
   +--+
 */
-/* $Id: php_encoding.c,v 1.161 2007/08/22 14:18:28 dmitry Exp $ */
+/* $Id: php_encoding.c,v 1.162 2007/08/31 08:07:46 dmitry Exp $ */
 
 #include 
 
@@ -358,7 +358,7 @@
return 0;
 }
 
-xmlNodePtr master_to_xml(encodePtr encode, zval *data, int style, xmlNodePtr 
parent)
+static xmlNodePtr master_to_xml_int(encodePtr encode, zval *data, int style, 
xmlNodePtr parent, int use_class_map)
 {
xmlNodePtr node = NULL;
TSRMLS_FETCH();
@@ -445,7 +445,7 @@
xmlSetNs(node, nsp);
}
} else {
-   if (SOAP_GLOBAL(class_map) && data &&
+   if (use_class_map && SOAP_GLOBAL(class_map) && data &&
Z_TYPE_P(data) == IS_OBJECT &&
!Z_OBJPROP_P(data)->nApplyCount) {
zend_class_entry *ce = Z_OBJCE_P(data);
@@ -518,6 +518,11 @@
return node;
 }
 
+xmlNodePtr master_to_xml(encodePtr encode, zval *data, int style, xmlNodePtr 
parent)
+{
+   return master_to_xml_int(encode, data, style, parent, 1);
+}
+
 static zval *master_to_zval_int(encodePtr encode, xmlNodePtr data)
 {
zval *ret = NULL;
@@ -2662,7 +2667,7 @@
} else {
enc = get_conversion(IS_NULL);
}
-   ret = master_to_xml(enc, data, style, parent);
+   ret = master_to_xml_int(enc, data, style, parent, 0);
 /*
if (style == SOAP_LITERAL && SOAP_GLOBAL(sdl)) {
set_ns_and_type(ret, &enc->details);
http://cvs.php.net/viewvc.cgi/php-src/ext/soap/tests/bugs/bug42326.phpt?r1=1.1&r2=1.2&diff_format=u
Index: php-src/ext/soap/tests/bugs/bug42326.phpt
diff -u /dev/null php-src/ext/soap/tests/bugs/bug42326.phpt:1.2
--- /dev/null   Fri Aug 31 08:07:46 2007
+++ php-src/ext/soap/tests/bugs/bug42326.phpt   Fri Aug 31 08:07:46 2007
@@ -0,0 +1,49 @@
+--TEST--
+Bug #42326 (SoapServer crash)
+--SKIPIF--
+
+--INI--
+soap.wsdl_cache_enabled=0
+--FILE--
+
+http://schemas.xmlsoap.org/soap/envelope/"; 
xmlns:ns1="http://www.example.com/";>
+EOF;
+
+
+$soap_admin_classmap = array('productDetailsType' => 'SOAP_productDetailsType',
+ 'GetProductsRequest' => 'SOAP_GetProductsRequest',
+ 'GetProductsResponse' => 
'SOAP_GetProductsResponse');
+
+class SOAP_productDetailsType {
+public $id = 0;
+}
+
+class SOAP_GetProductsRequest {
+public $time = '';
+}
+
+class SOAP_GetProductsResponse {
+public $products;
+function __construct(){
+$this->products = new SOAP_productDetailsType();
+
+}
+}
+
+class SOAP_Admin {
+public function GetProducts($time){
+return new SOAP_GetProductsResponse();
+}
+}
+
+$soap = new SoapServer(dirname(__FILE__).'/bug42326.wsdl', array('classmap' => 
$soap_admin_classmap));
+$soap->setClass('SOAP_Admin');
+ob_start();
+$soap->handle($request);
+ob_end_clean();
+echo "ok\n";
+?>
+--EXPECT--
+ok
http://cvs.php.net/viewvc.cgi/php-src/ext/soap/tests/bugs/bug42326.wsdl?r1=1.1&r2=1.2&diff_format=u
Index: php-src/ext/soap/tests/bugs/bug42326.wsdl
diff -u /dev/null php-src/ext/soap/tests/bugs/bug42326.wsdl:1.2
--- /dev/null   Fri Aug 31 08:07:46 2007
+++ php-src/ext/soap/tests/bugs/bug42326.wsdl   Fri Aug 31 08:07:46 2007
@@ -0,0 +1,82 @@
+
+http://www.example.com/";
+xmlns:tns="http://www.example.com/";
+xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/";
+xmlns:xsd="http://www.w3.org/2001/XMLSchema";
+xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/";>  
+
+
+   http://www.example.com/";
+  xmlns="http://www.w3.org/2000/10/XMLSchema";>
+  
+  
+  
+  
+  
+  
+  
+  
+   
+
+
+   http://www.example.com/";
+  xmlns="http://www.w3.org/2000/10/XMLSchema";>
+  
+  
+  
+  
+  
+  
+  
+   
+
+   http://www.example.com/";
+  xmlns="http://www.w3.org/2000/10/XMLSchema";>
+  
+  
+  
+  
+  
+  
+  
+   
+
+   
+
+
+
+
+
+
+
+
+
+
+

[PHP-CVS] cvs: php-src(PHP_5_2) / NEWS /ext/soap php_encoding.c /ext/soap/tests/bugs bug42326.phpt bug42326.wsdl

2007-08-31 Thread Dmitry Stogov

dmitry  Fri Aug 31 08:07:28 2007 UTC

  Added files: (Branch: PHP_5_2)
/php-src/ext/soap/tests/bugsbug42326.phpt bug42326.wsdl 

  Modified files:  
/php-srcNEWS 
/php-src/ext/soap   php_encoding.c 
  Log:
  Fixed bug #42326 (SoapServer crash)
  
  
http://cvs.php.net/viewvc.cgi/php-src/NEWS?r1=1.2027.2.547.2.917&r2=1.2027.2.547.2.918&diff_format=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.2027.2.547.2.917 php-src/NEWS:1.2027.2.547.2.918
--- php-src/NEWS:1.2027.2.547.2.917 Thu Aug 30 16:32:54 2007
+++ php-src/NEWSFri Aug 31 08:07:27 2007
@@ -7,6 +7,7 @@
   DOMElement). (Rob)
 - Fixed bug #42452 (PDO classes do not expose Reflection API information).
   (Hannes)
+- Fixed bug #42326 (SoapServer crash). (Dmitry)
 
 30 Aug 2007, PHP 5.2.4
 - Removed --enable-versioning configure option. (Jani)
http://cvs.php.net/viewvc.cgi/php-src/ext/soap/php_encoding.c?r1=1.103.2.21.2.35&r2=1.103.2.21.2.36&diff_format=u
Index: php-src/ext/soap/php_encoding.c
diff -u php-src/ext/soap/php_encoding.c:1.103.2.21.2.35 
php-src/ext/soap/php_encoding.c:1.103.2.21.2.36
--- php-src/ext/soap/php_encoding.c:1.103.2.21.2.35 Wed Aug 22 14:18:09 2007
+++ php-src/ext/soap/php_encoding.c Fri Aug 31 08:07:27 2007
@@ -17,7 +17,7 @@
   |  Dmitry Stogov <[EMAIL PROTECTED]> |
   +--+
 */
-/* $Id: php_encoding.c,v 1.103.2.21.2.35 2007/08/22 14:18:09 dmitry Exp $ */
+/* $Id: php_encoding.c,v 1.103.2.21.2.36 2007/08/31 08:07:27 dmitry Exp $ */
 
 #include 
 
@@ -357,7 +357,7 @@
return 0;
 }
 
-xmlNodePtr master_to_xml(encodePtr encode, zval *data, int style, xmlNodePtr 
parent)
+static xmlNodePtr master_to_xml_int(encodePtr encode, zval *data, int style, 
xmlNodePtr parent, int check_class_map)
 {
xmlNodePtr node = NULL;
TSRMLS_FETCH();
@@ -428,7 +428,7 @@
xmlSetNs(node, nsp);
}
} else {
-   if (SOAP_GLOBAL(class_map) && data &&
+   if (check_class_map && SOAP_GLOBAL(class_map) && data &&
Z_TYPE_P(data) == IS_OBJECT &&
!Z_OBJPROP_P(data)->nApplyCount) {
zend_class_entry *ce = Z_OBJCE_P(data);
@@ -489,6 +489,11 @@
return node;
 }
 
+xmlNodePtr master_to_xml(encodePtr encode, zval *data, int style, xmlNodePtr 
parent)
+{
+   return master_to_xml_int(encode, data, style, parent, 1);
+}
+
 static zval *master_to_zval_int(encodePtr encode, xmlNodePtr data)
 {
zval *ret = NULL;
@@ -2685,7 +2690,7 @@
} else {
enc = get_conversion(IS_NULL);
}
-   ret = master_to_xml(enc, data, style, parent);
+   ret = master_to_xml_int(enc, data, style, parent, 0);
 /*
if (style == SOAP_LITERAL && SOAP_GLOBAL(sdl)) {
set_ns_and_type(ret, &enc->details);

http://cvs.php.net/viewvc.cgi/php-src/ext/soap/tests/bugs/bug42326.phpt?view=markup&rev=1.1
Index: php-src/ext/soap/tests/bugs/bug42326.phpt
+++ php-src/ext/soap/tests/bugs/bug42326.phpt

http://cvs.php.net/viewvc.cgi/php-src/ext/soap/tests/bugs/bug42326.wsdl?view=markup&rev=1.1
Index: php-src/ext/soap/tests/bugs/bug42326.wsdl
+++ php-src/ext/soap/tests/bugs/bug42326.wsdl

-- 
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) /main php.h php_ini.h

2007-08-31 Thread Jani Taskinen

janiFri Aug 31 07:48:05 2007 UTC

  Modified files:  (Branch: PHP_5_2)
/php-src/main   php.h php_ini.h 
  Log:
  MFH: Moved php.ini related protos where they belong
  
http://cvs.php.net/viewvc.cgi/php-src/main/php.h?r1=1.221.2.4.2.7&r2=1.221.2.4.2.8&diff_format=u
Index: php-src/main/php.h
diff -u php-src/main/php.h:1.221.2.4.2.7 php-src/main/php.h:1.221.2.4.2.8
--- php-src/main/php.h:1.221.2.4.2.7Mon Jan  1 09:36:11 2007
+++ php-src/main/php.h  Fri Aug 31 07:48:05 2007
@@ -17,7 +17,7 @@
+--+
  */
 
-/* $Id: php.h,v 1.221.2.4.2.7 2007/01/01 09:36:11 sebastian Exp $ */
+/* $Id: php.h,v 1.221.2.4.2.8 2007/08/31 07:48:05 jani Exp $ */
 
 #ifndef PHP_H
 #define PHP_H
@@ -326,10 +326,6 @@
 
 PHPAPI void php_register_pre_request_shutdown(void (*func)(void *), void 
*userdata);
 
-PHPAPI int cfg_get_long(char *varname, long *result);
-PHPAPI int cfg_get_double(char *varname, double *result);
-PHPAPI int cfg_get_string(char *varname, char **result);
-
 PHPAPI void php_com_initialize(TSRMLS_D);
 END_EXTERN_C()
 
http://cvs.php.net/viewvc.cgi/php-src/main/php_ini.h?r1=1.45.2.3.2.2&r2=1.45.2.3.2.3&diff_format=u
Index: php-src/main/php_ini.h
diff -u php-src/main/php_ini.h:1.45.2.3.2.2 php-src/main/php_ini.h:1.45.2.3.2.3
--- php-src/main/php_ini.h:1.45.2.3.2.2 Thu Aug  2 23:57:52 2007
+++ php-src/main/php_ini.h  Fri Aug 31 07:48:05 2007
@@ -16,7 +16,7 @@
+--+
 */
 
-/* $Id: php_ini.h,v 1.45.2.3.2.2 2007/08/02 23:57:52 stas Exp $ */
+/* $Id: php_ini.h,v 1.45.2.3.2.3 2007/08/31 07:48:05 jani Exp $ */
 
 #ifndef PHP_INI_H
 #define PHP_INI_H
@@ -27,7 +27,10 @@
 int php_init_config(TSRMLS_D);
 int php_shutdown_config(void);
 void php_ini_register_extensions(TSRMLS_D);
-zval *cfg_get_entry(char *name, uint name_length);
+PHPAPI zval *cfg_get_entry(char *name, uint name_length);
+PHPAPI int cfg_get_long(char *varname, long *result);
+PHPAPI int cfg_get_double(char *varname, double *result);
+PHPAPI int cfg_get_string(char *varname, char **result);
 END_EXTERN_C()
 
 #define PHP_INI_USER   ZEND_INI_USER

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

[PHP-CVS] cvs: php-src /main php.h php_ini.h

2007-08-31 Thread Jani Taskinen

janiFri Aug 31 07:47:41 2007 UTC

  Modified files:  
/php-src/main   php.h php_ini.h 
  Log:
  - Moved the php.ini related function protos where they belong
  
http://cvs.php.net/viewvc.cgi/php-src/main/php.h?r1=1.239&r2=1.240&diff_format=u
Index: php-src/main/php.h
diff -u php-src/main/php.h:1.239 php-src/main/php.h:1.240
--- php-src/main/php.h:1.239Sun Jul 15 19:50:06 2007
+++ php-src/main/php.h  Fri Aug 31 07:47:41 2007
@@ -17,7 +17,7 @@
+--+
  */
 
-/* $Id: php.h,v 1.239 2007/07/15 19:50:06 jani Exp $ */
+/* $Id: php.h,v 1.240 2007/08/31 07:47:41 jani Exp $ */
 
 #ifndef PHP_H
 #define PHP_H
@@ -316,10 +316,6 @@
 
 PHPAPI void php_register_pre_request_shutdown(void (*func)(void *), void 
*userdata);
 
-PHPAPI int cfg_get_long(char *varname, long *result);
-PHPAPI int cfg_get_double(char *varname, double *result);
-PHPAPI int cfg_get_string(char *varname, char **result);
-
 PHPAPI void php_com_initialize(TSRMLS_D);
 END_EXTERN_C()
 
http://cvs.php.net/viewvc.cgi/php-src/main/php_ini.h?r1=1.50&r2=1.51&diff_format=u
Index: php-src/main/php_ini.h
diff -u php-src/main/php_ini.h:1.50 php-src/main/php_ini.h:1.51
--- php-src/main/php_ini.h:1.50 Fri Aug  3 01:40:05 2007
+++ php-src/main/php_ini.h  Fri Aug 31 07:47:41 2007
@@ -16,7 +16,7 @@
+--+
 */
 
-/* $Id: php_ini.h,v 1.50 2007/08/03 01:40:05 stas Exp $ */
+/* $Id: php_ini.h,v 1.51 2007/08/31 07:47:41 jani Exp $ */
 
 #ifndef PHP_INI_H
 #define PHP_INI_H
@@ -27,7 +27,10 @@
 int php_init_config(TSRMLS_D);
 int php_shutdown_config(void);
 void php_ini_register_extensions(TSRMLS_D);
-zval *cfg_get_entry(char *name, uint name_length);
+PHPAPI zval *cfg_get_entry(char *name, uint name_length);
+PHPAPI int cfg_get_long(char *varname, long *result);
+PHPAPI int cfg_get_double(char *varname, double *result);
+PHPAPI int cfg_get_string(char *varname, char **result);
 END_EXTERN_C()
 
 #define PHP_INI_USER   ZEND_INI_USER

-- 
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) /main SAPI.h

2007-08-31 Thread Jani Taskinen

janiFri Aug 31 07:43:37 2007 UTC

  Modified files:  (Branch: PHP_5_2)
/php-src/main   SAPI.h 
  Log:
  MFH: ws
  
http://cvs.php.net/viewvc.cgi/php-src/main/SAPI.h?r1=1.114.2.1.2.2&r2=1.114.2.1.2.3&diff_format=u
Index: php-src/main/SAPI.h
diff -u php-src/main/SAPI.h:1.114.2.1.2.2 php-src/main/SAPI.h:1.114.2.1.2.3
--- php-src/main/SAPI.h:1.114.2.1.2.2   Mon Jan  1 09:36:10 2007
+++ php-src/main/SAPI.h Fri Aug 31 07:43:37 2007
@@ -16,7 +16,7 @@
+--+
 */
 
-/* $Id: SAPI.h,v 1.114.2.1.2.2 2007/01/01 09:36:10 sebastian Exp $ */
+/* $Id: SAPI.h,v 1.114.2.1.2.3 2007/08/31 07:43:37 jani Exp $ */
 
 #ifndef SAPI_H
 #define SAPI_H
@@ -107,9 +107,9 @@
char *current_user;
int current_user_length;
 
-/* this is necessary for CLI module */
-int argc;
-char **argv;
+   /* this is necessary for CLI module */
+   int argc;
+   char **argv;
int proto_num;
 } sapi_request_info;
 

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

[PHP-CVS] cvs: php-src /main SAPI.h

2007-08-31 Thread Jani Taskinen

janiFri Aug 31 07:43:28 2007 UTC

  Modified files:  
/php-src/main   SAPI.h 
  Log:
  ws
  
http://cvs.php.net/viewvc.cgi/php-src/main/SAPI.h?r1=1.119&r2=1.120&diff_format=u
Index: php-src/main/SAPI.h
diff -u php-src/main/SAPI.h:1.119 php-src/main/SAPI.h:1.120
--- php-src/main/SAPI.h:1.119   Mon Jan  1 09:29:35 2007
+++ php-src/main/SAPI.h Fri Aug 31 07:43:28 2007
@@ -16,7 +16,7 @@
+--+
 */
 
-/* $Id: SAPI.h,v 1.119 2007/01/01 09:29:35 sebastian Exp $ */
+/* $Id: SAPI.h,v 1.120 2007/08/31 07:43:28 jani Exp $ */
 
 #ifndef SAPI_H
 #define SAPI_H
@@ -107,9 +107,9 @@
char *current_user;
int current_user_length;
 
-/* this is necessary for CLI module */
-int argc;
-char **argv;
+   /* this is necessary for CLI module */
+   int argc;
+   char **argv;
int proto_num;
 } sapi_request_info;
 

-- 
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/odbc birdstep.c /ext/standard ftp_fopen_wrapper.c /ext/sybase php_sybase_db.c /ext/sysvshm sysvshm.c

2007-08-31 Thread Jani Taskinen

janiFri Aug 31 07:42:00 2007 UTC

  Modified files:  (Branch: PHP_5_2)
/php-src/ext/odbc   birdstep.c 
/php-src/ext/standard   ftp_fopen_wrapper.c 
/php-src/ext/sybase php_sybase_db.c 
/php-src/ext/sysvshmsysvshm.c 
  Log:
  MFH
  
http://cvs.php.net/viewvc.cgi/php-src/ext/odbc/birdstep.c?r1=1.13.2.2.2.1&r2=1.13.2.2.2.2&diff_format=u
Index: php-src/ext/odbc/birdstep.c
diff -u php-src/ext/odbc/birdstep.c:1.13.2.2.2.1 
php-src/ext/odbc/birdstep.c:1.13.2.2.2.2
--- php-src/ext/odbc/birdstep.c:1.13.2.2.2.1Mon Jan  1 09:36:03 2007
+++ php-src/ext/odbc/birdstep.c Fri Aug 31 07:42:00 2007
@@ -16,7 +16,7 @@
+--+
  */
 
-/* $Id: birdstep.c,v 1.13.2.2.2.1 2007/01/01 09:36:03 sebastian Exp $ */
+/* $Id: birdstep.c,v 1.13.2.2.2.2 2007/08/31 07:42:00 jani Exp $ */
 
 /*
  * TODO:
@@ -47,6 +47,7 @@
 #ifdef HAVE_BIRDSTEP
 #include "php_birdstep.h"
 #include "ext/standard/info.h"
+#include "php_ini.h"
 
 zend_function_entry birdstep_functions[] = {
PHP_FE(birdstep_connect,NULL)
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/ftp_fopen_wrapper.c?r1=1.85.2.4.2.2&r2=1.85.2.4.2.3&diff_format=u
Index: php-src/ext/standard/ftp_fopen_wrapper.c
diff -u php-src/ext/standard/ftp_fopen_wrapper.c:1.85.2.4.2.2 
php-src/ext/standard/ftp_fopen_wrapper.c:1.85.2.4.2.3
--- php-src/ext/standard/ftp_fopen_wrapper.c:1.85.2.4.2.2   Thu Jun  7 
08:59:00 2007
+++ php-src/ext/standard/ftp_fopen_wrapper.cFri Aug 31 07:42:00 2007
@@ -18,11 +18,12 @@
|  Sara Golemon <[EMAIL PROTECTED]>  |
+--+
  */
-/* $Id: ftp_fopen_wrapper.c,v 1.85.2.4.2.2 2007/06/07 08:59:00 tony2001 Exp $ 
*/
+/* $Id: ftp_fopen_wrapper.c,v 1.85.2.4.2.3 2007/08/31 07:42:00 jani Exp $ */
 
 #include "php.h"
 #include "php_globals.h"
 #include "php_network.h"
+#include "php_ini.h"
 
 #include 
 #include 
http://cvs.php.net/viewvc.cgi/php-src/ext/sybase/php_sybase_db.c?r1=1.66.2.5.2.7&r2=1.66.2.5.2.8&diff_format=u
Index: php-src/ext/sybase/php_sybase_db.c
diff -u php-src/ext/sybase/php_sybase_db.c:1.66.2.5.2.7 
php-src/ext/sybase/php_sybase_db.c:1.66.2.5.2.8
--- php-src/ext/sybase/php_sybase_db.c:1.66.2.5.2.7 Fri Aug 10 13:24:59 2007
+++ php-src/ext/sybase/php_sybase_db.c  Fri Aug 31 07:42:00 2007
@@ -20,7 +20,7 @@
+--+
  */
  
-/* $Id: php_sybase_db.c,v 1.66.2.5.2.7 2007/08/10 13:24:59 jani Exp $ */
+/* $Id: php_sybase_db.c,v 1.66.2.5.2.8 2007/08/31 07:42:00 jani Exp $ */
 
 
 #ifdef HAVE_CONFIG_H
@@ -32,6 +32,7 @@
 #include "ext/standard/php_standard.h"
 #include "ext/standard/info.h"
 #include "php_globals.h"
+#include "php_ini.h"
 
 #if HAVE_SYBASE
 
http://cvs.php.net/viewvc.cgi/php-src/ext/sysvshm/sysvshm.c?r1=1.70.2.2.2.4&r2=1.70.2.2.2.5&diff_format=u
Index: php-src/ext/sysvshm/sysvshm.c
diff -u php-src/ext/sysvshm/sysvshm.c:1.70.2.2.2.4 
php-src/ext/sysvshm/sysvshm.c:1.70.2.2.2.5
--- php-src/ext/sysvshm/sysvshm.c:1.70.2.2.2.4  Sat Feb 24 15:44:43 2007
+++ php-src/ext/sysvshm/sysvshm.c   Fri Aug 31 07:42:00 2007
@@ -16,7 +16,7 @@
+--+
  */
  
-/* $Id: sysvshm.c,v 1.70.2.2.2.4 2007/02/24 15:44:43 iliaa Exp $ */
+/* $Id: sysvshm.c,v 1.70.2.2.2.5 2007/08/31 07:42:00 jani Exp $ */
 
 /* This has been built and tested on Linux 2.2.14 
  *
@@ -37,6 +37,7 @@
 #include "php_sysvshm.h"
 #include "ext/standard/php_var.h"
 #include "ext/standard/php_smart_str.h"
+#include "php_ini.h"
 
 /* {{{ sysvshm_functions[]
  */

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

[PHP-CVS] cvs: php-src /ext/odbc birdstep.c /ext/standard ftp_fopen_wrapper.c /ext/sybase php_sybase_db.c /ext/sysvshm sysvshm.c

2007-08-31 Thread Jani Taskinen

janiFri Aug 31 07:41:46 2007 UTC

  Modified files:  
/php-src/ext/odbc   birdstep.c 
/php-src/ext/standard   ftp_fopen_wrapper.c 
/php-src/ext/sybase php_sybase_db.c 
/php-src/ext/sysvshmsysvshm.c 
  Log:
  - Include php_ini.h (needed in future, does not break anything)
  
  
http://cvs.php.net/viewvc.cgi/php-src/ext/odbc/birdstep.c?r1=1.16&r2=1.17&diff_format=u
Index: php-src/ext/odbc/birdstep.c
diff -u php-src/ext/odbc/birdstep.c:1.16 php-src/ext/odbc/birdstep.c:1.17
--- php-src/ext/odbc/birdstep.c:1.16Mon Jan  1 09:29:26 2007
+++ php-src/ext/odbc/birdstep.c Fri Aug 31 07:41:45 2007
@@ -16,7 +16,7 @@
+--+
  */
 
-/* $Id: birdstep.c,v 1.16 2007/01/01 09:29:26 sebastian Exp $ */
+/* $Id: birdstep.c,v 1.17 2007/08/31 07:41:45 jani Exp $ */
 
 /*
  * TODO:
@@ -47,6 +47,7 @@
 #ifdef HAVE_BIRDSTEP
 #include "php_birdstep.h"
 #include "ext/standard/info.h"
+#include "php_ini.h"
 
 zend_function_entry birdstep_functions[] = {
PHP_FE(birdstep_connect,NULL)
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/ftp_fopen_wrapper.c?r1=1.95&r2=1.96&diff_format=u
Index: php-src/ext/standard/ftp_fopen_wrapper.c
diff -u php-src/ext/standard/ftp_fopen_wrapper.c:1.95 
php-src/ext/standard/ftp_fopen_wrapper.c:1.96
--- php-src/ext/standard/ftp_fopen_wrapper.c:1.95   Sat Jul 14 08:38:19 2007
+++ php-src/ext/standard/ftp_fopen_wrapper.cFri Aug 31 07:41:45 2007
@@ -18,11 +18,12 @@
|  Sara Golemon <[EMAIL PROTECTED]>  |
+--+
  */
-/* $Id: ftp_fopen_wrapper.c,v 1.95 2007/07/14 08:38:19 tony2001 Exp $ */
+/* $Id: ftp_fopen_wrapper.c,v 1.96 2007/08/31 07:41:45 jani Exp $ */
 
 #include "php.h"
 #include "php_globals.h"
 #include "php_network.h"
+#include "php_ini.h"
 
 #include 
 #include 
http://cvs.php.net/viewvc.cgi/php-src/ext/sybase/php_sybase_db.c?r1=1.76&r2=1.77&diff_format=u
Index: php-src/ext/sybase/php_sybase_db.c
diff -u php-src/ext/sybase/php_sybase_db.c:1.76 
php-src/ext/sybase/php_sybase_db.c:1.77
--- php-src/ext/sybase/php_sybase_db.c:1.76 Fri Aug 10 13:25:12 2007
+++ php-src/ext/sybase/php_sybase_db.c  Fri Aug 31 07:41:45 2007
@@ -20,7 +20,7 @@
+--+
  */
  
-/* $Id: php_sybase_db.c,v 1.76 2007/08/10 13:25:12 jani Exp $ */
+/* $Id: php_sybase_db.c,v 1.77 2007/08/31 07:41:45 jani Exp $ */
 
 
 #ifdef HAVE_CONFIG_H
@@ -32,6 +32,7 @@
 #include "ext/standard/php_standard.h"
 #include "ext/standard/info.h"
 #include "php_globals.h"
+#include "php_ini.h"
 
 #if HAVE_SYBASE
 
http://cvs.php.net/viewvc.cgi/php-src/ext/sysvshm/sysvshm.c?r1=1.76&r2=1.77&diff_format=u
Index: php-src/ext/sysvshm/sysvshm.c
diff -u php-src/ext/sysvshm/sysvshm.c:1.76 php-src/ext/sysvshm/sysvshm.c:1.77
--- php-src/ext/sysvshm/sysvshm.c:1.76  Mon May 28 23:00:24 2007
+++ php-src/ext/sysvshm/sysvshm.c   Fri Aug 31 07:41:45 2007
@@ -16,7 +16,7 @@
+--+
  */
  
-/* $Id: sysvshm.c,v 1.76 2007/05/28 23:00:24 iliaa Exp $ */
+/* $Id: sysvshm.c,v 1.77 2007/08/31 07:41:45 jani Exp $ */
 
 /* This has been built and tested on Linux 2.2.14 
  *
@@ -37,6 +37,7 @@
 #include "php_sysvshm.h"
 #include "ext/standard/php_var.h"
 #include "ext/standard/php_smart_str.h"
+#include "php_ini.h"
 
 /* {{{ sysvshm_functions[]
  */

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

[PHP-CVS] cvs: php-src /ext/pdo_oci/tests pdo_oci_attr_autocommit_1.phpt pdo_oci_attr_autocommit_2.phpt pdo_oci_attr_autocommit_3.phpt pdo_oci_attr_case.phpt pdo_oci_attr_client.phpt pdo_oci_attr_driv

[PHP-CVS] cvs: php-src /ext/pdo_oci config.m4 oci_driver.c oci_statement.c php_pdo_oci_int.h

[PHP-CVS] cvs: php-src(PHP_5_2) /ext/pdo_oci/tests pdo_oci_attr_autocommit_1.phpt pdo_oci_attr_autocommit_2.phpt pdo_oci_attr_autocommit_3.phpt pdo_oci_attr_case.phpt pdo_oci_attr_client.phpt pdo_oci_

[PHP-CVS] cvs: php-src(PHP_5_2) /ext/pdo_oci config.m4 oci_driver.c oci_statement.c php_pdo_oci_int.h

[PHP-CVS] cvs: php-src /sapi/cgi cgi_main.c

[PHP-CVS] cvs: php-src(PHP_5_2) / NEWS /sapi/cgi cgi_main.c

[PHP-CVS] cvs: php-src /ext/soap php_schema.c soap.c /ext/soap/tests/bugs bug42359.phpt bug42359.wsdl

[PHP-CVS] cvs: php-src(PHP_5_2) / NEWS /ext/soap php_schema.c soap.c /ext/soap/tests/bugs bug42359.phpt bug42359.wsdl

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

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

[PHP-CVS] cvs: php-src /ext/soap soap.c /ext/soap/tests/bugs bug42086.phpt bug42086.wsdl

[PHP-CVS] cvs: php-src(PHP_5_2) / NEWS /ext/soap soap.c /ext/soap/tests/bugs bug42086.phpt bug42086.wsdl

[PHP-CVS] cvs: php-src(PHP_5_2) /main main.c

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

[PHP-CVS] cvs: php-src(PHP_5_2) /main php_ini.c

[PHP-CVS] cvs: php-src /main php_ini.c

[PHP-CVS] cvs: php-src(PHP_5_2) /main php_ini.c

[PHP-CVS] cvs: php-src /main php_ini.c

[PHP-CVS] cvs: php-src /ext/soap php_encoding.c /ext/soap/tests/bugs bug42326.phpt bug42326.wsdl

[PHP-CVS] cvs: php-src(PHP_5_2) / NEWS /ext/soap php_encoding.c /ext/soap/tests/bugs bug42326.phpt bug42326.wsdl

[PHP-CVS] cvs: php-src(PHP_5_2) /main php.h php_ini.h

[PHP-CVS] cvs: php-src /main php.h php_ini.h

[PHP-CVS] cvs: php-src(PHP_5_2) /main SAPI.h

[PHP-CVS] cvs: php-src /main SAPI.h

[PHP-CVS] cvs: php-src(PHP_5_2) /ext/odbc birdstep.c /ext/standard ftp_fopen_wrapper.c /ext/sybase php_sybase_db.c /ext/sysvshm sysvshm.c

[PHP-CVS] cvs: php-src /ext/odbc birdstep.c /ext/standard ftp_fopen_wrapper.c /ext/sybase php_sybase_db.c /ext/sysvshm sysvshm.c

26 matches

Site Navigation

Mail list logo

Footer information