[PHP-CVS] com php-src: OCI8 build change: Fix source variable definition for C89 compatibility: ext/oci8/oci8.c ext/oci8/package.xml ext/oci8/php_oci8.h

2013-12-13 Thread Christopher Jones 
Commit:bc748ba38ce93025178a0f9de6c444f5cd25ad1d
Author:Christopher Jones s...@php.net Wed, 6 Nov 2013 10:37:22 
-0800
Parents:   c9d00a23ae5e34bd03dd71f53b5be8b412ad4302
Branches:  PHP-5.6 master

Link:   
http://git.php.net/?p=php-src.git;a=commitdiff;h=bc748ba38ce93025178a0f9de6c444f5cd25ad1d

Log:
OCI8 build change: Fix source variable definition for C89 compatibility

Changed paths:
  M  ext/oci8/oci8.c
  M  ext/oci8/package.xml
  M  ext/oci8/php_oci8.h


Diff:
diff --git a/ext/oci8/oci8.c b/ext/oci8/oci8.c
index f8abacf..1e505f1 100644
--- a/ext/oci8/oci8.c
+++ b/ext/oci8/oci8.c
@@ -2201,6 +2201,9 @@ php_oci_connection *php_oci_do_connect_ex(char *username, 
int username_len, char
 static int php_oci_connection_ping(php_oci_connection *connection TSRMLS_DC)
 {
sword errstatus;
+#if (!((OCI_MAJOR_VERSION  10) || ((OCI_MAJOR_VERSION == 10)  
(OCI_MINOR_VERSION = 2
+   char version[256];
+#endif
 
OCI_G(errcode) = 0; /* assume ping is successful */
 
@@ -2212,7 +2215,6 @@ static int php_oci_connection_ping(php_oci_connection 
*connection TSRMLS_DC)
 #if ((OCI_MAJOR_VERSION  10) || ((OCI_MAJOR_VERSION == 10)  
(OCI_MINOR_VERSION = 2)))  /* OCIPing available 10.2 onwards */
PHP_OCI_CALL_RETURN(errstatus, OCIPing, (connection-svc, OCI_G(err), 
OCI_DEFAULT));
 #else
-   char version[256];
/* use good old OCIServerVersion() */
PHP_OCI_CALL_RETURN(errstatus, OCIServerVersion, (connection-svc, 
OCI_G(err), (text *)version, sizeof(version), OCI_HTYPE_SVCCTX));
 #endif
diff --git a/ext/oci8/package.xml b/ext/oci8/package.xml
index 7be825b..8e55b9a 100644
--- a/ext/oci8/package.xml
+++ b/ext/oci8/package.xml
@@ -49,8 +49,8 @@ libraries are available.
  time12:00:00/time
 
   version
-   release2.0.6/release
-   api2.0.6/api
+   release2.0.7/release
+   api2.0.7/api
   /version
   stability
releasestable/release
@@ -58,8 +58,7 @@ libraries are available.
   /stability
   license uri=http://www.php.net/license;PHP/license
   notes
-Added a LICENSE file to make it easier for PECL binary distributions
-to conform with the license.
+Build change: Fix source variable definition for C89 compatibility
   /notes
  contents
   dir name=/
@@ -460,6 +459,22 @@ to conform with the license.
 
 release
  version
+  release2.0.6/release
+  api2.0.6/api
+ /version
+ stability
+  releasestable/release
+  apistable/api
+ /stability
+ license uri=http://www.php.net/license;PHP/license
+ notes
+Added a LICENSE file to make it easier for PECL binary distributions
+to conform with the license.
+ /notes
+/release
+
+release
+ version
   release2.0.5/release
   api2.0.5/api
  /version
diff --git a/ext/oci8/php_oci8.h b/ext/oci8/php_oci8.h
index 7510415..86c5abf 100644
--- a/ext/oci8/php_oci8.h
+++ b/ext/oci8/php_oci8.h
@@ -45,7 +45,7 @@
  */
 #undef PHP_OCI8_VERSION
 #endif
-#define PHP_OCI8_VERSION 2.0.6
+#define PHP_OCI8_VERSION 2.0.7-dev
 
 extern zend_module_entry oci8_module_entry;
 #define phpext_oci8_ptr oci8_module_entry


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

[PHP-CVS] com php-src: Merge branch 'PHP-5.5': php.ini-development php.ini-production

2013-10-23 Thread Christopher Jones 
Commit:b3a2b44198f160aa829c0079012dd8a029fe5f6d
Author:Christopher Jones s...@php.net Mon, 21 Oct 2013 14:21:19 
-0700
Parents:   d15cedfba9bfa99bf4d4f55ebf67ef49adf1d15b 
b6ceea4a25f667bfed6c26899dd55a274a3270d3
Branches:  master

Link:   
http://git.php.net/?p=php-src.git;a=commitdiff;h=b3a2b44198f160aa829c0079012dd8a029fe5f6d

Log:
Merge branch 'PHP-5.5'

* PHP-5.5:
  Fixed bug #65939 (Space before ; breaks php.ini parsing). (brainstorm at 
nopcode dot org)

Bugs:
https://bugs.php.net/65939

Changed paths:
  MM  php.ini-development
  MM  php.ini-production


Diff:



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

[PHP-CVS] com php-src: Fixed bug #65939 (Space before ; breaks php.ini parsing). (brainstorm at nopcode dot org): NEWS php.ini-development php.ini-production

2013-10-23 Thread Christopher Jones 
Commit:b6ceea4a25f667bfed6c26899dd55a274a3270d3
Author:Christopher Jones s...@php.net Mon, 21 Oct 2013 14:20:35 
-0700
Parents:   ee7cfa022dcec6cf5ce0714de3f34c90681962b6
Branches:  PHP-5.5 master

Link:   
http://git.php.net/?p=php-src.git;a=commitdiff;h=b6ceea4a25f667bfed6c26899dd55a274a3270d3

Log:
Fixed bug #65939 (Space before ; breaks php.ini parsing). (brainstorm at 
nopcode dot org)

Bugs:
https://bugs.php.net/65939

Changed paths:
  M  NEWS
  M  php.ini-development
  M  php.ini-production


Diff:
diff --git a/NEWS b/NEWS
index 69b1658..b51b8b2 100644
--- a/NEWS
+++ b/NEWS
@@ -3,6 +3,8 @@ PHP 
   NEWS
 ?? ??? 2013, PHP 5.5.6
 
 - Core:
+  . Fixed bug #65939 (Space before ; breaks php.ini parsing).
+(brainstorm at nopcode dot org)
   . Fixed bug #65911 (scope resolution operator - strange behavior with $this).
 (Bob Weinand)
 
diff --git a/php.ini-development b/php.ini-development
index 630f9e9..2ef47a4 100644
--- a/php.ini-development
+++ b/php.ini-development
@@ -1907,7 +1907,7 @@ ldap.max_links = -1
 ;opcache.revalidate_path=0
 
 ; If disabled, all PHPDoc comments are dropped from the code to reduce the
- ;size of the optimized code.
+; size of the optimized code.
 ;opcache.save_comments=1
 
 ; If disabled, PHPDoc comments are not loaded from SHM, so Doc Comments
diff --git a/php.ini-production b/php.ini-production
index ba30f90..c39de74 100644
--- a/php.ini-production
+++ b/php.ini-production
@@ -1907,7 +1907,7 @@ ldap.max_links = -1
 ;opcache.revalidate_path=0
 
 ; If disabled, all PHPDoc comments are dropped from the code to reduce the
- ;size of the optimized code.
+; size of the optimized code.
 ;opcache.save_comments=1
 
 ; If disabled, PHPDoc comments are not loaded from SHM, so Doc Comments


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

[PHP-CVS] com php-src: OCI8: sync README and package.xml descriptions: ext/oci8/README ext/oci8/package.xml

2013-10-10 Thread Christopher Jones 
Commit:5ae8c51e688060d0a3263b67ff9fb24ba2c8c1d2
Author:Christopher Jones s...@php.net Thu, 10 Oct 2013 13:38:38 
-0700
Parents:   71a3c07843ca2d35e59cc165f37359fc7796aea9
Branches:  master

Link:   
http://git.php.net/?p=php-src.git;a=commitdiff;h=5ae8c51e688060d0a3263b67ff9fb24ba2c8c1d2

Log:
OCI8: sync README and package.xml descriptions

Changed paths:
  M  ext/oci8/README
  M  ext/oci8/package.xml


Diff:
diff --git a/ext/oci8/README b/ext/oci8/README
index af5beeb..d662072 100644
--- a/ext/oci8/README
+++ b/ext/oci8/README
@@ -1,13 +1,20 @@
 The OCI8 Extension
 --
 
-Use the OCI8 extension to access Oracle Database.  
+Use the OCI8 extension to access Oracle Database.
 
 Documentation is at http://php.net/oci8
 
-The extension can be built with PHP versions 4.3.9 to 5.x using Oracle
-Database 9.2, 10, 11 or 12 client libraries.  Oracle's standard
-cross-version connectivity applies.  For example PHP linked with
-Oracle 11.2 client libraries can connect to Oracle Database 9.2
-onwards.  See Oracle's note Oracle Client / Server Interoperability
-Support (ID 207303.1) for details.
+The extension can be linked with Oracle client libraries from Oracle
+Database 10.2, 11, or 12.1.  These libraries are found in the database
+installation, or in the free Oracle Instant Client available from
+Oracle.
+
+Oracle's standard cross-version connectivity applies.  For example,
+PHP OCI8 linked with Instant Client 11.2 can connect to Oracle
+Database 9.2 onward.  See Oracle's note Oracle Client / Server
+Interoperability Support (ID 207303.1) for details.
+
+PHP OCI8 2.0 can be built with PHP 5.2 onward.  Use the older PHP OCI8
+1.4.10 when using PHP 4.3.9 through to PHP 5.1.x, or when only Oracle
+Database 9.2 client libraries are available.
diff --git a/ext/oci8/package.xml b/ext/oci8/package.xml
index d85faf0..f61def5 100644
--- a/ext/oci8/package.xml
+++ b/ext/oci8/package.xml
@@ -8,15 +8,17 @@ http://pear.php.net/dtd/package-2.0.xsd;
  summaryExtension for Oracle Database/summary
 
  description
-The PHP OCI8 extension gives access to Oracle Database. The extension
-can be linked with Oracle client libraries from Oracle Database 10.2,
-11, or 12.1. These libraries are found in the database installation,
-or in the free Oracle Instant Client. Oracle's standard cross-version
-connectivity applies.  For example, PHP OCI8 linked with Instant
-Client 11.2 can connect to Oracle Database 9.2 onwards.  PHP OCI8 2.0
-can be built with PHP 5.2 onwards. Use the older PHP OCI8 1.4.10 when
-using PHP 4.3.9 through to PHP 5.1.x, or when only Oracle Database 9.2
-client libraries are available.
+Use the OCI8 extension to access Oracle Database.  The extension can
+be linked with Oracle client libraries from Oracle Database 10.2, 11,
+or 12.1.  These libraries are found in the database installation, or
+in the free Oracle Instant Client available from Oracle.  Oracle's
+standard cross-version connectivity applies.  For example, PHP OCI8
+linked with Instant Client 11.2 can connect to Oracle Database 9.2
+onward.  See Oracle's note Oracle Client / Server Interoperability
+Support (ID 207303.1) for details.  PHP OCI8 2.0 can be built with
+PHP 5.2 onward.  Use the older PHP OCI8 1.4.10 when using PHP 4.3.9
+through to PHP 5.1.x, or when only Oracle Database 9.2 client
+libraries are available.
  /description
  lead
   nameChristopher Jones/name


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

[PHP-CVS] com php-src: Add new tests: ext/oci8/tests/db_op_1.phpt ext/oci8/tests/db_op_2.phpt

2013-10-07 Thread Christopher Jones 
Commit:1675fd22775c7067c5d21e0cc1a0cc81f9434a5c
Author:Christopher Jones s...@php.net Mon, 7 Oct 2013 17:26:00 
-0700
Parents:   12f9939b790a02ca3f22b91813029e78208f2c24
Branches:  master

Link:   
http://git.php.net/?p=php-src.git;a=commitdiff;h=1675fd22775c7067c5d21e0cc1a0cc81f9434a5c

Log:
Add new tests

Changed paths:
  A  ext/oci8/tests/db_op_1.phpt
  A  ext/oci8/tests/db_op_2.phpt


Diff:
diff --git a/ext/oci8/tests/db_op_1.phpt b/ext/oci8/tests/db_op_1.phpt
new file mode 100644
index 000..f645cf8
--- /dev/null
+++ b/ext/oci8/tests/db_op_1.phpt
@@ -0,0 +1,61 @@
+--TEST--
+oci_set_db_operation: basic test for end-to-end tracing
+--SKIPIF--
+?php 
+if (!extension_loaded('oci8')) die (skip no oci8 extension); 
+$target_dbs = array('oracledb' = true, 'timesten' = false);  // test runs on 
these DBs
+require(dirname(__FILE__).'/skipif.inc');
+if (strcasecmp($user, system)  strcasecmp($user, sys)) {
+die(skip needs to be run as a DBA user);
+}
+preg_match('/.*Release 
([[:digit:]]+)\.([[:digit:]]+)\.([[:digit:]]+)\.([[:digit:]]+)\.([[:digit:]]+)*/',
 oci_server_version($c), $matches);
