date:20120911

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

2012-09-11 Thread Stanislav Malyshev

Commit:27b47d76856be7998417f67895f44918278e35de
Author:Stanislav Malyshev  Tue, 11 Sep 2012 23:26:14 
-0700
Parents:   d1b8eeb2d8dda8bc2697d0dcea9c129f6fc77b9a
Branches:  PHP-5.4.7

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

Log:
5.4.7

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


Diff:
diff --git a/NEWS b/NEWS
index a7dc00c..5fa2fb1 100644
--- a/NEWS
+++ b/NEWS
@@ -1,9 +1,11 @@
 PHPNEWS
 |||
-30 Aug 2012, PHP 5.4.7 RC1
+13 Sep 2012, PHP 5.4.7 
 
 - Core:
   . Fixed bug (segfault while build with zts and GOTO vm-kind). (Laruence)
+  . Fixed bug #62955 (Only one directive is loaded from "Per Directory Values"
+Windows registry). (Felipe)
   . Fixed bug #62844 (parse_url() does not recognize //). (Andrew Faulds).
   . Fixed bug #62829 (stdint.h included on platform where HAVE_STDINT_H is not 
 set). (Felipe)
@@ -24,7 +26,7 @@ PHP   
 NEWS
 
 - CURL:
   . Fixed bug #62912 (CURLINFO_PRIMARY_* AND CURLINFO_LOCAL_* not exposed).
-   (Pierrick)
+(Pierrick)
   . Fixed bug #62839 (curl_copy_handle segfault with CURLOPT_FILE). (Pierrick)
 
 - DateTime:
diff --git a/configure.in b/configure.in
index 7a86bbc..3b7ff03 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=7
-PHP_EXTRA_VERSION="RC1"
+PHP_EXTRA_VERSION=""
 
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 0bc1dcb..30c2a50 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 7
-#define PHP_EXTRA_VERSION "RC1"
-#define PHP_VERSION "5.4.7RC1"
+#define PHP_EXTRA_VERSION ""
+#define PHP_VERSION "5.4.7"
 #define PHP_VERSION_ID 50407


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

[PHP-CVS] svn: /SVNROOT/ global_avail

2012-09-11 Thread Rasmus Lerdorf

rasmus   Tue, 11 Sep 2012 16:08:24 +

Revision: http://svn.php.net/viewvc?view=revision&revision=327610

Log:
pecl/leveldb karma for reeze

Changed paths:
U   SVNROOT/global_avail

Modified: SVNROOT/global_avail
===
--- SVNROOT/global_avail2012-09-11 15:06:20 UTC (rev 327609)
+++ SVNROOT/global_avail2012-09-11 16:08:24 UTC (rev 327610)
@@ -364,6 +364,7 @@
 avail|ioseb|pecl/uri-template,phpdoc
 avail|edward|pecl/kadm5,phpdoc
 avail|zhangzhenyu|pecl/yar,phpdoc
+avail|reeze|pecl/leveldb,phpdoc

 # Objective-C bridge
 avail|wez,jan|php/php-objc

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

confirm subscribe to php-cvs@lists.php.net

2012-09-11 Thread php-cvs-help

Hi! This is the ezmlm program. I'm managing the
php-cvs@lists.php.net mailing list.

I'm working for my owner, who can be reached
at php-cvs-ow...@lists.php.net.

To confirm that you would like

   arch...@mail-archive.com

added to the php-cvs mailing list, please send
an empty reply to this address:

   
php-cvs-sc.1347368319.bbnbhgoofnboghpnkfoc-archive=mail-archive@lists.php.net

Usually, this happens when you just hit the "reply" button.
If this does not work, simply copy the address and paste it into
the "To:" field of a new message.

or click here:

mailto:php-cvs-sc.1347368319.bbnbhgoofnboghpnkfoc-archive=mail-archive@lists.php.net

This confirmation serves two purposes. First, it verifies that I am able
to get mail through to you. Second, it protects you in case someone
forges a subscription request in your name.

Some mail programs are broken and cannot handle long addresses. If you
cannot reply to this request, instead send a message to
 and put the
