[PHP-CVS] com php-src: 5.4.20 rc1: NEWS configure.in main/php_version.h

2013-09-03 Thread Stanislav Malyshev 
Commit:7d0eafce3a93105090662ef2e9bb4fe8995183a5
Author:Stanislav Malyshev s...@php.net Tue, 3 Sep 2013 13:36:45 
-0700
Parents:   6c48c6bc789e4a2f5bf480bd2c62070ee1152e62
Branches:  PHP-5.4.20

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

Log:
5.4.20 rc1

Changed paths:
  M  NEWS
  M  configure.in
  M  main/php_version.h


Diff:
diff --git a/NEWS b/NEWS
index 76eb1fa..55ab369 100644
--- a/NEWS
+++ b/NEWS
@@ -1,6 +1,6 @@
 PHPNEWS
 |||
-?? ??? 2013, PHP 5.4.20
+05 Sep 2013, PHP 5.4.20 RC1
 
 - Core:
   . Fixed bug #60598 (cli/apache sapi segfault on objects manipulation).
diff --git a/configure.in b/configure.in
index 9a99680..b93db4d 100644
--- a/configure.in
+++ b/configure.in
@@ -120,7 +120,7 @@ int zend_sprintf(char *buffer, const char *format, ...);
 PHP_MAJOR_VERSION=5
 PHP_MINOR_VERSION=4
 PHP_RELEASE_VERSION=20
-PHP_EXTRA_VERSION=-dev
+PHP_EXTRA_VERSION=RC1
 
PHP_VERSION=$PHP_MAJOR_VERSION.$PHP_MINOR_VERSION.$PHP_RELEASE_VERSION$PHP_EXTRA_VERSION
 PHP_VERSION_ID=`expr [$]PHP_MAJOR_VERSION \* 1 + [$]PHP_MINOR_VERSION \* 
100 + [$]PHP_RELEASE_VERSION`
 
diff --git a/main/php_version.h b/main/php_version.h
index 9dc0023..b53355c 100644
--- a/main/php_version.h
+++ b/main/php_version.h
@@ -3,6 +3,6 @@
 #define PHP_MAJOR_VERSION 5
 #define PHP_MINOR_VERSION 4
 #define PHP_RELEASE_VERSION 20
-#define PHP_EXTRA_VERSION -dev
-#define PHP_VERSION 5.4.20-dev
+#define PHP_EXTRA_VERSION RC1
+#define PHP_VERSION 5.4.20RC1
 #define PHP_VERSION_ID 50420


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

[PHP-CVS] com php-src: 5.4.21 now: NEWS configure.in main/php_version.h

2013-09-03 Thread Stanislav Malyshev 
Commit:7beef74a827f393753852f7239af75af236fb4f8
Author:Stanislav Malyshev s...@php.net Tue, 3 Sep 2013 13:38:15 
-0700
Parents:   6c48c6bc789e4a2f5bf480bd2c62070ee1152e62
Branches:  PHP-5.4

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

Log:
5.4.21 now

Changed paths:
  M  NEWS
  M  configure.in
  M  main/php_version.h


Diff:
diff --git a/NEWS b/NEWS
index 76eb1fa..486ccb2 100644
--- a/NEWS
+++ b/NEWS
@@ -1,5 +1,7 @@
 PHPNEWS
 |||
+?? ??? 2013, PHP 5.4.21
+
 ?? ??? 2013, PHP 5.4.20
 
 - Core:
diff --git a/configure.in b/configure.in
index 9a99680..30de2c3 100644
--- a/configure.in
+++ b/configure.in
@@ -119,7 +119,7 @@ int zend_sprintf(char *buffer, const char *format, ...);
 
 PHP_MAJOR_VERSION=5
 PHP_MINOR_VERSION=4
-PHP_RELEASE_VERSION=20
+PHP_RELEASE_VERSION=21
 PHP_EXTRA_VERSION=-dev
 
PHP_VERSION=$PHP_MAJOR_VERSION.$PHP_MINOR_VERSION.$PHP_RELEASE_VERSION$PHP_EXTRA_VERSION
 PHP_VERSION_ID=`expr [$]PHP_MAJOR_VERSION \* 1 + [$]PHP_MINOR_VERSION \* 
100 + [$]PHP_RELEASE_VERSION`
diff --git a/main/php_version.h b/main/php_version.h
index 9dc0023..e30528e 100644
--- a/main/php_version.h
+++ b/main/php_version.h
@@ -2,7 +2,7 @@
 /* edit configure.in to change version number */
 #define PHP_MAJOR_VERSION 5
 #define PHP_MINOR_VERSION 4
-#define PHP_RELEASE_VERSION 20
+#define PHP_RELEASE_VERSION 21
 #define PHP_EXTRA_VERSION -dev
-#define PHP_VERSION 5.4.20-dev
-#define PHP_VERSION_ID 50420
+#define PHP_VERSION 5.4.21-dev
+#define PHP_VERSION_ID 50421


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