+if (!(isset($matches[0])  $matches[1] = 12)) {
+die(skip expected output only valid when using Oracle Database 12c or 
greater);
+}
+preg_match('/^[[:digit:]]+/', oci_client_version(), $matches);
+if (!(isset($matches[0])  $matches[0] = 12)) { 
+die(skip works only with Oracle 12c or greater version of Oracle client 
libraries);
+}
+if (!function_exists('oci_set_db_operation'))
+{ 
+die(skip function oci_set_db_operation() does not exist);
+}
+?
+--FILE--
+?php
+
+require(dirname(__FILE__).'/connect.inc');
+
+// Run Test
+
+echo Test 1\n;
+
+// Test setting the DB operation used by Oracle DB for end-to-end 
application tracing
+
+function dq($c, $q)
+{
+$s = oci_parse($c, $q);
+oci_execute($s);
+var_dump(oci_fetch_assoc($s));
+}
+
+oci_set_db_operation($c, db_op_1);
+dq($c, 'select * from dual');
+
+dq($c, 'select dbop_name from v$sql_monitor where dbop_name is not null order 
by dbop_exec_id desc');
+
+?
+===DONE===
+?php exit(0); ?
+--EXPECTF--
+Test 1
+array(1) {
+  [DUMMY]=
+  string(1) X
+}
+array(1) {
+  [DBOP_NAME]=
+  string(7) db_op_1
+}
+===DONE===
+
diff --git a/ext/oci8/tests/db_op_2.phpt b/ext/oci8/tests/db_op_2.phpt
new file mode 100644
index 000..05c2269
--- /dev/null
+++ b/ext/oci8/tests/db_op_2.phpt
@@ -0,0 +1,69 @@
+--TEST--
+oci_set_db_operation: basic test for end-to-end tracing
+--SKIPIF--
+?php 
+if (!extension_loaded('oci8')) die (skip no oci8 extension); 
+$target_dbs = array('oracledb' = true, 'timesten' = false);  // test runs on 
these DBs
+require(dirname(__FILE__).'/skipif.inc');
+if (strcasecmp($user, system)  strcasecmp($user, sys)) {
+die(skip needs to be run as a DBA user);
+}
+preg_match('/.*Release 
([[:digit:]]+)\.([[:digit:]]+)\.([[:digit:]]+)\.([[:digit:]]+)\.([[:digit:]]+)*/',
 oci_server_version($c), $matches);
+if (!(isset($matches[0])  $matches[1] = 12)) {
+die(skip expected output only valid when using Oracle Database 12c or 
greater);
+}
+preg_match('/^[[:digit:]]+/', oci_client_version(), $matches);
+if (!(isset($matches[0])  $matches[0] = 12)) { 
+die(skip works only with Oracle 12c or greater version of Oracle client 
libraries);
+}
+if (!function_exists('oci_set_db_operation'))
+{ 
+die(skip function oci_set_db_operation() does not exist);
+}
+?
+--FILE--
+?php
+
+require(dirname(__FILE__).'/connect.inc');
+
+function dq($c, $q)
+{
+$s = oci_parse($c, $q);
+oci_execute($s);
+var_dump(oci_fetch_assoc($s));
+}
+
+echo Test 1\n;
+oci_set_db_operation($c, db_op_2_a);
+dq($c, 'select * from dual');
+
+echo Test 2\n;
+oci_set_db_operation($c, db_op_2_b);
+dq($c, 'select * from dual');
+
+echo Test 3\n;
+dq($c, 'select dbop_name from v$sql_monitor where dbop_name like \'db_op2%\' 
order by dbop_exec_id desc');
+
+?
+===DONE===
+?php exit(0); ?
+--XFAIL--
+Fails due to Oracle Bug 16695981
+--EXPECTF--
+Test 1
+array(1) {
+  [DUMMY]=
+  string(1) X
+}
+Test 2
+array(1) {
+  [DUMMY]=
+  string(1) X
+}
+Test 3
+array(2) {
+  [DBOP_NAME]=
+  string(7) db_op_2a
+}
+===DONE===
+


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

[PHP-CVS] com php-src: Bump mininum requirements for PHP OCI8 2.0 to PHP 5.2 and Oracle client library 10.2 (Note this will connect to Oracle Database 8.1.7 onwards). Use the older OCI8 1.4 from PECL

2013-10-07 Thread Christopher Jones 
Commit:12f9939b790a02ca3f22b91813029e78208f2c24
Author:Christopher Jones s...@php.net Mon, 7 Oct 2013 17:23:11 
-0700
Parents:   4fe7ec33f1eef1ae0344acef6189911e03066b25
Branches:  master

Link:   
http://git.php.net/?p=php-src.git;a=commitdiff;h=12f9939b790a02ca3f22b91813029e78208f2c24

Log:
Bump mininum requirements for PHP OCI8 2.0 to PHP 5.2 and Oracle
client library 10.2 (Note this will connect to Oracle Database 8.1.7
onwards). Use the older OCI8 1.4 from PECL if using an earlier PHP
version or older Oracle client library support is necessary.

Changed paths:
  M  ext/oci8/config.m4
  M  ext/oci8/config.w32
  M  ext/oci8/oci8.c
  M  ext/oci8/oci8_collection.c
  M  ext/oci8/oci8_interface.c
  M  ext/oci8/oci8_lob.c
  M  ext/oci8/package.xml
  M  ext/oci8/php_oci8_int.h

diff --git a/ext/oci8/config.m4 b/ext/oci8/config.m4
index 3873a22..0d08d21 100644
--- a/ext/oci8/config.m4
+++ b/ext/oci8/config.m4
@@ -208,8 +208,8 @@ if test $PHP_OCI8 != no; then
   IFS=$ac_IFS
   oci8_php_version=`expr [$]1 \* 100 + [$]2 \* 1000 + [$]3`
 
-  if test $oci8_php_version -lt 4003009; then
-AC_MSG_ERROR([You need at least PHP 4.3.9 to be able to use this version 
of OCI8. PHP $php_version found])
+  if test $oci8_php_version -lt 5002000; then
+AC_MSG_ERROR([You need at least PHP 5.2.0 to be able to use this version 
of OCI8. PHP $php_version found])
   else
 AC_MSG_RESULT([$php_version, ok])
   fi
@@ -332,24 +332,8 @@ if test $PHP_OCI8 != no; then
 AC_OCI8_ORACLE_VERSION($OCI8_DIR)
 
 case $OCI8_ORACLE_VERSION in
-  7.3|8.0|8.1)
-   AC_MSG_ERROR([Oracle client libraries  9.2 are not supported])
-   ;;
-
-  9.0)
-   PHP_CHECK_LIBRARY(clntsh, OCIEnvNlsCreate,
-   [
- OCI8_ORACLE_VERSION=9.2
-   ],
-   [
- AC_MSG_ERROR([Oracle client libraries  9.2 are not supported])
-   ], [
- -L$OCI8_DIR/$OCI8_LIB_DIR $OCI8_SHARED_LIBADD
-   ])
-   ;;
-
-  *)
-   AC_DEFINE(HAVE_OCI_LOB_READ2,1,[Defined to 1 if OCI8 configuration 
located Oracle's OCILobRead2 function])
+  7.3|8.0|8.1|9.0)
+   AC_MSG_ERROR([Oracle client libraries  10 are not supported])
;;
 esac
 
@@ -425,7 +409,6 @@ if test $PHP_OCI8 != no; then
 PHP_ADD_LIBPATH($PHP_OCI8_INSTANT_CLIENT, OCI8_SHARED_LIBADD)
 
 AC_DEFINE(HAVE_OCI_INSTANT_CLIENT,1,[Defined to 1 if OCI8 configuration 
located Oracle's Instant Client libraries])
-AC_DEFINE(HAVE_OCI_LOB_READ2,1,[Defined to 1 if OCI8 configuration located 
Oracle's OCILobRead2 function])
 
 PHP_NEW_EXTENSION(oci8, oci8.c oci8_lob.c oci8_statement.c 
oci8_collection.c oci8_interface.c, $ext_shared)
 AC_DEFINE(HAVE_OCI8,1,[Defined to 1 if the PHP OCI8 extension for Oracle 
Database is configured])
diff --git a/ext/oci8/config.w32 b/ext/oci8/config.w32
index ac573a8..750f163 100644
--- a/ext/oci8/config.w32
+++ b/ext/oci8/config.w32
@@ -29,8 +29,6 @@ if (PHP_OCI8_12C != no) {
 
AC_DEFINE('HAVE_OCI8', 1);
AC_DEFINE('HAVE_OCI_INSTANT_CLIENT', 1);
-   AC_DEFINE('HAVE_OCI_LOB_READ2', 1);
-
} else {
WARNING(oci8-12c not enabled: Oracle Database client libraries 
or Oracle Database 12c Instant Client not found);
PHP_OCI8_12C = no
diff --git a/ext/oci8/oci8.c b/ext/oci8/oci8.c
index eeb1ade..f8abacf 100644
--- a/ext/oci8/oci8.c
+++ b/ext/oci8/oci8.c
@@ -39,12 +39,9 @@
 
 #if HAVE_OCI8
 
-#if PHP_MAJOR_VERSION  5
-#error This version of the PHP OCI8 extension is not compatible with PHP 6 or 
later
-#elif PHP_MAJOR_VERSION  5
-#ifdef ZTS
-#error The PHP OCI8 extension does not support ZTS mode in PHP 4
-#endif
+/* PHP 5.2 is the minimum supported version for OCI8 2.0 */
+#if PHP_MAJOR_VERSION  5 || (PHP_MAJOR_VERSION == 5  PHP_MINOR_VERSION = 1)
+#error Use PHP OCI8 1.4 for your version of PHP
 #endif
 
 #include php_oci8.h
@@ -66,11 +63,8 @@
 #endif
 
 ZEND_DECLARE_MODULE_GLOBALS(oci)
-#if (PHP_MAJOR_VERSION == 5  PHP_MINOR_VERSION  1) || (PHP_MAJOR_VERSION  
5)
-/* This if allows PECL builds from this file to be portable to older PHP 
releases */
 static PHP_GINIT_FUNCTION(oci);
 static PHP_GSHUTDOWN_FUNCTION(oci);
-#endif
 
 /* Allow PHP 5.3 branch to be used in PECL for 5.x compatible builds */
 #ifndef Z_ADDREF_P
@@ -1055,16 +1049,11 @@ zend_module_entry oci8_module_entry = {
PHP_RSHUTDOWN(oci),   /* per-request shutdown function */
PHP_MINFO(oci),   /* information function */
PHP_OCI8_VERSION,
-#if (PHP_MAJOR_VERSION == 5  PHP_MINOR_VERSION  1) || (PHP_MAJOR_VERSION  
5)
-   /* This check allows PECL builds from this file to be portable to older 
PHP releases */
PHP_MODULE_GLOBALS(oci),  /* globals descriptor */
PHP_GINIT(oci),   /* globals ctor */
PHP_GSHUTDOWN(oci),   /* globals dtor */
NULL, /* post deactivate */
STANDARD_MODULE_PROPERTIES_EX

[PHP-CVS] com php-src: Add new tests to package.xml: ext/oci8/package.xml

2013-10-07 Thread Christopher Jones 
Commit:f0863fa43aa2201b7e2a749f5a8e98e519cfd47f
Author:Christopher Jones s...@php.net Mon, 7 Oct 2013 17:38:56 
-0700
Parents:   1675fd22775c7067c5d21e0cc1a0cc81f9434a5c
Branches:  master

Link:   
http://git.php.net/?p=php-src.git;a=commitdiff;h=f0863fa43aa2201b7e2a749f5a8e98e519cfd47f

Log:
Add new tests to package.xml

Changed paths:
  M  ext/oci8/package.xml


Diff:
diff --git a/ext/oci8/package.xml b/ext/oci8/package.xml
index d2c4972..47e5415 100644
--- a/ext/oci8/package.xml
+++ b/ext/oci8/package.xml
@@ -227,6 +227,8 @@ Oracle client library support is necessary.
 file name=cursors_old.phpt role=test /
 file name=cursors.phpt role=test /
 file name=dbmsoutput.phpt role=test /
+file name=db_op_1.phpt role=test /
+file name=db_op_2.phpt role=test /
 file name=debug.phpt role=test /
 file name=default_prefetch0.phpt role=test /
 file name=default_prefetch1.phpt role=test /


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

[PHP-CVS] com php-src: Allow the ldap extension to be compiled with Oracle's LDAP implementation, if desired. Note the implementations differ so you will see different ldap behavior.: ext/ldap/config

2013-10-04 Thread Christopher Jones 
Commit:5bc377457e155ceaddd27a536467a4d353fdcd4f
Author:Christopher Jones s...@php.net Fri, 4 Oct 2013 15:50:16 
-0700
Parents:   fb6f5d2e2d44e205cdde7320a7674e43fdd7980b
Branches:  PHP-5.5 master

Link:   
http://git.php.net/?p=php-src.git;a=commitdiff;h=5bc377457e155ceaddd27a536467a4d353fdcd4f

Log:
Allow the ldap extension to be compiled with Oracle's LDAP
implementation, if desired.  Note the implementations differ so you
will see different ldap behavior.

The patch allows configuration similar to:
--with-ldap=$HOME/instantclient --with-oci8=instantclient,$HOME/instantclient

The patch doesn't support configuration similar to:
--with-ldap --with-oci8=instantclient,$HOME/instantclient
since this would try and mix the default LDAP and Oracle LDAP
implementations.

This patch closes out bug #61450 and the associated github PR.

Regardless of this patch, my recommended way to install both OCI8 and
ldap extensions is to statically configure PHP with ldap, and then add
OCI8 as a shared extension from PECL.

Bugs:
https://bugs.php.net/61450

Changed paths:
  M  ext/ldap/config.m4
  M  ext/ldap/ldap.c

diff --git a/ext/ldap/config.m4 b/ext/ldap/config.m4
index 3c8e23e..2804cd5 100644
--- a/ext/ldap/config.m4
+++ b/ext/ldap/config.m4
@@ -15,6 +15,28 @@ AC_DEFUN([PHP_LDAP_CHECKS], [
 LDAP_DIR=$1
 LDAP_INCDIR=$1/ldap/public
 LDAP_LIBDIR=$1/$PHP_LIBDIR
+  else
+
+dnl Find Oracle Instant Client RPM header location corresponding to the 
given lib path e.g. for --with-ldap=/usr/lib/oracle/12.1/client64/lib
+AC_CHECK_SIZEOF(long int, 4)
+if test $ac_cv_sizeof_long_int = 4; then
+  PHP_OCI8_IC_LIBDIR_SUFFIX=
+else
+  PHP_OCI8_IC_LIBDIR_SUFFIX=64
+fi
+OCISDKRPMINC=`echo $1 | $SED -e 
's!^/usr/lib/oracle/\(.*\)/client\('${PHP_OCI8_IC_LIBDIR_SUFFIX}'\)*/lib[/]*$!/usr/include/oracle/\1/client\2!'`
+
+dnl Check for Oracle Instant Client RPM install
+if test -f $OCISDKRPMINC/ldap.h; then
+  LDAP_DIR=$1
+  LDAP_INCDIR=$OCISDKRPMINC
+  LDAP_LIBDIR=$1
+dnl Check for Oracle Instant Client ZIP install
+elif test -f $1/sdk/include/ldap.h; then
+  LDAP_DIR=$1
+  LDAP_INCDIR=$1/sdk/include
+  LDAP_LIBDIR=$1
+fi
   fi
 ])
 
@@ -143,12 +165,21 @@ if test $PHP_LDAP != no; then
 PHP_ADD_LIBRARY_WITH_PATH(umich_lber, $LDAP_LIBDIR, LDAP_SHARED_LIBADD)
 PHP_ADD_LIBRARY_WITH_PATH(umich_ldap, $LDAP_LIBDIR, LDAP_SHARED_LIBADD)
 
-  elif test -f $LDAP_LIBDIR/libclntsh.$SHLIB_SUFFIX_NAME; then
+  elif test -f $LDAP_LIBDIR/libclntsh.$SHLIB_SUFFIX_NAME.12.1; then
 PHP_ADD_LIBRARY_WITH_PATH(clntsh, $LDAP_LIBDIR, LDAP_SHARED_LIBADD)
 AC_DEFINE(HAVE_ORALDAP,1,[ ])
-if test -f $LDAP_LIBDIR/libclntsh.$SHLIB_SUFFIX_NAME.10.1; then
-  AC_DEFINE(HAVE_ORALDAP_10,1,[ ])
-fi
+AC_DEFINE(HAVE_ORALDAP_12,1,[ ])
+
+  elif test -f $LDAP_LIBDIR/libclntsh.$SHLIB_SUFFIX_NAME.11.1; then
+PHP_ADD_LIBRARY_WITH_PATH(clntsh, $LDAP_LIBDIR, LDAP_SHARED_LIBADD)
+AC_DEFINE(HAVE_ORALDAP,1,[ ])
+AC_DEFINE(HAVE_ORALDAP_11,1,[ ])
+
+  elif test -f $LDAP_LIBDIR/libclntsh.$SHLIB_SUFFIX_NAME; then
+ PHP_ADD_LIBRARY_WITH_PATH(clntsh, $LDAP_LIBDIR, LDAP_SHARED_LIBADD)
+ AC_DEFINE(HAVE_ORALDAP,1,[ ])
+ AC_DEFINE(HAVE_ORALDAP_10,1,[ ])
+
   else
 AC_MSG_ERROR(Cannot find ldap libraries in $LDAP_LIBDIR.)
   fi
diff --git a/ext/ldap/ldap.c b/ext/ldap/ldap.c
index 71d57d6..e95f898 100644
--- a/ext/ldap/ldap.c
+++ b/ext/ldap/ldap.c
@@ -152,7 +152,7 @@ PHP_MINIT_FUNCTION(ldap)
REGISTER_LONG_CONSTANT(LDAP_DEREF_FINDING, LDAP_DEREF_FINDING, 
CONST_PERSISTENT | CONST_CS);
REGISTER_LONG_CONSTANT(LDAP_DEREF_ALWAYS, LDAP_DEREF_ALWAYS, 
CONST_PERSISTENT | CONST_CS);
 
-#if (LDAP_API_VERSION  2000) || HAVE_NSLDAP || HAVE_ORALDAP_10
+#if (LDAP_API_VERSION  2000) || HAVE_NSLDAP || HAVE_ORALDAP
/* LDAP options */
REGISTER_LONG_CONSTANT(LDAP_OPT_DEREF, LDAP_OPT_DEREF, 
CONST_PERSISTENT | CONST_CS);
REGISTER_LONG_CONSTANT(LDAP_OPT_SIZELIMIT, LDAP_OPT_SIZELIMIT, 
CONST_PERSISTENT | CONST_CS);
@@ -361,7 +361,7 @@ PHP_FUNCTION(ldap_connect)
 static int _get_lderrno(LDAP *ldap)
 {
 #if !HAVE_NSLDAP
-#if LDAP_API_VERSION  2000 || HAVE_ORALDAP_10
+#if LDAP_API_VERSION  2000 || HAVE_ORALDAP
int lderr;
 
/* New versions of OpenLDAP do it this way */
@@ -550,7 +550,7 @@ static void php_set_opts(LDAP *ldap, int sizelimit, int 
timelimit, int deref, in
 {
/* sizelimit */
if (sizelimit  -1) {
-#if (LDAP_API_VERSION = 2004) || HAVE_NSLDAP || HAVE_ORALDAP_10
+#if (LDAP_API_VERSION = 2004) || HAVE_NSLDAP || HAVE_ORALDAP
ldap_get_option(ldap, LDAP_OPT_SIZELIMIT, old_sizelimit);
ldap_set_option(ldap, LDAP_OPT_SIZELIMIT, sizelimit);
 #else
@@ -561,7 +561,7 @@ static void php_set_opts(LDAP *ldap, int sizelimit, int 
timelimit, int deref, in
 
/* timelimit */
if (timelimit  -1) {
-#if (LDAP_API_VERSION = 2004) || HAVE_NSLDAP

Re: [PHP-CVS] com php-src: Make 'make distclean' remove the downloaded pear PHAR: Makefile.global

2013-10-01 Thread Christopher Jones 



On 09/30/2013 05:07 PM, Johannes Schlüter wrote:

hi,

On Mon, 2013-09-30 at 22:46 +, Christopher Jones wrote:

Commit:d7baf0427fb56cbde55495e5c2071b1cdacb94ce
Author:Christopher Jones s...@php.net Mon, 30 Sep 2013 15:46:22 
-0700
Parents:   d4d6a95105feb3d7a39a5dfea7c4cd3080097295
Branches:  PHP-5.5 master

Link:   
http://git.php.net/?p=php-src.git;a=commitdiff;h=d7baf0427fb56cbde55495e5c2071b1cdacb94ce

Log:
Make 'make distclean' remove the downloaded pear PHAR


My understanding of what distclean should do is clean it up to
distribution state. Distribution tarballs should have the pear file as
bundled by the release script and therefore the pear file should not be
removed.

I agree that we might need an obvious way for git users to update that
file from time to time. (I assume that is the intention with this)


It was to clean up out-of-tree builds, so that the whole build process is 100% 
repeatable.

Not related to the issue I was looking at, the git-clean target uses -X.  Does 
anyone recall why
it doesn't do a full clean?

Separately, I notice that the 5.5 snap is including things like an 
autom4te.cache dir
and various *.orig files.  This could be improved.

Also depending who does release bundling, the bison etc versions used can vary 
between
releases which isn't so good.

--
christopher.jo...@oracle.com  http://twitter.com/ghrd
Free PHP  Oracle book:
http://www.oracle.com/technetwork/topics/php/underground-php-oracle-manual-098250.html

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

[PHP-CVS] com php-src: Revert Make 'make distclean' remove the downloaded pear PHAR: Makefile.global

2013-10-01 Thread Christopher Jones 
Commit:60e38b3243577abc80ce6bbcfb0b4125b08acb85
Author:Christopher Jones s...@php.net Tue, 1 Oct 2013 10:33:39 
-0700
Parents:   ec5b87c50dd9b77bd3b638157f317749237d5566
Branches:  PHP-5.5 master

Link:   
http://git.php.net/?p=php-src.git;a=commitdiff;h=60e38b3243577abc80ce6bbcfb0b4125b08acb85

Log:
Revert Make 'make distclean' remove the downloaded pear PHAR

This reverts commit d7baf0427fb56cbde55495e5c2071b1cdacb94ce.

Changed paths:
  M  Makefile.global


Diff:
diff --git a/Makefile.global b/Makefile.global
index c56ef99..05c5d15 100644
--- a/Makefile.global
+++ b/Makefile.global
@@ -125,7 +125,6 @@ distclean: clean
rm -f sapi/fpm/php-fpm.conf sapi/fpm/init.d.php-fpm 
sapi/fpm/php-fpm.service sapi/fpm/php-fpm.8 sapi/fpm/status.html
rm -f ext/iconv/php_have_bsd_iconv.h ext/iconv/php_have_glibc_iconv.h 
ext/iconv/php_have_ibm_iconv.h ext/iconv/php_have_iconv.h 
ext/iconv/php_have_libiconv.h ext/iconv/php_iconv_aliased_libiconv.h 
ext/iconv/php_iconv_supports_errno.h ext/iconv/php_php_iconv_h_path.h 
ext/iconv/php_php_iconv_impl.h
rm -f ext/phar/phar.phar ext/phar/phar.php
-   rm -f pear/install-pear-nozlib.phar
if test $(srcdir) != $(builddir); then \
  rm -f ext/phar/phar/phar.inc; \
fi


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

[PHP-CVS] com php-src: Merge branch 'PHP-5.5': Makefile.global

2013-10-01 Thread Christopher Jones 
Commit:67df40fd54b65a62340bfd107ee29e2390a92dca
Author:Christopher Jones s...@php.net Tue, 1 Oct 2013 10:35:03 
-0700
Parents:   471413ab19f1052d2f7e950229d661547f6e1657 
60e38b3243577abc80ce6bbcfb0b4125b08acb85
Branches:  master

Link:   
http://git.php.net/?p=php-src.git;a=commitdiff;h=67df40fd54b65a62340bfd107ee29e2390a92dca

Log:
Merge branch 'PHP-5.5'

* PHP-5.5:
  Revert Make 'make distclean' remove the downloaded pear PHAR

Changed paths:
  MM  Makefile.global


Diff:



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

[PHP-CVS] com php-src: Make 'make distclean' remove the downloaded pear PHAR: Makefile.global

2013-09-30 Thread Christopher Jones 
Commit:d7baf0427fb56cbde55495e5c2071b1cdacb94ce
Author:Christopher Jones s...@php.net Mon, 30 Sep 2013 15:46:22 
-0700
Parents:   d4d6a95105feb3d7a39a5dfea7c4cd3080097295
Branches:  PHP-5.5 master

Link:   
http://git.php.net/?p=php-src.git;a=commitdiff;h=d7baf0427fb56cbde55495e5c2071b1cdacb94ce

Log:
Make 'make distclean' remove the downloaded pear PHAR

Changed paths:
  M  Makefile.global


Diff:
diff --git a/Makefile.global b/Makefile.global
index 05c5d15..c56ef99 100644
--- a/Makefile.global
+++ b/Makefile.global
@@ -125,6 +125,7 @@ distclean: clean
rm -f sapi/fpm/php-fpm.conf sapi/fpm/init.d.php-fpm 
sapi/fpm/php-fpm.service sapi/fpm/php-fpm.8 sapi/fpm/status.html
rm -f ext/iconv/php_have_bsd_iconv.h ext/iconv/php_have_glibc_iconv.h 
ext/iconv/php_have_ibm_iconv.h ext/iconv/php_have_iconv.h 
ext/iconv/php_have_libiconv.h ext/iconv/php_iconv_aliased_libiconv.h 
ext/iconv/php_iconv_supports_errno.h ext/iconv/php_php_iconv_h_path.h 
ext/iconv/php_php_iconv_impl.h
rm -f ext/phar/phar.phar ext/phar/phar.php
+   rm -f pear/install-pear-nozlib.phar
if test $(srcdir) != $(builddir); then \
  rm -f ext/phar/phar/phar.inc; \
fi


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

[PHP-CVS] com php-src: Merge branch 'PHP-5.5': Makefile.global

2013-09-30 Thread Christopher Jones 
Commit:86c3378c5c9c1ac76d989e5718ff2a3236ed46bc
Author:Christopher Jones s...@php.net Mon, 30 Sep 2013 15:47:33 
-0700
Parents:   675703335513d6ad3d861a9d03379fdc931b46bf 
d7baf0427fb56cbde55495e5c2071b1cdacb94ce
Branches:  master

Link:   
http://git.php.net/?p=php-src.git;a=commitdiff;h=86c3378c5c9c1ac76d989e5718ff2a3236ed46bc

Log:
Merge branch 'PHP-5.5'

* PHP-5.5:
  Make 'make distclean' remove the downloaded pear PHAR

Changed paths:
  MM  Makefile.global


Diff:



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

[PHP-CVS] com php-src: OCI8 2.0: Added a new oci_set_db_operation() user space function for the DB Operation tracing feature of Oracle DB 12c.: ext/oci8/oci8.c ext/oci8/oci8_interface.c

2013-09-30 Thread Christopher Jones 
Commit:954a0f8bf4f8779f509b8361c1bc02246bd1ea20
Author:Christopher Jones s...@php.net Mon, 30 Sep 2013 16:51:07 
-0700
Parents:   ca6a259ed1297e0b0a2c5f605587caadd1c3a7ed
Branches:  master

Link:   
http://git.php.net/?p=php-src.git;a=commitdiff;h=954a0f8bf4f8779f509b8361c1bc02246bd1ea20

Log:
OCI8 2.0: Added a new oci_set_db_operation() user space function for the DB 
Operation tracing feature of Oracle DB 12c.

Currently this code is #ifdef'd out, since I can't consider the feature stable 
until an Oracle-side fix for Oracle bug 16695981 is available.  Having the code 
available in PHP OCI8 facilitates testing of any fix.

Bugs:
https://bugs.php.net/16695981

Changed paths:
  M  ext/oci8/oci8.c
  M  ext/oci8/oci8_interface.c


Diff:
diff --git a/ext/oci8/oci8.c b/ext/oci8/oci8.c
index 6723c22..eeb1ade 100644
--- a/ext/oci8/oci8.c
+++ b/ext/oci8/oci8.c
@@ -457,6 +457,13 @@ ZEND_BEGIN_ARG_INFO_EX(arginfo_oci_set_client_info, 0, 0, 
2)
ZEND_ARG_INFO(0, client_information)
 ZEND_END_ARG_INFO()
 
+#ifdef WAITIING_ORACLE_BUG_16695981_FIX
+ZEND_BEGIN_ARG_INFO_EX(arginfo_oci_set_db_operation, 0, 0, 2)
+ZEND_ARG_INFO(0, connection_resource)
+ZEND_ARG_INFO(0, action)
+ZEND_END_ARG_INFO()
+#endif
+
 ZEND_BEGIN_ARG_INFO_EX(arginfo_oci_password_change, 0, 0, 4)
ZEND_ARG_INFO(0, connection_resource_or_connection_string)
ZEND_ARG_INFO(0, username)
@@ -708,6 +715,9 @@ static unsigned char arginfo_oci_bind_array_by_name[] = { 
3, BYREF_NONE, BYREF_N
 #define arginfo_oci_set_module_name
NULL
 #define arginfo_oci_set_action 
NULL
 #define arginfo_oci_set_client_info
NULL
+#ifdef WAITIING_ORACLE_BUG_16695981_FIX
+#define arginfo_oci_set_db_operation   NULL
+#endif
 #define arginfo_oci_password_change
NULL
 #define arginfo_oci_new_cursor 
NULL
 #define arginfo_oci_result 
NULL
@@ -799,6 +809,9 @@ PHP_FUNCTION(oci_statement_type);
 PHP_FUNCTION(oci_num_rows);
 PHP_FUNCTION(oci_set_prefetch);
 PHP_FUNCTION(oci_set_client_identifier);
+#ifdef WAITIING_ORACLE_BUG_16695981_FIX
+PHP_FUNCTION(oci_set_db_operation);
+#endif
 PHP_FUNCTION(oci_set_edition);
 PHP_FUNCTION(oci_set_module_name);
 PHP_FUNCTION(oci_set_action);
@@ -904,6 +917,9 @@ zend_function_entry php_oci_functions[] = {
PHP_FE(oci_new_descriptor,  
arginfo_oci_new_descriptor)
PHP_FE(oci_set_prefetch,
arginfo_oci_set_prefetch)
PHP_FE(oci_set_client_identifier,   
arginfo_oci_set_client_identifier)
+#ifdef WAITIING_ORACLE_BUG_16695981_FIX
+   PHP_FE(oci_set_db_operation,arginfo_oci_set_db_operation)
+#endif
PHP_FE(oci_set_edition, arginfo_oci_set_edition)
PHP_FE(oci_set_module_name, 
arginfo_oci_set_module_name)
PHP_FE(oci_set_action,  arginfo_oci_set_action)
diff --git a/ext/oci8/oci8_interface.c b/ext/oci8/oci8_interface.c
index 0f17f93..a452c1a 100644
--- a/ext/oci8/oci8_interface.c
+++ b/ext/oci8/oci8_interface.c
@@ -1928,6 +1928,38 @@ PHP_FUNCTION(oci_set_client_info)
 }
 /* }}} */
 
+#ifdef WAITIING_ORACLE_BUG_16695981_FIX
+/* {{{ proto bool oci_set_db_operation(resource connection, string value)
+   Sets the DB operation on the connection for Oracle end-to-end tracing */
+PHP_FUNCTION(oci_set_db_operation)
+{
+#if (OCI_MAJOR_VERSION  11)
+   zval *z_connection;
+   php_oci_connection *connection;
+   char *dbop_name;
+   int dbop_name_len;
+
+   if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, rs, 
z_connection, dbop_name, dbop_name_len) == FAILURE) {
+   return;
+   }
+
+   PHP_OCI_ZVAL_TO_CONNECTION(z_connection, connection);
+
+   PHP_OCI_CALL_RETURN(OCI_G(errcode), OCIAttrSet, ((dvoid *) 
connection-session, (ub4) OCI_HTYPE_SESSION, (dvoid *) dbop_name, (ub4) 
dbop_name_len, (ub4) OCI_ATTR_DBOP, OCI_G(err)));
+
+   if (OCI_G(errcode) != OCI_SUCCESS) {
+   php_oci_error(OCI_G(err), OCI_G(errcode) TSRMLS_CC);
+   RETURN_FALSE;
+   }
+   RETURN_TRUE;
+#else
+   php_error_docref(NULL TSRMLS_CC, E_NOTICE, Unsupported attribute 
type);
+   RETURN_FALSE;
+#endif
+}
+/* }}} */
+#endif /* WAITIING_ORACLE_BUG_16695981_FIX */
+
 /* {{{ proto bool oci_password_change(resource connection, string username, 
string old_password, string new_password)
   Changes the password of an account */
 PHP_FUNCTION(oci_password_change)


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

[PHP-CVS] com php-src: OCI8: Fix alloc function and DLL generation: ext/oci8/oci8.c ext/oci8/oci8_interface.c ext/oci8/package.xml

2013-09-27 Thread Christopher Jones 
Commit:9b9eaba0834a0f985290304187189d0e33834b30
Author:Christopher Jones s...@php.net Fri, 27 Sep 2013 17:00:41 
-0700
Parents:   aba30ce30676b6d73a2169b10311dfb07768630c
Branches:  master

Link:   
http://git.php.net/?p=php-src.git;a=commitdiff;h=9b9eaba0834a0f985290304187189d0e33834b30

Log:
OCI8: Fix alloc function and DLL generation

Changed paths:
  M  ext/oci8/oci8.c
  M  ext/oci8/oci8_interface.c
  M  ext/oci8/package.xml


Diff:
diff --git a/ext/oci8/oci8.c b/ext/oci8/oci8.c
index f04114d..6723c22 100644
--- a/ext/oci8/oci8.c
+++ b/ext/oci8/oci8.c
@@ -151,7 +151,7 @@ static sword php_oci_ping_init(php_oci_connection 
*connection, OCIError *errh TS
 /* }}} */
 
 /* {{{ dynamically loadable module stuff */
-#if defined(COMPILE_DL_OCI8) || defined(COMPILE_DL_OCI8_11G)
+#if defined(COMPILE_DL_OCI8) || defined(COMPILE_DL_OCI8_11G) || 
defined(COMPILE_DL_OCI8_12C)
 ZEND_GET_MODULE(oci8)
 #endif /* COMPILE_DL */
 /* }}} */
diff --git a/ext/oci8/oci8_interface.c b/ext/oci8/oci8_interface.c
index 3fad90d..0f17f93 100644
--- a/ext/oci8/oci8_interface.c
+++ b/ext/oci8/oci8_interface.c
@@ -1788,7 +1788,7 @@ PHP_FUNCTION(oci_set_client_identifier)
 
if (client_id) {
/* this long winded copy allows compatibility with older PHP 
versions */
-   connection-client_id = (char *)safe_emalloc(client_id_len+1, 
sizeof(char), connection-is_persistent);
+   connection-client_id = (char *)pemalloc(client_id_len+1, 
connection-is_persistent);
memcpy(connection-client_id, client_id, client_id_len);
connection-client_id[client_id_len] = '\0';
} else {
diff --git a/ext/oci8/package.xml b/ext/oci8/package.xml
index 24ba635..cd6bb04 100644
--- a/ext/oci8/package.xml
+++ b/ext/oci8/package.xml
@@ -44,8 +44,8 @@ http://pear.php.net/dtd/package-2.0.xsd;
  time12:00:00/time
 
   version
-   release2.0.3/release
-   api2.0.3/api
+   release2.0.4/release
+   api2.0.4/api
   /version
   stability
releasedevel/release
@@ -53,9 +53,8 @@ http://pear.php.net/dtd/package-2.0.xsd;
   /stability
   license uri=http://www.php.net/license;PHP/license
   notes
-Add the oci_set_client_identifier() value and statement structure pointer to 
several DTrace probes.
-Use 'phpoci' as the DTrace provider name since uniqueness is required by the 
Linux fasttrap module.
-Update Windows builds to create only php_oci8_12c.dll.
+Fix persistent memory usage with --enable-dtrace
+Export get_module() for Windows php_oci8_12c.dll
   /notes
  contents
   dir name=/
@@ -456,6 +455,23 @@ Update Windows builds to create only php_oci8_12c.dll.
 
 release
   version
+   release2.0.3/release
+   api2.0.3/api
+  /version
+  stability
+   releasedevel/release
+   apidevel/api
+  /stability
+  license uri=http://www.php.net/license;PHP/license
+  notes
+Add the oci_set_client_identifier() value and statement structure pointer to 
several DTrace probes.
+Use 'phpoci' as the DTrace provider name since uniqueness is required by the 
Linux fasttrap module.
+Update Windows builds to create only php_oci8_12c.dll.
+  /notes
+/release
+
+release
+  version
release2.0.2/release
api2.0.2/api
   /version


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

[PHP-CVS] com php-src: Prepare for next release: ext/oci8/package.xml ext/oci8/php_oci8.h

2013-09-27 Thread Christopher Jones 
Commit:0a3ee7b26bfe17a6536b2dd8b16febc8b4b55d4d
Author:Christopher Jones s...@php.net Fri, 27 Sep 2013 17:16:02 
-0700
Parents:   9b9eaba0834a0f985290304187189d0e33834b30
Branches:  master

Link:   
http://git.php.net/?p=php-src.git;a=commitdiff;h=0a3ee7b26bfe17a6536b2dd8b16febc8b4b55d4d

Log:
Prepare for next release

Changed paths:
  M  ext/oci8/package.xml
  M  ext/oci8/php_oci8.h


Diff:
diff --git a/ext/oci8/package.xml b/ext/oci8/package.xml
index cd6bb04..1161b03 100644
--- a/ext/oci8/package.xml
+++ b/ext/oci8/package.xml
@@ -44,8 +44,8 @@ http://pear.php.net/dtd/package-2.0.xsd;
  time12:00:00/time
 
   version
-   release2.0.4/release
-   api2.0.4/api
+   release2.0.5/release
+   api2.0.5/api
   /version
   stability
releasedevel/release
@@ -53,8 +53,7 @@ http://pear.php.net/dtd/package-2.0.xsd;
   /stability
   license uri=http://www.php.net/license;PHP/license
   notes
-Fix persistent memory usage with --enable-dtrace
-Export get_module() for Windows php_oci8_12c.dll
+   - no notes yet
   /notes
  contents
   dir name=/
@@ -455,6 +454,22 @@ Export get_module() for Windows php_oci8_12c.dll
 
 release
   version
+   release2.0.4/release
+   api2.0.4/api
+  /version
+  stability
+   releasedevel/release
+   apidevel/api
+  /stability
+  license uri=http://www.php.net/license;PHP/license
+  notes
+Fix persistent memory usage with --enable-dtrace
+Export get_module() for Windows php_oci8_12c.dll
+  /notes
+/release
+
+release
+  version
release2.0.3/release
api2.0.3/api
   /version
diff --git a/ext/oci8/php_oci8.h b/ext/oci8/php_oci8.h
index 6d02eff..1ea0411 100644
--- a/ext/oci8/php_oci8.h
+++ b/ext/oci8/php_oci8.h
@@ -46,7 +46,7 @@
  */
 #undef PHP_OCI8_VERSION
 #endif
-#define PHP_OCI8_VERSION 2.0.3-dev
+#define PHP_OCI8_VERSION 2.0.5-dev
 
 extern zend_module_entry oci8_module_entry;
 #define phpext_oci8_ptr oci8_module_entry


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

[PHP-CVS] com php-src: More OCI8 DTrace probe updates. Change php.ini-* doc to match an earlier change to config.w32: ext/oci8/config.m4 ext/oci8/oci8.c ext/oci8/oci8_dtrace.d ext/oci8/oci8_interface.

2013-09-26 Thread Christopher Jones 
Commit:5ac7c533a0334f384d1a74eed6172a3c8cc4ef49
Author:Christopher Jones s...@php.net Thu, 26 Sep 2013 21:12:11 
-0700
Parents:   8554800e7691f85275e650d0b88a3e4d35153e95
Branches:  master

Link:   
http://git.php.net/?p=php-src.git;a=commitdiff;h=5ac7c533a0334f384d1a74eed6172a3c8cc4ef49

Log:
More OCI8 DTrace probe updates.
Change php.ini-* doc to match an earlier change to config.w32

Changed paths:
  M  ext/oci8/config.m4
  M  ext/oci8/oci8.c
  M  ext/oci8/oci8_dtrace.d
  M  ext/oci8/oci8_interface.c
  M  ext/oci8/oci8_statement.c
  M  ext/oci8/package.xml
  M  ext/oci8/php_oci8.h
  M  ext/oci8/php_oci8_int.h
  M  php.ini-development
  M  php.ini-production

diff --git a/ext/oci8/config.m4 b/ext/oci8/config.m4
index 49998d1..3873a22 100644
--- a/ext/oci8/config.m4
+++ b/ext/oci8/config.m4
@@ -124,7 +124,7 @@ dnl in GNU Make which causes the .d file to be overwritten 
(Bug 61268)
 PHP_EXT_SRCDIR([oci8])/$ac_provsrc:;
 
 $ac_bdir[$]ac_hdrobj: $ac_srcdir[$]ac_provsrc
-   CFLAGS=\$(CFLAGS_CLEAN) dtrace -h -C -s $ac_srcdir[$]ac_provsrc -o 
\$[]@.bak  \$(SED) -e 's,PHP_,DTRACE_,g' \$[]@.bak  \$[]@
+   CFLAGS=\$(CFLAGS_CLEAN) dtrace -h -C -s $ac_srcdir[$]ac_provsrc -o 
\$[]@.bak  \$(SED) -e 's,PHPOCI_,DTRACE_,g' \$[]@.bak  \$[]@
 
 \$(OCI8_DTRACE_OBJS): $ac_bdir[$]ac_hdrobj
 
diff --git a/ext/oci8/oci8.c b/ext/oci8/oci8.c
index bccaa52..f04114d 100644
--- a/ext/oci8/oci8.c
+++ b/ext/oci8/oci8.c
@@ -12,7 +12,7 @@
| obtain it through the world-wide-web, please send a note to  |
| lice...@php.net so we can mail you a copy immediately.   |
+--+
-   | Authors: Stig S�ther Bakken s...@php.net|
+   | Authors: Stig Sæther Bakken s...@php.net|
|  Thies C. Arntzen th...@thieso.net |
|  Maxim Maletsky ma...@maxim.cx |
|  |
@@ -2097,6 +2097,9 @@ php_oci_connection *php_oci_do_connect_ex(char *username, 
int username_len, char
connection = (php_oci_connection *) ecalloc(1, 
sizeof(php_oci_connection));
connection-hash_key = estrndup(hashed_details.c, 
hashed_details.len);
connection-is_persistent = 0;
+#ifdef HAVE_OCI8_DTRACE
+   connection-client_id = NULL;
+#endif
} else {
connection = (php_oci_connection *) calloc(1, 
sizeof(php_oci_connection));
if (connection == NULL) {
@@ -2108,11 +2111,17 @@ php_oci_connection *php_oci_do_connect_ex(char 
*username, int username_len, char
return NULL;
}
connection-is_persistent = 1;
+#ifdef HAVE_OCI8_DTRACE
+   connection-client_id = NULL;
+#endif
}
} else {
connection = (php_oci_connection *) ecalloc(1, 
sizeof(php_oci_connection));
connection-hash_key = estrndup(hashed_details.c, 
hashed_details.len);
connection-is_persistent = 0;
+#ifdef HAVE_OCI8_DTRACE
+   connection-client_id = NULL;
+#endif
}
 
/* {{{ Get the session pool that suits this connection request from the 
persistent list. This
@@ -2366,17 +2375,15 @@ static int php_oci_connection_close(php_oci_connection 
*connection TSRMLS_DC)
php_oci_spool_close(connection-private_spool TSRMLS_CC);
}
 
-   if (connection-is_persistent) {
-   if (connection-hash_key) {
-   free(connection-hash_key);
-   }
-   free(connection);
-   } else {
-   if (connection-hash_key) {
-   efree(connection-hash_key);
-   }
-   efree(connection);
+   if (connection-hash_key) {
+   pefree(connection-hash_key, connection-is_persistent);
+   }
+#ifdef HAVE_OCI8_DTRACE
+   if (connection-client_id) {
+   pefree(connection-client_id, connection-is_persistent);
}
+#endif /* HAVE_OCI8_DTRACE */
+   pefree(connection, connection-is_persistent);
connection = NULL;
OCI_G(in_call) = in_call_save;
return result;
@@ -2463,6 +2470,12 @@ int php_oci_connection_release(php_oci_connection 
*connection TSRMLS_DC)
 * the OCI session
 */
connection-next_pingp = NULL;
+#ifdef HAVE_OCI8_DTRACE
+   if (connection-client_id) {
+   pefree(connection-client_id, 
connection-is_persistent);
+   connection-client_id = NULL;
+   }
+#endif /* HAVE_OCI8_DTRACE */
}
 
OCI_G(in_call) = in_call_save;
@@ -3500,7 +3513,7 @@ void php_oci_dtrace_check_connection

[PHP-CVS] com php-src: Added application/pdf to PHP CLI Web Server mime types.: NEWS sapi/cli/php_cli_server.c

2013-09-19 Thread Christopher Jones 
Commit:dfa43d55dd996fb06c7bb4d5efcae3fc78131cdc
Author:Christopher Jones s...@php.net Thu, 19 Sep 2013 20:22:50 
-0700
Parents:   c2b8a726737e0046eb72be535fdb4fb8dca57f3b
Branches:  PHP-5.5 master

Link:   
http://git.php.net/?p=php-src.git;a=commitdiff;h=dfa43d55dd996fb06c7bb4d5efcae3fc78131cdc

Log:
Added application/pdf to PHP CLI Web Server mime types.

Changed paths:
  M  NEWS
  M  sapi/cli/php_cli_server.c


Diff:
diff --git a/NEWS b/NEWS
index 37db7e6..7b37e07 100644
--- a/NEWS
+++ b/NEWS
@@ -5,6 +5,7 @@ PHP 
   NEWS
 - CLI server:
   . Fixed bug #65633 (built-in server treat some http headers as
 case-sensitive). (Adam)
+  . Added application/pdf to PHP CLI Web Server mime types (Chris Jones)
 
 - Datetime:
   . Fixed bug #65502 (DateTimeImmutable::createFromFormat returns DateTime).
diff --git a/sapi/cli/php_cli_server.c b/sapi/cli/php_cli_server.c
index d50cc4f..e84d9ea 100644
--- a/sapi/cli/php_cli_server.c
+++ b/sapi/cli/php_cli_server.c
@@ -268,6 +268,7 @@ static php_cli_server_ext_mime_type_pair mime_type_map[] = {
{ jpg, image/jpeg },
{ jpeg, image/jpeg },
{ jpe, image/jpeg },
+   { pdf, application/pdf },
{ png, image/png },
{ svg, image/svg+xml },
{ txt, text/plain },


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

[PHP-CVS] com php-src: Merge branch 'PHP-5.5': sapi/cli/php_cli_server.c

2013-09-19 Thread Christopher Jones 
Commit:dcafcd01a9c52ab31e013eddc58a308b0e0e105b
Author:Christopher Jones s...@php.net Thu, 19 Sep 2013 20:23:18 
-0700
Parents:   d879d3de1e51ae1e7a5dd09a554c35638dd0836c 
dfa43d55dd996fb06c7bb4d5efcae3fc78131cdc
Branches:  master

Link:   
http://git.php.net/?p=php-src.git;a=commitdiff;h=dcafcd01a9c52ab31e013eddc58a308b0e0e105b

Log:
Merge branch 'PHP-5.5'

* PHP-5.5:
  Added application/pdf to PHP CLI Web Server mime types.

Changed paths:
  MM  sapi/cli/php_cli_server.c


Diff:



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

[PHP-CVS] com php-src: Build OCI8 2.0 on Windows with Oracle Database 12c libraries only: ext/oci8/config.w32

2013-09-18 Thread Christopher Jones 
Commit:b6d0cb05533d1c7a8f0cce5cffc20352669a2506
Author:Christopher Jones s...@php.net Wed, 18 Sep 2013 19:50:32 
-0700
Parents:   3d165224da8b814b1a97f9ff02d27914a70b1f3f
Branches:  master

Link:   
http://git.php.net/?p=php-src.git;a=commitdiff;h=b6d0cb05533d1c7a8f0cce5cffc20352669a2506

Log:
Build OCI8 2.0 on Windows with Oracle Database 12c libraries only

Changed paths:
  M  ext/oci8/config.w32


Diff:
diff --git a/ext/oci8/config.w32 b/ext/oci8/config.w32
index fdd7fa5..ac573a8 100644
--- a/ext/oci8/config.w32
+++ b/ext/oci8/config.w32
@@ -1,82 +1,38 @@
 // $Id$
 // vim:ft=javascript
 
-if (PHP_OCI8 != no  PHP_OCI8_11G != no) {
-   if (!PHP_OCI8_SHARED  !PHP_OCI8_11G_SHARED) {
-   WARNING(oci8 and oci8-11g provide the same extension and 
cannot both be built statically);
-   PHP_OCI8 = no
-   PHP_OCI8_11G = no
-   }
-}
-
-ARG_WITH(oci8, OCI8 support, no);
-
-if (PHP_OCI8 != no) {
-
-   oci8_dirs = new Array(
-   PHP_OCI8
-   );
-
-   oci8_lib_paths = ;
-   oci8_inc_paths = ;
-
-   // find the Oracle install
-   for (i = 0; i  oci8_dirs.length; i++) {
-   oci8_lib_paths += oci8_dirs[i] + \\lib;;
-   oci8_lib_paths += oci8_dirs[i] + \\lib\\msvc;;
-   oci8_inc_paths += oci8_dirs[i] + \\include;;
-   }
-
-   oci8_inc_paths += PHP_PHP_BUILD + \\include\\instantclient;
-   oci8_lib_paths += PHP_PHP_BUILD + \\lib\\instantclient;;
-
-   if (CHECK_HEADER_ADD_INCLUDE(oci.h, CFLAGS_OCI8, oci8_inc_paths) 
-   CHECK_LIB(oci.lib, oci8, oci8_lib_paths))
-   {
-   EXTENSION('oci8', 'oci8.c oci8_lob.c oci8_statement.c 
oci8_collection.c oci8_interface.c');
-
-   AC_DEFINE('HAVE_OCI8', 1);
-   AC_DEFINE('HAVE_OCI_INSTANT_CLIENT', 1);
-   AC_DEFINE('HAVE_OCI_LOB_READ2', 1);
-
-   } else {
-   WARNING(oci8 not enabled: Oracle Database libraries or Oracle 
10g Instant Client not found);
-   PHP_OCI8 = no
-   }
-}
-
-ARG_WITH(oci8-11g, OCI8 support using Oracle 11g Instant Client, no);
+ARG_WITH(oci8-12c, OCI8 support using Oracle Database 12c Instant Client, 
no);
 
-if (PHP_OCI8_11G != no) {
+if (PHP_OCI8_12C != no) {
 
-   oci8_11g_dirs = new Array(
-   PHP_OCI8_11G
+   oci8_12c_dirs = new Array(
+   PHP_OCI8_12C
);
 
-   oci8_11g_lib_paths = ;
-   oci8_11g_inc_paths = ;
+   oci8_12c_lib_paths = ;
+   oci8_12c_inc_paths = ;
 
// find the Oracle install
-   for (i = 0; i  oci8_11g_dirs.length; i++) {
-   oci8_11g_lib_paths += oci8_11g_dirs[i] + \\lib;;
-   oci8_11g_lib_paths += oci8_11g_dirs[i] + \\lib\\msvc;;
-   oci8_11g_inc_paths += oci8_11g_dirs[i] + \\include;;
+   for (i = 0; i  oci8_12c_dirs.length; i++) {
+   oci8_12c_lib_paths += oci8_12c_dirs[i] + \\lib;;
+   oci8_12c_lib_paths += oci8_12c_dirs[i] + \\lib\\msvc;;
+   oci8_12c_inc_paths += oci8_12c_dirs[i] + \\include;;
}
 
-   oci8_11g_inc_paths += PHP_PHP_BUILD + \\include\\instantclient_11;
-   oci8_11g_lib_paths += PHP_PHP_BUILD + \\lib\\instantclient_11;;
+   oci8_12c_inc_paths += PHP_PHP_BUILD + \\include\\instantclient_12;
+   oci8_12c_lib_paths += PHP_PHP_BUILD + \\lib\\instantclient_12;;
 
-   if (CHECK_HEADER_ADD_INCLUDE(oci.h, CFLAGS_OCI8_11G, 
oci8_11g_inc_paths) 
-   CHECK_LIB(oci.lib, oci8_11g, oci8_11g_lib_paths))
+   if (CHECK_HEADER_ADD_INCLUDE(oci.h, CFLAGS_OCI8_12C, 
oci8_12c_inc_paths) 
+   CHECK_LIB(oci.lib, oci8_12c, oci8_12c_lib_paths))
{
-   EXTENSION('oci8_11g', 'oci8.c oci8_lob.c oci8_statement.c 
oci8_collection.c oci8_interface.c', null, null, null, ext\\oci8_11g)
+   EXTENSION('oci8_12c', 'oci8.c oci8_lob.c oci8_statement.c 
oci8_collection.c oci8_interface.c', null, null, null, ext\\oci8_12c)
 
AC_DEFINE('HAVE_OCI8', 1);
AC_DEFINE('HAVE_OCI_INSTANT_CLIENT', 1);
AC_DEFINE('HAVE_OCI_LOB_READ2', 1);
 
} else {
-   WARNING(oci8-11g not enabled: Oracle Database libraries or 
Oracle 11g Instant Client not found);
-   PHP_OCI8_11G = no
+   WARNING(oci8-12c not enabled: Oracle Database client libraries 
or Oracle Database 12c Instant Client not found);
+   PHP_OCI8_12C = no
}
 }


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

Re: [PHP-CVS] com php-src: Provide more macros for handling of interned strings: Zend/zend.h Zend/zend_API.c Zend/zend_builtin_functions.c Zend/zend_compile.c Zend/zend_constants.c Zend/zend_execute.c

2013-09-13 Thread Christopher Jones 



On 09/13/2013 10:42 AM, Nikita Popov wrote:

Commit:96b1c2145c2cd5e616dea191648c2d73af0239c9
Author:Nikita Popov ni...@php.net Fri, 13 Sep 2013 18:45:02 +0200
Parents:   d2950ac2791cd03559a58e78f5cd626283b9ee4d
Branches:  master

Link:   
http://git.php.net/?p=php-src.git;a=commitdiff;h=96b1c2145c2cd5e616dea191648c2d73af0239c9

Log:
Provide more macros for handling of interned strings

  * str_erealloc behaves like erealloc for normal strings, but will
use emalloc+memcpy for interned strings.
  * str_estrndup behaves like estrndup for normal strings, but will
not copy interned strings.
  * str_strndup behaves like zend_strndup for normal strings, but
will not copy interned strings.
  * str_efree_rel behaves like efree_rel for normal strings, but
will not free interned strings.
  * str_hash will return INTERNED_HASH for interned strings and
compute it using zend_hash_func for normal strings.


Hi Nikita,

Running g++ on ext/intl/intl_convertcpp.cpp is failing for me with gcc 4.1.2 on
Oracle Linux 5.9 (equivalent to RHEL 5.9):

/home/cjones/php-src/Zend/zend_string.h: In function ‘char* 
_str_erealloc(char*, size_t, size_t)’:
/home/cjones/php-src/Zend/zend_string.h:77: error: invalid conversion from 
‘void*’ to ‘char*’
make: *** [ext/intl/intl_convertcpp.lo] Error 1

Can you have a look at it?

Chris

--
christopher.jo...@oracle.com  http://twitter.com/ghrd
Free PHP  Oracle book:
http://www.oracle.com/technetwork/topics/php/underground-php-oracle-manual-098250.html

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

Re: [PHP-CVS] com php-src: Provide more macros for handling of interned strings: Zend/zend.h Zend/zend_API.c Zend/zend_builtin_functions.c Zend/zend_compile.c Zend/zend_constants.c Zend/zend_execute.c

2013-09-13 Thread Christopher Jones 



On 09/13/2013 04:39 PM, Nikita Popov wrote:

On Sat, Sep 14, 2013 at 1:27 AM, Christopher Jones 
christopher.jo...@oracle.com wrote:



Hi Nikita,

Running g++ on ext/intl/intl_convertcpp.cpp is failing for me with gcc
4.1.2 on
Oracle Linux 5.9 (equivalent to RHEL 5.9):

/home/cjones/php-src/Zend/**zend_string.h: In function ‘char*
_str_erealloc(char*, size_t, size_t)’:
/home/cjones/php-src/Zend/**zend_string.h:77: error: invalid conversion
from ‘void*’ to ‘char*’
make: *** [ext/intl/intl_convertcpp.lo] Error 1

Can you have a look at it?



Thanks for the notice, should be fixed now. I always forget that out header
files are written in C++ and not in C.

Nikita



Confirmed fixed.  Thanks for the quick response.

Chris

--
christopher.jo...@oracle.com  http://twitter.com/ghrd
Free PHP  Oracle book:
http://www.oracle.com/technetwork/topics/php/underground-php-oracle-manual-098250.html

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

[PHP-CVS] com php-src: Add test for oci_set_* error changes: ext/oci8/tests/error_set.phpt

2013-09-06 Thread Christopher Jones 
Commit:e504ed66a84815d3e2e9fd0e3679c787c14b2691
Author:Christopher Jones s...@php.net Fri, 6 Sep 2013 08:14:18 
-0700
Parents:   4b778faa8014947390d55dbc71e15ae0d7aca53a
Branches:  master

Link:   
http://git.php.net/?p=php-src.git;a=commitdiff;h=e504ed66a84815d3e2e9fd0e3679c787c14b2691

Log:
Add test for oci_set_* error changes

Changed paths:
  A  ext/oci8/tests/error_set.phpt


Diff:
diff --git a/ext/oci8/tests/error_set.phpt b/ext/oci8/tests/error_set.phpt
new file mode 100644
index 000..ad56e8a
--- /dev/null
+++ b/ext/oci8/tests/error_set.phpt
@@ -0,0 +1,72 @@
+--TEST--
+Check oci_set_{action,client_identifier,module_name,client_info} error handling
+--SKIPIF--
+?php if (!extension_loaded('oci8')) die (skip no oci8 extension); ?
+--FILE--
+?php
+
+require(dirname(__FILE__).'/connect.inc');
+
+error_reporting(E_ALL);
+ini_set('display_errors', 'Off');
+
+echo Test 1\n;
+
+// Generates ORA-24960: the attribute OCI_ATTR_* is greater than the maximum 
allowable length of 64
+$s = 
;
+
+$r = oci_set_action($c, $s);
+var_dump($r);
+$m = oci_error($c);
+echo $m['code'] , \n;
+
+$r = oci_set_client_identifier($c, $s);
+var_dump($r);
+$m = oci_error($c);
+echo $m['code'] , \n;
+
+$r = oci_set_module_name($c, $s);
+var_dump($r);
+$m = oci_error($c);
+echo $m['code'] , \n;
+
+$r = oci_set_client_info($c, $s);
+var_dump($r);
+$m = oci_error($c);
+echo $m['code'] , \n;
+
+echo \nTest 2\n;
+$s = x;
+
+$r = oci_set_action($c, $s);
+var_dump($r);
+
+$r = oci_set_client_identifier($c, $s);
+var_dump($r);
+
+$r = oci_set_module_name($c, $s);
+var_dump($r);
+
+$r = oci_set_client_info($c, $s);
+var_dump($r);
+
+?
+===DONE===
+?php exit(0); ?
+--EXPECTF--
+Test 1
+bool(false)
+24960
+bool(false)
+24960
+bool(false)
+24960
+bool(false)
+24960
+
+Test 2
+bool(true)
+bool(true)
+bool(true)
+bool(true)
+===DONE===


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

[PHP-CVS] com php-src: Update DTrace probes: ext/oci8/oci8.c ext/oci8/oci8_dtrace.d ext/oci8/oci8_statement.c ext/oci8/package.xml ext/oci8/php_oci8.h

2013-09-06 Thread Christopher Jones 
Commit:ca4d122adcab8703f63cf8ed95a28a1fbc6e2b47
Author:Christopher Jones s...@php.net Fri, 6 Sep 2013 08:54:19 
-0700
Parents:   e504ed66a84815d3e2e9fd0e3679c787c14b2691
Branches:  master

Link:   
http://git.php.net/?p=php-src.git;a=commitdiff;h=ca4d122adcab8703f63cf8ed95a28a1fbc6e2b47

Log:
Update DTrace probes

Changed paths:
  M  ext/oci8/oci8.c
  M  ext/oci8/oci8_dtrace.d
  M  ext/oci8/oci8_statement.c
  M  ext/oci8/package.xml
  M  ext/oci8/php_oci8.h


Diff:
diff --git a/ext/oci8/oci8.c b/ext/oci8/oci8.c
index 468bdaf..8b6a389 100644
--- a/ext/oci8/oci8.c
+++ b/ext/oci8/oci8.c
@@ -2317,6 +2317,12 @@ static int php_oci_connection_close(php_oci_connection 
*connection TSRMLS_DC)
int result = 0;
zend_bool in_call_save = OCI_G(in_call);
 
+#ifdef HAVE_OCI8_DTRACE
+   if (DTRACE_OCI8_CONNECTION_CLOSE_ENABLED()) {
+   DTRACE_OCI8_CONNECTION_CLOSE(connection);
+   }
+#endif /* HAVE_OCI8_DTRACE */
+
if (!connection-is_stub) {
/* Release resources associated with connection */
php_oci_connection_release(connection TSRMLS_CC);
diff --git a/ext/oci8/oci8_dtrace.d b/ext/oci8/oci8_dtrace.d
index 15b4a96..8ac9410 100644
--- a/ext/oci8/oci8_dtrace.d
+++ b/ext/oci8/oci8_dtrace.d
@@ -17,12 +17,13 @@
 */
 
 provider php {
+   probe oci8__check__connection(void *connection, int is_open, long 
errcode, unsigned long server_status);
probe oci8__connect__entry(char *username, char *dbname, char *charset, 
long session_mode, int persistent, int exclusive);
probe oci8__connect__return(void *connection);
-   probe oci8__check__connection(void *connection, int is_open, long 
errcode, unsigned long serverstatus);
-   probe oci8__sqltext(char *sql);
+   probe oci8__connection__close(void *connection);
probe oci8__error(int status, long errcode);
-   probe oci8__execute__mode(unsigned int mode);
+   probe oci8__execute__mode(void *connection, unsigned int mode);
+   probe oci8__sqltext(void *connection, char *sql);
 
probe oci8__connect__p__dtor__close(void *connection);
probe oci8__connect__p__dtor__release(void *connection);
diff --git a/ext/oci8/oci8_statement.c b/ext/oci8/oci8_statement.c
index b2fa8ca..274c4e9 100644
--- a/ext/oci8/oci8_statement.c
+++ b/ext/oci8/oci8_statement.c
@@ -58,7 +58,7 @@ php_oci_statement 
*php_oci_statement_create(php_oci_connection *connection, char
} else {
 #ifdef HAVE_OCI8_DTRACE
if (DTRACE_OCI8_SQLTEXT_ENABLED()) {
-   DTRACE_OCI8_SQLTEXT(query);
+   DTRACE_OCI8_SQLTEXT(connection, query);
}
 #endif /* HAVE_OCI8_DTRACE */
}
@@ -498,7 +498,7 @@ int php_oci_statement_execute(php_oci_statement *statement, 
ub4 mode TSRMLS_DC)
/* only these are allowed */
 #ifdef HAVE_OCI8_DTRACE
if (DTRACE_OCI8_EXECUTE_MODE_ENABLED()) {
-   DTRACE_OCI8_EXECUTE_MODE(mode);
+   DTRACE_OCI8_EXECUTE_MODE(statement-connection, 
mode);
}
 #endif /* HAVE_OCI8_DTRACE */
break;
diff --git a/ext/oci8/package.xml b/ext/oci8/package.xml
index 90c187b..fcab20c 100644
--- a/ext/oci8/package.xml
+++ b/ext/oci8/package.xml
@@ -40,7 +40,7 @@ http://pear.php.net/dtd/package-2.0.xsd;
   activeno/active
  /lead
 
- date2013-09-03/date
+ date2013-09-06/date
  time12:00:00/time
 
   version
@@ -55,6 +55,8 @@ http://pear.php.net/dtd/package-2.0.xsd;
   notes
 Review and improve error handling code and data types.
 Fix oci_set_*($connection, ...) error handling so oci_error($connection) works.
+Add DTrace oci8-connection-close probe
+Add the connection handle to several DTrace probes.
   /notes
  contents
   dir name=/
diff --git a/ext/oci8/php_oci8.h b/ext/oci8/php_oci8.h
index f10f01d..8c5fba9 100644
--- a/ext/oci8/php_oci8.h
+++ b/ext/oci8/php_oci8.h
@@ -46,7 +46,7 @@
  */
 #undef PHP_OCI8_VERSION
 #endif
-#define PHP_OCI8_VERSION 2.0.1-dev
+#define PHP_OCI8_VERSION 2.0.2-dev
 
 extern zend_module_entry oci8_module_entry;
 #define phpext_oci8_ptr oci8_module_entry


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

[PHP-CVS] com php-src: Remove obsolete flag: ext/oci8/oci8.c ext/oci8/oci8_interface.c ext/oci8/php_oci8_int.h ext/oci8/tests/function_aliases.phpt

2013-09-06 Thread Christopher Jones 
Commit:43289d664ccde3813c10c745687a7674067f9856
Author:Christopher Jones s...@php.net Fri, 6 Sep 2013 10:12:16 
-0700
Parents:   ca4d122adcab8703f63cf8ed95a28a1fbc6e2b47
Branches:  master

Link:   
http://git.php.net/?p=php-src.git;a=commitdiff;h=43289d664ccde3813c10c745687a7674067f9856

Log:
Remove obsolete flag

Changed paths:
  M  ext/oci8/oci8.c
  M  ext/oci8/oci8_interface.c
  M  ext/oci8/php_oci8_int.h
  M  ext/oci8/tests/function_aliases.phpt


Diff:
diff --git a/ext/oci8/oci8.c b/ext/oci8/oci8.c
index 8b6a389..bccaa52 100644
--- a/ext/oci8/oci8.c
+++ b/ext/oci8/oci8.c
@@ -1306,7 +1306,6 @@ PHP_MINIT_FUNCTION(oci)
 
 PHP_RINIT_FUNCTION(oci)
 {
-   OCI_G(debug_mode) = 0; /* start fresh */
OCI_G(num_links) = OCI_G(num_persistent);
OCI_G(errcode) = 0;
OCI_G(edition) = NULL;
diff --git a/ext/oci8/oci8_interface.c b/ext/oci8/oci8_interface.c
index 6042ca5..8d70aff 100644
--- a/ext/oci8/oci8_interface.c
+++ b/ext/oci8/oci8_interface.c
@@ -1308,12 +1308,7 @@ PHP_FUNCTION(oci_field_is_null)
Toggle internal debugging output for the OCI extension */
 PHP_FUNCTION(oci_internal_debug)
 {
-   zend_bool on_off;
-
-   if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, b, on_off) == 
FAILURE) {
-   return;
-   }
-   OCI_G(debug_mode) = on_off;
+   /* NOP in OCI8 2.0. Obsoleted by DTrace probes */
 }
 /* }}} */
 
diff --git a/ext/oci8/php_oci8_int.h b/ext/oci8/php_oci8_int.h
index 7c84858..6155a88 100644
--- a/ext/oci8/php_oci8_int.h
+++ b/ext/oci8/php_oci8_int.h
@@ -496,8 +496,6 @@ ZEND_BEGIN_MODULE_GLOBALS(oci) /* {{{ Module globals */
sb4  errcode;   
/* global last ORA- error number. Used when connect fails, for example 
*/
OCIError*err;   
/* global error handle */
 
-   zend_booldebug_mode;/* 
debug mode flag */
-
long max_persistent;/* 
maximum number of persistent connections per process */
long num_persistent;/* 
number of existing persistent connections */
long num_links; 
/* non-persistent + persistent connections */
diff --git a/ext/oci8/tests/function_aliases.phpt 
b/ext/oci8/tests/function_aliases.phpt
index 4c6ce83..2c890d6 100644
--- a/ext/oci8/tests/function_aliases.phpt
+++ b/ext/oci8/tests/function_aliases.phpt
@@ -104,8 +104,6 @@ NULL
 
 Warning: ocifreestatement() expects exactly 1 parameter, 0 given in %s on line 
%d
 NULL
-
-Warning: ociinternaldebug() expects exactly 1 parameter, 0 given in %s on line 
%d
 NULL
 
 Warning: ocinumcols() expects exactly 1 parameter, 0 given in %s on line %d


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

[PHP-CVS] com php-src: Cast time_t since some dtrace -G invocations fail on time_t arguments: ext/oci8/oci8.c ext/oci8/oci8_dtrace.d ext/oci8/package.xml

2013-09-03 Thread Christopher Jones 
Commit:6ece5503942a1d8c4a78504161f9466e9e14fed2
Author:Christopher Jones s...@php.net Tue, 3 Sep 2013 15:17:36 
-0700
Parents:   8a0ae67dd94fedbc4f47773919622d542505237c
Branches:  master

Link:   
http://git.php.net/?p=php-src.git;a=commitdiff;h=6ece5503942a1d8c4a78504161f9466e9e14fed2

Log:
Cast time_t since some dtrace -G invocations fail on time_t arguments

Changed paths:
  M  ext/oci8/oci8.c
  M  ext/oci8/oci8_dtrace.d
  M  ext/oci8/package.xml


Diff:
diff --git a/ext/oci8/oci8.c b/ext/oci8/oci8.c
index b183e48..2ff52b8 100644
--- a/ext/oci8/oci8.c
+++ b/ext/oci8/oci8.c
@@ -2783,7 +2783,7 @@ static int php_oci_persistent_helper(zend_rsrc_list_entry 
*le TSRMLS_DC)
if (!connection-used_this_request  OCI_G(persistent_timeout) 
!= -1) {
 #ifdef HAVE_OCI8_DTRACE
if (DTRACE_OCI8_CONNECT_EXPIRY_ENABLED()) {
-   DTRACE_OCI8_CONNECT_EXPIRY(connection, 
connection-is_stub ? 1 : 0, connection-idle_expiry, timestamp);
+   DTRACE_OCI8_CONNECT_EXPIRY(connection, 
connection-is_stub ? 1 : 0, (long)connection-idle_expiry, (long)timestamp);
}
 #endif /* HAVE_OCI8_DTRACE */
if (connection-idle_expiry  timestamp) {
diff --git a/ext/oci8/oci8_dtrace.d b/ext/oci8/oci8_dtrace.d
index 15d210c..d6982f0 100644
--- a/ext/oci8/oci8_dtrace.d
+++ b/ext/oci8/oci8_dtrace.d
@@ -27,7 +27,7 @@ provider php {
probe oci8__connect__p__dtor__close(void *connection);
probe oci8__connect__p__dtor__release(void *connection);
probe oci8__connect__lookup(void *connection, int is_stub);
-   probe oci8__connect__expiry(void *connection, int is_stub, time_t 
idle_expiry, time_t timestamp);
+   probe oci8__connect__expiry(void *connection, int is_stub, long 
idle_expiry, long timestamp);
probe oci8__connect__type(int persistent, int exclusive, void 
*connection, long num_persistent, long num_connections);
probe oci8__sesspool__create(void *session_pool);
probe oci8__sesspool__stats(unsigned long free, unsigned long busy, 
unsigned long open);
diff --git a/ext/oci8/package.xml b/ext/oci8/package.xml
index f18e7af..f2c59a1 100644
--- a/ext/oci8/package.xml
+++ b/ext/oci8/package.xml
@@ -40,7 +40,7 @@ http://pear.php.net/dtd/package-2.0.xsd;
   activeno/active
  /lead
 
- date2013-08-30/date
+ date2013-09-03/date
  time12:00:00/time
 
   version


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

[PHP-CVS] com php-src: OCI8: remove unused ext/oci8/config.m4 macro: ext/oci8/config.m4

2013-08-30 Thread Christopher Jones 
Commit:82da51bbce7e25a7f24d97522617c62060423776
Author:Christopher Jones s...@php.net Fri, 30 Aug 2013 11:15:56 
-0700
Parents:   e6053acd78259cc8bab396ede42cebc04de9157d
Branches:  master

Link:   
http://git.php.net/?p=php-src.git;a=commitdiff;h=82da51bbce7e25a7f24d97522617c62060423776

Log:
OCI8: remove unused ext/oci8/config.m4 macro

Changed paths:
  M  ext/oci8/config.m4


Diff:
diff --git a/ext/oci8/config.m4 b/ext/oci8/config.m4
index 2af75a2..311579f 100644
--- a/ext/oci8/config.m4
+++ b/ext/oci8/config.m4
@@ -15,22 +15,6 @@ else
 PHP_OCI8_TAIL1=tail -1
 fi
 
-AC_DEFUN([PHP_OCI_IF_DEFINED],[
-  old_CPPFLAGS=$CPPFLAGS
-  CPPFLAGS=$3
-  AC_EGREP_CPP(yes,[
-#include oci.h
-#if defined($1)
-yes
-#endif
-  ],[
-CPPFLAGS=$old_CPPFLAGS
-$2
-  ],[
-CPPFLAGS=$old_CPPFLAGS
-  ])
-])
-
 AC_DEFUN([AC_OCI8_CHECK_LIB_DIR],[
   AC_MSG_CHECKING([ORACLE_HOME library validity])
   if test ! -d $OCI8_DIR; then


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

[PHP-CVS] com php-src: OCI8 whitespace: remove tabs embedded in code: ext/oci8/oci8.c ext/oci8/oci8_collection.c ext/oci8/oci8_statement.c

2013-08-30 Thread Christopher Jones 
Commit:e6053acd78259cc8bab396ede42cebc04de9157d
Author:Christopher Jones s...@php.net Fri, 30 Aug 2013 11:14:20 
-0700
Parents:   faddd409a44f1b0b991951361ccdc8487a003bd5
Branches:  master

Link:   
http://git.php.net/?p=php-src.git;a=commitdiff;h=e6053acd78259cc8bab396ede42cebc04de9157d

Log:
OCI8 whitespace: remove tabs embedded in code

Changed paths:
  M  ext/oci8/oci8.c
  M  ext/oci8/oci8_collection.c
  M  ext/oci8/oci8_statement.c


Diff:
diff --git a/ext/oci8/oci8.c b/ext/oci8/oci8.c
index b30fb4b..dc4737f 100644
--- a/ext/oci8/oci8.c
+++ b/ext/oci8/oci8.c
@@ -2327,7 +2327,7 @@ static int php_oci_connection_close(php_oci_connection 
*connection TSRMLS_DC)
}
 
if (connection-svc) {
-   PHP_OCI_CALL(OCIHandleFree, ((dvoid *) connection-svc, 
(ub4) OCI_HTYPE_SVCCTX));
+   PHP_OCI_CALL(OCIHandleFree, ((dvoid *) connection-svc, 
(ub4) OCI_HTYPE_SVCCTX));
}
 
if (connection-server) {
diff --git a/ext/oci8/oci8_collection.c b/ext/oci8/oci8_collection.c
index 4abfbd6..ae93614 100644
--- a/ext/oci8/oci8_collection.c
+++ b/ext/oci8/oci8_collection.c
@@ -105,7 +105,7 @@ php_oci_collection * 
php_oci_collection_create(php_oci_connection *connection, c
}
 
/* get first parameter handle */
-   PHP_OCI_CALL_RETURN(connection-errcode, OCIAttrGet, ((dvoid *) dschp1, 
(ub4) OCI_HTYPE_DESCRIBE, (dvoid *)parmp1, (ub4 *)0, (ub4)OCI_ATTR_PARAM,  
connection-err));
+   PHP_OCI_CALL_RETURN(connection-errcode, OCIAttrGet, ((dvoid *) dschp1, 
(ub4) OCI_HTYPE_DESCRIBE, (dvoid *)parmp1, (ub4 *)0, (ub4)OCI_ATTR_PARAM, 
connection-err));
 
if (connection-errcode != OCI_SUCCESS) {
goto CLEANUP;
diff --git a/ext/oci8/oci8_statement.c b/ext/oci8/oci8_statement.c
index cf8d23d..752a45b 100644
--- a/ext/oci8/oci8_statement.c
+++ b/ext/oci8/oci8_statement.c
@@ -502,7 +502,7 @@ int php_oci_statement_execute(php_oci_statement *statement, 
ub4 mode TSRMLS_DC)

if (!statement-stmttype) {
/* get statement type */
-   PHP_OCI_CALL_RETURN(statement-errcode, OCIAttrGet, ((dvoid 
*)statement-stmt, OCI_HTYPE_STMT, (ub2 *)statement-stmttype, (ub4 *)0,   
OCI_ATTR_STMT_TYPE, statement-err));
+   PHP_OCI_CALL_RETURN(statement-errcode, OCIAttrGet, ((dvoid 
*)statement-stmt, OCI_HTYPE_STMT, (ub2 *)statement-stmttype, (ub4 *)0, 
OCI_ATTR_STMT_TYPE, statement-err));
 
if (statement-errcode != OCI_SUCCESS) {
statement-errcode = php_oci_error(statement-err, 
statement-errcode TSRMLS_CC);
@@ -528,7 +528,7 @@ int php_oci_statement_execute(php_oci_statement *statement, 
ub4 mode TSRMLS_DC)
}
 
/* execute statement */
-   PHP_OCI_CALL_RETURN(statement-errcode, OCIStmtExecute, 
(statement-connection-svc,statement-stmt, statement-err, iters, 0, 
NULL, NULL, mode));
+   PHP_OCI_CALL_RETURN(statement-errcode, OCIStmtExecute, 
(statement-connection-svc, statement-stmt, statement-err, iters, 0, NULL, 
NULL, mode));
 
if (statement-errcode != OCI_SUCCESS) {
statement-errcode = php_oci_error(statement-err, 
statement-errcode TSRMLS_CC);


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

[PHP-CVS] com php-src: Allow OCI8 to be DTrace-enabled independently of core PHP's DTrace status. The proviso is OCI8 must be built shared when DTrace is enabled. This implementation (i) works aro

2013-08-30 Thread Christopher Jones 
Commit:d7ffca590b4ee188a5dcdbafb036e6541f3c79be
Author:Christopher Jones s...@php.net Fri, 30 Aug 2013 17:37:44 
-0700
Parents:   82da51bbce7e25a7f24d97522617c62060423776
Branches:  master

Link:   
http://git.php.net/?p=php-src.git;a=commitdiff;h=d7ffca590b4ee188a5dcdbafb036e6541f3c79be

Log:
Allow OCI8 to be DTrace-enabled independently of core PHP's DTrace
status.  The proviso is OCI8 must be built shared when DTrace is
enabled.  This implementation (i) works around an incomplete core PHP
solution for extension tracing (ii) avoid any issues with DOF section
location and the complexities of needing to merge all provider .d
files for static builds (iii) allows OCI8 to be DTrace-enabled when
doing PECL installs of OCI8 on PHP versions without core PHP DTrace
support.

This is an initial patch i.e. it will undergo further testing.

Changed paths:
  M  ext/oci8/config.m4
  M  ext/oci8/oci8.c
  M  ext/oci8/oci8_statement.c
  M  ext/oci8/package.xml
  M  ext/oci8/php_oci8_int.h

diff --git a/ext/oci8/config.m4 b/ext/oci8/config.m4
index 311579f..49998d1 100644
--- a/ext/oci8/config.m4
+++ b/ext/oci8/config.m4
@@ -82,13 +82,99 @@ AC_DEFUN([AC_OCI8_ORACLE_VERSION],[
   AC_MSG_RESULT($OCI8_ORACLE_VERSION)
 ])
 
+dnl
+dnl OCI8_INIT_DTRACE(providerdesc, header-file, sources)
+dnl This mimics PHP_INIT_DTRACE from PHP 5.4's acinclude.m4. It is
+dnl necessarily different from PHP_INIT_DTRACE which doesn't currently
+dnl support DTrace for extensions.  Creating OCI8_INIT_DTRACE
+dnl independently instead of using a refactored PHP_INIT_DTRACE allows
+dnl OCI8 to be DTraced on versions of PHP where core PHP DTrace support
+dnl isn't available.
+dnl 
+AC_DEFUN([OCI8_INIT_DTRACE],[
+  ac_srcdir=[]PHP_EXT_SRCDIR([oci8])/
+  ac_bdir=[]PHP_EXT_BUILDDIR([oci8])/
+
+dnl providerdesc
+  ac_provsrc=$1
+
+dnl header-file
+  ac_hdrobj=$2
+
+dnl DTrace objects
+  old_IFS=[$]IFS
+  for ac_src in $3; do
+IFS=.
+set $ac_src
+ac_obj=[$]1
+IFS=$old_IFS
+
+OCI8_DTRACE_OBJS=[$]OCI8_DTRACE_OBJS [$]ac_bdir[$]ac_obj.lo
+  done;
+
+  for ac_lo in $OCI8_DTRACE_OBJS; do
+dtrace_oci8_objs=[$]dtrace_oci8_objs `echo $ac_lo | $SED -e 's,\.lo$,.o,' 
-e 's#\(.*\)\/#\1\/.libs\/#'`
+  done;
+
+dnl Generate Makefile.objects entry
+dnl The empty $ac_provsrc command stops an implicit circular dependency
+dnl in GNU Make which causes the .d file to be overwritten (Bug 61268)
+  catMakefile.objectsEOF
+
+PHP_EXT_SRCDIR([oci8])/$ac_provsrc:;
+
+$ac_bdir[$]ac_hdrobj: $ac_srcdir[$]ac_provsrc
+   CFLAGS=\$(CFLAGS_CLEAN) dtrace -h -C -s $ac_srcdir[$]ac_provsrc -o 
\$[]@.bak  \$(SED) -e 's,PHP_,DTRACE_,g' \$[]@.bak  \$[]@
+
+\$(OCI8_DTRACE_OBJS): $ac_bdir[$]ac_hdrobj
+
+EOF
+
+  case $host_alias in
+  *solaris*|*linux*)
+dtrace_prov_name=`echo $ac_provsrc | $SED -e 's#\(.*\)\/##'`.o
+dtrace_lib_dir=`echo $ac_bdir[$]ac_provsrc | $SED -e 
's#\(.*\)/[^/]*#\1#'`/.libs
+dtrace_d_obj=`echo $ac_bdir[$]ac_provsrc | $SED -e 
's#\(.*\)/\([^/]*\)#\1/.libs/\2#'`.o
+dtrace_nolib_objs='$(OCI8_DTRACE_OBJS:.lo=.o)'
+for ac_lo in $OCI8_DTRACE_OBJS; do
+  dtrace_oci8_lib_objs=[$]dtrace_oci8_lib_objs `echo $ac_lo | $SED -e 
's,\.lo$,.o,' -e 's#\(.*\)\/#\1\/.libs\/#'`
+done;
+dnl Always attempt to create both PIC and non-PIC DTrace objects (Bug 63692)
+catMakefile.objectsEOF
+$ac_bdir[$]ac_provsrc.lo: \$(OCI8_DTRACE_OBJS)
+   echo [#] Generated by Makefile for libtool  \$[]@
+   @test -d $dtrace_lib_dir || mkdir $dtrace_lib_dir
+   if CFLAGS=\$(CFLAGS_CLEAN) dtrace -G -o $dtrace_d_obj -s 
$ac_srcdir[$]ac_provsrc $dtrace_oci8_lib_objs 2 /dev/null  test -f 
$dtrace_d_obj; then [\\]
+ echo pic_object=['].libs/$dtrace_prov_name[']  \$[]@ [;\\]
+   else [\\]
+ echo pic_object='none'  \$[]@ [;\\]
+   fi
+   if CFLAGS=\$(CFLAGS_CLEAN) dtrace -G -o $ac_bdir[$]ac_provsrc.o -s 
$ac_srcdir[$]ac_provsrc $dtrace_nolib_objs 2 /dev/null  test -f 
$ac_bdir[$]ac_provsrc.o; then [\\]
+ echo non_pic_object=[']$dtrace_prov_name[']  \$[]@ [;\\]
+   else [\\]
+ echo non_pic_object='none'  \$[]@ [;\\]
+   fi
+
+EOF
+;;
+  *)
+AC_MSG_WARN([OCI8 extension: OCI8 DTrace support is not confirmed on this 
platform])
+catMakefile.objectsEOF
+$ac_bdir[$]ac_provsrc.o: \$(OCI8_DTRACE_OBJS)
+   CFLAGS=\$(CFLAGS_CLEAN) dtrace -G -o \$[]@ -s $ac_srcdir[$]ac_provsrc 
$dtrace_oci8_objs
+
+EOF
+;;
+  esac
+])
+
 
 dnl --with-oci8=shared,instantclient,/path/to/client/dir/lib
 dnl or
 dnl --with-oci8=shared,/path/to/oracle/home
 PHP_ARG_WITH(oci8, for Oracle Database OCI8 support,
-[  --with-oci8[=DIR] Include Oracle Database OCI8 support. DIR 
defaults to \$ORACLE_HOME.
-  Use 
--with-oci8=instantclient,/path/to/instant/client/lib 
+[  --with-oci8[=DIR] Include Oracle Database OCI8 support. DIR 
defaults to [$]ORACLE_HOME.
+  Use 
--with-oci8=instantclient,/path/to/instant/client/lib

[PHP-CVS] com php-src: OCI8 2.0: add oci8-check-connection probe and do some renaming: ext/oci8/config.m4 ext/oci8/oci8.c ext/oci8/oci8_dtrace.d ext/oci8/php_oci8_int.h

2013-08-27 Thread Christopher Jones 
Commit:49cd21e71cc6d18bbe601e5e2ae07f7c0ae143ec
Author:Christopher Jones s...@php.net Tue, 27 Aug 2013 16:41:02 
-0700
Parents:   72f80b2997920bf6fadc83ddcb3908252a9064eb
Branches:  master

Link:   
http://git.php.net/?p=php-src.git;a=commitdiff;h=49cd21e71cc6d18bbe601e5e2ae07f7c0ae143ec

Log:
OCI8 2.0: add oci8-check-connection probe and do some renaming

Changed paths:
  M  ext/oci8/config.m4
  M  ext/oci8/oci8.c
  M  ext/oci8/oci8_dtrace.d
  M  ext/oci8/php_oci8_int.h


Diff:
diff --git a/ext/oci8/config.m4 b/ext/oci8/config.m4
index b76db64..2af75a2 100644
--- a/ext/oci8/config.m4
+++ b/ext/oci8/config.m4
@@ -154,8 +154,7 @@ if test $PHP_OCI8 != no; then
   AC_MSG_ERROR([You need at least PHP 5.4 to be able to use DTrace with 
PHP OCI8])
 else
   AC_CHECK_HEADERS([sys/sdt.h], [
-
PHP_INIT_DTRACE([ext/oci8/oci8_dtrace.d],[ext/oci8/oci8_dtrace_gen.h],[ext/oci8/oci8.c
 \
-   ext/oci8/oci8_interface.c ext/oci8/oci8_collection.c 
ext/oci8/oci8_lob.c ext/oci8/oci8_statement.c])
+
PHP_INIT_DTRACE([ext/oci8/oci8_dtrace.d],[ext/oci8/oci8_dtrace_gen.h],[ext/oci8/oci8.c
 ext/oci8/oci8_statement.c])
], [
 AC_MSG_ERROR(
   [Cannot find sys/sdt.h which is required for DTrace support])
diff --git a/ext/oci8/oci8.c b/ext/oci8/oci8.c
index f717caa..b30fb4b 100644
--- a/ext/oci8/oci8.c
+++ b/ext/oci8/oci8.c
@@ -1772,8 +1772,8 @@ void php_oci_do_connect(INTERNAL_FUNCTION_PARAMETERS, int 
persistent, int exclus
}
 
 #ifdef HAVE_DTRACE
-   if (DTRACE_OCI8_CONNECT_START_ENABLED()) {
-   DTRACE_OCI8_CONNECT_START(username, dbname, charset, 
session_mode, persistent, exclusive);
+   if (DTRACE_OCI8_CONNECT_ENTRY_ENABLED()) {
+   DTRACE_OCI8_CONNECT_ENTRY(username, dbname, charset, 
session_mode, persistent, exclusive);
}
 #endif /* HAVE_DTRACE */
 
@@ -1784,8 +1784,8 @@ void php_oci_do_connect(INTERNAL_FUNCTION_PARAMETERS, int 
persistent, int exclus
connection = php_oci_do_connect_ex(username, username_len, password, 
password_len, NULL, 0, dbname, dbname_len, charset, session_mode, persistent, 
exclusive TSRMLS_CC);
 
 #ifdef HAVE_DTRACE
-   if (DTRACE_OCI8_CONNECT_DONE_ENABLED()) {
-   DTRACE_OCI8_CONNECT_DONE();
+   if (DTRACE_OCI8_CONNECT_RETURN_ENABLED()) {
+   DTRACE_OCI8_CONNECT_RETURN(connection);
}
 #endif /* HAVE_DTRACE */
 
@@ -3465,6 +3465,20 @@ static sword php_oci_ping_init(php_oci_connection 
*connection, OCIError *errh TS
 }
 /* }}} */
 
+/* {{{ php_oci_dtrace_check_connection()
+ *
+ * DTrace output for connections that may have become invalid and marked for 
reopening
+ */
+void php_oci_dtrace_check_connection(php_oci_connection *connection, sword 
errcode, ub4 serverStatus)
+{
+#ifdef HAVE_DTRACE
+   if (DTRACE_OCI8_CHECK_CONNECTION_ENABLED()) {
+   DTRACE_OCI8_CHECK_CONNECTION(connection, connection  
connection-is_open ? 1 : 0, (int)errcode, (unsigned long)serverStatus);
+   }
+#endif /* HAVE_DTRACE */
+}
+/* }}} */
+
 #endif /* HAVE_OCI8 */
 
 /*
diff --git a/ext/oci8/oci8_dtrace.d b/ext/oci8/oci8_dtrace.d
index 2773f78..15d210c 100644
--- a/ext/oci8/oci8_dtrace.d
+++ b/ext/oci8/oci8_dtrace.d
@@ -17,8 +17,9 @@
 */
 
 provider php {
-   probe oci8__connect__start(char *username, char *dbname, char *charset, 
long session_mode, int persistent, int exclusive);
-   probe oci8__connect__done();
+   probe oci8__connect__entry(char *username, char *dbname, char *charset, 
long session_mode, int persistent, int exclusive);
+   probe oci8__connect__return(void *connection);
+   probe oci8__check__connection(void *connection, int is_open, int 
errcode, unsigned long serverstatus);
probe oci8__sqltext(char *sql);
probe oci8__error(int status, long errcode);
probe oci8__execute__mode(unsigned int mode);
@@ -27,7 +28,7 @@ provider php {
probe oci8__connect__p__dtor__release(void *connection);
probe oci8__connect__lookup(void *connection, int is_stub);
probe oci8__connect__expiry(void *connection, int is_stub, time_t 
idle_expiry, time_t timestamp);
-   probe oci8__connect__type(int is_persistent, int exclusive, void 
*connection, long num_persistent, long num_links);
+   probe oci8__connect__type(int persistent, int exclusive, void 
*connection, long num_persistent, long num_connections);
probe oci8__sesspool__create(void *session_pool);
probe oci8__sesspool__stats(unsigned long free, unsigned long busy, 
unsigned long open);
probe oci8__sesspool__type(int type, void *session_pool);
diff --git a/ext/oci8/php_oci8_int.h b/ext/oci8/php_oci8_int.h
index daf649b..ac58145 100644
--- a/ext/oci8/php_oci8_int.h
+++ b/ext/oci8/php_oci8_int.h
@@ -310,6 +310,7 @@ typedef struct {
  */
 #define PHP_OCI_HANDLE_ERROR(connection, errcode) \
do

[PHP-CVS] com php-src: Use __ consistently in OCI8 DTrace probe definitions. It maps to - in the probe name.: ext/oci8/oci8_dtrace.d

2013-08-26 Thread Christopher Jones 
Commit:4b67c781f3fdd93e6a602ee980176720f1ace10e
Author:Christopher Jones s...@php.net Mon, 26 Aug 2013 15:42:57 
-0700
Parents:   493ad8702733f430f7a2cf31f820688b4dcd9be9
Branches:  master

Link:   
http://git.php.net/?p=php-src.git;a=commitdiff;h=4b67c781f3fdd93e6a602ee980176720f1ace10e

Log:
Use __ consistently in OCI8 DTrace probe definitions. It maps to - in the 
probe name.

Changed paths:
  M  ext/oci8/oci8_dtrace.d


Diff:
diff --git a/ext/oci8/oci8_dtrace.d b/ext/oci8/oci8_dtrace.d
index dfb92bc..2773f78 100644
--- a/ext/oci8/oci8_dtrace.d
+++ b/ext/oci8/oci8_dtrace.d
@@ -17,18 +17,18 @@
 */
 
 provider php {
-   probe oci8__connect_start(char *username, char *dbname, char *charset, 
long session_mode, int persistent, int exclusive);
-   probe oci8__connect_done();
+   probe oci8__connect__start(char *username, char *dbname, char *charset, 
long session_mode, int persistent, int exclusive);
+   probe oci8__connect__done();
probe oci8__sqltext(char *sql);
probe oci8__error(int status, long errcode);
-   probe oci8__execute_mode(unsigned int mode);
+   probe oci8__execute__mode(unsigned int mode);
 
-   probe oci8__connect_p_dtor_close(void *connection);
-   probe oci8__connect_p_dtor_release(void *connection);
-   probe oci8__connect_lookup(void *connection, int is_stub);
-   probe oci8__connect_expiry(void *connection, int is_stub, time_t 
idle_expiry, time_t timestamp);
-   probe oci8__connect_type(int is_persistent, int exclusive, void 
*connection, long num_persistent, long num_links);
-   probe oci8__sesspool_create(void *session_pool);
-   probe oci8__sesspool_stats(unsigned long free, unsigned long busy, 
unsigned long open);
-   probe oci8__sesspool_type(int type, void *session_pool);
+   probe oci8__connect__p__dtor__close(void *connection);
+   probe oci8__connect__p__dtor__release(void *connection);
+   probe oci8__connect__lookup(void *connection, int is_stub);
+   probe oci8__connect__expiry(void *connection, int is_stub, time_t 
idle_expiry, time_t timestamp);
+   probe oci8__connect__type(int is_persistent, int exclusive, void 
*connection, long num_persistent, long num_links);
+   probe oci8__sesspool__create(void *session_pool);
+   probe oci8__sesspool__stats(unsigned long free, unsigned long busy, 
unsigned long open);
+   probe oci8__sesspool__type(int type, void *session_pool);
 };


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

[PHP-CVS] com php-src: Update NEWS: NEWS

2013-08-23 Thread Christopher Jones 
Commit:768c34e7cd4a7d9f7290825e887cb90fa0b137cc
Author:Christopher Jones s...@php.net Fri, 23 Aug 2013 08:13:59 
-0700
Parents:   5ab6d215fca55a33b0f144c69afdcf9121d248eb
Branches:  PHP-5.4

Link:   
http://git.php.net/?p=php-src.git;a=commitdiff;h=768c34e7cd4a7d9f7290825e887cb90fa0b137cc

Log:
Update NEWS

Changed paths:
  M  NEWS


Diff:
diff --git a/NEWS b/NEWS
index 1218c50..d73cf3e 100644
--- a/NEWS
+++ b/NEWS
@@ -3,6 +3,8 @@ PHP 
   NEWS
 ?? ??? 2013, PHP 5.4.20
 
 - Core:
+  . Fixed bug #65490 (Duplicate calls to get lineno  filename for 
+DTRACE_FUNCTION_*). (Chris Jones)
   . Fixed bug #65481 (shutdown segfault due to serialize) (Mike)
   . Fixed bug #65470 (Segmentation fault in zend_error() with 
 --enable-dtrace). (Chris Jones, Kris Van Hees)


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

[PHP-CVS] com php-src: Update NEWS: NEWS

2013-08-23 Thread Christopher Jones 
Commit:38f9c515cdee7c7c0e1c204ba24027de04e3936e
Author:Christopher Jones s...@php.net Fri, 23 Aug 2013 08:18:33 
-0700
Parents:   a2b1546f3b59095b65a5624494c778078cb5a87f
Branches:  PHP-5.5

Link:   
http://git.php.net/?p=php-src.git;a=commitdiff;h=38f9c515cdee7c7c0e1c204ba24027de04e3936e

Log:
Update NEWS

Changed paths:
  M  NEWS


Diff:
diff --git a/NEWS b/NEWS
index 6d62951..5ff378b 100644
--- a/NEWS
+++ b/NEWS
@@ -3,6 +3,8 @@ PHP 
   NEWS
 ?? ??? 2013, PHP 5.5.4
 
 - Core:
+  . Fixed bug #65490 (Duplicate calls to get lineno  filename for 
+DTRACE_FUNCTION_*). (Chris Jones)
   . Fixed bug #65470 (Segmentation fault in zend_error() with
 --enable-dtrace). (Chris Jones, Kris Van Hees)
   . Fixed bug #65225 (PHP_BINARY incorrectly set). (Patrick Allaert)


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

[PHP-CVS] com php-src: Suppress compliation warning warning: passing argument 1 of ‘_efree’ discards qualifiers from pointer target type: ext/intl/resourcebundle/resourcebundle.c

2013-08-22 Thread Christopher Jones 
Commit:7109f369e84838a852cd0f0c591fd58a1bc4
Author:Christopher Jones s...@php.net Thu, 22 Aug 2013 09:05:52 
-0700
Parents:   f2ceb4963e1ecce4535d3a9b1e3dfa6960aff2c6
Branches:  PHP-5.4 PHP-5.5 master

Link:   
http://git.php.net/?p=php-src.git;a=commitdiff;h=7109f369e84838a852cd0f0c591fd58a1bc4

Log:
Suppress compliation warning warning: passing argument 1 of ‘_efree’ discards 
qualifiers from pointer target type

Changed paths:
  M  ext/intl/resourcebundle/resourcebundle.c


Diff:
diff --git a/ext/intl/resourcebundle/resourcebundle.c 
b/ext/intl/resourcebundle/resourcebundle.c
index 6d39dfb..f5475fa 100644
--- a/ext/intl/resourcebundle/resourcebundle.c
+++ b/ext/intl/resourcebundle/resourcebundle.c
@@ -41,7 +41,7 @@ void resourcebundle_extract_value( zval *return_value, 
ResourceBundle_object *so
case URES_STRING:
ufield = ures_getString( source-child, ilen, 
INTL_DATA_ERROR_CODE(source) );
INTL_METHOD_CHECK_STATUS(source, Failed to retrieve 
string value);
-   INTL_METHOD_RETVAL_UTF8(source, ufield, ilen, 0);
+   INTL_METHOD_RETVAL_UTF8(source, (UChar *)ufield, ilen, 
0);
break;
 
case URES_BINARY:


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

[PHP-CVS] com php-src: Revert Suppress compliation warning warning: passing argument 1 of ‘_efree’ discards qualifiers from pointer target type: ext/intl/intl_data.h

2013-08-22 Thread Christopher Jones 
Commit:a61f5bf925837ad39962f5d128b748f1c0c3b321
Author:Christopher Jones s...@php.net Thu, 22 Aug 2013 08:57:18 
-0700
Parents:   80917e5ca29b8eeed31d87915154dba13bdcc2b5
Branches:  master

Link:   
http://git.php.net/?p=php-src.git;a=commitdiff;h=a61f5bf925837ad39962f5d128b748f1c0c3b321

Log:
Revert Suppress compliation warning warning: passing argument 1 of ‘_efree’ 
discards qualifiers from pointer target type

This reverts commit f38bd22ed2c5f710f72e719d7ab2a41ce30541fc.

Changed paths:
  M  ext/intl/intl_data.h


Diff:
diff --git a/ext/intl/intl_data.h b/ext/intl/intl_data.h
index 6966dc2..66ca27a 100644
--- a/ext/intl/intl_data.h
+++ b/ext/intl/intl_data.h
@@ -79,7 +79,7 @@ typedef struct _intl_data {
int u8len;  

\
intl_convert_utf16_to_utf8(u8value, u8len, ustring, ulen, 
INTL_DATA_ERROR_CODE((obj)));  \
if((free_it)) { 

\
-   efree((void *)ustring); 

\
+   efree(ustring); 

\
}   

\
INTL_METHOD_CHECK_STATUS((obj), Error converting value to UTF-8); 
\
RETVAL_STRINGL(u8value, u8len, 0);  

\


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

[PHP-CVS] com php-src: Revert Suppress compliation warning warning: passing argument 1 of ‘_efree’ discards qualifiers from pointer target type: ext/intl/intl_data.h

2013-08-22 Thread Christopher Jones 
Commit:f2ceb4963e1ecce4535d3a9b1e3dfa6960aff2c6
Author:Christopher Jones s...@php.net Thu, 22 Aug 2013 08:58:24 
-0700
Parents:   d5987478a8fd566775510c08993cc933267a3765
Branches:  PHP-5.4 PHP-5.5 master

Link:   
http://git.php.net/?p=php-src.git;a=commitdiff;h=f2ceb4963e1ecce4535d3a9b1e3dfa6960aff2c6

Log:
Revert Suppress compliation warning warning: passing argument 1 of ‘_efree’ 
discards qualifiers from pointer target type

This reverts commit f38bd22ed2c5f710f72e719d7ab2a41ce30541fc.

Changed paths:
  M  ext/intl/intl_data.h


Diff:
diff --git a/ext/intl/intl_data.h b/ext/intl/intl_data.h
index 6966dc2..66ca27a 100644
--- a/ext/intl/intl_data.h
+++ b/ext/intl/intl_data.h
@@ -79,7 +79,7 @@ typedef struct _intl_data {
int u8len;  

\
intl_convert_utf16_to_utf8(u8value, u8len, ustring, ulen, 
INTL_DATA_ERROR_CODE((obj)));  \
if((free_it)) { 

\
-   efree((void *)ustring); 

\
+   efree(ustring); 

\
}   

\
INTL_METHOD_CHECK_STATUS((obj), Error converting value to UTF-8); 
\
RETVAL_STRINGL(u8value, u8len, 0);  

\


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

[PHP-CVS] com php-src: Revert Suppress compliation warning warning: passing argument 1 of ‘_efree’ discards qualifiers from pointer target type: ext/intl/intl_data.h

2013-08-22 Thread Christopher Jones 
Commit:18282f42c5d39e6b1790dfa7b2e18becc21d2f23
Author:Christopher Jones s...@php.net Thu, 22 Aug 2013 08:58:35 
-0700
Parents:   908da14bd1131c5c35d3f206734e9f8f42872b33
Branches:  PHP-5.5 master

Link:   
http://git.php.net/?p=php-src.git;a=commitdiff;h=18282f42c5d39e6b1790dfa7b2e18becc21d2f23

Log:
Revert Suppress compliation warning warning: passing argument 1 of ‘_efree’ 
discards qualifiers from pointer target type

This reverts commit f38bd22ed2c5f710f72e719d7ab2a41ce30541fc.

Changed paths:
  M  ext/intl/intl_data.h


Diff:
diff --git a/ext/intl/intl_data.h b/ext/intl/intl_data.h
index 6966dc2..66ca27a 100644
--- a/ext/intl/intl_data.h
+++ b/ext/intl/intl_data.h
@@ -79,7 +79,7 @@ typedef struct _intl_data {
int u8len;  

\
intl_convert_utf16_to_utf8(u8value, u8len, ustring, ulen, 
INTL_DATA_ERROR_CODE((obj)));  \
if((free_it)) { 

\
-   efree((void *)ustring); 

\
+   efree(ustring); 

\
}   

\
INTL_METHOD_CHECK_STATUS((obj), Error converting value to UTF-8); 
\
RETVAL_STRINGL(u8value, u8len, 0);  

\


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

Re: [PHP-CVS] com php-src: Suppress compliation warning warning: passing argument 1 of _efree discards qualifiers from pointer target type: ext/intl/intl_data.h

2013-08-22 Thread Christopher Jones 

Resend due to Spam URI Realtime Blocklist (SURBL) bounce.

On 08/22/2013 08:51 AM, Christopher Jones wrote:




On 8/22/13 1:23 AM, Nikita Popov wrote:

On Thu, Aug 22, 2013 at 12:06 AM, Christopher Jones s...@php.net wrote:



Assuming this suppresses a `const` qualifier, wouldn't it be better to
remove said qualifier, rather than suppressing the warning?

Nikita



Not in this usage. The const is valid in the caller of the macros.
It's a compile warning only: the free call is never executed on the
const pointer due to the protecting if.  I may be able to move the
cast up to the macro invocation so that not all users of the macros
will have the warning suppressed.



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

[PHP-CVS] com php-src: Reduce compilation noise during normal compilation: php-5.5/ext/session/session.c:836: warning: unused variable ‘struc’ php-5.5/ext/session/session.c:836: warning: unuse

2013-08-21 Thread Christopher Jones 
Commit:d85827fb7fc6983de6e58cb7412644dca407d67f
Author:Christopher Jones s...@php.net Wed, 21 Aug 2013 10:34:09 
-0700
Parents:   618194859205c178a5359e60d8e156763036ddfd
Branches:  PHP-5.5 master

Link:   
http://git.php.net/?p=php-src.git;a=commitdiff;h=d85827fb7fc6983de6e58cb7412644dca407d67f

Log:
Reduce compilation noise during normal compilation:
php-5.5/ext/session/session.c:836: warning: unused variable ‘struc’
php-5.5/ext/session/session.c:836: warning: unused variable ‘num_key’
php-5.5/ext/session/session.c:836: warning: unused variable ‘key_length’
php-5.5/ext/session/session.c:836: warning: unused variable ‘key’
php-5.5/ext/session/session.c:835: warning: unused variable ‘key_type’
php-5.5/ext/session/session.c:834: warning: unused variable ‘_ht’
php-5.5/ext/session/session.c:857: warning: unused variable ‘has_value’
php-5.5/ext/session/session.c:856: warning: unused variable ‘namelen’
php-5.5/ext/session/session.c:853: warning: unused variable ‘name’
php-5.5/ext/session/session.c:852: warning: unused variable ‘p’

php-5.5/ext/session/mod_user.c:191: warning: unused variable ‘ret’

Changed paths:
  M  ext/session/mod_user.c
  M  ext/session/session.c


Diff:
diff --git a/ext/session/mod_user.c b/ext/session/mod_user.c
index 82fd419..1b606b9 100644
--- a/ext/session/mod_user.c
+++ b/ext/session/mod_user.c
@@ -188,7 +188,7 @@ PS_CREATE_SID_FUNC(user)
/* maintain backwards compatibility */
if (PSF(create_sid) != NULL) {
char *id = NULL;
-   STDVARS;
+   zval *retval = NULL;
 
retval = ps_call_handler(PSF(create_sid), 0, NULL TSRMLS_CC);
 
diff --git a/ext/session/session.c b/ext/session/session.c
index 1db2018..7bb6584 100644
--- a/ext/session/session.c
+++ b/ext/session/session.c
@@ -831,9 +831,6 @@ PS_SERIALIZER_ENCODE_FUNC(php_serialize) /* {{{ */
 {
smart_str buf = {0};
php_serialize_data_t var_hash;
-   HashTable *_ht = Z_ARRVAL_P(PS(http_session_vars));
-   int key_type;
-   PS_ENCODE_VARS;
 
PHP_VAR_SERIALIZE_INIT(var_hash);
php_var_serialize(buf, PS(http_session_vars), var_hash TSRMLS_CC);
@@ -849,12 +846,8 @@ PS_SERIALIZER_ENCODE_FUNC(php_serialize) /* {{{ */
 
 PS_SERIALIZER_DECODE_FUNC(php_serialize) /* {{{ */
 {
-   const char *p;
-   char *name;
const char *endptr = val + vallen;
zval *session_vars;
-   int namelen;
-   int has_value;
php_unserialize_data_t var_hash;
 
PHP_VAR_UNSERIALIZE_INIT(var_hash);


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

[PHP-CVS] com php-src: Merge branch 'PHP-5.5': ext/session/session.c

2013-08-21 Thread Christopher Jones 
Commit:d9bfe06194ae8f760cb43a3e7120d0503f327398
Author:Christopher Jones s...@php.net Wed, 21 Aug 2013 10:35:07 
-0700
Parents:   4abee3730f15e4103760eddb421d79001092529d 
d85827fb7fc6983de6e58cb7412644dca407d67f
Branches:  master

Link:   
http://git.php.net/?p=php-src.git;a=commitdiff;h=d9bfe06194ae8f760cb43a3e7120d0503f327398

Log:
Merge branch 'PHP-5.5'

* PHP-5.5:
  Reduce compilation noise during normal compilation: 
php-5.5/ext/session/session.c:836: warning: unused variable ‘struc’ 
php-5.5/ext/session/session.c:836: warning: unused variable ‘num_key’ 
php-5.5/ext/session/session.c:836: warning: unused variable ‘key_length’ 
php-5.5/ext/session/session.c:836: warning: unused variable ‘key’ 
php-5.5/ext/session/session.c:835: warning: unused variable ‘key_type’ 
php-5.5/ext/session/session.c:834: warning: unused variable ‘_ht’ 
php-5.5/ext/session/session.c:857: warning: unused variable ‘has_value’ 
php-5.5/ext/session/session.c:856: warning: unused variable ‘namelen’ 
php-5.5/ext/session/session.c:853: warning: unused variable ‘name’ 
php-5.5/ext/session/session.c:852: warning: unused variable ‘p’

Changed paths:
  MM  ext/session/session.c


Diff:



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

[PHP-CVS] com php-src: Suppress compliation warning warning: passing argument 1 of ‘_efree’ discards qualifiers from pointer target type: ext/intl/intl_data.h

2013-08-21 Thread Christopher Jones 
Commit:f38bd22ed2c5f710f72e719d7ab2a41ce30541fc
Author:Christopher Jones s...@php.net Wed, 21 Aug 2013 15:06:23 
-0700
Parents:   d8023d13eb5c5c611a17b183b28c0a81233d8a1a
Branches:  PHP-5.4 PHP-5.5 master

Link:   
http://git.php.net/?p=php-src.git;a=commitdiff;h=f38bd22ed2c5f710f72e719d7ab2a41ce30541fc

Log:
Suppress compliation warning warning: passing argument 1 of ‘_efree’ discards 
qualifiers from pointer target type

Changed paths:
  M  ext/intl/intl_data.h


Diff:
diff --git a/ext/intl/intl_data.h b/ext/intl/intl_data.h
index 66ca27a..6966dc2 100644
--- a/ext/intl/intl_data.h
+++ b/ext/intl/intl_data.h
@@ -79,7 +79,7 @@ typedef struct _intl_data {
int u8len;  

\
intl_convert_utf16_to_utf8(u8value, u8len, ustring, ulen, 
INTL_DATA_ERROR_CODE((obj)));  \
if((free_it)) { 

\
-   efree(ustring); 

\
+   efree((void *)ustring); 

\
}   

\
INTL_METHOD_CHECK_STATUS((obj), Error converting value to UTF-8); 
\
RETVAL_STRINGL(u8value, u8len, 0);  

\


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

[PHP-CVS] com php-src: Suppress compiler warning warning: variable ‘length’ set but not used [-Wunused-but-set-variable]: ext/curl/interface.c

2013-08-21 Thread Christopher Jones 
Commit:54d4a28003f35020a734b172d263b9e15b38950f
Author:Christopher Jones s...@php.net Wed, 21 Aug 2013 15:39:14 
-0700
Parents:   1af111dd68fc246fa07dbd6bd8e84a30ce28f6c2
Branches:  PHP-5.4 PHP-5.5 master

Link:   
http://git.php.net/?p=php-src.git;a=commitdiff;h=54d4a28003f35020a734b172d263b9e15b38950f

Log:
Suppress compiler warning warning: variable ‘length’ set but not used 
[-Wunused-but-set-variable]

Changed paths:
  M  ext/curl/interface.c


Diff:
diff --git a/ext/curl/interface.c b/ext/curl/interface.c
index f79d0d5..d122051 100644
--- a/ext/curl/interface.c
+++ b/ext/curl/interface.c
@@ -1068,7 +1068,6 @@ static size_t curl_progress(void *clientp, double 
dltotal, double dlnow, double
 {
php_curl   *ch = (php_curl *) clientp;
php_curl_progress  *t  = ch-handlers-progress;
-   int length = -1;
size_t  rval = 0;
 
 #if PHP_CURL_DEBUG
@@ -1118,7 +1117,6 @@ static size_t curl_progress(void *clientp, double 
dltotal, double dlnow, double
ch-in_callback = 0;
if (error == FAILURE) {
php_error_docref(NULL TSRMLS_CC, E_WARNING, 
Cannot call the CURLOPT_PROGRESSFUNCTION);
-   length = -1;
} else if (retval_ptr) {
if (Z_TYPE_P(retval_ptr) != IS_LONG) {
convert_to_long_ex(retval_ptr);


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

[PHP-CVS] com php-src: Suppress compiler warning warning: variable ‘retcount’ set but not used [-Wunused-but-set-variable]: ext/dom/php_dom.c

2013-08-21 Thread Christopher Jones 
Commit:1af111dd68fc246fa07dbd6bd8e84a30ce28f6c2
Author:Christopher Jones s...@php.net Wed, 21 Aug 2013 15:37:02 
-0700
Parents:   d0bede2efa5b1801e3eb60c707e47bb4d90d3a92
Branches:  PHP-5.4 PHP-5.5 master

Link:   
http://git.php.net/?p=php-src.git;a=commitdiff;h=1af111dd68fc246fa07dbd6bd8e84a30ce28f6c2

Log:
Suppress compiler warning warning: variable ‘retcount’ set but not used 
[-Wunused-but-set-variable]

Changed paths:
  M  ext/dom/php_dom.c


Diff:
diff --git a/ext/dom/php_dom.c b/ext/dom/php_dom.c
index c3b0ee0..bd9c987 100644
--- a/ext/dom/php_dom.c
+++ b/ext/dom/php_dom.c
@@ -1089,7 +1089,11 @@ void dom_xpath_objects_free_storage(void *object 
TSRMLS_DC)
 void dom_objects_free_storage(void *object TSRMLS_DC)
 {
dom_object *intern = (dom_object *)object;
+#if defined(__GNUC__)  __GNUC__ = 3
+   int retcount __attribute__((unused)); /* keep compiler quiet */
+#else
int retcount;
+#endif
 
zend_object_std_dtor(intern-std TSRMLS_CC);


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

[PHP-CVS] com php-src: Merge branch 'PHP-5.4' into PHP-5.5: ext/dom/php_dom.c

2013-08-21 Thread Christopher Jones 
Commit:11087eece75786fd053161b431de056bf1052380
Author:Christopher Jones s...@php.net Wed, 21 Aug 2013 15:43:19 
-0700
Parents:   d2a2e949fea336787c23215aa8d91f3e7a41a432 
54d4a28003f35020a734b172d263b9e15b38950f
Branches:  PHP-5.5 master

Link:   
http://git.php.net/?p=php-src.git;a=commitdiff;h=11087eece75786fd053161b431de056bf1052380

Log:
Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  Suppress compiler warning warning: variable ‘length’ set but not used 
[-Wunused-but-set-variable]
  Suppress compiler warning warning: variable ‘retcount’ set but not used 
[-Wunused-but-set-variable]

Changed paths:
  MM  ext/dom/php_dom.c


Diff:



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

[PHP-CVS] com php-src: Eliminate compiler warnings: warning: pointer targets in initialization differ in signedness: ext/xml/xml.c

2013-08-20 Thread Christopher Jones 
Commit:d82f9339fee1795f26498539b5276c7bdd654658
Author:Christopher Jones s...@php.net Tue, 20 Aug 2013 10:41:29 
-0700
Parents:   eba85f91d834f1e1d1278af255ee92b04ad770b9
Branches:  PHP-5.4 PHP-5.5 master

Link:   
http://git.php.net/?p=php-src.git;a=commitdiff;h=d82f9339fee1795f26498539b5276c7bdd654658

Log:
Eliminate compiler warnings: warning: pointer targets in initialization differ 
in signedness

Changed paths:
  M  ext/xml/xml.c


Diff:
diff --git a/ext/xml/xml.c b/ext/xml/xml.c
index 334938a..1ef01c8 100644
--- a/ext/xml/xml.c
+++ b/ext/xml/xml.c
@@ -274,10 +274,10 @@ zend_module_entry xml_module_entry = {
  * the encoding is currently done internally by expat/xmltok.
  */
 xml_encoding xml_encodings[] = {
-   { ISO-8859-1, xml_decode_iso_8859_1, xml_encode_iso_8859_1 },
-   { US-ASCII,   xml_decode_us_ascii,   xml_encode_us_ascii   },
-   { UTF-8,  NULL,  NULL  },
-   { NULL, NULL,  NULL  }
+   { (XML_Char *)ISO-8859-1, xml_decode_iso_8859_1, 
xml_encode_iso_8859_1 },
+   { (XML_Char *)US-ASCII,   xml_decode_us_ascii,   xml_encode_us_ascii  
 },
+   { (XML_Char *)UTF-8,  NULL,  NULL 
 },
+   { (XML_Char *)NULL, NULL,  NULL 
 }
 };
 
 static XML_Memory_Handling_Suite php_xml_mem_hdlrs;


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

[PHP-CVS] com php-src: Fix compile warning intl_cppshims.h:34:7: warning: no newline at end of file: ext/intl/intl_cppshims.h

2013-08-20 Thread Christopher Jones 
Commit:dfb187752ea0326321c0d081e926e0cb11ed0b5b
Author:Christopher Jones s...@php.net Tue, 20 Aug 2013 10:55:10 
-0700
Parents:   db0166af2f5a57e2177fbab222815d89e48c9273
Branches:  PHP-5.5 master

Link:   
http://git.php.net/?p=php-src.git;a=commitdiff;h=dfb187752ea0326321c0d081e926e0cb11ed0b5b

Log:
Fix compile warning intl_cppshims.h:34:7: warning: no newline at end of file

Changed paths:
  M  ext/intl/intl_cppshims.h


Diff:
diff --git a/ext/intl/intl_cppshims.h b/ext/intl/intl_cppshims.h
index 2fb70ed..e58ec3b 100644
--- a/ext/intl/intl_cppshims.h
+++ b/ext/intl/intl_cppshims.h
@@ -31,4 +31,4 @@
 #define _MSC_STDINT_H_ 1
 #endif
 
-#endif
\ No newline at end of file
+#endif


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

[PHP-CVS] com php-src: Merge branch 'PHP-5.4' into PHP-5.5: ext/xml/compat.c

2013-08-20 Thread Christopher Jones 
Commit:0ab8475db2fe3eb9b2f382cda77171be1e66793a
Author:Christopher Jones s...@php.net Tue, 20 Aug 2013 10:42:20 
-0700
Parents:   7160adf4ad9016dcda945f8697a599acf240163b 
d82f9339fee1795f26498539b5276c7bdd654658
Branches:  PHP-5.5 master

Link:   
http://git.php.net/?p=php-src.git;a=commitdiff;h=0ab8475db2fe3eb9b2f382cda77171be1e66793a

Log:
Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  Eliminate compiler warnings: warning: pointer targets in initialization 
differ in signedness
  Eliminate compiler warnings warning: pointer targets in initialization 
differ in signedness

Changed paths:
  MM  ext/xml/compat.c


Diff:



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

[PHP-CVS] com php-src: Remove some compilation warnings: 'unused variable' and 'enumeration value not handled in switch': ext/pdo_oci/oci_driver.c ext/pdo_oci/oci_statement.c ext/pdo_odbc/odbc_dri

2013-08-20 Thread Christopher Jones 
Commit:b455ba971c3758a9314e3bf7d56b03264d889b60
Author:Christopher Jones s...@php.net Tue, 20 Aug 2013 10:33:00 
-0700
Parents:   72d1ec883e73cfa5efc8e20314de2677440e00e7
Branches:  PHP-5.4 PHP-5.5 master

Link:   
http://git.php.net/?p=php-src.git;a=commitdiff;h=b455ba971c3758a9314e3bf7d56b03264d889b60

Log:
Remove some compilation warnings:
  'unused variable' and
  'enumeration value not handled in switch'

Changed paths:
  M  ext/pdo_oci/oci_driver.c
  M  ext/pdo_oci/oci_statement.c
  M  ext/pdo_odbc/odbc_driver.c
  M  ext/pdo_odbc/odbc_stmt.c


Diff:
diff --git a/ext/pdo_oci/oci_driver.c b/ext/pdo_oci/oci_driver.c
index 5497beb..fcdefa9 100644
--- a/ext/pdo_oci/oci_driver.c
+++ b/ext/pdo_oci/oci_driver.c
@@ -537,7 +537,9 @@ static int pdo_oci_check_liveness(pdo_dbh_t *dbh TSRMLS_DC) 
/* {{{ */
 {
pdo_oci_db_handle *H = (pdo_oci_db_handle *)dbh-driver_data;
sb4 error_code = 0;
+#if (!((OCI_MAJOR_VERSION  10) || ((OCI_MAJOR_VERSION == 10)  
(OCI_MINOR_VERSION = 2
char version[256];
+#endif
 
/* TODO move attached check to PDO level */
if (H-attached == 0) {
diff --git a/ext/pdo_oci/oci_statement.c b/ext/pdo_oci/oci_statement.c
index dcb9557..6a74efa 100644
--- a/ext/pdo_oci/oci_statement.c
+++ b/ext/pdo_oci/oci_statement.c
@@ -270,6 +270,12 @@ static int oci_stmt_param_hook(pdo_stmt_t *stmt, struct 
pdo_bound_param_data *pa
P = (pdo_oci_bound_param*)param-driver_data;
 
switch (event_type) {
+   case PDO_PARAM_EVT_FETCH_PRE:
+   case PDO_PARAM_EVT_FETCH_POST:
+   case PDO_PARAM_EVT_NORMALIZE:
+   /* Do nothing */
+   break;
+
case PDO_PARAM_EVT_FREE:
P = param-driver_data;
if (P) {
diff --git a/ext/pdo_odbc/odbc_driver.c b/ext/pdo_odbc/odbc_driver.c
index 3316368..f7f3ef3 100644
--- a/ext/pdo_odbc/odbc_driver.c
+++ b/ext/pdo_odbc/odbc_driver.c
@@ -263,7 +263,7 @@ out:
 
 static int odbc_handle_quoter(pdo_dbh_t *dbh, const char *unquoted, int 
unquotedlen, char **quoted, int *quotedlen, enum pdo_param_type param_type  
TSRMLS_DC)
 {
-   pdo_odbc_db_handle *H = (pdo_odbc_db_handle *)dbh-driver_data;
+   /* pdo_odbc_db_handle *H = (pdo_odbc_db_handle *)dbh-driver_data; */
/* TODO: figure it out */
return 0;
 }
diff --git a/ext/pdo_odbc/odbc_stmt.c b/ext/pdo_odbc/odbc_stmt.c
index 6ee2fcd..0e3fd3c 100644
--- a/ext/pdo_odbc/odbc_stmt.c
+++ b/ext/pdo_odbc/odbc_stmt.c
@@ -286,6 +286,12 @@ static int odbc_stmt_param_hook(pdo_stmt_t *stmt, struct 
pdo_bound_param_data *p
if (param-is_param) {
 
switch (event_type) {
+   case PDO_PARAM_EVT_FETCH_PRE:
+   case PDO_PARAM_EVT_FETCH_POST:
+   case PDO_PARAM_EVT_NORMALIZE:
+   /* Do nothing */
+   break;
+
case PDO_PARAM_EVT_FREE:
P = param-driver_data;
if (P) {
@@ -543,7 +549,6 @@ static int odbc_stmt_describe(pdo_stmt_t *stmt, int colno 
TSRMLS_DC)
 {
pdo_odbc_stmt *S = (pdo_odbc_stmt*)stmt-driver_data;
struct pdo_column_data *col = stmt-columns[colno];
-   zend_bool dyn = FALSE;
RETCODE rc;
SWORD   colnamelen;
SDWORD  colsize, displaysize;
@@ -614,7 +619,6 @@ static int odbc_stmt_get_col(pdo_stmt_t *stmt, int colno, 
char **ptr, unsigned l
 
/* if it is a column containing long data, perform late binding now */
if (C-is_long) {
-   unsigned long alloced = 4096;
unsigned long used = 0;
char *buf;
RETCODE rc;


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

[PHP-CVS] com php-src: Remove compilation warnings: warning: no newline at end of file: ext/intl/breakiterator/breakiterator_iterators.h ext/intl/breakiterator/breakiterator_methods.h ext/intl/break

2013-08-20 Thread Christopher Jones 
Commit:ec3f8d2b1fc870bc920408a9d878122283e4e576
Author:Christopher Jones s...@php.net Tue, 20 Aug 2013 11:01:20 
-0700
Parents:   dfb187752ea0326321c0d081e926e0cb11ed0b5b
Branches:  PHP-5.5 master

Link:   
http://git.php.net/?p=php-src.git;a=commitdiff;h=ec3f8d2b1fc870bc920408a9d878122283e4e576

Log:
Remove compilation warnings: warning: no newline at end of file

Changed paths:
  M  ext/intl/breakiterator/breakiterator_iterators.h
  M  ext/intl/breakiterator/breakiterator_methods.h
  M  ext/intl/breakiterator/codepointiterator_internal.h
  M  ext/intl/breakiterator/codepointiterator_methods.h
  M  ext/intl/breakiterator/rulebasedbreakiterator_methods.h


Diff:
diff --git a/ext/intl/breakiterator/breakiterator_iterators.h 
b/ext/intl/breakiterator/breakiterator_iterators.h
index 7162072..a955f3a 100644
--- a/ext/intl/breakiterator/breakiterator_iterators.h
+++ b/ext/intl/breakiterator/breakiterator_iterators.h
@@ -39,4 +39,4 @@ U_CFUNC zend_object_iterator *_breakiterator_get_iterator(
zend_class_entry *ce, zval *object, int by_ref TSRMLS_DC);
 U_CFUNC void breakiterator_register_IntlPartsIterator_class(TSRMLS_D);
 
-#endif
\ No newline at end of file
+#endif
diff --git a/ext/intl/breakiterator/breakiterator_methods.h 
b/ext/intl/breakiterator/breakiterator_methods.h
index a479ac9..bc9ce80 100644
--- a/ext/intl/breakiterator/breakiterator_methods.h
+++ b/ext/intl/breakiterator/breakiterator_methods.h
@@ -61,4 +61,4 @@ PHP_FUNCTION(breakiter_get_error_code);
 
 PHP_FUNCTION(breakiter_get_error_message);
 
-#endif
\ No newline at end of file
+#endif
diff --git a/ext/intl/breakiterator/codepointiterator_internal.h 
b/ext/intl/breakiterator/codepointiterator_internal.h
index 988b91c..933347b 100644
--- a/ext/intl/breakiterator/codepointiterator_internal.h
+++ b/ext/intl/breakiterator/codepointiterator_internal.h
@@ -95,4 +95,4 @@ namespace PHP {
};
 }
 
-#endif
\ No newline at end of file
+#endif
diff --git a/ext/intl/breakiterator/codepointiterator_methods.h 
b/ext/intl/breakiterator/codepointiterator_methods.h
index d34e5b6..ad3b710 100644
--- a/ext/intl/breakiterator/codepointiterator_methods.h
+++ b/ext/intl/breakiterator/codepointiterator_methods.h
@@ -21,4 +21,4 @@
 
 PHP_FUNCTION(cpbi_get_last_code_point);
 
-#endif
\ No newline at end of file
+#endif
diff --git a/ext/intl/breakiterator/rulebasedbreakiterator_methods.h 
b/ext/intl/breakiterator/rulebasedbreakiterator_methods.h
index edea4ea..861ca42 100644
--- a/ext/intl/breakiterator/rulebasedbreakiterator_methods.h
+++ b/ext/intl/breakiterator/rulebasedbreakiterator_methods.h
@@ -29,4 +29,4 @@ PHP_FUNCTION(rbbi_get_rule_status_vec);
 
 PHP_FUNCTION(rbbi_get_binary_rules);
 
-#endif
\ No newline at end of file
+#endif


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

[PHP-CVS] com php-src: Tabify: ext/xml/compat.c

2013-08-20 Thread Christopher Jones 
Commit:db0166af2f5a57e2177fbab222815d89e48c9273
Author:Christopher Jones s...@php.net Tue, 20 Aug 2013 10:44:20 
-0700
Parents:   0ab8475db2fe3eb9b2f382cda77171be1e66793a
Branches:  PHP-5.5 master

Link:   
http://git.php.net/?p=php-src.git;a=commitdiff;h=db0166af2f5a57e2177fbab222815d89e48c9273

Log:
Tabify

Changed paths:
  M  ext/xml/compat.c


Diff:
diff --git a/ext/xml/compat.c b/ext/xml/compat.c
index bb654bc..a4c66d2 100644
--- a/ext/xml/compat.c
+++ b/ext/xml/compat.c
@@ -707,21 +707,21 @@ static const XML_Char *const error_mapping[] = {
(const XML_Char *)Entity value required,
(const XML_Char *)chunk is not well balanced,
(const XML_Char *)extra content at the end of well balanced chunk,
-(const XML_Char *)XML_ERR_ENTITY_CHAR_ERROR,
-(const XML_Char *)PEReferences forbidden in internal subset,
-(const XML_Char *)Detected an entity reference loop,
-(const XML_Char *)XML_ERR_ENTITY_BOUNDARY,
-(const XML_Char *)Invalid URI,
-(const XML_Char *)Fragment not allowed,
-(const XML_Char *)XML_WAR_CATALOG_PI,
-(const XML_Char *)XML_ERR_NO_DTD,
-(const XML_Char *)conditional section INCLUDE or IGNORE keyword 
expected, /* 95 */
-(const XML_Char *)Version in XML Declaration missing, /* 96 */
-(const XML_Char *)XML_WAR_UNKNOWN_VERSION, /* 97 */
-(const XML_Char *)XML_WAR_LANG_VALUE, /* 98 */
-(const XML_Char *)XML_WAR_NS_URI, /* 99 */
-(const XML_Char *)XML_WAR_NS_URI_RELATIVE, /* 100 */
-(const XML_Char *)Missing encoding in text declaration /* 101 */
+   (const XML_Char *)XML_ERR_ENTITY_CHAR_ERROR,
+   (const XML_Char *)PEReferences forbidden in internal subset,
+   (const XML_Char *)Detected an entity reference loop,
+   (const XML_Char *)XML_ERR_ENTITY_BOUNDARY,
+   (const XML_Char *)Invalid URI,
+   (const XML_Char *)Fragment not allowed,
+   (const XML_Char *)XML_WAR_CATALOG_PI,
+   (const XML_Char *)XML_ERR_NO_DTD,
+   (const XML_Char *)conditional section INCLUDE or IGNORE keyword 
expected, /* 95 */
+   (const XML_Char *)Version in XML Declaration missing, /* 96 */
+   (const XML_Char *)XML_WAR_UNKNOWN_VERSION, /* 97 */
+   (const XML_Char *)XML_WAR_LANG_VALUE, /* 98 */
+   (const XML_Char *)XML_WAR_NS_URI, /* 99 */
+   (const XML_Char *)XML_WAR_NS_URI_RELATIVE, /* 100 */
+   (const XML_Char *)Missing encoding in text declaration /* 101 */
 };
 
 PHPAPI const XML_Char *


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

[PHP-CVS] com php-src: Eliminate compiler warnings warning: pointer targets in initialization differ in signedness: ext/xml/compat.c

2013-08-20 Thread Christopher Jones 
Commit:eba85f91d834f1e1d1278af255ee92b04ad770b9
Author:Christopher Jones s...@php.net Tue, 20 Aug 2013 10:41:01 
-0700
Parents:   b455ba971c3758a9314e3bf7d56b03264d889b60
Branches:  PHP-5.4 PHP-5.5 master

Link:   
http://git.php.net/?p=php-src.git;a=commitdiff;h=eba85f91d834f1e1d1278af255ee92b04ad770b9

Log:
Eliminate compiler warnings warning: pointer targets in initialization differ 
in signedness

Changed paths:
  M  ext/xml/compat.c

diff --git a/ext/xml/compat.c b/ext/xml/compat.c
index fbebb63..c2d4497 100644
--- a/ext/xml/compat.c
+++ b/ext/xml/compat.c
@@ -619,109 +619,109 @@ XML_GetErrorCode(XML_Parser parser)
 }
 
 static const XML_Char *const error_mapping[] = {
-   No error,
-   No memory,
-   Invalid document start,
-   Empty document,
-   Not well-formed (invalid token),
-   Invalid document end,
-   Invalid hexadecimal character reference,
-   Invalid decimal character reference,
-   Invalid character reference,
-   Invalid character,
-   XML_ERR_CHARREF_AT_EOF,
-   XML_ERR_CHARREF_IN_PROLOG,
-   XML_ERR_CHARREF_IN_EPILOG,
-   XML_ERR_CHARREF_IN_DTD,
-   XML_ERR_ENTITYREF_AT_EOF,
-   XML_ERR_ENTITYREF_IN_PROLOG,
-   XML_ERR_ENTITYREF_IN_EPILOG,
-   XML_ERR_ENTITYREF_IN_DTD,
-   PEReference at end of document,
-   PEReference in prolog,
-   PEReference in epilog,
-   PEReference: forbidden within markup decl in internal subset,
-   XML_ERR_ENTITYREF_NO_NAME,
-   EntityRef: expecting ';',
-   PEReference: no name,
-   PEReference: expecting ';',
-   Undeclared entity error,
-   Undeclared entity warning,
-   Unparsed Entity,
-   XML_ERR_ENTITY_IS_EXTERNAL,
-   XML_ERR_ENTITY_IS_PARAMETER,
-   Unknown encoding,
-   Unsupported encoding,
-   String not started expecting ' or \,
-   String not closed expecting \ or ',
-   Namespace declaration error,
-   EntityValue: \ or ' expected,
-   EntityValue: \ or ' expected,
-in attribute,
-   Attribute not started,
-   Attribute not finished,
-   Attribute without value,
-   Attribute redefined,
-   SystemLiteral \ or ' expected,
-   SystemLiteral \ or ' expected,
-   /* XML_ERR_COMMENT_NOT_STARTED, = eliminated on purpose */
-   Comment not finished,
-   Processing Instruction not started,
-   Processing Instruction not finished,
-   NOTATION: Name expected here,
-   '' required to close NOTATION declaration,
-   '(' required to start ATTLIST enumeration,
-   '(' required to start ATTLIST enumeration,
-   MixedContentDecl : '|' or ')*' expected,
-   XML_ERR_MIXED_NOT_FINISHED,
-   ELEMENT in DTD not started,
-   ELEMENT in DTD not finished,
-   XML declaration not started,
-   XML declaration not finished,
-   XML_ERR_CONDSEC_NOT_STARTED,
-   XML conditional section not closed,
-   Content error in the external subset,
-   DOCTYPE not finished,
-   Sequence ']]' not allowed in content,
-   CDATA not finished,
-   Reserved XML Name,
-   Space required,
-   XML_ERR_SEPARATOR_REQUIRED,
-   NmToken expected in ATTLIST enumeration,
-   XML_ERR_NAME_REQUIRED,
-   MixedContentDecl : '#PCDATA' expected,
-   SYSTEM or PUBLIC, the URI is missing,
-   PUBLIC, the Public Identifier is missing,
-required,
-required,
-   / required,
-   = required,
-   Mismatched tag,
-   Tag not finished,
-   standalone accepts only 'yes' or 'no',
-   Invalid XML encoding name,
-   Comment must not contain '--' (double-hyphen),
-   Invalid encoding,
-   external parsed entities cannot be standalone,
-   XML conditional section '[' expected,
-   Entity value required,
-   chunk is not well balanced,
-   extra content at the end of well balanced chunk,
-XML_ERR_ENTITY_CHAR_ERROR,
-PEReferences forbidden in internal subset,
-Detected an entity reference loop,
-XML_ERR_ENTITY_BOUNDARY,
-Invalid URI,
-Fragment not allowed,
-XML_WAR_CATALOG_PI,
-XML_ERR_NO_DTD,
-conditional section INCLUDE or IGNORE keyword expected, /* 95 */
-Version in XML Declaration missing, /* 96 */
-XML_WAR_UNKNOWN_VERSION, /* 97 */
-XML_WAR_LANG_VALUE, /* 98 */
-XML_WAR_NS_URI, /* 99 */
-XML_WAR_NS_URI_RELATIVE, /* 100 */
-Missing encoding in text declaration /* 101 */
+   (const XML_Char *)No error,
+   (const XML_Char *)No memory,
+   (const XML_Char *)Invalid document start,
+   (const XML_Char *)Empty document,
+   (const XML_Char *)Not well-formed (invalid token),
+   (const XML_Char *)Invalid document end,
+   (const XML_Char *)Invalid hexadecimal character reference,
+   (const XML_Char *)Invalid decimal character reference,
+   (const XML_Char *)Invalid character reference,
+   (const XML_Char *)Invalid character,
+   (const

[PHP-CVS] com php-src: Remove compilation warning warning: no newline at end of file: ext/intl/breakiterator/codepointiterator_methods.cpp

2013-08-20 Thread Christopher Jones 
Commit:433225a92938c3fb22a4351d7f555c8faba38a9a
Author:Christopher Jones s...@php.net Tue, 20 Aug 2013 11:04:26 
-0700
Parents:   ec3f8d2b1fc870bc920408a9d878122283e4e576
Branches:  PHP-5.5 master

Link:   
http://git.php.net/?p=php-src.git;a=commitdiff;h=433225a92938c3fb22a4351d7f555c8faba38a9a

Log:
Remove compilation warning warning: no newline at end of file

Changed paths:
  M  ext/intl/breakiterator/codepointiterator_methods.cpp


Diff:
diff --git a/ext/intl/breakiterator/codepointiterator_methods.cpp 
b/ext/intl/breakiterator/codepointiterator_methods.cpp
index ae7e526..a833cf1 100644
--- a/ext/intl/breakiterator/codepointiterator_methods.cpp
+++ b/ext/intl/breakiterator/codepointiterator_methods.cpp
@@ -41,4 +41,4 @@ U_CFUNC PHP_FUNCTION(cpbi_get_last_code_point)
BREAKITER_METHOD_FETCH_OBJECT;
 
RETURN_LONG(fetch_cpbi(bio)-getLastCodePoint());
-}
\ No newline at end of file
+}


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

[PHP-CVS] com php-src: Merge branch 'PHP-5.4' into PHP-5.5: ext/pdo/pdo_stmt.c

2013-08-20 Thread Christopher Jones 
Commit:268c2884fa4a0e61ecf35712d6472c41a9023197
Author:Christopher Jones s...@php.net Tue, 20 Aug 2013 13:37:02 
-0700
Parents:   9e1e0096d1029d10b43e28add95925d42f2de8d5 
e9b12bedc331631cbcc8605972325ca41ec50f01
Branches:  PHP-5.5 master

Link:   
http://git.php.net/?p=php-src.git;a=commitdiff;h=268c2884fa4a0e61ecf35712d6472c41a9023197

Log:
Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  Quash compile warning warning: 'flags' may be used uninitialized in this 
function

Changed paths:
  MM  ext/pdo/pdo_stmt.c


Diff:



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

[PHP-CVS] com php-src: Quash compile warning warning: 'flags' may be used uninitialized in this function: ext/pdo/pdo_stmt.c

2013-08-20 Thread Christopher Jones 
Commit:e9b12bedc331631cbcc8605972325ca41ec50f01
Author:Christopher Jones s...@php.net Tue, 20 Aug 2013 13:36:18 
-0700
Parents:   9c9fee3f43024a674c98782681ea4caf7fa00574
Branches:  PHP-5.4 PHP-5.5 master

Link:   
http://git.php.net/?p=php-src.git;a=commitdiff;h=e9b12bedc331631cbcc8605972325ca41ec50f01

Log:
Quash compile warning warning: 'flags' may be used uninitialized in this 
function

Changed paths:
  M  ext/pdo/pdo_stmt.c


Diff:
diff --git a/ext/pdo/pdo_stmt.c b/ext/pdo/pdo_stmt.c
index a469d09..81224ab 100644
--- a/ext/pdo/pdo_stmt.c
+++ b/ext/pdo/pdo_stmt.c
@@ -1876,7 +1876,7 @@ static PHP_METHOD(PDOStatement, getColumnMeta)
 int pdo_stmt_setup_fetch_mode(INTERNAL_FUNCTION_PARAMETERS, pdo_stmt_t *stmt, 
int skip)
 {
long mode = PDO_FETCH_BOTH;
-   int flags, argc = ZEND_NUM_ARGS() - skip;
+   int flags = 0, argc = ZEND_NUM_ARGS() - skip;
zval ***args;
zend_class_entry **cep;
int retval;


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

[PHP-CVS] com php-src: Update NEWS: NEWS

2013-08-19 Thread Christopher Jones 
Commit:4ee1ec4bcfee93a3d9bdc2abf195bf5b29dcea73
Author:Christopher Jones s...@php.net Mon, 19 Aug 2013 17:14:38 
-0700
Parents:   9d2cdacf4a36045120aab049b03229bf0064df4e
Branches:  PHP-5.5

Link:   
http://git.php.net/?p=php-src.git;a=commitdiff;h=4ee1ec4bcfee93a3d9bdc2abf195bf5b29dcea73

Log:
Update NEWS

Changed paths:
  M  NEWS


Diff:
diff --git a/NEWS b/NEWS
index 634e6b9..645efed 100644
--- a/NEWS
+++ b/NEWS
@@ -4,7 +4,7 @@ PHP 
   NEWS
 
 - Core:
   . Fixed bug #65470 (Segmentation fault in zend_error() with
---enable-dtrace). (Chris Jones)
+--enable-dtrace). (Chris Jones, Kris Van Hees)
   . Fixed bug #65225 (PHP_BINARY incorrectly set). (Patrick Allaert)
   . Fixed bug #62692 (PHP fails to build with DTrace). (Chris Jones, Kris Van 
Hees)


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

[PHP-CVS] com php-src: Update NEWS: NEWS

2013-08-19 Thread Christopher Jones 
Commit:c60067c09a32af325d6cd70e4cfa6db3c78a8621
Author:Christopher Jones s...@php.net Mon, 19 Aug 2013 17:14:15 
-0700
Parents:   1ac4d8f2c632f5be5a02d49c1e0d3b1fb515e4a8
Branches:  PHP-5.4

Link:   
http://git.php.net/?p=php-src.git;a=commitdiff;h=c60067c09a32af325d6cd70e4cfa6db3c78a8621

Log:
Update NEWS

Changed paths:
  M  NEWS


Diff:
diff --git a/NEWS b/NEWS
index e56ff28..8894bb4 100644
--- a/NEWS
+++ b/NEWS
@@ -5,7 +5,7 @@ PHP 
   NEWS
 - Core:
   . Fixed bug #65481 (shutdown segfault due to serialize) (Mike)
   . Fixed bug #65470 (Segmentation fault in zend_error() with 
---enable-dtrace). (Chris Jones)
+--enable-dtrace). (Chris Jones, Kris Van Hees)
   . Fixed bug #65372 (Segfault in gc_zval_possible_root when return reference
 fails). (Laruence)
   . Fixed bug #65304 (Use of max int in array_sum). (Laruence)


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

[PHP-CVS] com php-src: Remove compile warnings: variable ‘obj_cnt’ set but not used [-Wunused-but-set-variable] unused variable ‘last’ [-Wunused-variable] unused variable ‘j’ [-Wunused-variable]

2013-08-19 Thread Christopher Jones 
Commit:cf7f50748a787affd9306b34ee1ba2c83772aedc
Author:Christopher Jones s...@php.net Mon, 19 Aug 2013 17:44:36 
-0700
Parents:   279b4fe614ac8380d6bdea9f9b54a77ec60114db
Branches:  PHP-5.5 master

Link:   
http://git.php.net/?p=php-src.git;a=commitdiff;h=cf7f50748a787affd9306b34ee1ba2c83772aedc

Log:
Remove compile warnings:
  variable ‘obj_cnt’ set but not used [-Wunused-but-set-variable]
  unused variable ‘last’ [-Wunused-variable]
  unused variable ‘j’ [-Wunused-variable]

Changed paths:
  M  ext/openssl/openssl.c


Diff:
diff --git a/ext/openssl/openssl.c b/ext/openssl/openssl.c
index 353c358..f9493c7 100644
--- a/ext/openssl/openssl.c
+++ b/ext/openssl/openssl.c
@@ -576,7 +576,7 @@ static void add_assoc_name_entry(zval * val, char * key, 
X509_NAME * name, int s
 {
zval **data;
zval *subitem, *subentries;
-   int i, j = -1, last = -1, obj_cnt = 0;
+   int i, j = -1;
char *sname;
int nid;
X509_NAME_ENTRY * ne;
@@ -598,7 +598,6 @@ static void add_assoc_name_entry(zval * val, char * key, 
X509_NAME * name, int s
ne  = X509_NAME_get_entry(name, i);
obj = X509_NAME_ENTRY_get_object(ne);
nid = OBJ_obj2nid(obj);
-   obj_cnt = 0;
 
if (shortname) {
sname = (char *) OBJ_nid2sn(nid);


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

[PHP-CVS] com php-src: Reduce (some more) compile noise of 'unused variable' and 'may be used uninitialized' warnings.: ext/curl/interface.c ext/intl/calendar/calendar_methods.cpp ext/intl/calendar/gr

2013-08-19 Thread Christopher Jones 
Commit:d5979c88eaca273479cf244d3e10c2f089c4f080
Author:Christopher Jones s...@php.net Mon, 19 Aug 2013 17:17:54 
-0700
Parents:   4ee1ec4bcfee93a3d9bdc2abf195bf5b29dcea73
Branches:  PHP-5.5 master

Link:   
http://git.php.net/?p=php-src.git;a=commitdiff;h=d5979c88eaca273479cf244d3e10c2f089c4f080

Log:
Reduce (some more) compile noise of 'unused variable' and 'may be used
uninitialized' warnings.

Changed paths:
  M  ext/curl/interface.c
  M  ext/intl/calendar/calendar_methods.cpp
  M  ext/intl/calendar/gregoriancalendar_methods.cpp
  M  ext/intl/msgformat/msgformat_helpers.cpp


Diff:
diff --git a/ext/curl/interface.c b/ext/curl/interface.c
index 8617954..9fdb57c 100644
--- a/ext/curl/interface.c
+++ b/ext/curl/interface.c
@@ -2441,7 +2441,7 @@ string_copy:
 
ph = HASH_OF(*zvalue);
if (!ph) {
-   char *name;
+   char *name = NULL;
switch (option) {
case CURLOPT_HTTPHEADER:
name = CURLOPT_HTTPHEADER;
diff --git a/ext/intl/calendar/calendar_methods.cpp 
b/ext/intl/calendar/calendar_methods.cpp
index db10502..ae7d009 100644
--- a/ext/intl/calendar/calendar_methods.cpp
+++ b/ext/intl/calendar/calendar_methods.cpp
@@ -184,7 +184,6 @@ U_CFUNC PHP_FUNCTION(intlcal_get_keyword_values_for_locale)
 
 U_CFUNC PHP_FUNCTION(intlcal_get_now)
 {
-   UErrorCode  status  = U_ZERO_ERROR;
intl_error_reset(NULL TSRMLS_CC);
 
if (zend_parse_parameters_none() == FAILURE) {
diff --git a/ext/intl/calendar/gregoriancalendar_methods.cpp 
b/ext/intl/calendar/gregoriancalendar_methods.cpp
index 3c05253..08b8949 100644
--- a/ext/intl/calendar/gregoriancalendar_methods.cpp
+++ b/ext/intl/calendar/gregoriancalendar_methods.cpp
@@ -38,7 +38,6 @@ static inline GregorianCalendar *fetch_greg(Calendar_object 
*co) {
 
 static void _php_intlgregcal_constructor_body(INTERNAL_FUNCTION_PARAMETERS)
 {
-   zval*object = getThis();
zval**tz_object = NULL;
zval**args_a[6] = {0},
***args = args_a[0];
@@ -84,7 +83,7 @@ static void 
_php_intlgregcal_constructor_body(INTERNAL_FUNCTION_PARAMETERS)
}

// instantion of ICU object
-   GregorianCalendar *gcal;
+   GregorianCalendar *gcal = NULL;
 
if (variant = 2) {
// From timezone and locale (0 to 2 arguments)
diff --git a/ext/intl/msgformat/msgformat_helpers.cpp 
b/ext/intl/msgformat/msgformat_helpers.cpp
index 9ee1cdc..c4456d5 100644
--- a/ext/intl/msgformat/msgformat_helpers.cpp
+++ b/ext/intl/msgformat/msgformat_helpers.cpp
@@ -487,7 +487,7 @@ U_CFUNC void umsg_format_helper(MessageFormatter_object 
*mfo,
}
case Formattable::kLong:
{
-   int32_t tInt32;
+   int32_t tInt32 = 0;
 retry_klong:
if (Z_TYPE_PP(elem) == IS_DOUBLE) {
if (Z_DVAL_PP(elem)  
(double)INT32_MAX ||
@@ -517,7 +517,7 @@ retry_klong:
}
case Formattable::kInt64:
{
-   int64_t tInt64;
+   int64_t tInt64 = 0;
 retry_kint64:
if (Z_TYPE_PP(elem) == IS_DOUBLE) {
if (Z_DVAL_PP(elem)  
(double)U_INT64_MAX ||


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

[PHP-CVS] com php-src: Remove compile warning: variable ‘streamp’ set but not used [-Wunused-but-set-variable]: ext/bz2/bz2_filter.c

2013-08-19 Thread Christopher Jones 
Commit:f69a5c520fd699a32d0787dc04984313b2b677ff
Author:Christopher Jones s...@php.net Mon, 19 Aug 2013 17:46:50 
-0700
Parents:   cf7f50748a787affd9306b34ee1ba2c83772aedc
Branches:  PHP-5.5 master

Link:   
http://git.php.net/?p=php-src.git;a=commitdiff;h=f69a5c520fd699a32d0787dc04984313b2b677ff

Log:
Remove compile warning: variable ‘streamp’ set but not used 
[-Wunused-but-set-variable]

Changed paths:
  M  ext/bz2/bz2_filter.c


Diff:
diff --git a/ext/bz2/bz2_filter.c b/ext/bz2/bz2_filter.c
index 5ed7921..3356002 100644
--- a/ext/bz2/bz2_filter.c
+++ b/ext/bz2/bz2_filter.c
@@ -215,7 +215,6 @@ static php_stream_filter_status_t php_bz2_compress_filter(
size_t consumed = 0;
int status;
php_stream_filter_status_t exit_status = PSFS_FEED_ME;
-   bz_stream *streamp;
 
if (!thisfilter || !thisfilter-abstract) {
/* Should never happen */
@@ -223,7 +222,6 @@ static php_stream_filter_status_t php_bz2_compress_filter(
}
 
data = (php_bz2_filter_data *)(thisfilter-abstract);
-   streamp = (data-strm);
 
while (buckets_in-head) {
size_t bin = 0, desired;


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

[PHP-CVS] com php-src: Remove compile warning variable ‘mekeylen’ set but not used: ext/intl/resourcebundle/resourcebundle_class.c

2013-08-19 Thread Christopher Jones 
Commit:279b4fe614ac8380d6bdea9f9b54a77ec60114db
Author:Christopher Jones s...@php.net Mon, 19 Aug 2013 17:40:15 
-0700
Parents:   d5979c88eaca273479cf244d3e10c2f089c4f080
Branches:  PHP-5.5 master

Link:   
http://git.php.net/?p=php-src.git;a=commitdiff;h=279b4fe614ac8380d6bdea9f9b54a77ec60114db

Log:
Remove compile warning variable ‘mekeylen’ set but not used

Changed paths:
  M  ext/intl/resourcebundle/resourcebundle_class.c


Diff:
diff --git a/ext/intl/resourcebundle/resourcebundle_class.c 
b/ext/intl/resourcebundle/resourcebundle_class.c
index 9c369bd..dc12124 100644
--- a/ext/intl/resourcebundle/resourcebundle_class.c
+++ b/ext/intl/resourcebundle/resourcebundle_class.c
@@ -163,7 +163,6 @@ static void resourcebundle_array_fetch(zval *object, zval 
*offset, zval *return_
 {
int32_t meindex = 0;
char *  mekey = NULL;
-   longmekeylen;
 zend_boolis_numeric = 0;
char *pbuf;
ResourceBundle_object *rb;
@@ -177,7 +176,6 @@ static void resourcebundle_array_fetch(zval *object, zval 
*offset, zval *return_
rb-child = ures_getByIndex( rb-me, meindex, rb-child, 
INTL_DATA_ERROR_CODE(rb) );
} else if(Z_TYPE_P(offset) == IS_STRING) {
mekey = Z_STRVAL_P(offset);
-   mekeylen = Z_STRLEN_P(offset);
rb-child = ures_getByKey(rb-me, mekey, rb-child, 
INTL_DATA_ERROR_CODE(rb) );
} else {
intl_errors_set(INTL_DATA_ERROR_P(rb), U_ILLEGAL_ARGUMENT_ERROR,


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

[PHP-CVS] com php-src: Remove compile warning: warning: unused variable ‘j’ [-Wunused-variable]: ext/openssl/openssl.c

2013-08-19 Thread Christopher Jones 
Commit:1a00b9bd264ba2495930be05cd0ed2b1c13b8ef8
Author:Christopher Jones s...@php.net Mon, 19 Aug 2013 17:58:42 
-0700
Parents:   83469477e70cba8191a4698252fc83804e88322b
Branches:  PHP-5.5 master

Link:   
http://git.php.net/?p=php-src.git;a=commitdiff;h=1a00b9bd264ba2495930be05cd0ed2b1c13b8ef8

Log:
Remove compile warning:
   warning: unused variable ‘j’ [-Wunused-variable]

Changed paths:
  M  ext/openssl/openssl.c


Diff:
diff --git a/ext/openssl/openssl.c b/ext/openssl/openssl.c
index f9493c7..4a9fcbc 100644
--- a/ext/openssl/openssl.c
+++ b/ext/openssl/openssl.c
@@ -576,7 +576,7 @@ static void add_assoc_name_entry(zval * val, char * key, 
X509_NAME * name, int s
 {
zval **data;
zval *subitem, *subentries;
-   int i, j = -1;
+   int i;
char *sname;
int nid;
X509_NAME_ENTRY * ne;


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

[PHP-CVS] com php-src: Remove compile warnings: warning: variable ‘lastch’ set but not used [-Wunused-but-set-variable] warning: variable ‘buf’ set but not used [-Wunused-but-set-variable]: ext/ft

2013-08-19 Thread Christopher Jones 
Commit:83469477e70cba8191a4698252fc83804e88322b
Author:Christopher Jones s...@php.net Mon, 19 Aug 2013 17:48:46 
-0700
Parents:   f69a5c520fd699a32d0787dc04984313b2b677ff
Branches:  PHP-5.5 master

Link:   
http://git.php.net/?p=php-src.git;a=commitdiff;h=83469477e70cba8191a4698252fc83804e88322b

Log:
Remove compile warnings:
  warning: variable ‘lastch’ set but not used [-Wunused-but-set-variable]
  warning: variable ‘buf’ set but not used [-Wunused-but-set-variable]

Changed paths:
  M  ext/ftp/ftp.c


Diff:
diff --git a/ext/ftp/ftp.c b/ext/ftp/ftp.c
index 0d6704f..2c5bc5d 100644
--- a/ext/ftp/ftp.c
+++ b/ext/ftp/ftp.c
@@ -790,7 +790,6 @@ int
 ftp_get(ftpbuf_t *ftp, php_stream *outstream, const char *path, ftptype_t 
type, long resumepos TSRMLS_DC)
 {
databuf_t   *data = NULL;
-   int lastch;
size_t  rcvd;
chararg[11];
 
@@ -828,7 +827,6 @@ ftp_get(ftpbuf_t *ftp, php_stream *outstream, const char 
*path, ftptype_t type,
goto bail;
}
 
-   lastch = 0;
while ((rcvd = my_recv(ftp, data-fd, data-buf, FTP_BUFSIZE))) {
if (rcvd == -1) {
goto bail;
@@ -1187,12 +1185,9 @@ ftp_readline(ftpbuf_t *ftp)
 int
 ftp_getresp(ftpbuf_t *ftp)
 {
-   char *buf;
-
if (ftp == NULL) {
return 0;
}
-   buf = ftp-inbuf;
ftp-resp = 0;
 
while (1) {


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

[PHP-CVS] com php-src: Merge branch 'PHP-5.5': ext/openssl/openssl.c

2013-08-19 Thread Christopher Jones 
Commit:5697aa57284bc6898b034aa5c968bc6a6e8c820c
Author:Christopher Jones s...@php.net Mon, 19 Aug 2013 17:51:04 
-0700
Parents:   19476f51f2167988909f5524d23444c05630 
83469477e70cba8191a4698252fc83804e88322b
Branches:  master

Link:   
http://git.php.net/?p=php-src.git;a=commitdiff;h=5697aa57284bc6898b034aa5c968bc6a6e8c820c

Log:
Merge branch 'PHP-5.5'

* PHP-5.5:
  Remove compile warnings:
  warning: variable ‘lastch’ set but not used [-Wunused-but-set-variable]
  warning: variable ‘buf’ set but not used [-Wunused-but-set-variable]
  Remove compile warning: variable ‘streamp’ set but not used 
[-Wunused-but-set-variable]
  Remove compile warnings:
  variable ‘obj_cnt’ set but not used [-Wunused-but-set-variable]
  unused variable ‘last’ [-Wunused-variable]
  unused variable ‘j’ [-Wunused-variable]
  Remove compile warning variable ‘mekeylen’ set but not used

Changed paths:
  MM  ext/openssl/openssl.c


Diff:



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

[PHP-CVS] com php-src: Merge branch 'PHP-5.5': ext/curl/interface.c

2013-08-19 Thread Christopher Jones 
Commit:19476f51f2167988909f5524d23444c05630
Author:Christopher Jones s...@php.net Mon, 19 Aug 2013 17:18:28 
-0700
Parents:   73cd2e0ab14d804c6bf0b689490bdd4fd6e969b1 
d5979c88eaca273479cf244d3e10c2f089c4f080
Branches:  master

Link:   
http://git.php.net/?p=php-src.git;a=commitdiff;h=19476f51f2167988909f5524d23444c05630

Log:
Merge branch 'PHP-5.5'

* PHP-5.5:
  Reduce (some more) compile noise of 'unused variable' and 'may be used 
uninitialized' warnings.
  Update NEWS

Changed paths:
  MM  ext/curl/interface.c


Diff:



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

[PHP-CVS] com php-src: Merge branch 'PHP-5.5': ext/openssl/openssl.c

2013-08-19 Thread Christopher Jones 
Commit:24288eb4d119ab4f613feb5c64cf0f08ecf8d10a
Author:Christopher Jones s...@php.net Mon, 19 Aug 2013 17:58:53 
-0700
Parents:   5697aa57284bc6898b034aa5c968bc6a6e8c820c 
1a00b9bd264ba2495930be05cd0ed2b1c13b8ef8
Branches:  master

Link:   
http://git.php.net/?p=php-src.git;a=commitdiff;h=24288eb4d119ab4f613feb5c64cf0f08ecf8d10a

Log:
Merge branch 'PHP-5.5'

* PHP-5.5:
  Remove compile warning:
  warning: unused variable ‘j’ [-Wunused-variable]

Changed paths:
  MM  ext/openssl/openssl.c


Diff:



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

[PHP-CVS] com php-src: Update NEWS: NEWS

2013-08-17 Thread Christopher Jones 
Commit:60c8d814e7997e5dab596b0644d6b2e064e71c0b
Author:Christopher Jones s...@php.net Fri, 16 Aug 2013 11:16:06 
-0700
Parents:   7237c317d6bb896372fcaa7ace1cd521994b9442
Branches:  PHP-5.5 master

Link:   
http://git.php.net/?p=php-src.git;a=commitdiff;h=60c8d814e7997e5dab596b0644d6b2e064e71c0b

Log:
Update NEWS

Changed paths:
  M  NEWS


Diff:
diff --git a/NEWS b/NEWS
index bc71cc6..037f656 100644
--- a/NEWS
+++ b/NEWS
@@ -2,6 +2,9 @@ PHP 
   NEWS
 |||
 ?? ??? 2013, PHP 5.5.3
 
+- Core:
+  . Fixed bug #62692 (PHP fails to build with DTrace). (Chris Jones, Kris Van 
Hees)
+
 15 Aug 2013, PHP 5.5.2
 
 - Core:


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

[PHP-CVS] com php-src: Update NEWS: NEWS

2013-08-17 Thread Christopher Jones 
Commit:cb539b3e96dd0fc8df9564a60b66d8dea4439bc1
Author:Christopher Jones s...@php.net Fri, 16 Aug 2013 11:13:27 
-0700
Parents:   6993ca5bd71541e77853fc1739355efe889f9a02
Branches:  PHP-5.4 PHP-5.5 master

Link:   
http://git.php.net/?p=php-src.git;a=commitdiff;h=cb539b3e96dd0fc8df9564a60b66d8dea4439bc1

Log:
Update NEWS

Changed paths:
  M  NEWS


Diff:
diff --git a/NEWS b/NEWS
index a63bfe6..5db6792 100644
--- a/NEWS
+++ b/NEWS
@@ -9,11 +9,12 @@ PHP   
 NEWS
   . Fixed bug #65291 (get_defined_constants() causes PHP to crash in a very
 limited case). (Arpad)
   . Improved fix for bug #63186 (compile failure on netbsd). (Matteo)
+  . Fixed bug #62692 (PHP fails to build with DTrace). (Chris Jones, Kris Van 
Hees)
   . Fixed bug #61345 (CGI mode - make install don't work). (Michael Heimpold)
+  . Cherry-picked some DTrace build commits (allowing builds on Linux,
+bug #62691, and bug #63706) from PHP 5.5 branch
   . Fixed bug #61268 (--enable-dtrace leads make to clobber
 Zend/zend_dtrace.d) (Chris Jones)
-  . Cherry picked some DTrace build commits (allowing builds on Linux,
-bug 62691, and bug 63706) from PHP 5.5 branch
 
 - Session:
   . Fixed bug #62129 (rfc1867 crashes php even though turned off). (gxd305 at


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

[PHP-CVS] com php-src: Fix duplicated 5.5.2 NEWS in my tree: NEWS

2013-08-17 Thread Christopher Jones 
Commit:803045e3c74c3360d141b4aec26f6a1507e7508c
Author:Christopher Jones s...@php.net Fri, 16 Aug 2013 12:03:01 
-0700
Parents:   a6f596f90f7a3c8c68d84b33fcfdfb4ac5c13fcb
Branches:  PHP-5.5

Link:   
http://git.php.net/?p=php-src.git;a=commitdiff;h=803045e3c74c3360d141b4aec26f6a1507e7508c

Log:
Fix duplicated 5.5.2 NEWS in my tree

Changed paths:
  M  NEWS


Diff:
diff --git a/NEWS b/NEWS
index 037f656..914b2a4 100644
--- a/NEWS
+++ b/NEWS
@@ -8,6 +8,14 @@ PHP
NEWS
 15 Aug 2013, PHP 5.5.2
 
 - Core:
+  . Fixed bug #65372 (Segfault in gc_zval_possible_root when return reference
+fails). (Laruence)
+  . Fixed value of FILTER_SANITIZE_FULL_SPECIAL_CHARS constant (previously was
+erroneously set to FILTER_SANITIZE_SPECIAL_CHARS value). (Andrey
+avp200681 gmail com).
+  . Fixed bug #65304 (Use of max int in array_sum). (Laruence)
+  . Fixed bug #65291 (get_defined_constants() causes PHP to crash in a very
+limited case). (Arpad)
   . Fixed bug #62691 (solaris sed has no -i switch). (Chris Jones)
   . Fixed bug #61345 (CGI mode - make install don't work). (Michael Heimpold)
   . Fixed bug #61268 (--enable-dtrace leads make to clobber
@@ -18,33 +26,9 @@ PHP  
  NEWS
 DOMDocument::schemaValidateSource(). Added LIBXML_SCHEMA_CREATE flag. 
 (Chris Wright)
 
-- Sessions:
-  . Implemented strict sessions RFC (https://wiki.php.net/rfc/strict_sessions)
-which protects against session fixation attacks and session collisions.
-(Yasuo Ohgaki)
-  . Fixed possible buffer overflow under Windows. Note: Not a security fix.
-(Yasuo)
-  . Changed session.auto_start to PHP_INI_PERDIR. (Yasuo)
-
-- Pgsql:
-  . Fixed bug #62978 (Disallow possible SQL injections with 
pg_select()/pg_update()
-/pg_delete()/pg_insert()). (Yasuo)
-
-15 Aug 2013, PHP 5.5.2
-
-- Core:
-  . Fixed bug #65372 (Segfault in gc_zval_possible_root when return reference
-fails). (Laruence)
-  . Fixed value of FILTER_SANITIZE_FULL_SPECIAL_CHARS constant (previously was
-erroneously set to FILTER_SANITIZE_SPECIAL_CHARS value). (Andrey
-avp200681 gmail com).
-  . Fixed bug #65304 (Use of max int in array_sum). (Laruence)
-  . Fixed bug #65291 (get_defined_constants() causes PHP to crash in a very
-limited case). (Arpad)
-
 - OPcache:
   . Added opcache.restrict_api configuration directive that may limit
-usage of OPcahce API functions only to patricular script(s). (Dmitry)
+usage of OPcache API functions only to particular script(s). (Dmitry)
   . Added support for glob symbols in blacklist entries (?, *, **).
 (Terry Elison, Dmitry)
   . Fixed bug #65338 (Enabling both php_opcache and php_wincache AVs on
@@ -57,10 +41,22 @@ PHP 
   NEWS
 - PDO_mysql:
   . Fixed bug #65299 (pdo mysql parsing errors). (Johannes)
 
+- Pgsql:
+  . Fixed bug #62978 (Disallow possible SQL injections with 
pg_select()/pg_update()
+/pg_delete()/pg_insert()). (Yasuo)
+
 - Phar:
   . Fixed bug #65028 (Phar::buildFromDirectory creates corrupt archives for 
 some specific contents). (Stas)
 
+- Sessions:
+  . Implemented strict sessions RFC (https://wiki.php.net/rfc/strict_sessions)
+which protects against session fixation attacks and session collisions.
+(Yasuo Ohgaki)
+  . Fixed possible buffer overflow under Windows. Note: Not a security fix.
+(Yasuo)
+  . Changed session.auto_start to PHP_INI_PERDIR. (Yasuo)
+
 - SOAP:
   . Fixed bug #65018 (SoapHeader problems with SoapServer). (Dmitry)


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

[PHP-CVS] com php-src: Merge branch 'PHP-5.4' into PHP-5.5: acinclude.m4

2013-08-17 Thread Christopher Jones 
Commit:4b4ffaf703a243db6bb1026a339376d089dec72d
Author:Christopher Jones s...@php.net Fri, 16 Aug 2013 10:49:05 
-0700
Parents:   e8a4477a4836b552557a483d803e0b1c29224c2a 
0ebef462ceb50094e64a8d48bf705594175f86ab
Branches:  PHP-5.5 master

Link:   
http://git.php.net/?p=php-src.git;a=commitdiff;h=4b4ffaf703a243db6bb1026a339376d089dec72d

Log:
Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  With --enable-dtrace, the correct PIC/non-PIC .o files on Solaris and Linux 
are now used.  DTrace is part of Oracle Linux.  See 
https://oss.oracle.com/projects/DTrace/

Changed paths:
  MM  acinclude.m4


Diff:



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

[PHP-CVS] com php-src: With --enable-dtrace, the correct PIC/non-PIC .o files on Solaris and Linux are now used. DTrace is part of Oracle Linux. See https://oss.oracle.com/projects/DTrace/: acinclud

2013-08-17 Thread Christopher Jones 
Commit:0ebef462ceb50094e64a8d48bf705594175f86ab
Author:Christopher Jones s...@php.net Fri, 16 Aug 2013 10:40:50 
-0700
Parents:   ba30c78d5ca1edfa593c32bfa203cf6ea7f942b2
Branches:  PHP-5.4 PHP-5.5 master

Link:   
http://git.php.net/?p=php-src.git;a=commitdiff;h=0ebef462ceb50094e64a8d48bf705594175f86ab

Log:
With --enable-dtrace, the correct PIC/non-PIC .o files on Solaris and
Linux are now used.  DTrace is part of Oracle Linux.  See
https://oss.oracle.com/projects/DTrace/

This patch does not change DTrace linking for non-Solaris/Linux
platforms.

For SystemTap users on Linux, this patch removes the compilation
warning:
  Warning: Linking the shared library libphp5.la against the
  non-libtool objects Zend/zend_dtrace.d.o is not portable!

Changed paths:
  M  acinclude.m4


Diff:
diff --git a/acinclude.m4 b/acinclude.m4
index f7da55c..448659f 100644
--- a/acinclude.m4
+++ b/acinclude.m4
@@ -2925,17 +2925,17 @@ dnl providerdesc
 dnl header-file
   ac_hdrobj=$2
 
-dnl Add providerdesc.o into global objects when needed
+dnl Add providerdesc.o or .lo into global objects when needed
   case $host_alias in
   *freebsd*)
 PHP_GLOBAL_OBJS=[$]PHP_GLOBAL_OBJS [$]ac_bdir[$]ac_provsrc.o
 PHP_LDFLAGS=$PHP_LDFLAGS -lelf
 ;;
   *solaris*)
-PHP_GLOBAL_OBJS=[$]PHP_GLOBAL_OBJS [$]ac_bdir[$]ac_provsrc.o
+PHP_GLOBAL_OBJS=[$]PHP_GLOBAL_OBJS [$]ac_bdir[$]ac_provsrc.lo
 ;;
   *linux*)
-PHP_GLOBAL_OBJS=[$]PHP_GLOBAL_OBJS [$]ac_bdir[$]ac_provsrc.o
+PHP_GLOBAL_OBJS=[$]PHP_GLOBAL_OBJS [$]ac_bdir[$]ac_provsrc.lo
 ;;
   esac
 
@@ -2969,12 +2969,46 @@ dnl in GNU Make which causes the .d file to be 
overwritten (Bug 61268)
 $abs_srcdir/$ac_provsrc:;
 
 $ac_bdir[$]ac_hdrobj: $abs_srcdir/$ac_provsrc
-   CFLAGS=\$(CFLAGS_CLEAN) dtrace -h -C -s $ac_srcdir[$]ac_provsrc -o 
\$[]@.bak  \$(SED) 's,PHP_,DTRACE_,g' \$[]@.bak  \$[]@
+   CFLAGS=\$(CFLAGS_CLEAN) dtrace -h -C -s $ac_srcdir[$]ac_provsrc -o 
\$[]@.bak  \$(SED) -e 's,PHP_,DTRACE_,g' \$[]@.bak  \$[]@
 
 \$(PHP_DTRACE_OBJS): $ac_bdir[$]ac_hdrobj
 
+EOF
+
+  case $host_alias in
+  *solaris*|*linux*)
+dtrace_prov_name=`echo $ac_provsrc | $SED -e 's#\(.*\)\/##'`.o
+dtrace_lib_dir=`echo $ac_bdir[$]ac_provsrc | $SED -e 
's#\(.*\)/[^/]*#\1#'`/.libs
+dtrace_d_obj=`echo $ac_bdir[$]ac_provsrc | $SED -e 
's#\(.*\)/\([^/]*\)#\1/.libs/\2#'`.o
+dtrace_nolib_objs='$(PHP_DTRACE_OBJS:.lo=.o)'
+for ac_lo in $PHP_DTRACE_OBJS; do
+  dtrace_lib_objs=[$]dtrace_lib_objs `echo $ac_lo | $SED -e 's,\.lo$,.o,' 
-e 's#\(.*\)\/#\1\/.libs\/#'`
+done;
+dnl Always attempt to create both PIC and non-PIC DTrace objects (Bug 63692)
+catMakefile.objectsEOF
+$ac_bdir[$]ac_provsrc.lo: \$(PHP_DTRACE_OBJS)
+   echo [#] Generated by Makefile for libtool  \$[]@
+   @test -d $dtrace_lib_dir || mkdir $dtrace_lib_dir
+   if CFLAGS=\$(CFLAGS_CLEAN) dtrace -G -o $dtrace_d_obj -s 
$abs_srcdir/$ac_provsrc $dtrace_lib_objs 2 /dev/null  test -f 
$dtrace_d_obj; then [\\]
+ echo pic_object=['].libs/$dtrace_prov_name[']  \$[]@ [;\\]
+   else [\\]
+ echo pic_object='none'  \$[]@ [;\\]
+   fi
+   if CFLAGS=\$(CFLAGS_CLEAN) dtrace -G -o $ac_bdir[$]ac_provsrc.o -s 
$abs_srcdir/$ac_provsrc $dtrace_nolib_objs 2 /dev/null  test -f 
$ac_bdir[$]ac_provsrc.o; then [\\]
+ echo non_pic_object=[']$dtrace_prov_name[']  \$[]@ [;\\]
+   else [\\]
+ echo non_pic_object='none'  \$[]@ [;\\]
+   fi
+
+EOF
+
+;;
+  *)
+catMakefile.objectsEOF
 $ac_bdir[$]ac_provsrc.o: \$(PHP_DTRACE_OBJS)
CFLAGS=\$(CFLAGS_CLEAN) dtrace -G -o \$[]@ -s $abs_srcdir/$ac_provsrc 
$dtrace_objs
 
 EOF
+;;
+  esac
 ])


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

[PHP-CVS] com php-src: Merge branch 'PHP-5.5': acinclude.m4

2013-08-17 Thread Christopher Jones 
Commit:2251e4369a77eab540db6e08e01fb941b3a62ba7
Author:Christopher Jones s...@php.net Fri, 16 Aug 2013 10:57:55 
-0700
Parents:   30502dbc75fb604eb1741d5b735f86c16f5dd0b1 
4b4ffaf703a243db6bb1026a339376d089dec72d
Branches:  master

Link:   
http://git.php.net/?p=php-src.git;a=commitdiff;h=2251e4369a77eab540db6e08e01fb941b3a62ba7

Log:
Merge branch 'PHP-5.5'

* PHP-5.5:
  With --enable-dtrace, the correct PIC/non-PIC .o files on Solaris and Linux 
are now used.  DTrace is part of Oracle Linux.  See 
https://oss.oracle.com/projects/DTrace/

Changed paths:
  MM  acinclude.m4


Diff:
diff --cc acinclude.m4
index b76bd34,3284978..c25e59e
--- a/acinclude.m4
+++ b/acinclude.m4
@@@ -2977,23 -3009,6 +3009,25 @@@ $ac_bdir[$]ac_provsrc.o: \$(PHP_DTRACE_
CFLAGS=\$(CFLAGS_CLEAN) dtrace -G -o \$[]@ -s $abs_srcdir/$ac_provsrc 
$dtrace_objs
  
  EOF
+ ;;
+   esac
  ])
 +
 +dnl
 +dnl PHP_CHECK_STDINT_TYPES
 +dnl
 +AC_DEFUN([PHP_CHECK_STDINT_TYPES], [
 +  AC_CHECK_SIZEOF([short], 2)
 +  AC_CHECK_SIZEOF([int], 4)
 +  AC_CHECK_SIZEOF([long], 4)
 +  AC_CHECK_SIZEOF([long long], 8)
 +  AC_CHECK_TYPES([int8, int16, int32, int64, int8_t, int16_t, int32_t, 
int64_t, uint8, uint16, uint32, uint64, uint8_t, uint16_t, uint32_t, uint64_t, 
u_int8_t, u_int16_t, u_int32_t, u_int64_t], [], [], [
 +#if HAVE_STDINT_H
 +# include stdint.h
 +#endif
 +#if HAVE_SYS_TYPES_H
 +# include sys/types.h
 +#endif
 +  ])
 +  AC_DEFINE([PHP_HAVE_STDINT_TYPES], [1], [Checked for stdint types])
 +])


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

[PHP-CVS] com php-src: Skip test if SKIP_ONLINE_TESTS set: ext/standard/tests/file/file_get_contents_error001.phpt

2013-08-14 Thread Christopher Jones 
Commit:9d62807190ebda858acbb09ad832c96570a97c40
Author:Christopher Jones s...@php.net Wed, 14 Aug 2013 15:45:06 
-0700
Parents:   7f69f07fc18f750843e756668a1a8a9178cdef97
Branches:  PHP-5.4 PHP-5.5 master

Link:   
http://git.php.net/?p=php-src.git;a=commitdiff;h=9d62807190ebda858acbb09ad832c96570a97c40

Log:
Skip test if SKIP_ONLINE_TESTS set

Changed paths:
  M  ext/standard/tests/file/file_get_contents_error001.phpt


Diff:
diff --git a/ext/standard/tests/file/file_get_contents_error001.phpt 
b/ext/standard/tests/file/file_get_contents_error001.phpt
index 127901a..a347d9d 100644
--- a/ext/standard/tests/file/file_get_contents_error001.phpt
+++ b/ext/standard/tests/file/file_get_contents_error001.phpt
@@ -10,6 +10,7 @@ display_errors=false
if (getenv(SKIP_SLOW_TESTS)) die(skip slow test);
if (!function_exists(file_get_contents))
die (skip file_get_contents function is not found);
+   if (getenv(SKIP_ONLINE_TESTS)) die(skip online test);
 ?
 --FILE--
 ?php


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

[PHP-CVS] com php-src: Reduce (some) compile noise of 'unused variable' and 'may be used uninitialized' warnings.: ext/date/php_date.c ext/dba/dba.c ext/dba/libinifile/inifile.c ext/dom/xpath.c ext/gm

2013-08-14 Thread Christopher Jones 
Commit:9ad97cd48903ea5454853960f2c14de326e0f624
Author:Christopher Jones s...@php.net Wed, 14 Aug 2013 20:36:50 
-0700
Parents:   9d62807190ebda858acbb09ad832c96570a97c40
Branches:  PHP-5.4 PHP-5.5 master

Link:   
http://git.php.net/?p=php-src.git;a=commitdiff;h=9ad97cd48903ea5454853960f2c14de326e0f624

Log:
Reduce (some) compile noise of 'unused variable' and 'may be used 
uninitialized' warnings.

Changed paths:
  M  ext/date/php_date.c
  M  ext/dba/dba.c
  M  ext/dba/libinifile/inifile.c
  M  ext/dom/xpath.c
  M  ext/gmp/gmp.c
  M  ext/intl/grapheme/grapheme_util.c
  M  ext/intl/resourcebundle/resourcebundle_class.c
  M  ext/openssl/openssl.c
  M  ext/openssl/xp_ssl.c
  M  ext/session/session.c
  M  ext/simplexml/simplexml.c
  M  ext/snmp/snmp.c
  M  ext/spl/spl_array.c
  M  ext/spl/spl_dllist.c
  M  ext/standard/array.c
  M  ext/standard/html.c
  M  ext/standard/string.c
  M  ext/standard/url_scanner_ex.re
  M  ext/xsl/xsltprocessor.c
  M  ext/zip/php_zip.c
  M  main/php_variables.c
  M  main/rfc1867.c
  M  sapi/cli/php_cli_server.c

diff --git a/ext/date/php_date.c b/ext/date/php_date.c
index 270c058..f091fed 100644
--- a/ext/date/php_date.c
+++ b/ext/date/php_date.c
@@ -997,7 +997,7 @@ char *php_date_short_day_name(timelib_sll y, timelib_sll m, 
timelib_sll d)
 static char *date_format(char *format, int format_len, timelib_time *t, int 
localtime)
 {
smart_strstring = {0};
-   int  i, length;
+   int  i, length = 0;
char buffer[97];
timelib_time_offset *offset = NULL;
timelib_sll  isoweek, isoyear;
@@ -2409,8 +2409,8 @@ PHPAPI int php_date_initialize(php_date_obj *dateobj, 
/*const*/ char *time_str,
timelib_time   *now;
timelib_tzinfo *tzi = NULL;
timelib_error_container *err = NULL;
-   int type = TIMELIB_ZONETYPE_ID, new_dst;
-   char *new_abbr;
+   int type = TIMELIB_ZONETYPE_ID, new_dst = 0;
+   char *new_abbr = NULL;
timelib_sll new_offset;

if (dateobj-time) {
diff --git a/ext/dba/dba.c b/ext/dba/dba.c
index 5295ab3..8005101 100644
--- a/ext/dba/dba.c
+++ b/ext/dba/dba.c
@@ -538,7 +538,6 @@ PHP_MINFO_FUNCTION(dba)
  */
 static void php_dba_update(INTERNAL_FUNCTION_PARAMETERS, int mode)
 {
-   char *v;
int val_len;
zval *id;
dba_info *info = NULL;
diff --git a/ext/dba/libinifile/inifile.c b/ext/dba/libinifile/inifile.c
index 89373b1..3cd9770 100644
--- a/ext/dba/libinifile/inifile.c
+++ b/ext/dba/libinifile/inifile.c
@@ -460,7 +460,7 @@ static int inifile_filter(inifile *dba, inifile *from, 
const key_type *key TSRML
  */
 static int inifile_delete_replace_append(inifile *dba, const key_type *key, 
const val_type *value, int append TSRMLS_DC) 
 {
-   size_t pos_grp_start, pos_grp_next;
+   size_t pos_grp_start = 0, pos_grp_next;
inifile *ini_tmp = NULL;
php_stream *fp_tmp = NULL;
int ret;
diff --git a/ext/dom/xpath.c b/ext/dom/xpath.c
index cf556a3..d12ef30 100644
--- a/ext/dom/xpath.c
+++ b/ext/dom/xpath.c
@@ -74,7 +74,7 @@ const zend_function_entry php_dom_xpath_class_functions[] = {
 
 static void dom_xpath_ext_function_php(xmlXPathParserContextPtr ctxt, int 
nargs, int type) /* {{{ */
 {
-   zval **args;
+   zval **args = NULL;
zval *retval;
int result, i, ret;
int error = 0;
diff --git a/ext/gmp/gmp.c b/ext/gmp/gmp.c
index f8c3a07..e3a3563 100644
--- a/ext/gmp/gmp.c
+++ b/ext/gmp/gmp.c
@@ -1069,7 +1069,7 @@ ZEND_FUNCTION(gmp_powm)
zval **base_arg, **exp_arg, **mod_arg;
mpz_t *gmpnum_base, *gmpnum_exp, *gmpnum_mod, *gmpnum_result;
int use_ui = 0;
-   int temp_base, temp_exp, temp_mod;
+   int temp_base = 0, temp_exp = 0, temp_mod;
 
if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, ZZZ, base_arg, 
exp_arg, mod_arg) == FAILURE){
return;
diff --git a/ext/intl/grapheme/grapheme_util.c 
b/ext/intl/grapheme/grapheme_util.c
index 883fa03..c752b02 100644
--- a/ext/intl/grapheme/grapheme_util.c
+++ b/ext/intl/grapheme/grapheme_util.c
@@ -130,7 +130,7 @@ void grapheme_substr_ascii(char *str, int str_len, int f, 
int l, int argc, char
 /* {{{ grapheme_strpos_utf16 - strrpos using utf16*/
 int grapheme_strpos_utf16(unsigned char *haystack, int32_t haystack_len, 
unsigned char*needle, int32_t needle_len, int32_t offset, int32_t *puchar_pos, 
int f_ignore_case, int last TSRMLS_DC)
 {
-   UChar *uhaystack = NULL, *puhaystack, *uneedle = NULL;
+   UChar *uhaystack = NULL, *uneedle = NULL;
int32_t uhaystack_len = 0, uneedle_len = 0, char_pos, ret_pos, 
offset_pos = 0;
unsigned char u_break_iterator_buffer[U_BRK_SAFECLONE_BUFFERSIZE];
UBreakIterator* bi = NULL;
diff --git a/ext/intl/resourcebundle/resourcebundle_class.c 
b/ext/intl/resourcebundle/resourcebundle_class.c
index a6a73f5..7c1a5c2 100644
--- a/ext/intl/resourcebundle

[PHP-CVS] com php-src: Reduce compiler noise by removing unused variables and labels: ext/gd/gd.c ext/gd/libgd/gd.c ext/standard/url_scanner_ex.c

2013-08-14 Thread Christopher Jones 
Commit:cd14de94d2428a28c8bfad1aad9837c59ab81e8f
Author:Christopher Jones s...@php.net Wed, 14 Aug 2013 21:06:59 
-0700
Parents:   39612afc72623e89a2bc595c9be4be497568d1be
Branches:  PHP-5.5 master

Link:   
http://git.php.net/?p=php-src.git;a=commitdiff;h=cd14de94d2428a28c8bfad1aad9837c59ab81e8f

Log:
Reduce compiler noise by removing unused variables and labels

Changed paths:
  M  ext/gd/gd.c
  M  ext/gd/libgd/gd.c
  M  ext/standard/url_scanner_ex.c


Diff:
diff --git a/ext/gd/gd.c b/ext/gd/gd.c
index 8f32ad5..fb25821 100644
--- a/ext/gd/gd.c
+++ b/ext/gd/gd.c
@@ -2434,7 +2434,7 @@ static void 
_php_image_create_from(INTERNAL_FUNCTION_PARAMETERS, int image_type,
fflush(fp);
}
 
-register_im:
+/* register_im: */
if (im) {
ZEND_REGISTER_RESOURCE(return_value, im, le_gd);
php_stream_close(stream);
diff --git a/ext/gd/libgd/gd.c b/ext/gd/libgd/gd.c
index 7ed6617..54890bc 100644
--- a/ext/gd/libgd/gd.c
+++ b/ext/gd/libgd/gd.c
@@ -3011,7 +3011,6 @@ void gdImageGetClip (gdImagePtr im, int *x1P, int *y1P, 
int *x2P, int *y2P)
 int gdImagePaletteToTrueColor(gdImagePtr src)
 {
unsigned int y;
-   unsigned char alloc_y = 0;
unsigned int yy;
 
if (src == NULL) {
diff --git a/ext/standard/url_scanner_ex.c b/ext/standard/url_scanner_ex.c
index 833e9d8..2c2dfda 100644
--- a/ext/standard/url_scanner_ex.c
+++ b/ext/standard/url_scanner_ex.c
@@ -1011,7 +1011,7 @@ static void php_url_scanner_output_handler(char *output, 
uint output_len, char *
 
 PHPAPI int php_url_scanner_add_var(char *name, int name_len, char *value, int 
value_len, int urlencode TSRMLS_DC)
 {
-   char *encoded;
+   char *encoded = NULL;
int encoded_len;
smart_str val;


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

[PHP-CVS] com php-src: Merge branch 'PHP-5.4' into PHP-5.5: ext/date/php_date.c ext/intl/resourcebundle/resourcebundle_class.c ext/openssl/openssl.c ext/openssl/xp_ssl.c ext/session/session.c ext/simp

2013-08-14 Thread Christopher Jones 
Commit:39612afc72623e89a2bc595c9be4be497568d1be
Author:Christopher Jones s...@php.net Wed, 14 Aug 2013 20:43:25 
-0700
Parents:   8c61758dc772345636e436e3f69bef7323f8b339 
9ad97cd48903ea5454853960f2c14de326e0f624
Branches:  PHP-5.5 master

Link:   
http://git.php.net/?p=php-src.git;a=commitdiff;h=39612afc72623e89a2bc595c9be4be497568d1be

Log:
Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  Reduce (some) compile noise of 'unused variable' and 'may be used 
uninitialized' warnings.

Conflicts:
ext/dba/libinifile/inifile.c

Changed paths:
  MM  ext/date/php_date.c
  MM  ext/intl/resourcebundle/resourcebundle_class.c
  MM  ext/openssl/openssl.c
  MM  ext/openssl/xp_ssl.c
  MM  ext/session/session.c
  MM  ext/simplexml/simplexml.c
  MM  ext/snmp/snmp.c
  MM  ext/spl/spl_array.c
  MM  ext/spl/spl_dllist.c
  MM  ext/standard/array.c
  MM  ext/standard/string.c
  MM  ext/zip/php_zip.c
  MM  main/php_variables.c
  MM  main/rfc1867.c
  MM  sapi/cli/php_cli_server.c


Diff:
diff --cc ext/openssl/openssl.c
index 05e1e79,68be86f..4c3b2ec
--- a/ext/openssl/openssl.c
+++ b/ext/openssl/openssl.c
@@@ -588,10 -575,10 +588,10 @@@ static void add_assoc_name_entry(zval 
} else {
subitem = val;
}
 -
 +  
for (i = 0; i  X509_NAME_entry_count(name); i++) {
unsigned char *to_add;
-   int to_add_len;
+   int to_add_len = 0;
  
  
ne  = X509_NAME_get_entry(name, i);


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

[PHP-CVS] com php-src: Remove unused variable: ext/openssl/openssl.c

2013-08-14 Thread Christopher Jones 
Commit:ac03b67e6a04f4337dcaa0ef0061afaa57c70e12
Author:Christopher Jones s...@php.net Wed, 14 Aug 2013 21:21:17 
-0700
Parents:   4824d0f43e6d8742eafb5e751f3c9a3d7da3f3cd
Branches:  master

Link:   
http://git.php.net/?p=php-src.git;a=commitdiff;h=ac03b67e6a04f4337dcaa0ef0061afaa57c70e12

Log:
Remove unused variable

Changed paths:
  M  ext/openssl/openssl.c


Diff:
diff --git a/ext/openssl/openssl.c b/ext/openssl/openssl.c
index e4000bc..cc6c79a 100644
--- a/ext/openssl/openssl.c
+++ b/ext/openssl/openssl.c
@@ -1529,7 +1529,6 @@ PHP_FUNCTION(openssl_spki_export)
EVP_PKEY *pkey = NULL;
NETSCAPE_SPKI *spki = NULL;
BIO *out = BIO_new(BIO_s_mem());
-   BUF_MEM *bio_buf;
 
if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, s, spkstr, 
spkstr_len) == FAILURE) {
return;


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

[PHP-CVS] com php-src: Merge branch 'PHP-5.5': ext/gd/gd.c

2013-08-14 Thread Christopher Jones 
Commit:4824d0f43e6d8742eafb5e751f3c9a3d7da3f3cd
Author:Christopher Jones s...@php.net Wed, 14 Aug 2013 21:08:55 
-0700
Parents:   3c166c47584c7a7eb8c1ce42ea05a8a5677da028 
cd14de94d2428a28c8bfad1aad9837c59ab81e8f
Branches:  master

Link:   
http://git.php.net/?p=php-src.git;a=commitdiff;h=4824d0f43e6d8742eafb5e751f3c9a3d7da3f3cd

Log:
Merge branch 'PHP-5.5'

* PHP-5.5:
  Reduce compiler noise by removing unused variables and labels

Changed paths:
  MM  ext/gd/gd.c


Diff:



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

[PHP-CVS] com php-src: Merge branch 'PHP-5.5': ext/gmp/gmp.c ext/openssl/openssl.c ext/openssl/xp_ssl.c ext/session/session.c ext/standard/string.c ext/zip/php_zip.c main/rfc1867.c

2013-08-14 Thread Christopher Jones 
Commit:3c166c47584c7a7eb8c1ce42ea05a8a5677da028
Author:Christopher Jones s...@php.net Wed, 14 Aug 2013 20:47:00 
-0700
Parents:   759517651ec5fb09349a3653435dc9ddd0fc53b5 
39612afc72623e89a2bc595c9be4be497568d1be
Branches:  master

Link:   
http://git.php.net/?p=php-src.git;a=commitdiff;h=3c166c47584c7a7eb8c1ce42ea05a8a5677da028

Log:
Merge branch 'PHP-5.5'

* PHP-5.5:
  Reduce (some) compile noise of 'unused variable' and 'may be used 
uninitialized' warnings.

Conflicts:
ext/gmp/gmp.c

Changed paths:
  MM  ext/gmp/gmp.c
  MM  ext/openssl/openssl.c
  MM  ext/openssl/xp_ssl.c
  MM  ext/session/session.c
  MM  ext/standard/string.c
  MM  ext/zip/php_zip.c
  MM  main/rfc1867.c


Diff:
diff --cc ext/gmp/gmp.c
index 6b3dadf,e3a3563..8b5c131
--- a/ext/gmp/gmp.c
+++ b/ext/gmp/gmp.c
@@@ -1360,12 -1066,12 +1360,12 @@@ ZEND_FUNCTION(gmp_pow
 Raise base to power exp and take result modulo mod */
  ZEND_FUNCTION(gmp_powm)
  {
 -  zval **base_arg, **exp_arg, **mod_arg;
 -  mpz_t *gmpnum_base, *gmpnum_exp, *gmpnum_mod, *gmpnum_result;
 +  zval *base_arg, *exp_arg, *mod_arg;
 +  mpz_ptr gmpnum_base, gmpnum_exp, gmpnum_mod, gmpnum_result;
int use_ui = 0;
-   gmp_temp_t temp_base, temp_exp, temp_mod;
 -  int temp_base = 0, temp_exp = 0, temp_mod;
++  gmp_temp_t temp_base = {0}, temp_exp = {0}, temp_mod;
  
 -  if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, ZZZ, base_arg, 
exp_arg, mod_arg) == FAILURE){
 +  if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, zzz, base_arg, 
exp_arg, mod_arg) == FAILURE){
return;
}


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

[PHP-CVS] com php-src: Fix unused variable warning in OCI8 2.0: ext/oci8/oci8_statement.c

2013-08-13 Thread Christopher Jones 
Commit:f95cd93408997bd03e1811060d1f25680dc66607
Author:Christopher Jones s...@php.net Tue, 13 Aug 2013 15:15:57 
-0700
Parents:   c5674bb502ba5a0b4f14c3171de1ab617245a39d
Branches:  master

Link:   
http://git.php.net/?p=php-src.git;a=commitdiff;h=f95cd93408997bd03e1811060d1f25680dc66607

Log:
Fix unused variable warning in OCI8 2.0

Changed paths:
  M  ext/oci8/oci8_statement.c


Diff:
diff --git a/ext/oci8/oci8_statement.c b/ext/oci8/oci8_statement.c
index 561abab..feec056 100644
--- a/ext/oci8/oci8_statement.c
+++ b/ext/oci8/oci8_statement.c
@@ -124,14 +124,14 @@ php_oci_statement 
*php_oci_statement_create(php_oci_connection *connection, char
Fetch implicit result set statement resource */
 php_oci_statement *php_oci_get_implicit_resultset(php_oci_statement *statement 
TSRMLS_DC)
 {
-   void*result;
-   ub4  rtype;
-   php_oci_statement *statement2;  /* implicit result set statement handle 
*/
-
 #if (OCI_MAJOR_VERSION  12)
php_error_docref(NULL TSRMLS_CC, E_WARNING, Implicit results are 
available in Oracle Database 12c onwards);
return NULL;
 #else
+   void *result;
+   ub4   rtype;
+   php_oci_statement *statement2;  /* implicit result set statement handle 
*/
+
PHP_OCI_CALL_RETURN(OCISTMTGETNEXTRESULT, statement-errcode, 
OCIStmtGetNextResult, (statement-stmt, statement-err, result, rtype, 
OCI_DEFAULT));
if (statement-errcode == OCI_NO_DATA) {
return NULL;


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

[PHP-CVS] com php-src: Merge branch 'PHP-5.4' into PHP-5.5: Makefile.global

2013-08-07 Thread Christopher Jones 
Commit:ae4f8b2ab091cf96058e20ebfab387e21cd26b4c
Author:Christopher Jones s...@php.net Wed, 7 Aug 2013 13:14:46 
-0700
Parents:   c932d532c8d858bed66b5393cc8d7be21f26dd2e 
4ed133c4e216b62778fc9c2c53b27be5f454850f
Branches:  PHP-5.5

Link:   
http://git.php.net/?p=php-src.git;a=commitdiff;h=ae4f8b2ab091cf96058e20ebfab387e21cd26b4c

Log:
Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  Remove tabs on blanklines in Makefile sources. This prevents a 'suspicious 
line' warning when editing  saving Makefile using Emacs.

Changed paths:
  MM  Makefile.global


Diff:



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

[PHP-CVS] com php-src: Remove tabs on blanklines in Makefile sources. This prevents a 'suspicious line' warning when editing saving Makefile using Emacs.: Makefile.global scripts/Makefile.frag

2013-08-07 Thread Christopher Jones 
Commit:4ed133c4e216b62778fc9c2c53b27be5f454850f
Author:Christopher Jones s...@php.net Tue, 30 Jul 2013 13:36:10 
-0700
Parents:   2743c3aac81ac8095962f87442b0a2b59cc54445
Branches:  PHP-5.4 PHP-5.5

Link:   
http://git.php.net/?p=php-src.git;a=commitdiff;h=4ed133c4e216b62778fc9c2c53b27be5f454850f

Log:
Remove tabs on blanklines in Makefile sources. This prevents a
'suspicious line' warning when editing  saving Makefile using Emacs.

Changed paths:
  M  Makefile.global
  M  scripts/Makefile.frag


Diff:
diff --git a/Makefile.global b/Makefile.global
index fe31eed..6b79ad7 100644
--- a/Makefile.global
+++ b/Makefile.global
@@ -10,7 +10,7 @@ all: $(all_targets)
@echo Build complete.
@echo Don't forget to run 'make test'.
@echo
-   
+
 build-modules: $(PHP_MODULES) $(PHP_ZEND_EX)
 
 build-binaries: $(PHP_BINARIES)
diff --git a/scripts/Makefile.frag b/scripts/Makefile.frag
index 00272b0..7cd78fa 100644
--- a/scripts/Makefile.frag
+++ b/scripts/Makefile.frag
@@ -44,7 +44,7 @@ install-programs: $(builddir)/phpize $(builddir)/php-config
echo   page: $(program_prefix)$${page}$(program_suffix).1; \
$(INSTALL_DATA) $(builddir)/man1/$${page}.1 
$(INSTALL_ROOT)$(mandir)/man1/$(program_prefix)$${page}$(program_suffix).1; \
done
-   
+
 $(builddir)/phpize: $(srcdir)/phpize.in $(top_builddir)/config.status
(CONFIG_FILES=$@ CONFIG_HEADERS= $(top_builddir)/config.status)


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

[PHP-CVS] com php-src: One more './configure --help' alignment fix: build/libtool.m4

2013-08-06 Thread Christopher Jones 
Commit:c932d532c8d858bed66b5393cc8d7be21f26dd2e
Author:Christopher Jones s...@php.net Tue, 6 Aug 2013 11:23:02 
-0700
Parents:   c6d977dd395262c5c8d9091519a41aebe6f40db9
Branches:  PHP-5.5 master

Link:   
http://git.php.net/?p=php-src.git;a=commitdiff;h=c932d532c8d858bed66b5393cc8d7be21f26dd2e

Log:
One more './configure --help' alignment fix

Changed paths:
  M  build/libtool.m4


Diff:
diff --git a/build/libtool.m4 b/build/libtool.m4
index dcd2aea..56658cc 100644
--- a/build/libtool.m4
+++ b/build/libtool.m4
@@ -2103,7 +2103,8 @@ AC_DEFUN([AC_ENABLE_FAST_INSTALL],
 [define([AC_ENABLE_FAST_INSTALL_DEFAULT], ifelse($1, no, no, yes))dnl
 AC_ARG_ENABLE([fast-install],
 changequote(, )dnl
-  --enable-fast-install[=PKGS]  Optimize for fast installation 
[default=AC_ENABLE_FAST_INSTALL_DEFAULT],
+  --enable-fast-install[=PKGS]
+  Optimize for fast installation 
[default=AC_ENABLE_FAST_INSTALL_DEFAULT],
 changequote([, ])dnl
 [p=${PACKAGE-default}
 case $enableval in


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

[PHP-CVS] com php-src: Merge branch 'PHP-5.5': configure.in ext/oci8/config.m4 ext/simplexml/config.m4

2013-08-06 Thread Christopher Jones 
Commit:4c3c9d1fe585abaa59213dedd04996b8fb9f041a
Author:Christopher Jones s...@php.net Tue, 6 Aug 2013 11:09:12 
-0700
Parents:   db610ba050cdc44c3c0d7c1c9ce81a2a17f5d087 
c6d977dd395262c5c8d9091519a41aebe6f40db9
Branches:  master

Link:   
http://git.php.net/?p=php-src.git;a=commitdiff;h=4c3c9d1fe585abaa59213dedd04996b8fb9f041a

Log:
Merge branch 'PHP-5.5'

* PHP-5.5:
  Fix long-standing visual pain point: the misalignment of './configure help' 
text. Whitespace changes and a couple of grammar fixes.

Changed paths:
  MM  configure.in
  MM  ext/oci8/config.m4
  MM  ext/simplexml/config.m4


Diff:



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

[PHP-CVS] com php-src: Merge branch 'PHP-5.5': acinclude.m4

2013-08-05 Thread Christopher Jones 
Commit:8fdf1ad32d8d9a752b757f17c52757f32a462c3f
Author:Christopher Jones s...@php.net Mon, 5 Aug 2013 14:28:24 
-0700
Parents:   85cc3b324014c283366e7091fb45a85cc6fb74c8 
b90b551228c7dcc8399030c2cb0a12c72e9440f6
Branches:  master

Link:   
http://git.php.net/?p=php-src.git;a=commitdiff;h=8fdf1ad32d8d9a752b757f17c52757f32a462c3f

Log:
Merge branch 'PHP-5.5'

* PHP-5.5:
  Add an empty make command for DTrace .d files to stop an implicit circular 
dependency in GNU Make which causes .d files to be overwritten (Bug 61268)
  Merge branch 'PHP-5.4'

Bugs:
https://bugs.php.net/61268

Changed paths:
  MM  acinclude.m4


Diff:



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

[PHP-CVS] com php-src: Merge branch 'PHP-5.4' into PHP-5.5: acinclude.m4

2013-08-05 Thread Christopher Jones 
Commit:b90b551228c7dcc8399030c2cb0a12c72e9440f6
Author:Christopher Jones s...@php.net Mon, 5 Aug 2013 14:27:54 
-0700
Parents:   963c1be38db3fd4b31303ae28e72933c5873103f 
ec4019e8f693fb68c8e282bb540812a10d99cba1
Branches:  PHP-5.5 master

Link:   
http://git.php.net/?p=php-src.git;a=commitdiff;h=b90b551228c7dcc8399030c2cb0a12c72e9440f6

Log:
Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  Add an empty make command for DTrace .d files to stop an implicit circular 
dependency in GNU Make which causes .d files to be overwritten (Bug 61268)
  Merge branch 'PHP-5.4'

Conflicts:
ext/mysqlnd/mysqlnd.c

Bugs:
https://bugs.php.net/61268

Changed paths:
  MM  acinclude.m4


Diff:
diff --cc acinclude.m4
index 07b1f8e,1c8ca19..335b1b4
--- a/acinclude.m4
+++ b/acinclude.m4
@@@ -2962,10 -2959,14 +2962,14 @@@ dnl DTrace object
esac
  
  dnl Generate Makefile.objects entries
+ dnl The empty $ac_provsrc command stops an implicit circular dependency
+ dnl in GNU Make which causes the .d file to be overwritten (Bug 61268)
catMakefile.objectsEOF
  
+ $abs_srcdir/$ac_provsrc:;
+ 
  $ac_bdir[$]ac_hdrobj: $abs_srcdir/$ac_provsrc
 -  dtrace -h -C -s $ac_srcdir[$]ac_provsrc -o \$[]@  \$(SED) -ibak 
's,PHP_,DTRACE_,g' \$[]@
 +  CFLAGS=\$(CFLAGS_CLEAN) dtrace -h -C -s $ac_srcdir[$]ac_provsrc -o 
\$[]@  cp \$[]@ \$[]@.bak  \$(SED) 's,PHP_,DTRACE_,g' \$[]@.bak  \$[]@
  
  \$(PHP_DTRACE_OBJS): $ac_bdir[$]ac_hdrobj


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

[PHP-CVS] com php-src: Add an empty make command for DTrace .d files to stop an implicit circular dependency in GNU Make which causes .d files to be overwritten (Bug 61268): acinclude.m4

2013-08-05 Thread Christopher Jones 
Commit:ec4019e8f693fb68c8e282bb540812a10d99cba1
Author:Christopher Jones s...@php.net Mon, 5 Aug 2013 14:21:06 
-0700
Parents:   cabf38af6d1013b6ea6d0c8539fc8f632da04870
Branches:  PHP-5.4 PHP-5.5 master

Link:   
http://git.php.net/?p=php-src.git;a=commitdiff;h=ec4019e8f693fb68c8e282bb540812a10d99cba1

Log:
Add an empty make command for DTrace .d files to stop an implicit
circular dependency in GNU Make which causes .d files to be
overwritten (Bug 61268)

Bugs:
https://bugs.php.net/61268

Changed paths:
  M  acinclude.m4


Diff:
diff --git a/acinclude.m4 b/acinclude.m4
index d5912ad..1c8ca19 100644
--- a/acinclude.m4
+++ b/acinclude.m4
@@ -2959,8 +2959,12 @@ dnl DTrace objects
   esac
 
 dnl Generate Makefile.objects entries
+dnl The empty $ac_provsrc command stops an implicit circular dependency
+dnl in GNU Make which causes the .d file to be overwritten (Bug 61268)
   catMakefile.objectsEOF
 
+$abs_srcdir/$ac_provsrc:;
+
 $ac_bdir[$]ac_hdrobj: $abs_srcdir/$ac_provsrc
dtrace -h -C -s $ac_srcdir[$]ac_provsrc -o \$[]@  \$(SED) -ibak 
's,PHP_,DTRACE_,g' \$[]@


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

[PHP-CVS] com php-src: Fixed bug #63706: Cannot build PHP-5.5 with --enable-dtrace on Fedora 17: acinclude.m4

2013-08-05 Thread Christopher Jones 
Commit:3c5e22921202bf5451774b23e2a25fb73029fc68
Author:Remi Collet r...@php.net Sun, 16 Dec 2012 08:51:17 +0100
Committer: Christopher Jones s...@php.net  Mon, 5 Aug 2013 14:52:12 -0700
Parents:   ec4019e8f693fb68c8e282bb540812a10d99cba1
Branches:  PHP-5.4

Link:   
http://git.php.net/?p=php-src.git;a=commitdiff;h=3c5e22921202bf5451774b23e2a25fb73029fc68

Log:
Fixed bug #63706: Cannot build PHP-5.5 with --enable-dtrace on Fedora 17

Bugs:
https://bugs.php.net/63706

Changed paths:
  M  acinclude.m4


Diff:
diff --git a/acinclude.m4 b/acinclude.m4
index 1c8ca19..1abdeed 100644
--- a/acinclude.m4
+++ b/acinclude.m4
@@ -2966,12 +2966,12 @@ dnl in GNU Make which causes the .d file to be 
overwritten (Bug 61268)
 $abs_srcdir/$ac_provsrc:;
 
 $ac_bdir[$]ac_hdrobj: $abs_srcdir/$ac_provsrc
-   dtrace -h -C -s $ac_srcdir[$]ac_provsrc -o \$[]@  \$(SED) -ibak 
's,PHP_,DTRACE_,g' \$[]@
+   CFLAGS=\$(CFLAGS_CLEAN) dtrace -h -C -s $ac_srcdir[$]ac_provsrc -o 
\$[]@  \$(SED) -ibak 's,PHP_,DTRACE_,g' \$[]@
 
 \$(PHP_DTRACE_OBJS): $ac_bdir[$]ac_hdrobj
 
 $ac_bdir[$]ac_provsrc.o: \$(PHP_DTRACE_OBJS)
-   dtrace -G -o \$[]@ -s $abs_srcdir/$ac_provsrc $dtrace_objs
+   CFLAGS=\$(CFLAGS_CLEAN) dtrace -G -o \$[]@ -s $abs_srcdir/$ac_provsrc 
$dtrace_objs
 
 EOF
 ])


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

[PHP-CVS] com php-src: Enable dtrace probes on linux as they are compatible with systemtap: acinclude.m4

2013-08-05 Thread Christopher Jones 
Commit:a5c524f1bee382bb5792069c7a0afac9abdcd3ce
Author:David Soria Parra d...@php.net Mon, 3 Dec 2012 12:21:32 
+0100
Committer: Christopher Jones s...@php.net  Mon, 5 Aug 2013 15:07:04 -0700
Parents:   3c5e22921202bf5451774b23e2a25fb73029fc68
Branches:  PHP-5.4

Link:   
http://git.php.net/?p=php-src.git;a=commitdiff;h=a5c524f1bee382bb5792069c7a0afac9abdcd3ce

Log:
Enable dtrace probes on linux as they are compatible with systemtap

You can build php with dtrace probes enabled on linux if you have
systemtap with uprobes.

Changed paths:
  M  acinclude.m4


Diff:
diff --git a/acinclude.m4 b/acinclude.m4
index 1abdeed..ae5509d 100644
--- a/acinclude.m4
+++ b/acinclude.m4
@@ -2934,6 +2934,9 @@ dnl Add providerdesc.o into global objects when needed
   *solaris*)
 PHP_GLOBAL_OBJS=[$]PHP_GLOBAL_OBJS [$]ac_bdir[$]ac_provsrc.o
 ;;
+  *linux*)
+PHP_GLOBAL_OBJS=[$]PHP_GLOBAL_OBJS [$]ac_bdir[$]ac_provsrc.o
+;;
   esac
 
 dnl DTrace objects


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

[PHP-CVS] com php-src: Fixed bug #62691 (solaris sed has no -i switch) Make 'make distclean' remove generated DTrace .h file: Makefile.global acinclude.m4

2013-08-05 Thread Christopher Jones 
Commit:3bbe5931bc2b05ff8bcdf217bc6e79f5ac4cd692
Author:Christopher Jones s...@php.net Wed, 31 Jul 2013 09:58:28 
-0700
Parents:   a5c524f1bee382bb5792069c7a0afac9abdcd3ce
Branches:  PHP-5.4

Link:   
http://git.php.net/?p=php-src.git;a=commitdiff;h=3bbe5931bc2b05ff8bcdf217bc6e79f5ac4cd692

Log:
Fixed bug #62691 (solaris sed has no -i switch)
Make 'make distclean' remove generated DTrace .h file

Bugs:
https://bugs.php.net/62691

Changed paths:
  M  Makefile.global
  M  acinclude.m4


Diff:
diff --git a/Makefile.global b/Makefile.global
index b30c318..fe31eed 100644
--- a/Makefile.global
+++ b/Makefile.global
@@ -116,7 +116,7 @@ clean:
rm -f libphp$(PHP_MAJOR_VERSION).la $(SAPI_CLI_PATH) $(OVERALL_TARGET) 
modules/* libs/*
 
 distclean: clean
-   rm -f Makefile config.cache config.log config.status Makefile.objects 
Makefile.fragments libtool main/php_config.h stamp-h 
sapi/apache/libphp$(PHP_MAJOR_VERSION).module buildmk.stamp
+   rm -f Makefile config.cache config.log config.status Makefile.objects 
Makefile.fragments libtool main/php_config.h stamp-h 
sapi/apache/libphp$(PHP_MAJOR_VERSION).module buildmk.stamp 
Zend/zend_dtrace_gen.h Zend/zend_dtrace_gen.h.bak
$(EGREP) define'.*include/php' $(top_srcdir)/configure | $(SED) 
's/.*//'|xargs rm -f
 
 .PHONY: all clean install distclean test
diff --git a/acinclude.m4 b/acinclude.m4
index ae5509d..76845d6 100644
--- a/acinclude.m4
+++ b/acinclude.m4
@@ -2969,7 +2969,7 @@ dnl in GNU Make which causes the .d file to be 
overwritten (Bug 61268)
 $abs_srcdir/$ac_provsrc:;
 
 $ac_bdir[$]ac_hdrobj: $abs_srcdir/$ac_provsrc
-   CFLAGS=\$(CFLAGS_CLEAN) dtrace -h -C -s $ac_srcdir[$]ac_provsrc -o 
\$[]@  \$(SED) -ibak 's,PHP_,DTRACE_,g' \$[]@
+   CFLAGS=\$(CFLAGS_CLEAN) dtrace -h -C -s $ac_srcdir[$]ac_provsrc -o 
\$[]@  cp \$[]@ \$[]@.bak  \$(SED) 's,PHP_,DTRACE_,g' \$[]@.bak  \$[]@
 
 \$(PHP_DTRACE_OBJS): $ac_bdir[$]ac_hdrobj


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

[PHP-CVS] com php-src: Merge branch 'PHP-5.5': acinclude.m4

2013-08-05 Thread Christopher Jones 
Commit:ca0497bbac282c39048776a9f61052e67643
Author:Christopher Jones s...@php.net Mon, 5 Aug 2013 15:46:54 
-0700
Parents:   8fdf1ad32d8d9a752b757f17c52757f32a462c3f 
18f17818a697269fbd93b9ec234640b67972eb23
Branches:  master

Link:   
http://git.php.net/?p=php-src.git;a=commitdiff;h=ca0497bbac282c39048776a9f61052e67643

Log:
Merge branch 'PHP-5.5'

* PHP-5.5:
  NEWS for recent DTrace merges. Remove redundant 'cp' during DTrace install.
  Fixed bug #62691 (solaris sed has no -i switch) Make 'make distclean' remove 
generated DTrace .h file
  Enable dtrace probes on linux as they are compatible with systemtap
  Fixed bug #63706: Cannot build PHP-5.5 with --enable-dtrace on Fedora 17

Bugs:
https://bugs.php.net/62691
https://bugs.php.net/63706

Changed paths:
  MM  acinclude.m4


Diff:



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

[PHP-CVS] com php-src: NEWS for recent DTrace merges. Remove redundant 'cp' during DTrace install.: NEWS acinclude.m4

2013-08-05 Thread Christopher Jones 
Commit:47d66a0b4ea83bc4e1c9bfaa5c478cd42e28337c
Author:Christopher Jones s...@php.net Mon, 5 Aug 2013 15:38:36 
-0700
Parents:   3bbe5931bc2b05ff8bcdf217bc6e79f5ac4cd692
Branches:  PHP-5.4 PHP-5.5 master

Link:   
http://git.php.net/?p=php-src.git;a=commitdiff;h=47d66a0b4ea83bc4e1c9bfaa5c478cd42e28337c

Log:
NEWS for recent DTrace merges.
Remove redundant 'cp' during DTrace install.

Changed paths:
  M  NEWS
  M  acinclude.m4


Diff:
diff --git a/NEWS b/NEWS
index 332d4e7..103abeb 100644
--- a/NEWS
+++ b/NEWS
@@ -9,6 +9,10 @@ PHP
NEWS
   . Fixed bug #65291 (get_defined_constants() causes PHP to crash in a very
 limited case). (Arpad)
   . Improve fix for bug #63186 (compile failure on netbsd). (Matteo)
+  . Fixed bug #61268 (--enable-dtrace leads make to clobber
+Zend/zend_dtrace.d) (Chris Jones)
+  . Cherry picked some DTrace build commits (allowing builds on Linux,
+bug 62691, and bug 63706) from PHP 5.5 branch
 
 - Session:
   . Fixed bug #62129 (rfc1867 crashes php even though turned off). (gxd305 at
diff --git a/acinclude.m4 b/acinclude.m4
index 76845d6..f7da55c 100644
--- a/acinclude.m4
+++ b/acinclude.m4
@@ -2969,7 +2969,7 @@ dnl in GNU Make which causes the .d file to be 
overwritten (Bug 61268)
 $abs_srcdir/$ac_provsrc:;
 
 $ac_bdir[$]ac_hdrobj: $abs_srcdir/$ac_provsrc
-   CFLAGS=\$(CFLAGS_CLEAN) dtrace -h -C -s $ac_srcdir[$]ac_provsrc -o 
\$[]@  cp \$[]@ \$[]@.bak  \$(SED) 's,PHP_,DTRACE_,g' \$[]@.bak  \$[]@
+   CFLAGS=\$(CFLAGS_CLEAN) dtrace -h -C -s $ac_srcdir[$]ac_provsrc -o 
\$[]@.bak  \$(SED) 's,PHP_,DTRACE_,g' \$[]@.bak  \$[]@
 
 \$(PHP_DTRACE_OBJS): $ac_bdir[$]ac_hdrobj


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

[PHP-CVS] com php-src: Merge branch 'PHP-5.4' into PHP-5.5: acinclude.m4

2013-08-05 Thread Christopher Jones 
Commit:18f17818a697269fbd93b9ec234640b67972eb23
Author:Christopher Jones s...@php.net Mon, 5 Aug 2013 15:40:56 
-0700
Parents:   6e89818f2f0f5cff16ce319fdc2bde8d7aa8951d 
47d66a0b4ea83bc4e1c9bfaa5c478cd42e28337c
Branches:  PHP-5.5 master

Link:   
http://git.php.net/?p=php-src.git;a=commitdiff;h=18f17818a697269fbd93b9ec234640b67972eb23

Log:
Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  NEWS for recent DTrace merges. Remove redundant 'cp' during DTrace install.

Changed paths:
  MM  acinclude.m4


Diff:



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

[PHP-CVS] com php-src: Doh. PHP 5.5 NEWS needs own commit.: NEWS

2013-08-05 Thread Christopher Jones 
Commit:4f87f26d061de81c0856c0af5017d6b57e53d633
Author:Christopher Jones s...@php.net Mon, 5 Aug 2013 15:56:46 
-0700
Parents:   18f17818a697269fbd93b9ec234640b67972eb23
Branches:  PHP-5.5

Link:   
http://git.php.net/?p=php-src.git;a=commitdiff;h=4f87f26d061de81c0856c0af5017d6b57e53d633

Log:
Doh. PHP 5.5 NEWS needs own commit.

Changed paths:
  M  NEWS


Diff:
diff --git a/NEWS b/NEWS
index c01b43e..2f9a4c7 100644
--- a/NEWS
+++ b/NEWS
@@ -19,6 +19,8 @@ PHP   
 NEWS
   . Fixed bug #65291 (get_defined_constants() causes PHP to crash in a very
 limited case). (Arpad)
   . Fixed bug #62691 (solaris sed has no -i switch). (Chris Jones)
+  . Fixed bug #61268 (--enable-dtrace leads make to clobber
+Zend/zend_dtrace.d) (Chris Jones)
 
 - OPcache:
   . Added opcache.restrict_api configuration directive that may limit


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

[PHP-CVS] com php-src: PHP 5.5.2 has already branched: NEWS

2013-08-05 Thread Christopher Jones 
Commit:6e505f496905529a7976f0873a69fc222fe2d617
Author:Christopher Jones s...@php.net Mon, 5 Aug 2013 16:03:22 
-0700
Parents:   4f87f26d061de81c0856c0af5017d6b57e53d633
Branches:  PHP-5.5

Link:   
http://git.php.net/?p=php-src.git;a=commitdiff;h=6e505f496905529a7976f0873a69fc222fe2d617

Log:
PHP 5.5.2 has already branched

Changed paths:
  M  NEWS


Diff:
diff --git a/NEWS b/NEWS
index 2f9a4c7..5c07185 100644
--- a/NEWS
+++ b/NEWS
@@ -2,6 +2,11 @@ PHP
NEWS
 |||
 ?? ??? 2013, PHP 5.5.3
 
+- Core:
+  . Fixed bug #62691 (solaris sed has no -i switch). (Chris Jones)
+  . Fixed bug #61268 (--enable-dtrace leads make to clobber
+Zend/zend_dtrace.d) (Chris Jones)
+
 - Sessions:
   . Implemented strict sessions RFC (https://wiki.php.net/rfc/strict_sessions)
 which protects against session fixation attacks and session collisions.
@@ -18,9 +23,6 @@ PHP   
 NEWS
   . Fixed bug #65304 (Use of max int in array_sum). (Laruence)
   . Fixed bug #65291 (get_defined_constants() causes PHP to crash in a very
 limited case). (Arpad)
-  . Fixed bug #62691 (solaris sed has no -i switch). (Chris Jones)
-  . Fixed bug #61268 (--enable-dtrace leads make to clobber
-Zend/zend_dtrace.d) (Chris Jones)
 
 - OPcache:
   . Added opcache.restrict_api configuration directive that may limit


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

Re: [PHP-CVS] com php-src: Allow 'make distclean' to clean up the 'generated' phar.inc: Makefile.global ext/phar/Makefile.frag ext/phar/phar/phar.inc ext/phar/phar/phar.inc.in

2013-08-01 Thread Christopher Jones 



On 7/31/13 7:59 PM, Johannes Schlüter wrote:

On Wed, 2013-07-31 at 19:31 +, Christopher Jones wrote:

Commit:017145bc57e604153f2a2400dd6e73a397f52f96 Author:Christopher Jones 
s...@php.net Wed, 31 Jul 2013 12:31:50 -0700 Parents:
4ed18d5955ad7ac0172f6eec87735fefcd113270 Branches:  PHP-5.5 master

Link:   
http://git.php.net/?p=php-src.git;a=commitdiff;h=017145bc57e604153f2a2400dd6e73a397f52f96

Log: Allow 'make distclean' to clean up the 'generated' phar.inc


This seems to be the wrong fix for the actual issue.


-$(builddir)/phar/phar.inc: $(srcdir)/phar/phar.inc +$(builddir)/phar/phar.inc: 
$(srcdir)/phar/phar.inc.in -@test -d $(builddir)/phar || mkdir
$(builddir)/phar -  -@test -f $(builddir)/phar/phar.inc || cp 
$(srcdir)/phar/phar.inc $(builddir)/phar/phar.inc +   -@test -f
$(builddir)/phar/phar.inc || cp $(srcdir)/phar/phar.inc.in 
$(builddir)/phar/phar.inc


This rule copies the file from the source to the buildir for out of tree builds 
...


$(builddir)/phar.php: $(srcdir)/build_precommand.php $(srcdir)/phar/*.inc 
$(srcdir)/phar/*.php $(SAPI_CLI_PATH) -@echo Generating phar.php


... where it is then used by this rule, so phar.php can include it easily or 
something. (a quick scan over the file didn't tell me why that .inc is
different from the others ...)

If sourcedir == builddir nothing should happen in the first step.

If I read the Makefile correctly (mind the $(srcdir)/phar/ argument to the 
phar.php pack call) the .in file will be added to the generated
phar, too.

I don't now which exact problem is meant to be solved with this change but copying files 
around for no reason seems weird. Maybe the copy from
srcdir to builddir can be avoided at all?

johannes




When srcdir != builddir then a 'make distclean' needs to remove the
installed copy of the file.  However a unilateral rm on the file would
affect the source copy in the case when srcdir == builddir, since the
paths  names are identical.  My patch solved this by making sure the
rm never affected the base source file.  All phar tests passed, BTW.

What the copy is for, only the (nonexistent) phar maintainer can tell.
(this is why I did the change in a separate commit, so it can be
reverted etc).

Your followup fix looks better, though it pushes some phar
logic-awareness into Makefile.global.  (Unless we can add a
'distcleanphar' target in phar/Makefile.frag and add that target as a
dependency to Makefile.global's 'distclean'. This could depend how the
Makefile gets constructed and if the target is always present - I
might leave this icing to a phar person).

Chris

--
christopher.jo...@oracle.com  http://twitter.com/ghrd
Free PHP  Oracle book:
http://www.oracle.com/technetwork/topics/php/underground-php-oracle-manual-098250.html

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

[PHP-CVS] com php-src: Revert Allow 'make distclean' to clean up the 'generated' phar.inc: Makefile.global ext/phar/Makefile.frag ext/phar/phar/phar.inc ext/phar/phar/phar.inc.in

2013-08-01 Thread Christopher Jones 
Commit:146b933ab49f8068a5fe983bcb5c821e103e575e
Author:Christopher Jones s...@php.net Thu, 1 Aug 2013 08:47:13 
-0700
Parents:   c069b5f571f0d5d28d8f12cbf795155fe4c1c90b
Branches:  PHP-5.5 master

Link:   
http://git.php.net/?p=php-src.git;a=commitdiff;h=146b933ab49f8068a5fe983bcb5c821e103e575e

Log:
Revert Allow 'make distclean' to clean up the 'generated' phar.inc

This reverts commit 017145bc57e604153f2a2400dd6e73a397f52f96.

Changed paths:
  M  Makefile.global
  M  ext/phar/Makefile.frag
  A  ext/phar/phar/phar.inc
  D  ext/phar/phar/phar.inc.in


Diff:
diff --git a/Makefile.global b/Makefile.global
index 73fcdda..a868ad0 100644
--- a/Makefile.global
+++ b/Makefile.global
@@ -124,7 +124,7 @@ distclean: clean
rm -f scripts/man1/phpize.1 scripts/php-config 
scripts/man1/php-config.1 sapi/cli/php.1 sapi/cgi/php-cgi.1 ext/phar/phar.1 
ext/phar/phar.phar.1
rm -f sapi/fpm/php-fpm.conf sapi/fpm/init.d.php-fpm 
sapi/fpm/php-fpm.service sapi/fpm/php-fpm.8 sapi/fpm/status.html
rm -f ext/iconv/php_have_bsd_iconv.h ext/iconv/php_have_glibc_iconv.h 
ext/iconv/php_have_ibm_iconv.h ext/iconv/php_have_iconv.h 
ext/iconv/php_have_libiconv.h ext/iconv/php_iconv_aliased_libiconv.h 
ext/iconv/php_iconv_supports_errno.h ext/iconv/php_php_iconv_h_path.h 
ext/iconv/php_php_iconv_impl.h
-   rm -f ext/phar/phar.phar ext/phar/phar.php ext/phar/phar/phar.inc
+   rm -f ext/phar/phar.phar ext/phar/phar.php
$(EGREP) define'.*include/php' $(top_srcdir)/configure | $(SED) 
's/.*//'|xargs rm -f
 
 .PHONY: all clean install distclean test
diff --git a/ext/phar/Makefile.frag b/ext/phar/Makefile.frag
index d95a998..faa9db0 100644
--- a/ext/phar/Makefile.frag
+++ b/ext/phar/Makefile.frag
@@ -20,9 +20,9 @@ PHP_PHARCMD_EXECUTABLE = ` \
fi;`
 PHP_PHARCMD_BANG = `$(top_srcdir)/build/shtool echo -n -- 
$(INSTALL_ROOT)$(bindir)/$(program_prefix)php$(program_suffix)$(EXEEXT);`
 
-$(builddir)/phar/phar.inc: $(srcdir)/phar/phar.inc.in
+$(builddir)/phar/phar.inc: $(srcdir)/phar/phar.inc
-@test -d $(builddir)/phar || mkdir $(builddir)/phar
-   -@test -f $(builddir)/phar/phar.inc || cp $(srcdir)/phar/phar.inc.in 
$(builddir)/phar/phar.inc
+   -@test -f $(builddir)/phar/phar.inc || cp $(srcdir)/phar/phar.inc 
$(builddir)/phar/phar.inc
 
 $(builddir)/phar.php: $(srcdir)/build_precommand.php $(srcdir)/phar/*.inc 
$(srcdir)/phar/*.php $(SAPI_CLI_PATH)
-@echo Generating phar.php
diff --git a/ext/phar/phar/phar.inc b/ext/phar/phar/phar.inc
new file mode 100644
index 000..7e7d618
--- /dev/null
+++ b/ext/phar/phar/phar.inc
@@ -0,0 +1,80 @@
+?php
+
+/**
+ * @file phar.inc
+ * @ingroup Phar
+ * @brief class Phar
+ * @author  Marcus Boerger
+ * @date2007 - 2008
+ *
+ * Phar Command
+ */
+// {{{ class Phar extends PHP_Archive
+/**
+ * Phar class
+ * 
+ * @ingroup Phar
+ * @brief   Phar implementation
+ * @author  Marcus Boerger
+ * @version 1.0
+ */
+class Phar extends PHP_Archive implements RecursiveIterator
+{
+   function getSignature()
+   {
+   return false;
+   }
+
+   function getAlias()
+   {
+   return false;
+   }
+
+   function rewind()
+   {
+   }
+
+   function valid()
+   {
+   return false;
+   }
+
+   function current()
+   {
+   }
+
+   function key()
+   {
+   }
+
+   function next()
+   {
+   }
+
+   function hasChildren()
+   {
+   return false;
+   }
+
+   function getChildren()
+   {
+   }
+
+   function hasMetadata()
+   {
+   }
+
+   function getMetadata()
+   {
+   }
+
+   function getStub()
+   {
+   }
+
+   function setStub()
+   {
+   }
+}
+
+?
\ No newline at end of file
diff --git a/ext/phar/phar/phar.inc.in b/ext/phar/phar/phar.inc.in
deleted file mode 100644
index 7e7d618..000
--- a/ext/phar/phar/phar.inc.in
+++ /dev/null
@@ -1,80 +0,0 @@
-?php
-
-/**
- * @file phar.inc
- * @ingroup Phar
- * @brief class Phar
- * @author  Marcus Boerger
- * @date2007 - 2008
- *
- * Phar Command
- */
-// {{{ class Phar extends PHP_Archive
-/**
- * Phar class
- * 
- * @ingroup Phar
- * @brief   Phar implementation
- * @author  Marcus Boerger
- * @version 1.0
- */
-class Phar extends PHP_Archive implements RecursiveIterator
-{
-   function getSignature()
-   {
-   return false;
-   }
-
-   function getAlias()
-   {
-   return false;
-   }
-
-   function rewind()
-   {
-   }
-
-   function valid()
-   {
-   return false;
-   }
-
-   function current()
-   {
-   }
-
-   function key()
-   {
-   }
-
-   function next()
-   {
-   }
-
-   function hasChildren()
-   {
-   return false;
-   }
-
-   function getChildren()
-   {
-   }
-
-   function hasMetadata

[PHP-CVS] com php-src: Merge branch 'PHP-5.5': Makefile.global

2013-08-01 Thread Christopher Jones 
Commit:1c91ca990ff673edf8aa521285986759996f0cca
Author:Christopher Jones s...@php.net Thu, 1 Aug 2013 08:49:19 
-0700
Parents:   1f6b940dd1b5d43fc2f846a2a85babb342749f05 
146b933ab49f8068a5fe983bcb5c821e103e575e
Branches:  master

Link:   
http://git.php.net/?p=php-src.git;a=commitdiff;h=1c91ca990ff673edf8aa521285986759996f0cca

Log:
Merge branch 'PHP-5.5'

* PHP-5.5:
  Revert Allow 'make distclean' to clean up the 'generated' phar.inc

Changed paths:
  MM  Makefile.global


Diff:



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

[PHP-CVS] com php-src: Clean up the 'generated' phar.inc file. When building outside the source tree the copied phar.inc needs to be removed, but when building in the tree, the file must remain since

2013-08-01 Thread Christopher Jones 
Commit:d884ec15e93fa153c845961f5e4c35ef9240eedd
Author:Christopher Jones s...@php.net Thu, 1 Aug 2013 09:19:53 
-0700
Parents:   146b933ab49f8068a5fe983bcb5c821e103e575e
Branches:  PHP-5.5 master

Link:   
http://git.php.net/?p=php-src.git;a=commitdiff;h=d884ec15e93fa153c845961f5e4c35ef9240eedd

Log:
Clean up the 'generated' phar.inc file.
When building outside the source tree the copied phar.inc needs to be removed,
but when building in the tree, the file must remain since it is part of the 
source.
See the copying logic in ext/phar/Makefile.frag.

Changed paths:
  M  Makefile.global


Diff:
diff --git a/Makefile.global b/Makefile.global
index a868ad0..4edaca9 100644
--- a/Makefile.global
+++ b/Makefile.global
@@ -125,6 +125,9 @@ distclean: clean
rm -f sapi/fpm/php-fpm.conf sapi/fpm/init.d.php-fpm 
sapi/fpm/php-fpm.service sapi/fpm/php-fpm.8 sapi/fpm/status.html
rm -f ext/iconv/php_have_bsd_iconv.h ext/iconv/php_have_glibc_iconv.h 
ext/iconv/php_have_ibm_iconv.h ext/iconv/php_have_iconv.h 
ext/iconv/php_have_libiconv.h ext/iconv/php_iconv_aliased_libiconv.h 
ext/iconv/php_iconv_supports_errno.h ext/iconv/php_php_iconv_h_path.h 
ext/iconv/php_php_iconv_impl.h
rm -f ext/phar/phar.phar ext/phar/phar.php
+   if test $(srcdir) != $(builddir); then \
+ rm -f ext/phar/phar/phar.inc; \
+   fi
$(EGREP) define'.*include/php' $(top_srcdir)/configure | $(SED) 
's/.*//'|xargs rm -f
 
 .PHONY: all clean install distclean test


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

[PHP-CVS] com php-src: Merge branch 'PHP-5.5': Makefile.global

2013-08-01 Thread Christopher Jones 
Commit:9cd1ac7b61a473232d867c3eb69bfb8525f0d951
Author:Christopher Jones s...@php.net Thu, 1 Aug 2013 09:22:47 
-0700
Parents:   1c91ca990ff673edf8aa521285986759996f0cca 
d884ec15e93fa153c845961f5e4c35ef9240eedd
Branches:  master

Link:   
http://git.php.net/?p=php-src.git;a=commitdiff;h=9cd1ac7b61a473232d867c3eb69bfb8525f0d951

Log:
Merge branch 'PHP-5.5'

* PHP-5.5:
  Clean up the 'generated' phar.inc file. When building outside the source tree 
the copied phar.inc needs to be removed, but when building in the tree, the 
file must remain since it is part of the source. See the copying logic in 
ext/phar/Makefile.frag.

Changed paths:
  MM  Makefile.global


Diff:



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

[PHP-CVS] com php-src: Fixed bug #62691 (solaris sed has no -i switch) Make 'make distclean' remove generated DTrace .h file: Makefile.global NEWS acinclude.m4

2013-07-31 Thread Christopher Jones 
Commit:e3a4b87e899ac55995f783e52379801973e199e7
Author:Christopher Jones s...@php.net Wed, 31 Jul 2013 09:58:28 
-0700
Parents:   0625d5ce67bcaf4a82b0f95dc6968ca5473c8171
Branches:  PHP-5.5 master

Link:   
http://git.php.net/?p=php-src.git;a=commitdiff;h=e3a4b87e899ac55995f783e52379801973e199e7

Log:
Fixed bug #62691 (solaris sed has no -i switch)
Make 'make distclean' remove generated DTrace .h file

Bugs:
https://bugs.php.net/62691

Changed paths:
  M  Makefile.global
  M  NEWS
  M  acinclude.m4


Diff:
diff --git a/Makefile.global b/Makefile.global
index 5118de8..b714a65 100644
--- a/Makefile.global
+++ b/Makefile.global
@@ -118,7 +118,7 @@ clean:
rm -f libphp$(PHP_MAJOR_VERSION).la $(SAPI_CLI_PATH) $(OVERALL_TARGET) 
modules/* libs/*
 
 distclean: clean
-   rm -f Makefile config.cache config.log config.status Makefile.objects 
Makefile.fragments libtool main/php_config.h stamp-h 
sapi/apache/libphp$(PHP_MAJOR_VERSION).module buildmk.stamp
+   rm -f Makefile config.cache config.log config.status Makefile.objects 
Makefile.fragments libtool main/php_config.h stamp-h 
sapi/apache/libphp$(PHP_MAJOR_VERSION).module buildmk.stamp 
Zend/zend_dtrace_gen.h Zend/zend_dtrace_gen.h.bak
$(EGREP) define'.*include/php' $(top_srcdir)/configure | $(SED) 
's/.*//'|xargs rm -f
 
 .PHONY: all clean install distclean test
diff --git a/NEWS b/NEWS
index 78f6539..6fe5c3a 100644
--- a/NEWS
+++ b/NEWS
@@ -9,8 +9,9 @@ PHP 
   NEWS
   . Fixed bug #65304 (Use of max int in array_sum). (Laruence)
   . Fixed bug #65291 (get_defined_constants() causes PHP to crash in a very
 limited case). (Arpad)
+  . Fixed bug #62691 (solaris sed has no -i switch). (Chris Jones)
 
-- OPcahce:
+- OPcache:
   . Added opcache.restrict_api configuration directive that may limit
 usage of OPcahce API functions only to patricular script(s). (Dmitry)
   . Added support for glob symbols in blacklist entries (?, *, **).
diff --git a/acinclude.m4 b/acinclude.m4
index 6c97dc3..07b1f8e 100644
--- a/acinclude.m4
+++ b/acinclude.m4
@@ -2965,7 +2965,7 @@ dnl Generate Makefile.objects entries
   catMakefile.objectsEOF
 
 $ac_bdir[$]ac_hdrobj: $abs_srcdir/$ac_provsrc
-   CFLAGS=\$(CFLAGS_CLEAN) dtrace -h -C -s $ac_srcdir[$]ac_provsrc -o 
\$[]@  \$(SED) -ibak 's,PHP_,DTRACE_,g' \$[]@
+   CFLAGS=\$(CFLAGS_CLEAN) dtrace -h -C -s $ac_srcdir[$]ac_provsrc -o 
\$[]@  cp \$[]@ \$[]@.bak  \$(SED) 's,PHP_,DTRACE_,g' \$[]@.bak  \$[]@
 
 \$(PHP_DTRACE_OBJS): $ac_bdir[$]ac_hdrobj


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

  1   2   3   4   5   6   >