entire address listed above into the "Subject:" line.


--- Administrative commands for the php-cvs list ---

I can handle administrative requests automatically. Please
do not send them to the list address! Instead, send
your message to the correct command address:

For help and a description of available commands, send a message to:
   

To subscribe to the list, send a message to:
   

To remove your address from the list, just send a message to
the address in the ``List-Unsubscribe'' header of any list
message. If you haven't changed addresses since subscribing,
you can also send a message to:
   

or for the digest to:
   

For addition or removal of addresses, I'll send a confirmation
message to that address. When you receive it, simply reply to it
to complete the transaction.

If you need to get in touch with the human owner of this list,
please send a message to:



Please include a FORWARDED list message with ALL HEADERS intact
to make it easier to help you.

--- Enclosed is a copy of the request I received.

Return-Path: 
Received: (qmail 4295 invoked from network); 11 Sep 2012 12:58:39 -
Received: from unknown (HELO lists.php.net) (127.0.0.1)
  by localhost with SMTP; 11 Sep 2012 12:58:39 -
Return-Path: 
Authentication-Results: pb1.pair.com smtp.mail=nore...@php.net; spf=unknown; 
sender-id=unknown
Authentication-Results: pb1.pair.com header.from=arch...@mail-archive.com; 
sender-id=softfail
Received-SPF: unknown (pb1.pair.com: domain php.net does not designate 
140.211.15.143 as permitted sender)
X-PHP-List-Original-Sender: nore...@php.net
X-Host-Fingerprint: 140.211.15.143 osu1php.osuosl.org  
Received: from [140.211.15.143] ([140.211.15.143:58019] helo=osu1php.osuosl.org)
by pb1.pair.com (ecelerity 2.1.1.9-wez r(12769M)) with ESMTP
id 47/A2-24398-F753F405 for 
; Tue, 11 Sep 2012 
08:58:39 -0400
Authentication-Results: osu1php.osuosl.org smtp.mail=nore...@php.net; 
spf=neutral; sender-id=neutral
Authentication-Results: osu1php.osuosl.org 
header.from=arch...@mail-archive.com; sender-id=softfail
Received-SPF: neutral (osu1php.osuosl.org: 127.0.0.1 is neither permitted nor 
denied by domain of php.net)
Received: from [127.0.0.1] ([127.0.0.1:60160] helo=localhost)
by osu1php.osuosl.org (envelope-from )
(ecelerity 3.3.2.44647 r(44647)) with ESMTP
id 2A/D0-30231-D753F405; Tue, 11 Sep 2012 12:58:37 +
Date: Tue, 11 Sep 2012 12:58:37 +
Message-ID: <2a.d0.30231.d753f...@osu1php.osuosl.org>
X-Authentication-Warning: osu1php.osuosl.org: nobody set sender to 
nore...@php.net using -f
To: php-cvs-subscribe-archive=mail-archive@lists.php.net
Subject: PHP Mailing List Website Subscription
X-PHP-Originating-Script: 0:subscribe.php
From: arch...@mail-archive.com

This was a request generated from the form at 
http://www.php.net/mailing-lists.php by 109.61.3.34.

[PHP-CVS] com php-src: Capitalize the warning message: ext/date/php_date.c ext/date/tests/date_default_timezone_get-4.phpt

2012-09-11 Thread Xinchen Hui

Commit:f6000a01e286f855a7f40fcad738a1f9b00aa81e
Author:Xinchen Hui  Tue, 11 Sep 2012 18:09:47 
+0800
Parents:   79e6635cb66a9efd47d48012bafe00f2897b0814
Branches:  master

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

Log:
Capitalize the warning message

Changed paths:
  M  ext/date/php_date.c
  M  ext/date/tests/date_default_timezone_get-4.phpt


Diff:
diff --git a/ext/date/php_date.c b/ext/date/php_date.c
index e43ff19..765da9e 100644
--- a/ext/date/php_date.c
+++ b/ext/date/php_date.c
@@ -864,7 +864,7 @@ static char* guess_timezone(const timelib_tzdb *tzdb 
TSRMLS_DC)
return DATEG(default_timezone);
}
/* Invalid date.timezone value */
-   php_error_docref(NULL TSRMLS_CC, E_WARNING, "date.timezone 
value '%s' is invalid. We selected the timezone 'UTC' for now.", 
DATEG(default_timezone));
+   php_error_docref(NULL TSRMLS_CC, E_WARNING, "Invalid 
date.timezone value '%s', we selected the timezone 'UTC' for now.", 
DATEG(default_timezone));
} else {
/* No date.timezone value */
php_error_docref(NULL TSRMLS_CC, E_WARNING, DATE_TZ_ERRMSG "We 
selected the timezone 'UTC' for now, but please set date.timezone to select 
your timezone.");
diff --git a/ext/date/tests/date_default_timezone_get-4.phpt 
b/ext/date/tests/date_default_timezone_get-4.phpt
index e76d4e3..6d1982b 100644
--- a/ext/date/tests/date_default_timezone_get-4.phpt
+++ b/ext/date/tests/date_default_timezone_get-4.phpt
@@ -7,5 +7,5 @@ date.timezone=Incorrect/Zone
echo date_default_timezone_get(), "\n";
 ?>
 --EXPECTF--
-Warning: date_default_timezone_get(): date.timezone value 'Incorrect/Zone' is 
invalid. We selected the timezone 'UTC' for now. in 
%sdate_default_timezone_get-4.php on line %d
+Warning: date_default_timezone_get(): Invalid date.timezone value 
'Incorrect/Zone', we selected the timezone 'UTC' for now. in 
%sdate_default_timezone_get-4.php on line %d
 UTC


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

[PHP-CVS] com php-src: Provide a specific error message if date.timezone value is invalid.: ext/date/php_date.c ext/date/tests/date_default_timezone_get-4.phpt

2012-09-11 Thread Xinchen Hui

Commit:e06c47ca2ab482ab5e6ba47a9249a9b9417cb1b4
Author:Simon Welsh  Tue, 11 Sep 2012 21:14:51 
+1200
Parents:   328a3d9f1384d3555833345dbe879e4d99922a35
Branches:  master

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

Log:
Provide a specific error message if date.timezone value is invalid.

Changed paths:
  M  ext/date/php_date.c
  A  ext/date/tests/date_default_timezone_get-4.phpt


Diff:
diff --git a/ext/date/php_date.c b/ext/date/php_date.c
index 7c4e782..eac6ca5 100644
--- a/ext/date/php_date.c
+++ b/ext/date/php_date.c
@@ -862,9 +862,14 @@ static char* guess_timezone(const timelib_tzdb *tzdb 
TSRMLS_DC)
}
} else if (*DATEG(default_timezone) && 
timelib_timezone_id_is_valid(DATEG(default_timezone), tzdb)) {
return DATEG(default_timezone);
+   } else if (*DATEG(default_timezone)) {
+   /* Invalid date.timezone value */
+   php_error_docref(NULL TSRMLS_CC, E_WARNING, "date.timezone 
value '%s' is invalid. We selected the timezone 'UTC' for now.", 
DATEG(default_timezone));
+   } else {
+   /* No date.timezone value */
+   php_error_docref(NULL TSRMLS_CC, E_WARNING, DATE_TZ_ERRMSG "We 
selected the timezone 'UTC' for now, but please set date.timezone to select 
your timezone.");
}
/* Fallback to UTC */
-   php_error_docref(NULL TSRMLS_CC, E_WARNING, DATE_TZ_ERRMSG "We selected 
the timezone 'UTC' for now, but please set date.timezone to select your 
timezone.");
return "UTC";
 }
 
diff --git a/ext/date/tests/date_default_timezone_get-4.phpt 
b/ext/date/tests/date_default_timezone_get-4.phpt
new file mode 100644
index 000..e76d4e3
--- /dev/null
+++ b/ext/date/tests/date_default_timezone_get-4.phpt
@@ -0,0 +1,11 @@
+--TEST--
+date_default_timezone_get() function [4]
+--INI--
+date.timezone=Incorrect/Zone
+--FILE--
+
+--EXPECTF--
+Warning: date_default_timezone_get(): date.timezone value 'Incorrect/Zone' is 
invalid. We selected the timezone 'UTC' for now. in 
%sdate_default_timezone_get-4.php on line %d
+UTC


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

[PHP-CVS] com php-src: Rearrange the codes, remove empty lines: ext/date/php_date.c

2012-09-11 Thread Xinchen Hui

Commit:79e6635cb66a9efd47d48012bafe00f2897b0814
Author:Xinchen Hui  Tue, 11 Sep 2012 18:02:19 
+0800
Parents:   0146efbd4108eab809d1f0d70b46691c229e0315
Branches:  master

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

Log:
Rearrange the codes, remove empty lines

Changed paths:
  M  ext/date/php_date.c


Diff:
diff --git a/ext/date/php_date.c b/ext/date/php_date.c
index eac6ca5..e43ff19 100644
--- a/ext/date/php_date.c
+++ b/ext/date/php_date.c
@@ -738,7 +738,6 @@ PHP_RSHUTDOWN_FUNCTION(date)
 #define SUNFUNCS_RET_STRING1
 #define SUNFUNCS_RET_DOUBLE2
 
-
 /* {{{ PHP_MINIT_FUNCTION */
 PHP_MINIT_FUNCTION(date)
 {
@@ -860,9 +859,10 @@ static char* guess_timezone(const timelib_tzdb *tzdb 
TSRMLS_DC)
timelib_timezone_id_is_valid(Z_STRVAL(ztz), tzdb)) {
return Z_STRVAL(ztz);
}
-   } else if (*DATEG(default_timezone) && 
timelib_timezone_id_is_valid(DATEG(default_timezone), tzdb)) {
-   return DATEG(default_timezone);
} else if (*DATEG(default_timezone)) {
+   if (timelib_timezone_id_is_valid(DATEG(default_timezone), 
tzdb)) {
+   return DATEG(default_timezone);
+   }
/* Invalid date.timezone value */
php_error_docref(NULL TSRMLS_CC, E_WARNING, "date.timezone 
value '%s' is invalid. We selected the timezone 'UTC' for now.", 
DATEG(default_timezone));
} else {
@@ -887,7 +887,6 @@ PHPAPI timelib_tzinfo *get_timezone_info(TSRMLS_D)
 }
 /* }}} */
 
-
 /* {{{ date() and gmdate() data */
 #include "ext/standard/php_smart_str.h"
 
@@ -1323,7 +1322,6 @@ PHPAPI signed long php_parse_date(char *string, signed 
long *now)
 }
 /* }}} */
 
-
 /* {{{ proto int strtotime(string time [, int now ])
Convert string representation of date and time to a timestamp */
 PHP_FUNCTION(strtotime)
@@ -1384,7 +1382,6 @@ PHP_FUNCTION(strtotime)
 }
 /* }}} */
 
-
 /* {{{ php_mktime - (gm)mktime helper */
 PHPAPI void php_mktime(INTERNAL_FUNCTION_PARAMETERS, int gmt)
 {
@@ -1493,7 +1490,6 @@ PHP_FUNCTION(gmmktime)
 }
 /* }}} */
 
-
 /* {{{ proto bool checkdate(int month, int day, int year)
Returns true(1) if it is a valid date in gregorian calendar */
 PHP_FUNCTION(checkdate)


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

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

[PHP-CVS] svn: /SVNROOT/ global_avail

confirm subscribe to php-cvs@lists.php.net

[PHP-CVS] com php-src: Capitalize the warning message: ext/date/php_date.c ext/date/tests/date_default_timezone_get-4.phpt

[PHP-CVS] com php-src: Provide a specific error message if date.timezone value is invalid.: ext/date/php_date.c ext/date/tests/date_default_timezone_get-4.phpt

[PHP-CVS] com php-src: Rearrange the codes, remove empty lines: ext/date/php_date.c

6 matches

Site Navigation

Mail list logo

Footer information