date:20090504

[PHP-CVS] cvs: php-src /ext/curl interface.c

2009-05-04 Thread Pierre-Alain Joye

pajoye  Mon May  4 12:12:40 2009 UTC

  Modified files:  
/php-src/ext/curl   interface.c 
  Log:
  - [DOC] #47739. add option CURLOPT_IPRESOLVE which accepts 
CURL_IPRESOLVE_WHATEVER, CURL_IPRESOLVE_V4 or CURL_IPRESOLVE_V6
  
http://cvs.php.net/viewvc.cgi/php-src/ext/curl/interface.c?r1=1.153r2=1.154diff_format=u
Index: php-src/ext/curl/interface.c
diff -u php-src/ext/curl/interface.c:1.153 php-src/ext/curl/interface.c:1.154
--- php-src/ext/curl/interface.c:1.153  Sun May  3 21:47:52 2009
+++ php-src/ext/curl/interface.cMon May  4 12:12:40 2009
@@ -16,7 +16,7 @@
+--+
 */
 
-/* $Id: interface.c,v 1.153 2009/05/03 21:47:52 pajoye Exp $ */
+/* $Id: interface.c,v 1.154 2009/05/04 12:12:40 pajoye Exp $ */
 
 #define ZEND_INCLUDE_FULL_WINDOWS_HEADERS
 
@@ -443,6 +443,10 @@
le_curl_multi_handle = 
zend_register_list_destructors_ex(_php_curl_multi_close, NULL, curl, 
module_number);
 
/* Constants for curl_setopt() */
+   REGISTER_CURL_CONSTANT(CURLOPT_IPRESOLVE);
+   REGISTER_CURL_CONSTANT(CURL_IPRESOLVE_WHATEVER);
+   REGISTER_CURL_CONSTANT(CURL_IPRESOLVE_V4);
+   REGISTER_CURL_CONSTANT(CURL_IPRESOLVE_V6);
REGISTER_CURL_CONSTANT(CURLOPT_DNS_USE_GLOBAL_CACHE);
REGISTER_CURL_CONSTANT(CURLOPT_DNS_CACHE_TIMEOUT);
REGISTER_CURL_CONSTANT(CURLOPT_PORT);
@@ -1525,6 +1529,7 @@
case CURLOPT_REDIR_PROTOCOLS:
case CURLOPT_PROTOCOLS:
 #endif
+   case CURLOPT_IPRESOLVE:
convert_to_long_ex(zvalue);
error = curl_easy_setopt(ch-cp, option, 
Z_LVAL_PP(zvalue));
break;



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

[PHP-CVS] cvs: php-src(PHP_5_3) /ext/curl interface.c

2009-05-04 Thread Pierre-Alain Joye

pajoye  Mon May  4 12:12:57 2009 UTC

  Modified files:  (Branch: PHP_5_3)
/php-src/ext/curl   interface.c 
  Log:
  - MFH: [DOC] #47739. add option CURLOPT_IPRESOLVE which accepts 
CURL_IPRESOLVE_WHATEVER, CURL_IPRESOLVE_V4 or CURL_IPRESOLVE_V6
  
http://cvs.php.net/viewvc.cgi/php-src/ext/curl/interface.c?r1=1.62.2.14.2.27.2.35r2=1.62.2.14.2.27.2.36diff_format=u
Index: php-src/ext/curl/interface.c
diff -u php-src/ext/curl/interface.c:1.62.2.14.2.27.2.35 
php-src/ext/curl/interface.c:1.62.2.14.2.27.2.36
--- php-src/ext/curl/interface.c:1.62.2.14.2.27.2.35Sun May  3 15:16:10 2009
+++ php-src/ext/curl/interface.cMon May  4 12:12:57 2009
@@ -16,7 +16,7 @@
+--+
 */
 
-/* $Id: interface.c,v 1.62.2.14.2.27.2.35 2009/05/03 15:16:10 pajoye Exp $ */
+/* $Id: interface.c,v 1.62.2.14.2.27.2.36 2009/05/04 12:12:57 pajoye Exp $ */
 
 #define ZEND_INCLUDE_FULL_WINDOWS_HEADERS
 
@@ -444,6 +444,10 @@
le_curl_multi_handle = 
zend_register_list_destructors_ex(_php_curl_multi_close, NULL, curl, 
module_number);
 
/* Constants for curl_setopt() */
+   REGISTER_CURL_CONSTANT(CURLOPT_IPRESOLVE);
+   REGISTER_CURL_CONSTANT(CURL_IPRESOLVE_WHATEVER);
+   REGISTER_CURL_CONSTANT(CURL_IPRESOLVE_V4);
+   REGISTER_CURL_CONSTANT(CURL_IPRESOLVE_V6);
REGISTER_CURL_CONSTANT(CURLOPT_DNS_USE_GLOBAL_CACHE);
REGISTER_CURL_CONSTANT(CURLOPT_DNS_CACHE_TIMEOUT);
REGISTER_CURL_CONSTANT(CURLOPT_PORT);
@@ -1512,6 +1516,7 @@
case CURLOPT_REDIR_PROTOCOLS:
case CURLOPT_PROTOCOLS:
 #endif
+   case CURLOPT_IPRESOLVE:
convert_to_long_ex(zvalue);
error = curl_easy_setopt(ch-cp, option, 
Z_LVAL_PP(zvalue));
break;



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

[PHP-CVS] cvs: php-src(PHP_5_3) / NEWS

2009-05-04 Thread Pierre-Alain Joye

pajoye  Mon May  4 12:23:56 2009 UTC

  Modified files:  (Branch: PHP_5_3)
/php-srcNEWS 
  Log:
  - #47739
  
http://cvs.php.net/viewvc.cgi/php-src/NEWS?r1=1.2027.2.547.2.965.2.578r2=1.2027.2.547.2.965.2.579diff_format=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.2027.2.547.2.965.2.578 
php-src/NEWS:1.2027.2.547.2.965.2.579
--- php-src/NEWS:1.2027.2.547.2.965.2.578   Sun May  3 19:58:49 2009
+++ php-src/NEWSMon May  4 12:23:56 2009
@@ -12,6 +12,7 @@
 
 - Implemented FR #41712 (curl progress callback: CURLOPT_PROGRESSFUNCTION).
   (sdteffen[at]gmail[dot].com, Pierre)
+- Implemented FR #47739 (Missing cURL option do disable IPv6) (Pierre)
 
 - Added timezone_version_get() to retrieve the version of the used timezone
   database. (Derick)



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

[PHP-CVS] cvs: CVSROOT / avail

2009-05-04 Thread Philip Olson

philip  Mon May  4 12:55:20 2009 UTC

  Modified files:  
/CVSROOTavail 
  Log:
  - pecl/gearman karma for James Michael Luedke (jluedke)
  
  
http://cvs.php.net/viewvc.cgi/CVSROOT/avail?r1=1.1520r2=1.1521diff_format=u
Index: CVSROOT/avail
diff -u CVSROOT/avail:1.1520 CVSROOT/avail:1.1521
--- CVSROOT/avail:1.1520Fri May  1 16:06:24 2009
+++ CVSROOT/avail   Mon May  4 12:55:19 2009
@@ -309,6 +309,7 @@
 avail|kannan,veeve,cjiang|pecl/xhprof,phpdoc
 avail|bhuisgen|pecl/htscanner
 avail|dams,splanquart|pecl/pdo_4d
+avail|jluedke|pecl/gearman
 
 
 # Objective-C bridge



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

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

2009-05-04 Thread Ilia Alshanetsky

iliaa   Mon May  4 13:12:53 2009 UTC

  Modified files:  
/php-src/main   network.c 
  Log:
  
  MFB: Fixed bug #48131 (Don't try to bind ipv4 addresses to ipv6 ips via
  bindto)
  
http://cvs.php.net/viewvc.cgi/php-src/main/network.c?r1=1.142r2=1.143diff_format=u
Index: php-src/main/network.c
diff -u php-src/main/network.c:1.142 php-src/main/network.c:1.143
--- php-src/main/network.c:1.142Tue Mar 10 23:39:53 2009
+++ php-src/main/network.c  Mon May  4 13:12:53 2009
@@ -17,7 +17,7 @@
+--+
  */
 
-/* $Id: network.c,v 1.142 2009/03/10 23:39:53 helly Exp $ */
+/* $Id: network.c,v 1.143 2009/05/04 13:12:53 iliaa Exp $ */
 
 /*#define DEBUG_MAIN_NETWORK 1*/
 
@@ -792,9 +792,14 @@
switch (sa-sa_family) {
 #if HAVE_GETADDRINFO  HAVE_IPV6
case AF_INET6:
-   ((struct sockaddr_in6 *)sa)-sin6_family = 
sa-sa_family;
-   ((struct sockaddr_in6 *)sa)-sin6_port = 
htons(port);
-   socklen = sizeof(struct sockaddr_in6);
+   if (strstr(bindto, ':')) {
+   ((struct sockaddr_in6 
*)sa)-sin6_family = sa-sa_family;
+   ((struct sockaddr_in6 *)sa)-sin6_port 
= htons(port);
+   socklen = sizeof(struct sockaddr_in6);
+   } else {
+   socklen = 0;
+   sa = NULL;
+   }
break;
 #endif
case AF_INET:



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

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

2009-05-04 Thread Antony Dovgal

tony2001Mon May  4 14:46:37 2009 UTC

  Modified files:  (Branch: PHP_5_2)
/php-src/main   network.c 
  Log:
  MFH: use correct function
  
  
http://cvs.php.net/viewvc.cgi/php-src/main/network.c?r1=1.118.2.2.2.19r2=1.118.2.2.2.20diff_format=u
Index: php-src/main/network.c
diff -u php-src/main/network.c:1.118.2.2.2.19 
php-src/main/network.c:1.118.2.2.2.20
--- php-src/main/network.c:1.118.2.2.2.19   Mon May  4 14:43:14 2009
+++ php-src/main/network.c  Mon May  4 14:46:37 2009
@@ -17,7 +17,7 @@
+--+
  */
 
-/* $Id: network.c,v 1.118.2.2.2.19 2009/05/04 14:43:14 iliaa Exp $ */
+/* $Id: network.c,v 1.118.2.2.2.20 2009/05/04 14:46:37 tony2001 Exp $ */
 
 /*#define DEBUG_MAIN_NETWORK 1*/
 
@@ -786,7 +786,7 @@
switch (sa-sa_family) {
 #if HAVE_GETADDRINFO  HAVE_IPV6
case AF_INET6:
-   if (bindto  strstr(bindto, ':')) {
+   if (bindto  strchr(bindto, ':')) {
((struct sockaddr_in6 
*)sa)-sin6_family = sa-sa_family;
((struct sockaddr_in6 *)sa)-sin6_port 
= htons(port);
socklen = sizeof(struct sockaddr_in6);



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

[PHP-CVS] cvs: php-src / php.ini-development php.ini-production

2009-05-04 Thread Pierre-Alain Joye

pajoye  Mon May  4 15:20:17 2009 UTC

  Modified files:  
/php-srcphp.ini-development php.ini-production 
  Log:
  - win extension_dir
  
http://cvs.php.net/viewvc.cgi/php-src/php.ini-development?r1=1.7r2=1.8diff_format=u
Index: php-src/php.ini-development
diff -u php-src/php.ini-development:1.7 php-src/php.ini-development:1.8
--- php-src/php.ini-development:1.7 Fri Apr 10 15:18:55 2009
+++ php-src/php.ini-development Mon May  4 15:20:17 2009
@@ -809,6 +809,8 @@
 ; Directory in which the loadable extensions (modules) reside.
 ; http://php.net/extension-dir
 ; extension_dir = ./
+; On windows:
+; extension_dir = ext
 
 ; Whether or not to enable the dl() function.  The dl() function does NOT work
 ; properly in multithreaded servers, such as IIS or Zeus, and is automatically
http://cvs.php.net/viewvc.cgi/php-src/php.ini-production?r1=1.7r2=1.8diff_format=u
Index: php-src/php.ini-production
diff -u php-src/php.ini-production:1.7 php-src/php.ini-production:1.8
--- php-src/php.ini-production:1.7  Fri Apr 10 15:18:55 2009
+++ php-src/php.ini-production  Mon May  4 15:20:17 2009
@@ -809,6 +809,8 @@
 ; Directory in which the loadable extensions (modules) reside.
 ; http://php.net/extension-dir
 ; extension_dir = ./
+; On windows:
+; extension_dir = ext
 
 ; Whether or not to enable the dl() function.  The dl() function does NOT work
 ; properly in multithreaded servers, such as IIS or Zeus, and is automatically



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

[PHP-CVS] cvs: php-src(PHP_5_3) / php.ini-development php.ini-production

2009-05-04 Thread Pierre-Alain Joye

pajoye  Mon May  4 15:20:38 2009 UTC

  Modified files:  (Branch: PHP_5_3)
/php-srcphp.ini-development php.ini-production 
  Log:
  - win extension_dir
  
http://cvs.php.net/viewvc.cgi/php-src/php.ini-development?r1=1.1.2.8r2=1.1.2.9diff_format=u
Index: php-src/php.ini-development
diff -u php-src/php.ini-development:1.1.2.8 php-src/php.ini-development:1.1.2.9
--- php-src/php.ini-development:1.1.2.8 Fri Apr 10 01:18:49 2009
+++ php-src/php.ini-development Mon May  4 15:20:38 2009
@@ -809,6 +809,8 @@
 ; Directory in which the loadable extensions (modules) reside.
 ; http://php.net/extension-dir
 ; extension_dir = ./
+; On windows:
+; extension_dir = ext
 
 ; Whether or not to enable the dl() function.  The dl() function does NOT work
 ; properly in multithreaded servers, such as IIS or Zeus, and is automatically
http://cvs.php.net/viewvc.cgi/php-src/php.ini-production?r1=1.1.2.8r2=1.1.2.9diff_format=u
Index: php-src/php.ini-production
diff -u php-src/php.ini-production:1.1.2.8 php-src/php.ini-production:1.1.2.9
--- php-src/php.ini-production:1.1.2.8  Fri Apr 10 01:18:49 2009
+++ php-src/php.ini-production  Mon May  4 15:20:38 2009
@@ -809,6 +809,8 @@
 ; Directory in which the loadable extensions (modules) reside.
 ; http://php.net/extension-dir
 ; extension_dir = ./
+; On windows:
+; extension_dir = ext
 
 ; Whether or not to enable the dl() function.  The dl() function does NOT work
 ; properly in multithreaded servers, such as IIS or Zeus, and is automatically



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

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

2009-05-04 Thread Ilia Alshanetsky

iliaa   Mon May  4 14:43:14 2009 UTC

  Modified files:  (Branch: PHP_5_2)
/php-src/main   network.c 
  Log:
  
  Fixed a possible crash
  
http://cvs.php.net/viewvc.cgi/php-src/main/network.c?r1=1.118.2.2.2.18r2=1.118.2.2.2.19diff_format=u
Index: php-src/main/network.c
diff -u php-src/main/network.c:1.118.2.2.2.18 
php-src/main/network.c:1.118.2.2.2.19
--- php-src/main/network.c:1.118.2.2.2.18   Mon May  4 14:12:23 2009
+++ php-src/main/network.c  Mon May  4 14:43:14 2009
@@ -17,7 +17,7 @@
+--+
  */
 
-/* $Id: network.c,v 1.118.2.2.2.18 2009/05/04 14:12:23 iliaa Exp $ */
+/* $Id: network.c,v 1.118.2.2.2.19 2009/05/04 14:43:14 iliaa Exp $ */
 
 /*#define DEBUG_MAIN_NETWORK 1*/
 
@@ -786,7 +786,7 @@
switch (sa-sa_family) {
 #if HAVE_GETADDRINFO  HAVE_IPV6
case AF_INET6:
-   if (strstr(bindto, ':')) {
+   if (bindto  strstr(bindto, ':')) {
((struct sockaddr_in6 
*)sa)-sin6_family = sa-sa_family;
((struct sockaddr_in6 *)sa)-sin6_port 
= htons(port);
socklen = sizeof(struct sockaddr_in6);



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

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

2009-05-04 Thread Antony Dovgal

tony2001Mon May  4 14:44:24 2009 UTC

  Modified files:  
/php-src/main   network.c 
  Log:
  use correct function
  
  
http://cvs.php.net/viewvc.cgi/php-src/main/network.c?r1=1.144r2=1.145diff_format=u
Index: php-src/main/network.c
diff -u php-src/main/network.c:1.144 php-src/main/network.c:1.145
--- php-src/main/network.c:1.144Mon May  4 14:25:04 2009
+++ php-src/main/network.c  Mon May  4 14:44:24 2009
@@ -17,7 +17,7 @@
+--+
  */
 
-/* $Id: network.c,v 1.144 2009/05/04 14:25:04 tony2001 Exp $ */
+/* $Id: network.c,v 1.145 2009/05/04 14:44:24 tony2001 Exp $ */
 
 /*#define DEBUG_MAIN_NETWORK 1*/
 
@@ -792,7 +792,7 @@
switch (sa-sa_family) {
 #if HAVE_GETADDRINFO  HAVE_IPV6
case AF_INET6:
-   if (bindto  strstr(bindto, ':')) {
+   if (bindto  strchr(bindto, ':')) {
((struct sockaddr_in6 
*)sa)-sin6_family = sa-sa_family;
((struct sockaddr_in6 *)sa)-sin6_port 
= htons(port);
socklen = sizeof(struct sockaddr_in6);



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

[PHP-CVS] cvs: phpruntests /src/testcase/sections/configurationsections rtPostRawSection.php

2009-05-04 Thread Zoe Slattery

zoe Mon May  4 15:45:26 2009 UTC

  Added files: 
/phpruntests/src/testcase/sections/configurationsections

rtPostRawSection.php 
  Log:
  PostRaw section
  

http://cvs.php.net/viewvc.cgi/phpruntests/src/testcase/sections/configurationsections/rtPostRawSection.php?view=markuprev=1.1
Index: 
phpruntests/src/testcase/sections/configurationsections/rtPostRawSection.php
+++ phpruntests/src/testcase/sections/configurationsections/rtPostRawSection.php
?php
/**
 * rtPostSection
 * Sets environment variables for POST_RAW section
 *
 *
 * @category  Testing
 * @package   RUNTESTS
 * @authorZoe Slattery z...@php.net
 * @authorStefan Priebsch sprieb...@php.net
 * @copyright 2009 The PHP Group
 * @license   http://www.php.net/license/3_01.txt PHP License 3.01
 * @link  http://qa.php.net/
 */
class rtPostRawSection extends rtConfigurationSection
{
private $postVariables = array();
private $postFileName;

protected function init()
{
$postContents = array();
$isContentSet= false;

foreach($this-sectionContents as $line) {
//get the first - and only the first - Content-Type line
if (!$isContentSet  preg_match('/^Content-Type:(.*)/i', $line, 
$matches)) {
$this-postVariables['CONTENT_TYPE'] = trim(str_replace(\r, 
'', $matches[1]));
$isContentSet = true;
} else {
$postContents[] = $line;
}
}

$postString = implode('\n', $postContents);
$this-postVariables['CONTENT_LENGTH'] = strlen($postString);
$this-postVariables['REQUEST_METHOD'] = 'POST';

$this-postFileName = tempnam(sys_get_temp_dir(), 'post');

file_put_contents($this-postFileName, $postString);
}

/**
 * Additional POST environment variables required by the test
 *
 * @return array
 */
public function getPostVariables()
{
return $this-postVariables;
}

/**
 * return the name of teh file containing post data
 *
 */
public function getPostFileName()
{
return $this-postFileName;
}
}
?


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

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

2009-05-04 Thread Ilia Alshanetsky

iliaa   Mon May  4 13:12:35 2009 UTC

  Modified files:  (Branch: PHP_5_2)
/php-srcNEWS 
/php-src/main   network.c 
  Log:
  
  MFB: Fixed bug #48131 (Don't try to bind ipv4 addresses to ipv6 ips via 
  bindto)
  
http://cvs.php.net/viewvc.cgi/php-src/NEWS?r1=1.2027.2.547.2.1487r2=1.2027.2.547.2.1488diff_format=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.2027.2.547.2.1487 php-src/NEWS:1.2027.2.547.2.1488
--- php-src/NEWS:1.2027.2.547.2.1487Sun May  3 19:09:22 2009
+++ php-src/NEWSMon May  4 13:12:34 2009
@@ -11,6 +11,8 @@
 - Fixed segfault on invalid session.save_path. (Hannes)
 - Fixed leaks in imap when a mail_criteria is used. (Pierre)
 
+- Fixed bug #48131 (Don't try to bind ipv4 addresses to ipv6 ips via
+  bindto). (Ilia)
 - Fixed bug #48132 (configure check for curl ssl support fails with
   --disable-rpath). (Jani)
 - Fixed bug #48058 (Year formatter goes wrong with out-of-int range). (Derick)
http://cvs.php.net/viewvc.cgi/php-src/main/network.c?r1=1.118.2.2.2.16r2=1.118.2.2.2.17diff_format=u
Index: php-src/main/network.c
diff -u php-src/main/network.c:1.118.2.2.2.16 
php-src/main/network.c:1.118.2.2.2.17
--- php-src/main/network.c:1.118.2.2.2.16   Sat Jan  3 00:06:59 2009
+++ php-src/main/network.c  Mon May  4 13:12:35 2009
@@ -17,7 +17,7 @@
+--+
  */
 
-/* $Id: network.c,v 1.118.2.2.2.16 2009/01/03 00:06:59 felipe Exp $ */
+/* $Id: network.c,v 1.118.2.2.2.17 2009/05/04 13:12:35 iliaa Exp $ */
 
 /*#define DEBUG_MAIN_NETWORK 1*/
 
@@ -423,9 +423,14 @@
switch (sa-sa_family) {
 #if HAVE_GETADDRINFO  HAVE_IPV6
case AF_INET6:
-   ((struct sockaddr_in6 *)sa)-sin6_family = 
sa-sa_family;
-   ((struct sockaddr_in6 *)sa)-sin6_port = 
htons(port);
-   socklen = sizeof(struct sockaddr_in6);
+   if (strstr(bindto, ':')) {
+   ((struct sockaddr_in6 
*)sa)-sin6_family = sa-sa_family;
+   ((struct sockaddr_in6 *)sa)-sin6_port 
= htons(port);
+   socklen = sizeof(struct sockaddr_in6);
+   } else {
+   socklen = 0;
+   sa = NULL;
+   }
break;
 #endif
case AF_INET:
@@ -786,9 +791,14 @@
switch (sa-sa_family) {
 #if HAVE_GETADDRINFO  HAVE_IPV6
case AF_INET6:
-   ((struct sockaddr_in6 *)sa)-sin6_family = 
sa-sa_family;
-   ((struct sockaddr_in6 *)sa)-sin6_port = 
htons(port);
-   socklen = sizeof(struct sockaddr_in6);
+   if (strstr(bindto, ':')) {
+   ((struct sockaddr_in6 
*)sa)-sin6_family = sa-sa_family;
+   ((struct sockaddr_in6 *)sa)-sin6_port 
= htons(port);
+   socklen = sizeof(struct sockaddr_in6);
+   } else {
+   socklen = 0;
+   sa = NULL;
+   }
break;
 #endif
case AF_INET:
@@ -808,7 +818,7 @@
if (bindto) {
struct sockaddr *local_address = NULL;
int local_address_len = 0;
-   
+
if (sa-sa_family == AF_INET) {
struct sockaddr_in *in4 = 
emalloc(sizeof(struct sockaddr_in));
 



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

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

2009-05-04 Thread Antony Dovgal


The build is broken:

/local/qa/5_2/main/network.c: In function 
'php_network_bind_socket_to_local_addr':
/local/qa/5_2/main/network.c:426: error: 'bindto' undeclared (first use in this 
function)
/local/qa/5_2/main/network.c:426: error: (Each undeclared identifier is 
reported only once
/local/qa/5_2/main/network.c:426: error: for each function it appears in.)
/local/qa/5_2/main/network.c:426: warning: passing argument 2 of 'strstr' makes 
pointer from integer without a cast
/local/qa/5_2/main/network.c: In function 'php_network_connect_socket_to_host':
/local/qa/5_2/main/network.c:794: warning: passing argument 2 of 'strstr' makes 
pointer from integer without a cast
make: *** [main/network.lo] Error 1


-- 
Wbr, 
Antony Dovgal

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

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

2009-05-04 Thread Antony Dovgal

tony2001Mon May  4 14:44:47 2009 UTC

  Modified files:  (Branch: PHP_5_3)
/php-src/main   network.c 
  Log:
  MFH: use correct function
  
  
http://cvs.php.net/viewvc.cgi/php-src/main/network.c?r1=1.118.2.2.2.6.2.16r2=1.118.2.2.2.6.2.17diff_format=u
Index: php-src/main/network.c
diff -u php-src/main/network.c:1.118.2.2.2.6.2.16 
php-src/main/network.c:1.118.2.2.2.6.2.17
--- php-src/main/network.c:1.118.2.2.2.6.2.16   Mon May  4 14:25:17 2009
+++ php-src/main/network.c  Mon May  4 14:44:46 2009
@@ -17,7 +17,7 @@
+--+
  */
 
-/* $Id: network.c,v 1.118.2.2.2.6.2.16 2009/05/04 14:25:17 tony2001 Exp $ */
+/* $Id: network.c,v 1.118.2.2.2.6.2.17 2009/05/04 14:44:46 tony2001 Exp $ */
 
 /*#define DEBUG_MAIN_NETWORK 1*/
 
@@ -792,7 +792,7 @@
switch (sa-sa_family) {
 #if HAVE_GETADDRINFO  HAVE_IPV6
case AF_INET6:
-   if (bindto  strstr(bindto, ':')) {
+   if (bindto  strchr(bindto, ':')) {
((struct sockaddr_in6 
*)sa)-sin6_family = sa-sa_family;
((struct sockaddr_in6 *)sa)-sin6_port 
= htons(port);
socklen = sizeof(struct sockaddr_in6);



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

[PHP-CVS] cvs: php-src(PHP_5_3) /ext/curl interface.c

2009-05-04 Thread Pierre-Alain Joye

pajoye  Mon May  4 14:09:28 2009 UTC

  Modified files:  (Branch: PHP_5_3)
/php-src/ext/curl   interface.c 
  Log:
  - [DOC] MFH: #39637, add CURLOPT_FTP_FILEMETHOD which accepts 
CURLFTPMETHOD_MULTICWD, CURLFTPMETHOD_NOCWD and CURLFTPMETHOD_SINGLECWD
  
http://cvs.php.net/viewvc.cgi/php-src/ext/curl/interface.c?r1=1.62.2.14.2.27.2.36r2=1.62.2.14.2.27.2.37diff_format=u
Index: php-src/ext/curl/interface.c
diff -u php-src/ext/curl/interface.c:1.62.2.14.2.27.2.36 
php-src/ext/curl/interface.c:1.62.2.14.2.27.2.37
--- php-src/ext/curl/interface.c:1.62.2.14.2.27.2.36Mon May  4 12:12:57 2009
+++ php-src/ext/curl/interface.cMon May  4 14:09:28 2009
@@ -16,7 +16,7 @@
+--+
 */
 
-/* $Id: interface.c,v 1.62.2.14.2.27.2.36 2009/05/04 12:12:57 pajoye Exp $ */
+/* $Id: interface.c,v 1.62.2.14.2.27.2.37 2009/05/04 14:09:28 pajoye Exp $ */
 
 #define ZEND_INCLUDE_FULL_WINDOWS_HEADERS
 
@@ -757,6 +757,13 @@
REGISTER_CURL_CONSTANT(CURLPROTO_ALL);
 #endif
 
+#if LIBCURL_VERSION_NUM = 0x070f01
+   REGISTER_CURL_CONSTANT(CURLOPT_FTP_FILEMETHOD);
+   REGISTER_CURL_CONSTANT(CURLFTPMETHOD_MULTICWD);
+   REGISTER_CURL_CONSTANT(CURLFTPMETHOD_NOCWD);
+   REGISTER_CURL_CONSTANT(CURLFTPMETHOD_SINGLECWD);
+#endif
+
 #ifdef PHP_CURL_NEED_OPENSSL_TSL
if (!CRYPTO_get_id_callback()) {
int i, c = CRYPTO_num_locks();
@@ -1517,6 +1524,7 @@
case CURLOPT_PROTOCOLS:
 #endif
case CURLOPT_IPRESOLVE:
+   case CURLOPT_FTP_FILEMETHOD:
convert_to_long_ex(zvalue);
error = curl_easy_setopt(ch-cp, option, 
Z_LVAL_PP(zvalue));
break;



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

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

2009-05-04 Thread Ilia Alshanetsky

iliaa   Mon May  4 14:12:23 2009 UTC

  Modified files:  (Branch: PHP_5_2)
/php-src/main   network.c 
  Log:
  
  Fixed bad merge
  
http://cvs.php.net/viewvc.cgi/php-src/main/network.c?r1=1.118.2.2.2.17r2=1.118.2.2.2.18diff_format=u
Index: php-src/main/network.c
diff -u php-src/main/network.c:1.118.2.2.2.17 
php-src/main/network.c:1.118.2.2.2.18
--- php-src/main/network.c:1.118.2.2.2.17   Mon May  4 13:12:35 2009
+++ php-src/main/network.c  Mon May  4 14:12:23 2009
@@ -17,7 +17,7 @@
+--+
  */
 
-/* $Id: network.c,v 1.118.2.2.2.17 2009/05/04 13:12:35 iliaa Exp $ */
+/* $Id: network.c,v 1.118.2.2.2.18 2009/05/04 14:12:23 iliaa Exp $ */
 
 /*#define DEBUG_MAIN_NETWORK 1*/
 
@@ -423,14 +423,9 @@
switch (sa-sa_family) {
 #if HAVE_GETADDRINFO  HAVE_IPV6
case AF_INET6:
-   if (strstr(bindto, ':')) {
-   ((struct sockaddr_in6 
*)sa)-sin6_family = sa-sa_family;
-   ((struct sockaddr_in6 *)sa)-sin6_port 
= htons(port);
-   socklen = sizeof(struct sockaddr_in6);
-   } else {
-   socklen = 0;
-   sa = NULL;
-   }
+   ((struct sockaddr_in6 *)sa)-sin6_family = 
sa-sa_family;
+   ((struct sockaddr_in6 *)sa)-sin6_port = 
htons(port);
+   socklen = sizeof(struct sockaddr_in6);
break;
 #endif
case AF_INET:



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

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

2009-05-04 Thread Antony Dovgal

tony2001Mon May  4 14:25:17 2009 UTC

  Modified files:  (Branch: PHP_5_3)
/php-src/main   network.c 
  Log:
  MFH: don't segfault on bindto == NULL
  
  
http://cvs.php.net/viewvc.cgi/php-src/main/network.c?r1=1.118.2.2.2.6.2.15r2=1.118.2.2.2.6.2.16diff_format=u
Index: php-src/main/network.c
diff -u php-src/main/network.c:1.118.2.2.2.6.2.15 
php-src/main/network.c:1.118.2.2.2.6.2.16
--- php-src/main/network.c:1.118.2.2.2.6.2.15   Mon May  4 13:09:15 2009
+++ php-src/main/network.c  Mon May  4 14:25:17 2009
@@ -17,7 +17,7 @@
+--+
  */
 
-/* $Id: network.c,v 1.118.2.2.2.6.2.15 2009/05/04 13:09:15 iliaa Exp $ */
+/* $Id: network.c,v 1.118.2.2.2.6.2.16 2009/05/04 14:25:17 tony2001 Exp $ */
 
 /*#define DEBUG_MAIN_NETWORK 1*/
 
@@ -792,7 +792,7 @@
switch (sa-sa_family) {
 #if HAVE_GETADDRINFO  HAVE_IPV6
case AF_INET6:
-   if (strstr(bindto, ':')) {
+   if (bindto  strstr(bindto, ':')) {
((struct sockaddr_in6 
*)sa)-sin6_family = sa-sa_family;
((struct sockaddr_in6 *)sa)-sin6_port 
= htons(port);
socklen = sizeof(struct sockaddr_in6);



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

[PHP-CVS] cvs: phpruntests /src/testcase/sections/configurationsections rtDeflatePostSection.php rtGzipPostSection.php rtPostRawSection.php rtPostSection.php

2009-05-04 Thread Zoe Slattery

zoe Mon May  4 16:26:43 2009 UTC

  Modified files:  
/phpruntests/src/testcase/sections/configurationsections

rtDeflatePostSection.php 

rtPostSection.php 

rtPostRawSection.php 

rtGzipPostSection.php 
  Log:
  Fixing quotes
  
http://cvs.php.net/viewvc.cgi/phpruntests/src/testcase/sections/configurationsections/rtDeflatePostSection.php?r1=1.1r2=1.2diff_format=u
Index: 
phpruntests/src/testcase/sections/configurationsections/rtDeflatePostSection.php
diff -u 
phpruntests/src/testcase/sections/configurationsections/rtDeflatePostSection.php:1.1
 
phpruntests/src/testcase/sections/configurationsections/rtDeflatePostSection.php:1.2
--- 
phpruntests/src/testcase/sections/configurationsections/rtDeflatePostSection.php:1.1
Thu Apr 30 20:07:42 2009
+++ 
phpruntests/src/testcase/sections/configurationsections/rtDeflatePostSection.php
Mon May  4 16:26:43 2009
@@ -19,7 +19,7 @@
 
 protected function init()
 { 
-$postString = implode('\n', $this-sectionContents);
+$postString = implode(\n, $this-sectionContents);
 $compressedPostString = gzcompress($postString);
 
 $this-postVariables['CONTENT_TYPE'] = 
'application/x-www-form-urlencoded';
http://cvs.php.net/viewvc.cgi/phpruntests/src/testcase/sections/configurationsections/rtPostSection.php?r1=1.3r2=1.4diff_format=u
Index: phpruntests/src/testcase/sections/configurationsections/rtPostSection.php
diff -u 
phpruntests/src/testcase/sections/configurationsections/rtPostSection.php:1.3 
phpruntests/src/testcase/sections/configurationsections/rtPostSection.php:1.4
--- 
phpruntests/src/testcase/sections/configurationsections/rtPostSection.php:1.3   
Wed Apr 29 17:29:56 2009
+++ phpruntests/src/testcase/sections/configurationsections/rtPostSection.php   
Mon May  4 16:26:43 2009
@@ -19,7 +19,7 @@
 
 protected function init()
 { 
-$postString = implode('\n', $this-sectionContents);
+$postString = implode(\n, $this-sectionContents);
 $this-postVariables['CONTENT_TYPE'] = 
'application/x-www-form-urlencoded';
 $this-postVariables['CONTENT_LENGTH'] = strlen($postString);
 $this-postVariables['REQUEST_METHOD'] = 'POST';
http://cvs.php.net/viewvc.cgi/phpruntests/src/testcase/sections/configurationsections/rtPostRawSection.php?r1=1.1r2=1.2diff_format=u
Index: 
phpruntests/src/testcase/sections/configurationsections/rtPostRawSection.php
diff -u 
phpruntests/src/testcase/sections/configurationsections/rtPostRawSection.php:1.1
 
phpruntests/src/testcase/sections/configurationsections/rtPostRawSection.php:1.2
--- 
phpruntests/src/testcase/sections/configurationsections/rtPostRawSection.php:1.1
Mon May  4 15:45:26 2009
+++ 
phpruntests/src/testcase/sections/configurationsections/rtPostRawSection.php
Mon May  4 16:26:43 2009
@@ -32,7 +32,7 @@
 }
 }
 
-$postString = implode('\n', $postContents);
+$postString = implode(\n, $postContents);
 $this-postVariables['CONTENT_LENGTH'] = strlen($postString);
 $this-postVariables['REQUEST_METHOD'] = 'POST';
 
http://cvs.php.net/viewvc.cgi/phpruntests/src/testcase/sections/configurationsections/rtGzipPostSection.php?r1=1.2r2=1.3diff_format=u
Index: 
phpruntests/src/testcase/sections/configurationsections/rtGzipPostSection.php
diff -u 
phpruntests/src/testcase/sections/configurationsections/rtGzipPostSection.php:1.2
 
phpruntests/src/testcase/sections/configurationsections/rtGzipPostSection.php:1.3
--- 
phpruntests/src/testcase/sections/configurationsections/rtGzipPostSection.php:1.2
   Thu Apr 30 08:12:32 2009
+++ 
phpruntests/src/testcase/sections/configurationsections/rtGzipPostSection.php   
Mon May  4 16:26:43 2009
@@ -19,7 +19,7 @@
 
 protected function init()
 { 
-$postString = implode('\n', $this-sectionContents);
+$postString = implode(\n, $this-sectionContents);
 $gzipPostString = gzencode($postString);
 
 $this-postVariables['CONTENT_TYPE'] = 
'application/x-www-form-urlencoded';



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

[PHP-CVS] cvs: phpruntests /src/testcase rtTestConfiguration.php /src/testcase/sections rtSection.php

2009-05-04 Thread Zoe Slattery

zoe Mon May  4 16:27:13 2009 UTC

  Modified files:  
/phpruntests/src/testcase   rtTestConfiguration.php 
/phpruntests/src/testcase/sections  rtSection.php 
  Log:
  post raw changes
  
http://cvs.php.net/viewvc.cgi/phpruntests/src/testcase/rtTestConfiguration.php?r1=1.11r2=1.12diff_format=u
Index: phpruntests/src/testcase/rtTestConfiguration.php
diff -u phpruntests/src/testcase/rtTestConfiguration.php:1.11 
phpruntests/src/testcase/rtTestConfiguration.php:1.12
--- phpruntests/src/testcase/rtTestConfiguration.php:1.11   Thu Apr 30 
20:22:22 2009
+++ phpruntests/src/testcase/rtTestConfiguration.phpMon May  4 16:27:12 2009
@@ -75,6 +75,9 @@
 if (array_key_exists('DEFLATE_POST', $sections)) {
 $this-environmentVariables = 
array_merge($this-environmentVariables, 
$sections['DEFLATE_POST']-getPostVariables());
 }
+if (array_key_exists('POST_RAW', $sections)) {
+$this-environmentVariables = 
array_merge($this-environmentVariables, 
$sections['POST_RAW']-getPostVariables());
+}
 
 }
 
@@ -118,6 +121,9 @@
 if(in_array('DEFLATE_POST', $sectionHeadings)) {
 $this-inputFileString = ' 
'.$sections['DEFLATE_POST']-getPostFileName();
 }
+if(in_array('POST_RAW', $sectionHeadings)) {
+$this-inputFileString = ' 
'.$sections['POST_RAW']-getPostFileName();
+}
 }
 
 private function isCgiTest($sectionHeadings)
http://cvs.php.net/viewvc.cgi/phpruntests/src/testcase/sections/rtSection.php?r1=1.6r2=1.7diff_format=u
Index: phpruntests/src/testcase/sections/rtSection.php
diff -u phpruntests/src/testcase/sections/rtSection.php:1.6 
phpruntests/src/testcase/sections/rtSection.php:1.7
--- phpruntests/src/testcase/sections/rtSection.php:1.6 Thu Apr 30 20:22:22 2009
+++ phpruntests/src/testcase/sections/rtSection.php Mon May  4 16:27:12 2009
@@ -22,6 +22,7 @@
 'POST'= 'rtPostSection',
 'GZIP_POST'   = 'rtGzipPostSection',
 'DEFLATE_POST'  = 'rtDeflatePostSection',
+'POST_RAW'  = 'rtPostRawSection',
 );
 
 protected $sectionName;



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

[PHP-CVS] cvs: phpruntests /tests/testcase rtPostRawExecutionTest.php

2009-05-04 Thread Zoe Slattery

zoe Mon May  4 16:27:40 2009 UTC

  Added files: 
/phpruntests/tests/testcase rtPostRawExecutionTest.php 
  Log:
  execute post raw test
  

http://cvs.php.net/viewvc.cgi/phpruntests/tests/testcase/rtPostRawExecutionTest.php?view=markuprev=1.1
Index: phpruntests/tests/testcase/rtPostRawExecutionTest.php
+++ phpruntests/tests/testcase/rtPostRawExecutionTest.php
?php

require_once 'PHPUnit/Framework.php';
require_once dirname(__FILE__) . '../../../src/rtAutoload.php';

class rtPostRawExecutionTest extends PHPUnit_Framework_TestCase
{
private $sample_test;

public function setUp()
{
$this-php = trim(shell_exec(which php));
$this-php_cgi = trim(shell_exec(which php-cgi));

$this-path_to_tests = realpath(dirname(__FILE__) . 
'/../../phpt-tests');
$this-sample_test = $this-path_to_tests . '/sample_postraw.phpt';
}

public function tearDown()
{
@unlink($this-path-to_tests . '/sample_postraw.php');
}

public function testFileRun()
{ 
//Create a new test configuration
$config = rtRuntestsConfiguration::getInstance(array('run-tests.php', 
'-p', $this-php, $this-sample_test));

$config-setEnvironmentVariable('TEST_PHP_CGI_EXECUTABLE',$this-php_cgi);
$config-configure();

//Retrieve the array of test file names
$testFiles = $config-getSetting('TestFiles');

//Read the test file
$testFile = new rtPhpTestFile();
$testFile-doRead($testFiles[0]);
$testFile-normaliseLineEndings();

//Create a new test case
$testCase = new rtPhpTest($testFile-getContents(), 
$testFile-getTestName(), $testFile-getSectionHeadings(), $config);  

//Setup and set the local environment for the test case
$testCase-executeTest($config);

$status = $testCase-getStatus();
  
//$this-assertEquals('It worked!', trim($output));
$this-assertEquals('', $status['pass']);


}
}

?
?


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

[PHP-CVS] cvs: phpruntests /src/testcase/preconditions rtIsSectionImplemented.php

2009-05-04 Thread Zoe Slattery

zoe Mon May  4 16:28:17 2009 UTC

  Modified files:  
/phpruntests/src/testcase/preconditions rtIsSectionImplemented.php 
  Log:
  post raw changes
  
http://cvs.php.net/viewvc.cgi/phpruntests/src/testcase/preconditions/rtIsSectionImplemented.php?r1=1.5r2=1.6diff_format=u
Index: phpruntests/src/testcase/preconditions/rtIsSectionImplemented.php
diff -u phpruntests/src/testcase/preconditions/rtIsSectionImplemented.php:1.5 
phpruntests/src/testcase/preconditions/rtIsSectionImplemented.php:1.6
--- phpruntests/src/testcase/preconditions/rtIsSectionImplemented.php:1.5   
Thu Apr 30 20:22:22 2009
+++ phpruntests/src/testcase/preconditions/rtIsSectionImplemented.php   Mon May 
 4 16:28:17 2009
@@ -21,6 +21,7 @@
 'POST'= 'rtPostSection',
 'GZIP_POST'   = 'rtGzipPostSection',
 'DEFLATE_POST'   = 'rtDeflatePostSection',
+'POST_RAW'= 'rtPostRawSection',
 );
 
 /** Return the message associated with an unimplemented test section



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

[PHP-CVS] cvs: php-src(PHP_5_3) /ext/date php_date.c

2009-05-04 Thread Pierre-Alain Joye

pajoye  Mon May  4 16:28:50 2009 UTC

  Modified files:  (Branch: PHP_5_3)
/php-src/ext/date   php_date.c 
  Log:
  - fix build
  
http://cvs.php.net/viewvc.cgi/php-src/ext/date/php_date.c?r1=1.43.2.45.2.51.2.71r2=1.43.2.45.2.51.2.72diff_format=u
Index: php-src/ext/date/php_date.c
diff -u php-src/ext/date/php_date.c:1.43.2.45.2.51.2.71 
php-src/ext/date/php_date.c:1.43.2.45.2.51.2.72
--- php-src/ext/date/php_date.c:1.43.2.45.2.51.2.71 Sun May  3 19:58:49 2009
+++ php-src/ext/date/php_date.c Mon May  4 16:28:50 2009
@@ -16,7 +16,7 @@
+--+
  */
 
-/* $Id: php_date.c,v 1.43.2.45.2.51.2.71 2009/05/03 19:58:49 derick Exp $ */
+/* $Id: php_date.c,v 1.43.2.45.2.51.2.72 2009/05/04 16:28:50 pajoye Exp $ */
 
 #include php.h
 #include php_streams.h
@@ -31,6 +31,11 @@
 #include lib/timelib.h
 #include time.h
 
+#ifdef PHP_WIN32
+# include win32/php_stdint.h
+static inline int64_t llabs( int64_t i ) { return i = 0? i: -i; }
+#endif
+
 /* {{{ arginfo */
 ZEND_BEGIN_ARG_INFO_EX(arginfo_date, 0, 0, 1)
ZEND_ARG_INFO(0, format)



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

[PHP-CVS] cvs: php-src /ext/date php_date.c

2009-05-04 Thread Pierre-Alain Joye

pajoye  Mon May  4 16:29:09 2009 UTC

  Modified files:  
/php-src/ext/date   php_date.c 
  Log:
  - fix build
  
http://cvs.php.net/viewvc.cgi/php-src/ext/date/php_date.c?r1=1.227r2=1.228diff_format=u
Index: php-src/ext/date/php_date.c
diff -u php-src/ext/date/php_date.c:1.227 php-src/ext/date/php_date.c:1.228
--- php-src/ext/date/php_date.c:1.227   Sun May  3 19:57:35 2009
+++ php-src/ext/date/php_date.c Mon May  4 16:29:09 2009
@@ -16,7 +16,7 @@
+--+
  */
 
-/* $Id: php_date.c,v 1.227 2009/05/03 19:57:35 derick Exp $ */
+/* $Id: php_date.c,v 1.228 2009/05/04 16:29:09 pajoye Exp $ */
 
 #include php.h
 #include php_streams.h
@@ -32,6 +32,11 @@
 #include time.h
 #include unicode/udat.h
 
+#ifdef PHP_WIN32
+# include win32/php_stdint.h
+static inline int64_t llabs( int64_t i ) { return i = 0? i: -i; }
+#endif
+
 /* {{{ arginfo */
 ZEND_BEGIN_ARG_INFO_EX(arginfo_date, 0, 0, 1)
ZEND_ARG_INFO(0, format)



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

[PHP-CVS] cvs: phpruntests /tests/testcase/sections/configurationsections rtPostRawSectionTest.php

2009-05-04 Thread Zoe Slattery

zoe Mon May  4 16:29:55 2009 UTC

  Modified files:  
/phpruntests/tests/testcase/sections/configurationsections  

rtPostRawSectionTest.php 
  Log:
  more quote fixing
  
http://cvs.php.net/viewvc.cgi/phpruntests/tests/testcase/sections/configurationsections/rtPostRawSectionTest.php?r1=1.1r2=1.2diff_format=u
Index: 
phpruntests/tests/testcase/sections/configurationsections/rtPostRawSectionTest.php
diff -u 
phpruntests/tests/testcase/sections/configurationsections/rtPostRawSectionTest.php:1.1
 
phpruntests/tests/testcase/sections/configurationsections/rtPostRawSectionTest.php:1.2
--- 
phpruntests/tests/testcase/sections/configurationsections/rtPostRawSectionTest.php:1.1
  Mon May  4 15:45:54 2009
+++ 
phpruntests/tests/testcase/sections/configurationsections/rtPostRawSectionTest.php
  Mon May  4 16:29:55 2009
@@ -20,7 +20,7 @@
 
 $fileName = $postSection-getPostFileName();
 $string = file_get_contents($fileName);
-$this-assertEquals('fred\njoe\nContent-Type:the second\nmary', 
$string);
+$this-assertEquals(fred\njoe\nContent-Type:the second\nmary, 
$string);
 }
 }
 ?
\ 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] cvs: php-src(PHP_5_3) /ext/hash hash.c

2009-05-04 Thread Scott MacVicar

scottmacMon May  4 16:37:32 2009 UTC

  Modified files:  (Branch: PHP_5_3)
/php-src/ext/hash   hash.c 
  Log:
  Add missing prototypes for mhash, no code changes.
  
  
http://cvs.php.net/viewvc.cgi/php-src/ext/hash/hash.c?r1=1.18.2.5.2.7.2.17r2=1.18.2.5.2.7.2.18diff_format=u
Index: php-src/ext/hash/hash.c
diff -u php-src/ext/hash/hash.c:1.18.2.5.2.7.2.17 
php-src/ext/hash/hash.c:1.18.2.5.2.7.2.18
--- php-src/ext/hash/hash.c:1.18.2.5.2.7.2.17   Wed Dec 31 11:15:37 2008
+++ php-src/ext/hash/hash.c Mon May  4 16:37:31 2009
@@ -17,7 +17,7 @@
   +--+
 */
 
-/* $Id: hash.c,v 1.18.2.5.2.7.2.17 2008/12/31 11:15:37 sebastian Exp $ */
+/* $Id: hash.c,v 1.18.2.5.2.7.2.18 2009/05/04 16:37:31 scottmac Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include config.h
@@ -527,7 +527,7 @@
 }
 /* }}} */
 
-/* {{{ proto resource hash_copy(resource context) U
+/* {{{ proto resource hash_copy(resource context)
 Copy hash resource */
 PHP_FUNCTION(hash_copy)
 {
@@ -647,6 +647,8 @@
zend_register_module_ex(mhash_module_entry TSRMLS_CC);
 }
 
+/* {{{ proto string mhash(int hash, string data [, string key])
+   Hash data with hash */
 PHP_FUNCTION(mhash)
 {
zval **z_algorithm;
@@ -660,7 +662,7 @@
convert_to_long_ex(z_algorithm);
algorithm = Z_LVAL_PP(z_algorithm);
 
-   /* need to conver the first parameter from int to string */
+   /* need to convert the first parameter from int constant to string 
algorithm name */
if (algorithm = 0  algorithm  MHASH_NUM_ALGOS) {
struct mhash_bc_entry algorithm_lookup = 
mhash_to_hash[algorithm];
if (algorithm_lookup.hash_name) {
@@ -676,7 +678,10 @@
WRONG_PARAM_COUNT;
}
 }
+/* }}} */
 
+/* {{{ proto string mhash_get_hash_name(int hash)
+   Gets the name of hash */
 PHP_FUNCTION(mhash_get_hash_name)
 {
long algorithm;
@@ -693,7 +698,10 @@
}
RETURN_FALSE;
 }
+/* }}} */
 
+/* {{{ proto int mhash_count(void)
+   Gets the number of available hashes */
 PHP_FUNCTION(mhash_count)
 {
if (zend_parse_parameters_none() == FAILURE) {
@@ -701,7 +709,10 @@
}
RETURN_LONG(MHASH_NUM_ALGOS - 1);
 }
+/* }}} */
 
+/* {{{ proto int mhash_get_block_size(int hash)
+   Gets the block size of hash */
 PHP_FUNCTION(mhash_get_block_size)
 {
long algorithm;
@@ -721,9 +732,12 @@
}
}
 }
+/* }}} */
 
 #define SALT_SIZE 8
 
+/* {{{ proto string mhash_keygen_s2k(int hash, string input_password, string 
salt, int bytes)
+   Generates a key using hash functions */
 PHP_FUNCTION(mhash_keygen_s2k)
 {
long algorithm, bytes;
@@ -789,6 +803,7 @@
}
}
 }
+/* }}} */
 
 #endif
 



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

[PHP-CVS] cvs: phpruntests /src/testcase rtTestConfiguration.php /src/testcase/preconditions rtIsSectionImplemented.php /src/testcase/sections rtSection.php /src/testcase/sections/configurationsect

2009-05-04 Thread Zoe Slattery

zoe Mon May  4 17:02:37 2009 UTC

  Added files: 
/phpruntests/tests/testcase/sections/configurationsections  

rtCookieSectionTest.php 
/phpruntests/tests/testcase rtCookieExecutionTest.php 
/phpruntests/src/testcase/sections/configurationsections

rtCookieSection.php 

  Modified files:  
/phpruntests/src/testcase/preconditions rtIsSectionImplemented.php 
/phpruntests/src/testcase   rtTestConfiguration.php 
/phpruntests/src/testcase/sections  rtSection.php 
  Log:
  cookie section
  http://cvs.php.net/viewvc.cgi/phpruntests/src/testcase/preconditions/rtIsSectionImplemented.php?r1=1.6r2=1.7diff_format=u
Index: phpruntests/src/testcase/preconditions/rtIsSectionImplemented.php
diff -u phpruntests/src/testcase/preconditions/rtIsSectionImplemented.php:1.6 
phpruntests/src/testcase/preconditions/rtIsSectionImplemented.php:1.7
--- phpruntests/src/testcase/preconditions/rtIsSectionImplemented.php:1.6   
Mon May  4 16:28:17 2009
+++ phpruntests/src/testcase/preconditions/rtIsSectionImplemented.php   Mon May 
 4 17:02:37 2009
@@ -22,6 +22,7 @@
 'GZIP_POST'   = 'rtGzipPostSection',
 'DEFLATE_POST'   = 'rtDeflatePostSection',
 'POST_RAW'= 'rtPostRawSection',
+'COOKIE'= 'rtCookieSection',
 );
 
 /** Return the message associated with an unimplemented test section
http://cvs.php.net/viewvc.cgi/phpruntests/src/testcase/rtTestConfiguration.php?r1=1.12r2=1.13diff_format=u
Index: phpruntests/src/testcase/rtTestConfiguration.php
diff -u phpruntests/src/testcase/rtTestConfiguration.php:1.12 
phpruntests/src/testcase/rtTestConfiguration.php:1.13
--- phpruntests/src/testcase/rtTestConfiguration.php:1.12   Mon May  4 
16:27:12 2009
+++ phpruntests/src/testcase/rtTestConfiguration.phpMon May  4 17:02:37 2009
@@ -48,12 +48,6 @@
 $this-setPhpExecutable($runConfiguration, $sectionHeadings);
 $this-setInputFileString($runConfiguration, $sections, 
$sectionHeadings);
 
-if($this-cgiTest) {
-$this-environmentVariables['SCRIPT_FILENAME'] = 
$fileSection-getFileName();
-$this-environmentVariables['PATH_TRANSLATED'] = 
$fileSection-getFileName();
-//Required by when the cgi has been compiled with 
force-cgi-redirect.
-$this-environmentVariables['REDIRECT_STATUS'] = '1';
-}
 }
 
 private function setEnvironmentVariables(rtRuntestsConfiguration 
$runConfiguration, $sections, $fileSection)
@@ -63,20 +57,33 @@
 if (array_key_exists('ENV', $sections)) {
 $this-environmentVariables = 
array_merge($this-environmentVariables, 
$sections['ENV']-getTestEnvironmentVariables());
 }
-if (array_key_exists('GET', $sections)) {
-$this-environmentVariables = 
array_merge($this-environmentVariables, $sections['GET']-getGetVariables());
-}
-if (array_key_exists('POST', $sections)) {
-$this-environmentVariables = 
array_merge($this-environmentVariables, $sections['POST']-getPostVariables());
-}
-if (array_key_exists('GZIP_POST', $sections)) {
-$this-environmentVariables = 
array_merge($this-environmentVariables, 
$sections['GZIP_POST']-getPostVariables());
-}
-if (array_key_exists('DEFLATE_POST', $sections)) {
-$this-environmentVariables = 
array_merge($this-environmentVariables, 
$sections['DEFLATE_POST']-getPostVariables());
-}
-if (array_key_exists('POST_RAW', $sections)) {
-$this-environmentVariables = 
array_merge($this-environmentVariables, 
$sections['POST_RAW']-getPostVariables());
+
+if($this-cgiTest) {
+$this-environmentVariables['SCRIPT_FILENAME'] = 
$fileSection-getFileName();
+$this-environmentVariables['PATH_TRANSLATED'] = 
$fileSection-getFileName();
+//Required by when the cgi has been compiled with 
force-cgi-redirect.
+$this-environmentVariables['REDIRECT_STATUS'] = '1';
+//Default is GET
+$this-environmentVariables['REQUEST_METHOD'] = 'GET';
+
+if (array_key_exists('GET', $sections)) {
+$this-environmentVariables = 
array_merge($this-environmentVariables, $sections['GET']-getGetVariables());
+}
+if (array_key_exists('POST', $sections)) {
+$this-environmentVariables = 
array_merge($this-environmentVariables, $sections['POST']-getPostVariables());
+}
+if (array_key_exists('GZIP_POST', $sections)) {
+$this-environmentVariables = 
array_merge($this-environmentVariables, 
$sections['GZIP_POST']-getPostVariables());
+}
+if (array_key_exists('DEFLATE_POST', $sections)) {
+$this-environmentVariables =

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

2009-05-04 Thread Pierre-Alain Joye

pajoye  Mon May  4 17:08:44 2009 UTC

  Modified files:  (Branch: PHP_5_2)
/php-src/ext/date   php_date.c 
  Log:
  - fix build
  
http://cvs.php.net/viewvc.cgi/php-src/ext/date/php_date.c?r1=1.43.2.45.2.65r2=1.43.2.45.2.66diff_format=u
Index: php-src/ext/date/php_date.c
diff -u php-src/ext/date/php_date.c:1.43.2.45.2.65 
php-src/ext/date/php_date.c:1.43.2.45.2.66
--- php-src/ext/date/php_date.c:1.43.2.45.2.65  Sun May  3 18:22:59 2009
+++ php-src/ext/date/php_date.c Mon May  4 17:08:43 2009
@@ -16,7 +16,7 @@
+--+
  */
 
-/* $Id: php_date.c,v 1.43.2.45.2.65 2009/05/03 18:22:59 derick Exp $ */
+/* $Id: php_date.c,v 1.43.2.45.2.66 2009/05/04 17:08:43 pajoye Exp $ */
 
 #include php.h
 #include php_streams.h
@@ -30,6 +30,10 @@
 #include lib/timelib.h
 #include time.h
 
+#ifdef PHP_WIN32
+static inline __int64 llabs( __int64 i ) { return i = 0? i: -i; }
+#endif
+
 /* {{{ arginfo */
 static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_date, 0, 0, 1)



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

[PHP-CVS] cvs: php-src(PHP_5_3) /ext/date php_date.c

2009-05-04 Thread Pierre-Alain Joye

pajoye  Mon May  4 17:11:23 2009 UTC

  Modified files:  (Branch: PHP_5_3)
/php-src/ext/date   php_date.c 
  Log:
  - cleaner fix
  
http://cvs.php.net/viewvc.cgi/php-src/ext/date/php_date.c?r1=1.43.2.45.2.51.2.72r2=1.43.2.45.2.51.2.73diff_format=u
Index: php-src/ext/date/php_date.c
diff -u php-src/ext/date/php_date.c:1.43.2.45.2.51.2.72 
php-src/ext/date/php_date.c:1.43.2.45.2.51.2.73
--- php-src/ext/date/php_date.c:1.43.2.45.2.51.2.72 Mon May  4 16:28:50 2009
+++ php-src/ext/date/php_date.c Mon May  4 17:11:22 2009
@@ -16,7 +16,7 @@
+--+
  */
 
-/* $Id: php_date.c,v 1.43.2.45.2.51.2.72 2009/05/04 16:28:50 pajoye Exp $ */
+/* $Id: php_date.c,v 1.43.2.45.2.51.2.73 2009/05/04 17:11:22 pajoye Exp $ */
 
 #include php.h
 #include php_streams.h
@@ -33,7 +33,6 @@
 
 #ifdef PHP_WIN32
 # include win32/php_stdint.h
-static inline int64_t llabs( int64_t i ) { return i = 0? i: -i; }
 #endif
 
 /* {{{ arginfo */



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

[PHP-CVS] cvs: php-src /ext/date php_date.c

2009-05-04 Thread Pierre-Alain Joye

pajoye  Mon May  4 17:11:39 2009 UTC

  Modified files:  
/php-src/ext/date   php_date.c 
  Log:
  - cleaner fix
  
http://cvs.php.net/viewvc.cgi/php-src/ext/date/php_date.c?r1=1.228r2=1.229diff_format=u
Index: php-src/ext/date/php_date.c
diff -u php-src/ext/date/php_date.c:1.228 php-src/ext/date/php_date.c:1.229
--- php-src/ext/date/php_date.c:1.228   Mon May  4 16:29:09 2009
+++ php-src/ext/date/php_date.c Mon May  4 17:11:39 2009
@@ -16,7 +16,7 @@
+--+
  */
 
-/* $Id: php_date.c,v 1.228 2009/05/04 16:29:09 pajoye Exp $ */
+/* $Id: php_date.c,v 1.229 2009/05/04 17:11:39 pajoye Exp $ */
 
 #include php.h
 #include php_streams.h
@@ -34,7 +34,6 @@
 
 #ifdef PHP_WIN32
 # include win32/php_stdint.h
-static inline int64_t llabs( int64_t i ) { return i = 0? i: -i; }
 #endif
 
 /* {{{ arginfo */



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

[PHP-CVS] cvs: phpruntests /src/configuration/settings rtPhpCgiExecutableSetting.php

2009-05-04 Thread Zoe Slattery

zoe Mon May  4 17:19:20 2009 UTC

  Modified files:  
/phpruntests/src/configuration/settings 
rtPhpCgiExecutableSetting.php 
  Log:
  ooops
  
http://cvs.php.net/viewvc.cgi/phpruntests/src/configuration/settings/rtPhpCgiExecutableSetting.php?r1=1.5r2=1.6diff_format=u
Index: phpruntests/src/configuration/settings/rtPhpCgiExecutableSetting.php
diff -u 
phpruntests/src/configuration/settings/rtPhpCgiExecutableSetting.php:1.5 
phpruntests/src/configuration/settings/rtPhpCgiExecutableSetting.php:1.6
--- phpruntests/src/configuration/settings/rtPhpCgiExecutableSetting.php:1.5
Sun Apr 26 06:54:12 2009
+++ phpruntests/src/configuration/settings/rtPhpCgiExecutableSetting.php
Mon May  4 17:19:20 2009
@@ -6,7 +6,7 @@
  */
 class rtPhpCgiExecutableSetting extends rtSetting
 {
-const SAPI_CGI = /sapi/cgi/php;
+const SAPI_CGI = /sapi/cgi/php-cgi;
 
 private $phpCgiExecutable;
 
@@ -37,7 +37,7 @@
 if(substr(dirname($phpCli),-3) == 'cli') {
 $pathLength = strlen(dirname($phpCli)) - 3;
 $sapiDir = substr(dirname($phpCli), 0, $pathLength);  
-$this-phpCgiExecutable = $sapiDir.cgi/php;
+$this-phpCgiExecutable = $sapiDir.cgi/php-cgi;
 }
 }
 



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

[PHP-CVS] cvs: php-src(PHP_5_3) / NEWS

2009-05-04 Thread Jani Taskinen

janiMon May  4 19:02:27 2009 UTC

  Modified files:  (Branch: PHP_5_3)
/php-srcNEWS 
  Log:
  - Fix news
  
http://cvs.php.net/viewvc.cgi/php-src/NEWS?r1=1.2027.2.547.2.965.2.580r2=1.2027.2.547.2.965.2.581diff_format=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.2027.2.547.2.965.2.580 
php-src/NEWS:1.2027.2.547.2.965.2.581
--- php-src/NEWS:1.2027.2.547.2.965.2.580   Mon May  4 14:15:58 2009
+++ php-src/NEWSMon May  4 19:02:26 2009
@@ -7,14 +7,13 @@
 - Undeprecated ticks. (Arnaud)
 
 - Improved IMAP support (Pierre):
-  - Added imap_gc to clear the imap cache
-  - Added imap_utf8_to_mutf7 and imap_mutf7_to_utf8
+  . Added imap_gc() to clear the imap cache
+  . Added imap_utf8_to_mutf7() and imap_mutf7_to_utf8()
 
 - Implemented FR #41712 (curl progress callback: CURLOPT_PROGRESSFUNCTION).
   (sdteffen[at]gmail[dot].com, Pierre)
-- Implemented FR #47739 (Missing cURL option do disable IPv6) (Pierre)
-- Implemented FR #39637 (Missing cURL option CURLOPT_FTP_FILEMETHOD)
-  (Pierre)
+- Implemented FR #47739 (Missing cURL option do disable IPv6). (Pierre)
+- Implemented FR #39637 (Missing cURL option CURLOPT_FTP_FILEMETHOD). (Pierre)
 
 - Added timezone_version_get() to retrieve the version of the used timezone
   database. (Derick)



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

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

2009-05-04 Thread Derick Rethans

derick  Mon May  4 19:55:33 2009 UTC

  Modified files:  
/php-src/main   main.c 
  Log:
  - Fixed warnings
  
http://cvs.php.net/viewvc.cgi/php-src/main/main.c?r1=1.798r2=1.799diff_format=u
Index: php-src/main/main.c
diff -u php-src/main/main.c:1.798 php-src/main/main.c:1.799
--- php-src/main/main.c:1.798   Sun May  3 19:08:28 2009
+++ php-src/main/main.c Mon May  4 19:55:33 2009
@@ -18,7 +18,7 @@
+--+
 */
 
-/* $Id: main.c,v 1.798 2009/05/03 19:08:28 derick Exp $ */
+/* $Id: main.c,v 1.799 2009/05/04 19:55:33 derick Exp $ */
 
 /* {{{ includes
  */
@@ -59,6 +59,7 @@
 #include fopen_wrappers.h
 #include ext/standard/php_standard.h
 #include ext/standard/php_string.h
+#include ext/date/php_date.h
 #include php_variables.h
 #include ext/standard/credits.h
 #ifdef PHP_WIN32
@@ -612,7 +613,6 @@
 PHPAPI void php_log_err(char *log_message TSRMLS_DC)
 {
int fd = -1;
-   struct tm tmbuf;
time_t error_time;
 
/* Try to use the specified logging location. */



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

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

2009-05-04 Thread Derick Rethans

derick  Mon May  4 19:55:42 2009 UTC

  Modified files:  (Branch: PHP_5_2)
/php-src/main   main.c 
  Log:
  - MFH: Fixed warnings
  
http://cvs.php.net/viewvc.cgi/php-src/main/main.c?r1=1.640.2.23.2.69r2=1.640.2.23.2.70diff_format=u
Index: php-src/main/main.c
diff -u php-src/main/main.c:1.640.2.23.2.69 php-src/main/main.c:1.640.2.23.2.70
--- php-src/main/main.c:1.640.2.23.2.69 Sun May  3 19:09:23 2009
+++ php-src/main/main.c Mon May  4 19:55:42 2009
@@ -18,7 +18,7 @@
+--+
 */
 
-/* $Id: main.c,v 1.640.2.23.2.69 2009/05/03 19:09:23 derick Exp $ */
+/* $Id: main.c,v 1.640.2.23.2.70 2009/05/04 19:55:42 derick Exp $ */
 
 /* {{{ includes
  */
@@ -59,6 +59,7 @@
 #include fopen_wrappers.h
 #include ext/standard/php_standard.h
 #include ext/standard/php_string.h
+#include ext/date/php_date.h
 #include php_variables.h
 #include ext/standard/credits.h
 #ifdef PHP_WIN32
@@ -473,7 +474,6 @@
 PHPAPI void php_log_err(char *log_message TSRMLS_DC)
 {
int fd = -1;
-   struct tm tmbuf;
time_t error_time;
 
/* Try to use the specified logging location. */



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

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

2009-05-04 Thread Derick Rethans

derick  Mon May  4 19:55:47 2009 UTC

  Modified files:  (Branch: PHP_5_3)
/php-src/main   main.c 
  Log:
  - MFH: Fixed warnings
  
http://cvs.php.net/viewvc.cgi/php-src/main/main.c?r1=1.640.2.23.2.57.2.50r2=1.640.2.23.2.57.2.51diff_format=u
Index: php-src/main/main.c
diff -u php-src/main/main.c:1.640.2.23.2.57.2.50 
php-src/main/main.c:1.640.2.23.2.57.2.51
--- php-src/main/main.c:1.640.2.23.2.57.2.50Sun May  3 19:08:49 2009
+++ php-src/main/main.c Mon May  4 19:55:47 2009
@@ -18,7 +18,7 @@
+--+
 */
 
-/* $Id: main.c,v 1.640.2.23.2.57.2.50 2009/05/03 19:08:49 derick Exp $ */
+/* $Id: main.c,v 1.640.2.23.2.57.2.51 2009/05/04 19:55:47 derick Exp $ */
 
 /* {{{ includes
  */
@@ -59,6 +59,7 @@
 #include fopen_wrappers.h
 #include ext/standard/php_standard.h
 #include ext/standard/php_string.h
+#include ext/date/php_date.h
 #include php_variables.h
 #include ext/standard/credits.h
 #ifdef PHP_WIN32
@@ -520,7 +521,6 @@
 PHPAPI void php_log_err(char *log_message TSRMLS_DC)
 {
int fd = -1;
-   struct tm tmbuf;
time_t error_time;
 
/* Try to use the specified logging location. */



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

[PHP-CVS] cvs: php-src(PHP_5_3) /win32 php_stdint.h

2009-05-04 Thread Pierre-Alain Joye

pajoye  Mon May  4 20:31:02 2009 UTC

  Modified files:  (Branch: PHP_5_3)
/php-src/win32  php_stdint.h 
  Log:
  - a  macro will just do it too
  
http://cvs.php.net/viewvc.cgi/php-src/win32/php_stdint.h?r1=1.1.2.5r2=1.1.2.6diff_format=u
Index: php-src/win32/php_stdint.h
diff -u php-src/win32/php_stdint.h:1.1.2.5 php-src/win32/php_stdint.h:1.1.2.6
--- php-src/win32/php_stdint.h:1.1.2.5  Mon May  4 17:09:33 2009
+++ php-src/win32/php_stdint.h  Mon May  4 20:31:02 2009
@@ -238,8 +238,7 @@
 #define INTMAX_C   INT64_C
 #define UINTMAX_C  UINT64_C
 
-static inline int64_t llabs( int64_t i ) { return i = 0? i: -i; }
-
+#define llabs(i) (i = 0? i : -i)
 #endif // __STDC_CONSTANT_MACROS ]
 
 



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

[PHP-CVS] cvs: php-src /win32 php_stdint.h

2009-05-04 Thread Pierre-Alain Joye

pajoye  Mon May  4 20:32:33 2009 UTC

  Modified files:  
/php-src/win32  php_stdint.h 
  Log:
  - a  macro will just do it too
  
http://cvs.php.net/viewvc.cgi/php-src/win32/php_stdint.h?r1=1.5r2=1.6diff_format=u
Index: php-src/win32/php_stdint.h
diff -u php-src/win32/php_stdint.h:1.5 php-src/win32/php_stdint.h:1.6
--- php-src/win32/php_stdint.h:1.5  Mon May  4 17:10:26 2009
+++ php-src/win32/php_stdint.h  Mon May  4 20:32:33 2009
@@ -264,7 +264,7 @@
 #define INTMAX_C   INT64_C
 #define UINTMAX_C  UINT64_C
 
-static inline int64_t llabs( int64_t i ) { return i = 0? i: -i; }
+#define llabs(i) (i = 0? i : -i)
 
 #endif // __STDC_CONSTANT_MACROS ]
 



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

Re: [PHP-CVS] cvs: php-src /win32 php_stdint.h

2009-05-04 Thread Nuno Lopes


pajoye Mon May  4 20:32:33 2009 UTC

 Modified files:
   /php-src/win32 php_stdint.h
 Log:
 - a  macro will just do it too

http://cvs.php.net/viewvc.cgi/php-src/win32/php_stdint.h?r1=1.5r2=1.6diff_format=u
Index: php-src/win32/php_stdint.h
diff -u php-src/win32/php_stdint.h:1.5 php-src/win32/php_stdint.h:1.6
--- php-src/win32/php_stdint.h:1.5 Mon May  4 17:10:26 2009
+++ php-src/win32/php_stdint.h Mon May  4 20:32:33 2009
@@ -264,7 +264,7 @@
#define INTMAX_C   INT64_C
#define UINTMAX_C  UINT64_C

-static inline int64_t llabs( int64_t i ) { return i = 0? i: -i; }
+#define llabs(i) (i = 0? i : -i)


what about multiple evaluation problems? (e.g. llabs(some_function_call()) )

Nuno 



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

[PHP-CVS] cvs: php-src /ext/fileinfo/libmagic apprentice.c apptype.c cdf.c cdf.h compress.c file.h funcs.c magic.c patchlevel.h readcdf.c softmagic.c

2009-05-04 Thread Scott MacVicar

scottmacMon May  4 20:52:44 2009 UTC

  Modified files:  
/php-src/ext/fileinfo/libmagic  apprentice.c apptype.c cdf.c cdf.h 
compress.c file.h funcs.c magic.c 
patchlevel.h readcdf.c softmagic.c 
  Log:
  Update libmagic to 5.02
  
  http://cvs.php.net/viewvc.cgi/php-src/ext/fileinfo/libmagic/apprentice.c?r1=1.21r2=1.22diff_format=u
Index: php-src/ext/fileinfo/libmagic/apprentice.c
diff -u php-src/ext/fileinfo/libmagic/apprentice.c:1.21 
php-src/ext/fileinfo/libmagic/apprentice.c:1.22
--- php-src/ext/fileinfo/libmagic/apprentice.c:1.21 Sun Mar 15 23:02:34 2009
+++ php-src/ext/fileinfo/libmagic/apprentice.c  Mon May  4 20:52:43 2009
@@ -98,8 +98,8 @@
 
 private int getvalue(struct magic_set *ms, struct magic *, const char **, int);
 private int hextoint(int);
-private const char *getstr(struct magic_set *, const char *, char *, int,
-int *, int);
+private const char *getstr(struct magic_set *, struct magic *, const char *,
+int);
 private int parse(struct magic_set *, struct magic_entry **, uint32_t *,
 const char *, size_t, int);
 private void eatsize(const char **);
@@ -1670,8 +1670,7 @@
 * string is not one character long
 */
file_magwarn(ms, Printf format `%c' is not valid for type 
-   `%s' in description `%s',
-ptr  *ptr ? *ptr : '?',
+   `%s' in description `%s', *ptr ? *ptr : '?',
 file_names[m-type], m-desc);
return -1;
}
@@ -1696,8 +1695,6 @@
 private int
 getvalue(struct magic_set *ms, struct magic *m, const char **p, int action)
 {
-   int slen;
-
switch (m-type) {
case FILE_BESTRING16:
case FILE_LESTRING16:
@@ -1705,16 +1702,13 @@
case FILE_PSTRING:
case FILE_REGEX:
case FILE_SEARCH:
-   *p = getstr(ms, *p, m-value.s, sizeof(m-value.s), slen, 
action);
+   *p = getstr(ms, m, *p, action == FILE_COMPILE);
if (*p == NULL) {
if (ms-flags  MAGIC_CHECK)
file_magwarn(ms, cannot get string from `%s',
m-value.s);
return -1;
}
-   m-vallen = slen;
-   if (m-type == FILE_PSTRING)
-   m-vallen++;
return 0;
case FILE_FLOAT:
case FILE_BEFLOAT:
@@ -1753,13 +1747,15 @@
 /*
  * Convert a string containing C character escapes.  Stop at an unescaped
  * space or tab.
- * Copy the converted version to p, returning its length in *slen.
- * Return updated scan pointer as function result.
+ * Copy the converted version to m-value.s, and the length in m-vallen.
+ * Return updated scan pointer as function result. Warn if set.
  */
 private const char *
-getstr(struct magic_set *ms, const char *s, char *p, int plen, int *slen, int 
action)
+getstr(struct magic_set *ms, struct magic *m, const char *s, int warn)
 {
const char *origs = s;
+   char*p = m-value.s;
+   size_t  plen = sizeof(m-value.s);
char*origp = p;
char*pmax = p + plen - 1;
int c;
@@ -1776,25 +1772,33 @@
switch(c = *s++) {
 
case '\0':
-   if (action == FILE_COMPILE)
+   if (warn)
file_magwarn(ms, incomplete escape);
goto out;
 
case '\t':
-   if (action == FILE_COMPILE) {
+   if (warn) {
file_magwarn(ms,
escaped tab found, use \\t 
instead);
-   action++;
+   warn = 0;   /* already did */
}
/*FALLTHROUGH*/
default:
-   if (action == FILE_COMPILE) {
-   if (isprint((unsigned char)c))
-   file_magwarn(ms,
-   no need to escape `%c', c);
-   else
-   file_magwarn(ms,
-   unknown escape sequence: 
\\%03o, c);
+   if (warn) {
+   if (isprint((unsigned char)c)) {
+   /* Allow escaping of 
+* ``relations'' */
+   if (strchr(^=!, c)
+   == NULL) {
+

[PHP-CVS] cvs: php-src(PHP_5_3) /ext/fileinfo/libmagic apprentice.c apptype.c cdf.c cdf.h compress.c file.h funcs.c magic.c patchlevel.h readcdf.c softmagic.c

2009-05-04 Thread Scott MacVicar

scottmacMon May  4 20:54:53 2009 UTC

  Modified files:  (Branch: PHP_5_3)
/php-src/ext/fileinfo/libmagic  apprentice.c apptype.c cdf.c cdf.h 
compress.c file.h funcs.c magic.c 
patchlevel.h readcdf.c softmagic.c 
  Log:
  MFH Update libmagic to 5.02
  
  http://cvs.php.net/viewvc.cgi/php-src/ext/fileinfo/libmagic/apprentice.c?r1=1.7.2.14r2=1.7.2.15diff_format=u
Index: php-src/ext/fileinfo/libmagic/apprentice.c
diff -u php-src/ext/fileinfo/libmagic/apprentice.c:1.7.2.14 
php-src/ext/fileinfo/libmagic/apprentice.c:1.7.2.15
--- php-src/ext/fileinfo/libmagic/apprentice.c:1.7.2.14 Mon Mar 16 15:03:06 2009
+++ php-src/ext/fileinfo/libmagic/apprentice.c  Mon May  4 20:54:53 2009
@@ -96,8 +96,8 @@
 
 private int getvalue(struct magic_set *ms, struct magic *, const char **, int);
 private int hextoint(int);
-private const char *getstr(struct magic_set *, const char *, char *, int,
-int *, int);
+private const char *getstr(struct magic_set *, struct magic *, const char *,
+int);
 private int parse(struct magic_set *, struct magic_entry **, uint32_t *,
 const char *, size_t, int);
 private void eatsize(const char **);
@@ -1668,8 +1668,7 @@
 * string is not one character long
 */
file_magwarn(ms, Printf format `%c' is not valid for type 
-   `%s' in description `%s',
-ptr  *ptr ? *ptr : '?',
+   `%s' in description `%s', *ptr ? *ptr : '?',
 file_names[m-type], m-desc);
return -1;
}
@@ -1694,8 +1693,6 @@
 private int
 getvalue(struct magic_set *ms, struct magic *m, const char **p, int action)
 {
-   int slen;
-
switch (m-type) {
case FILE_BESTRING16:
case FILE_LESTRING16:
@@ -1703,16 +1700,13 @@
case FILE_PSTRING:
case FILE_REGEX:
case FILE_SEARCH:
-   *p = getstr(ms, *p, m-value.s, sizeof(m-value.s), slen, 
action);
+   *p = getstr(ms, m, *p, action == FILE_COMPILE);
if (*p == NULL) {
if (ms-flags  MAGIC_CHECK)
file_magwarn(ms, cannot get string from `%s',
m-value.s);
return -1;
}
-   m-vallen = slen;
-   if (m-type == FILE_PSTRING)
-   m-vallen++;
return 0;
case FILE_FLOAT:
case FILE_BEFLOAT:
@@ -1751,13 +1745,15 @@
 /*
  * Convert a string containing C character escapes.  Stop at an unescaped
  * space or tab.
- * Copy the converted version to p, returning its length in *slen.
- * Return updated scan pointer as function result.
+ * Copy the converted version to m-value.s, and the length in m-vallen.
+ * Return updated scan pointer as function result. Warn if set.
  */
 private const char *
-getstr(struct magic_set *ms, const char *s, char *p, int plen, int *slen, int 
action)
+getstr(struct magic_set *ms, struct magic *m, const char *s, int warn)
 {
const char *origs = s;
+   char*p = m-value.s;
+   size_t  plen = sizeof(m-value.s);
char*origp = p;
char*pmax = p + plen - 1;
int c;
@@ -1774,25 +1770,33 @@
switch(c = *s++) {
 
case '\0':
-   if (action == FILE_COMPILE)
+   if (warn)
file_magwarn(ms, incomplete escape);
goto out;
 
case '\t':
-   if (action == FILE_COMPILE) {
+   if (warn) {
file_magwarn(ms,
escaped tab found, use \\t 
instead);
-   action++;
+   warn = 0;   /* already did */
}
/*FALLTHROUGH*/
default:
-   if (action == FILE_COMPILE) {
-   if (isprint((unsigned char)c))
-   file_magwarn(ms,
-   no need to escape `%c', c);
-   else
-   file_magwarn(ms,
-   unknown escape sequence: 
\\%03o, c);
+   if (warn) {
+   if (isprint((unsigned char)c)) {
+   /* Allow escaping of 
+* ``relations'' */
+   if (strchr(^=!, c)
+

[PHP-CVS] cvs: php-src /win32 php_stdint.h

2009-05-04 Thread Pierre-Alain Joye

pajoye  Mon May  4 21:03:00 2009 UTC

  Modified files:  
/php-src/win32  php_stdint.h 
  Log:
  - revert last commit and fix inline
  
http://cvs.php.net/viewvc.cgi/php-src/win32/php_stdint.h?r1=1.6r2=1.7diff_format=u
Index: php-src/win32/php_stdint.h
diff -u php-src/win32/php_stdint.h:1.6 php-src/win32/php_stdint.h:1.7
--- php-src/win32/php_stdint.h:1.6  Mon May  4 20:32:33 2009
+++ php-src/win32/php_stdint.h  Mon May  4 21:03:00 2009
@@ -264,7 +264,7 @@
 #define INTMAX_C   INT64_C
 #define UINTMAX_C  UINT64_C
 
-#define llabs(i) (i = 0? i : -i)
+static __inline int64_t llabs( int64_t i ) { return i = 0? i: -i; }
 
 #endif // __STDC_CONSTANT_MACROS ]
 



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

[PHP-CVS] cvs: php-src(PHP_5_3) /win32 php_stdint.h

2009-05-04 Thread Pierre-Alain Joye

pajoye  Mon May  4 21:03:20 2009 UTC

  Modified files:  (Branch: PHP_5_3)
/php-src/win32  php_stdint.h 
  Log:
  - revert last commit and fix inline
  
http://cvs.php.net/viewvc.cgi/php-src/win32/php_stdint.h?r1=1.1.2.6r2=1.1.2.7diff_format=u
Index: php-src/win32/php_stdint.h
diff -u php-src/win32/php_stdint.h:1.1.2.6 php-src/win32/php_stdint.h:1.1.2.7
--- php-src/win32/php_stdint.h:1.1.2.6  Mon May  4 20:31:02 2009
+++ php-src/win32/php_stdint.h  Mon May  4 21:03:20 2009
@@ -238,7 +238,8 @@
 #define INTMAX_C   INT64_C
 #define UINTMAX_C  UINT64_C
 
-#define llabs(i) (i = 0? i : -i)
+static __inline int64_t llabs( int64_t i ) { return i = 0? i: -i; }
+
 #endif // __STDC_CONSTANT_MACROS ]
 
 



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

[PHP-CVS] cvs: php-src(PHP_5_3) / NEWS

2009-05-04 Thread Scott MacVicar

scottmacMon May  4 21:11:41 2009 UTC

  Modified files:  (Branch: PHP_5_3)
/php-srcNEWS 
  Log:
  BFN
  
  
http://cvs.php.net/viewvc.cgi/php-src/NEWS?r1=1.2027.2.547.2.965.2.581r2=1.2027.2.547.2.965.2.582diff_format=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.2027.2.547.2.965.2.581 
php-src/NEWS:1.2027.2.547.2.965.2.582
--- php-src/NEWS:1.2027.2.547.2.965.2.581   Mon May  4 19:02:26 2009
+++ php-src/NEWSMon May  4 21:11:40 2009
@@ -3,6 +3,7 @@
 ?? ??? 200?, PHP 5.3.0 RC 2
 - Upgraded bundled sqlite to version 3.6.13. (Ilia)
 - Upgraded bundled PCRE to version 7.9. (Nuno)
+- Upgraded bundled libmagic to 5.02 in the fileinfo extension. (Scott)
 
 - Undeprecated ticks. (Arnaud)
 



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

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

2009-05-04 Thread Jani Taskinen

janiTue May  5 00:25:40 2009 UTC

  Modified files:  (Branch: PHP_5_2)
/php-src/ext/standard   http_fopen_wrapper.c 
  Log:
  MFH: sync
  
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/http_fopen_wrapper.c?r1=1.99.2.12.2.13r2=1.99.2.12.2.14diff_format=u
Index: php-src/ext/standard/http_fopen_wrapper.c
diff -u php-src/ext/standard/http_fopen_wrapper.c:1.99.2.12.2.13 
php-src/ext/standard/http_fopen_wrapper.c:1.99.2.12.2.14
--- php-src/ext/standard/http_fopen_wrapper.c:1.99.2.12.2.13Wed Dec 31 
11:17:45 2008
+++ php-src/ext/standard/http_fopen_wrapper.c   Tue May  5 00:25:40 2009
@@ -19,7 +19,7 @@
|  Sara Golemon poll...@php.net  |
+--+
  */
-/* $Id: http_fopen_wrapper.c,v 1.99.2.12.2.13 2008/12/31 11:17:45 sebastian 
Exp $ */ 
+/* $Id: http_fopen_wrapper.c,v 1.99.2.12.2.14 2009/05/05 00:25:40 jani Exp $ 
*/ 
 
 #include php.h
 #include php_globals.h
@@ -81,7 +81,7 @@
 #define HTTP_HEADER_CONTENT_LENGTH 16
 #define HTTP_HEADER_TYPE   32
 
-php_stream *php_stream_url_wrap_http_ex(php_stream_wrapper *wrapper, char 
*path, char *mode, int options, char **opened_path, php_stream_context 
*context, int redirect_max, int header_init STREAMS_DC TSRMLS_DC)
+php_stream *php_stream_url_wrap_http_ex(php_stream_wrapper *wrapper, char 
*path, char *mode, int options, char **opened_path, php_stream_context 
*context, int redirect_max, int header_init STREAMS_DC TSRMLS_DC) /* {{{ */
 {
php_stream *stream = NULL;
php_url *resource = NULL;
@@ -390,7 +390,7 @@
strcat(scratch, :);
strcat(scratch, resource-pass);
 
-   tmp = php_base64_encode((unsigned char*)scratch, 
strlen(scratch), NULL);
+   tmp = (char*)php_base64_encode((unsigned char*)scratch, 
strlen(scratch), NULL);

if (snprintf(scratch, scratch_len, Authorization: Basic 
%s\r\n, tmp)  0) {
php_stream_write(stream, scratch, strlen(scratch));
@@ -665,7 +665,7 @@
unsigned char *s, *e;   \
int l;  \
l = php_url_decode(val, strlen(val));   \
-   s = val; e = s + l; \
+   s = (unsigned char*)val; e = s + l; \
while (s  e) { \
if (iscntrl(*s)) {  \
php_stream_wrapper_log_error(wrapper, options 
TSRMLS_CC, Invalid redirect URL! %s, new_path); \
@@ -724,22 +724,22 @@
 
return stream;
 }
+/* }}} */
 
-php_stream *php_stream_url_wrap_http(php_stream_wrapper *wrapper, char *path, 
char *mode, int options, char **opened_path, php_stream_context *context 
STREAMS_DC TSRMLS_DC)
+php_stream *php_stream_url_wrap_http(php_stream_wrapper *wrapper, char *path, 
char *mode, int options, char **opened_path, php_stream_context *context 
STREAMS_DC TSRMLS_DC) /* {{{ */
 {
return php_stream_url_wrap_http_ex(wrapper, path, mode, options, 
opened_path, context, PHP_URL_REDIRECT_MAX, 1 STREAMS_CC TSRMLS_CC);
 }
+/* }}} */
 
-static int php_stream_http_stream_stat(php_stream_wrapper *wrapper,
-   php_stream *stream,
-   php_stream_statbuf *ssb
-   TSRMLS_DC)
+static int php_stream_http_stream_stat(php_stream_wrapper *wrapper, php_stream 
*stream, php_stream_statbuf *ssb TSRMLS_DC) /* {{{ */
 {
/* one day, we could fill in the details based on Date: and 
Content-Length:
 * headers.  For now, we return with a failure code to prevent the 
underlying
 * file's details from being used instead. */
return -1;
 }
+/* }}} */
 
 static php_stream_wrapper_ops http_stream_wops = {
php_stream_url_wrap_http,



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

[PHP-CVS] cvs: php-src /ext/curl streams.c /ext/standard http_fopen_wrapper.c

2009-05-04 Thread Jani Taskinen

janiTue May  5 00:30:40 2009 UTC

  Modified files:  
/php-src/ext/curl   streams.c 
/php-src/ext/standard   http_fopen_wrapper.c 
  Log:
  - Fixed bug #45092 (header HTTP context option not being used with 
--with-curlwrappers)
  [DOC] Synced regular and cURL http wrapper header option to accept
  [DOC] either string or array.
  
  
http://cvs.php.net/viewvc.cgi/php-src/ext/curl/streams.c?r1=1.32r2=1.33diff_format=u
Index: php-src/ext/curl/streams.c
diff -u php-src/ext/curl/streams.c:1.32 php-src/ext/curl/streams.c:1.33
--- php-src/ext/curl/streams.c:1.32 Tue Mar 10 23:39:11 2009
+++ php-src/ext/curl/streams.c  Tue May  5 00:30:40 2009
@@ -16,7 +16,7 @@
+--+
 */
 
-/* $Id: streams.c,v 1.32 2009/03/10 23:39:11 helly Exp $ */
+/* $Id: streams.c,v 1.33 2009/05/05 00:30:40 jani Exp $ */
 
 /* This file implements cURL based wrappers.
  * NOTE: If you are implementing your own streams that are intended to
@@ -48,6 +48,7 @@
 #include ext/standard/php_smart_str.h
 #include ext/standard/info.h
 #include ext/standard/file.h
+#include ext/standard/php_string.h
 #include php_curl.h
 
 static size_t on_data_available(char *data, size_t size, size_t nmemb, void 
*ctx)
@@ -263,6 +264,7 @@
php_stream *stream;
php_curl_stream *curlstream;
zval *tmp, **ctx_opt = NULL;
+   struct curl_slist *slist = NULL;
 
curlstream = emalloc(sizeof(php_curl_stream));
memset(curlstream, 0, sizeof(php_curl_stream));
@@ -311,6 +313,15 @@

/* TODO: read cookies and options from context */
if (context  !strncasecmp(filename, http, sizeof(http)-1)) {
+   /* Protocol version */
+   if (SUCCESS == php_stream_context_get_option(context, http, 
protocol_version, ctx_opt)  Z_TYPE_PP(ctx_opt) == IS_DOUBLE) {
+   if (Z_DVAL_PP(ctx_opt) == 1.1) {
+   curl_easy_setopt(curlstream-curl, 
CURLOPT_HTTP_VERSION, CURL_HTTP_VERSION_1_1);
+   } else {
+   curl_easy_setopt(curlstream-curl, 
CURLOPT_HTTP_VERSION, CURL_HTTP_VERSION_1_0);
+   }
+   }
+
if (SUCCESS == php_stream_context_get_option(context, http, 
curl_verify_ssl_host, ctx_opt)  Z_TYPE_PP(ctx_opt) == IS_BOOL  
Z_LVAL_PP(ctx_opt) == 1) {
curl_easy_setopt(curlstream-curl, 
CURLOPT_SSL_VERIFYHOST, 1);
} else {
@@ -326,20 +337,34 @@
if (SUCCESS == php_stream_context_get_option(context, http, 
user_agent, ctx_opt)  Z_TYPE_PP(ctx_opt) == IS_STRING) {
curl_easy_setopt(curlstream-curl, CURLOPT_USERAGENT, 
Z_STRVAL_PP(ctx_opt));
}
-   if (SUCCESS == php_stream_context_get_option(context, http, 
header, ctx_opt)  Z_TYPE_PP(ctx_opt) == IS_ARRAY) {
-   HashPosition pos;
-   zval **header = NULL;
-   struct curl_slist *hl = NULL;
+   if (SUCCESS == php_stream_context_get_option(context, http, 
header, ctx_opt)) {
+   if (Z_TYPE_PP(ctx_opt) == IS_ARRAY) {
+   HashPosition pos;
+   zval **header = NULL;

-   for 
(zend_hash_internal_pointer_reset_ex(Z_ARRVAL_PP(ctx_opt), pos);
-   SUCCESS == 
zend_hash_get_current_data_ex(Z_ARRVAL_PP(ctx_opt), (void *)header, pos);
-   zend_hash_move_forward_ex(Z_ARRVAL_PP(ctx_opt), 
pos)) {
-   if (Z_TYPE_PP(header) == IS_STRING) {
-   hl = curl_slist_append(hl, 
Z_STRVAL_PP(header));
+   for 
(zend_hash_internal_pointer_reset_ex(Z_ARRVAL_PP(ctx_opt), pos);
+   SUCCESS == 
zend_hash_get_current_data_ex(Z_ARRVAL_PP(ctx_opt), (void *)header, pos);
+   
zend_hash_move_forward_ex(Z_ARRVAL_PP(ctx_opt), pos)
+   ) {
+   if (Z_TYPE_PP(header) == IS_STRING) {
+   slist = 
curl_slist_append(slist, Z_STRVAL_PP(header));
+   }
}
+   } else if (Z_TYPE_PP(ctx_opt) == IS_STRING  
Z_STRLEN_PP(ctx_opt)) {
+   char *p, *token, *trimmed, *copy_ctx_opt;
+
+   copy_ctx_opt = php_trim(Z_STRVAL_PP(ctx_opt), 
Z_STRLEN_PP(ctx_opt), NULL, 0, NULL, 3 TSRMLS_CC);
+   p = php_strtok_r(copy_ctx_opt, \r\n, token);
+   while (p) {
+   trimmed = php_trim(p, strlen(p), NULL, 
0, NULL, 3 TSRMLS_CC);
+

[PHP-CVS] cvs: php-src(PHP_5_3) /ext/curl streams.c /ext/standard http_fopen_wrapper.c

2009-05-04 Thread Jani Taskinen

janiTue May  5 00:31:56 2009 UTC

  Modified files:  (Branch: PHP_5_3)
/php-src/ext/curl   streams.c 
/php-src/ext/standard   http_fopen_wrapper.c 
  Log:
  MFH: - Fixed Bug #45092header HTTP context option not being used 
(--with-curlwrappers)
  
http://cvs.php.net/viewvc.cgi/php-src/ext/curl/streams.c?r1=1.14.2.2.2.11.2.4r2=1.14.2.2.2.11.2.5diff_format=u
Index: php-src/ext/curl/streams.c
diff -u php-src/ext/curl/streams.c:1.14.2.2.2.11.2.4 
php-src/ext/curl/streams.c:1.14.2.2.2.11.2.5
--- php-src/ext/curl/streams.c:1.14.2.2.2.11.2.4Mon Feb 23 15:58:19 2009
+++ php-src/ext/curl/streams.c  Tue May  5 00:31:56 2009
@@ -16,7 +16,7 @@
+--+
 */
 
-/* $Id: streams.c,v 1.14.2.2.2.11.2.4 2009/02/23 15:58:19 iliaa Exp $ */
+/* $Id: streams.c,v 1.14.2.2.2.11.2.5 2009/05/05 00:31:56 jani Exp $ */
 
 /* This file implements cURL based wrappers.
  * NOTE: If you are implementing your own streams that are intended to
@@ -48,6 +48,7 @@
 #include ext/standard/php_smart_str.h
 #include ext/standard/info.h
 #include ext/standard/file.h
+#include ext/standard/php_string.h
 #include php_curl.h
 
 static size_t on_data_available(char *data, size_t size, size_t nmemb, void 
*ctx)
@@ -263,6 +264,7 @@
php_stream *stream;
php_curl_stream *curlstream;
zval *tmp, **ctx_opt = NULL;
+   struct curl_slist *slist = NULL;
 
curlstream = emalloc(sizeof(php_curl_stream));
memset(curlstream, 0, sizeof(php_curl_stream));
@@ -311,6 +313,15 @@

/* TODO: read cookies and options from context */
if (context  !strncasecmp(filename, http, sizeof(http)-1)) {
+   /* Protocol version */
+   if (SUCCESS == php_stream_context_get_option(context, http, 
protocol_version, ctx_opt)  Z_TYPE_PP(ctx_opt) == IS_DOUBLE) {
+   if (Z_DVAL_PP(ctx_opt) == 1.1) {
+   curl_easy_setopt(curlstream-curl, 
CURLOPT_HTTP_VERSION, CURL_HTTP_VERSION_1_1);
+   } else {
+   curl_easy_setopt(curlstream-curl, 
CURLOPT_HTTP_VERSION, CURL_HTTP_VERSION_1_0);
+   }
+   }
+
if (SUCCESS == php_stream_context_get_option(context, http, 
curl_verify_ssl_host, ctx_opt)  Z_TYPE_PP(ctx_opt) == IS_BOOL  
Z_LVAL_PP(ctx_opt) == 1) {
curl_easy_setopt(curlstream-curl, 
CURLOPT_SSL_VERIFYHOST, 1);
} else {
@@ -326,20 +337,34 @@
if (SUCCESS == php_stream_context_get_option(context, http, 
user_agent, ctx_opt)  Z_TYPE_PP(ctx_opt) == IS_STRING) {
curl_easy_setopt(curlstream-curl, CURLOPT_USERAGENT, 
Z_STRVAL_PP(ctx_opt));
}
-   if (SUCCESS == php_stream_context_get_option(context, http, 
header, ctx_opt)  Z_TYPE_PP(ctx_opt) == IS_ARRAY) {
-   HashPosition pos;
-   zval **header = NULL;
-   struct curl_slist *hl = NULL;
+   if (SUCCESS == php_stream_context_get_option(context, http, 
header, ctx_opt)) {
+   if (Z_TYPE_PP(ctx_opt) == IS_ARRAY) {
+   HashPosition pos;
+   zval **header = NULL;

-   for 
(zend_hash_internal_pointer_reset_ex(Z_ARRVAL_PP(ctx_opt), pos);
-   SUCCESS == 
zend_hash_get_current_data_ex(Z_ARRVAL_PP(ctx_opt), (void *)header, pos);
-   zend_hash_move_forward_ex(Z_ARRVAL_PP(ctx_opt), 
pos)) {
-   if (Z_TYPE_PP(header) == IS_STRING) {
-   hl = curl_slist_append(hl, 
Z_STRVAL_PP(header));
+   for 
(zend_hash_internal_pointer_reset_ex(Z_ARRVAL_PP(ctx_opt), pos);
+   SUCCESS == 
zend_hash_get_current_data_ex(Z_ARRVAL_PP(ctx_opt), (void *)header, pos);
+   
zend_hash_move_forward_ex(Z_ARRVAL_PP(ctx_opt), pos)
+   ) {
+   if (Z_TYPE_PP(header) == IS_STRING) {
+   slist = 
curl_slist_append(slist, Z_STRVAL_PP(header));
+   }
}
+   } else if (Z_TYPE_PP(ctx_opt) == IS_STRING  
Z_STRLEN_PP(ctx_opt)) {
+   char *p, *token, *trimmed, *copy_ctx_opt;
+
+   copy_ctx_opt = php_trim(Z_STRVAL_PP(ctx_opt), 
Z_STRLEN_PP(ctx_opt), NULL, 0, NULL, 3 TSRMLS_CC);
+   p = php_strtok_r(copy_ctx_opt, \r\n, token);
+   while (p) {
+   trimmed = php_trim(p, strlen(p), NULL, 
0, NULL, 3 TSRMLS_CC);
+

[PHP-CVS] cvs: php-src(PHP_5_2) / NEWS /ext/curl streams.c /ext/standard http_fopen_wrapper.c

2009-05-04 Thread Jani Taskinen

janiTue May  5 00:33:03 2009 UTC

  Modified files:  (Branch: PHP_5_2)
/php-src/ext/curl   streams.c 
/php-src/ext/standard   http_fopen_wrapper.c 
/php-srcNEWS 
  Log:
  MFH: - Fixed Bug #45092 header HTTP context option not being used 
(--with-curlwrappers)
  
http://cvs.php.net/viewvc.cgi/php-src/ext/curl/streams.c?r1=1.14.2.2.2.13r2=1.14.2.2.2.14diff_format=u
Index: php-src/ext/curl/streams.c
diff -u php-src/ext/curl/streams.c:1.14.2.2.2.13 
php-src/ext/curl/streams.c:1.14.2.2.2.14
--- php-src/ext/curl/streams.c:1.14.2.2.2.13Wed Dec 31 11:17:36 2008
+++ php-src/ext/curl/streams.c  Tue May  5 00:33:02 2009
@@ -16,7 +16,7 @@
+--+
 */
 
-/* $Id: streams.c,v 1.14.2.2.2.13 2008/12/31 11:17:36 sebastian Exp $ */
+/* $Id: streams.c,v 1.14.2.2.2.14 2009/05/05 00:33:02 jani Exp $ */
 
 /* This file implements cURL based wrappers.
  * NOTE: If you are implementing your own streams that are intended to
@@ -48,6 +48,7 @@
 #include ext/standard/php_smart_str.h
 #include ext/standard/info.h
 #include ext/standard/file.h
+#include ext/standard/php_string.h
 #include php_curl.h
 
 static size_t on_data_available(char *data, size_t size, size_t nmemb, void 
*ctx)
@@ -258,6 +259,7 @@
php_stream *stream;
php_curl_stream *curlstream;
zval *tmp, **ctx_opt = NULL;
+   struct curl_slist *slist = NULL;
 
curlstream = emalloc(sizeof(php_curl_stream));
memset(curlstream, 0, sizeof(php_curl_stream));
@@ -306,6 +308,15 @@

/* TODO: read cookies and options from context */
if (context  !strncasecmp(filename, http, sizeof(http)-1)) {
+   /* Protocol version */
+   if (SUCCESS == php_stream_context_get_option(context, http, 
protocol_version, ctx_opt)  Z_TYPE_PP(ctx_opt) == IS_DOUBLE) {
+   if (Z_DVAL_PP(ctx_opt) == 1.1) {
+   curl_easy_setopt(curlstream-curl, 
CURLOPT_HTTP_VERSION, CURL_HTTP_VERSION_1_1);
+   } else {
+   curl_easy_setopt(curlstream-curl, 
CURLOPT_HTTP_VERSION, CURL_HTTP_VERSION_1_0);
+   }
+   }
+
if (SUCCESS == php_stream_context_get_option(context, http, 
curl_verify_ssl_host, ctx_opt)  Z_TYPE_PP(ctx_opt) == IS_BOOL  
Z_LVAL_PP(ctx_opt) == 1) {
curl_easy_setopt(curlstream-curl, 
CURLOPT_SSL_VERIFYHOST, 1);
} else {
@@ -321,20 +332,34 @@
if (SUCCESS == php_stream_context_get_option(context, http, 
user_agent, ctx_opt)  Z_TYPE_PP(ctx_opt) == IS_STRING) {
curl_easy_setopt(curlstream-curl, CURLOPT_USERAGENT, 
Z_STRVAL_PP(ctx_opt));
}
-   if (SUCCESS == php_stream_context_get_option(context, http, 
header, ctx_opt)  Z_TYPE_PP(ctx_opt) == IS_ARRAY) {
-   HashPosition pos;
-   zval **header = NULL;
-   struct curl_slist *hl = NULL;
+   if (SUCCESS == php_stream_context_get_option(context, http, 
header, ctx_opt)) {
+   if (Z_TYPE_PP(ctx_opt) == IS_ARRAY) {
+   HashPosition pos;
+   zval **header = NULL;

-   for 
(zend_hash_internal_pointer_reset_ex(Z_ARRVAL_PP(ctx_opt), pos);
-   SUCCESS == 
zend_hash_get_current_data_ex(Z_ARRVAL_PP(ctx_opt), (void *)header, pos);
-   zend_hash_move_forward_ex(Z_ARRVAL_PP(ctx_opt), 
pos)) {
-   if (Z_TYPE_PP(header) == IS_STRING) {
-   hl = curl_slist_append(hl, 
Z_STRVAL_PP(header));
+   for 
(zend_hash_internal_pointer_reset_ex(Z_ARRVAL_PP(ctx_opt), pos);
+   SUCCESS == 
zend_hash_get_current_data_ex(Z_ARRVAL_PP(ctx_opt), (void *)header, pos);
+   
zend_hash_move_forward_ex(Z_ARRVAL_PP(ctx_opt), pos)
+   ) {
+   if (Z_TYPE_PP(header) == IS_STRING) {
+   slist = 
curl_slist_append(slist, Z_STRVAL_PP(header));
+   }
}
+   } else if (Z_TYPE_PP(ctx_opt) == IS_STRING  
Z_STRLEN_PP(ctx_opt)) {
+   char *p, *token, *trimmed, *copy_ctx_opt;
+
+   copy_ctx_opt = php_trim(Z_STRVAL_PP(ctx_opt), 
Z_STRLEN_PP(ctx_opt), NULL, 0, NULL, 3 TSRMLS_CC);
+   p = php_strtok_r(copy_ctx_opt, \r\n, token);
+   while (p) {
+   trimmed = php_trim(p, strlen(p), NULL, 
0, NULL, 3 TSRMLS_CC);
+

[PHP-CVS] cvs: php-src(PHP_5_3) / NEWS

2009-05-04 Thread Jani Taskinen

janiTue May  5 00:39:34 2009 UTC

  Modified files:  (Branch: PHP_5_3)
/php-srcNEWS 
  Log:
  duh..
  
http://cvs.php.net/viewvc.cgi/php-src/NEWS?r1=1.2027.2.547.2.965.2.583r2=1.2027.2.547.2.965.2.584diff_format=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.2027.2.547.2.965.2.583 
php-src/NEWS:1.2027.2.547.2.965.2.584
--- php-src/NEWS:1.2027.2.547.2.965.2.583   Mon May  4 21:18:21 2009
+++ php-src/NEWSTue May  5 00:39:33 2009
@@ -1,4 +1,4 @@
-ï»¿PHP
NEWS
+PHPNEWS
 |||
 ?? ??? 200?, PHP 5.3.0 RC 2
 - Upgraded bundled sqlite to version 3.6.13. (Ilia)



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

[PHP-CVS] cvs: php-src(PHP_5_3) / NEWS

2009-05-04 Thread Matt Wilmas

mattwil Tue May  5 00:55:27 2009 UTC

  Modified files:  (Branch: PHP_5_3)
/php-srcNEWS 
  Log:
  Changed wording
  
http://cvs.php.net/viewvc.cgi/php-src/NEWS?r1=1.2027.2.547.2.965.2.584r2=1.2027.2.547.2.965.2.585diff_format=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.2027.2.547.2.965.2.584 
php-src/NEWS:1.2027.2.547.2.965.2.585
--- php-src/NEWS:1.2027.2.547.2.965.2.584   Tue May  5 00:39:33 2009
+++ php-src/NEWSTue May  5 00:55:27 2009
@@ -22,7 +22,7 @@
   open(2) system call. (Mikko)
 - Added dechunk filter which can decode HTTP responses with chunked
   transfer-encoding. HTTP streams use this filter automatically in case
-  Transfer-Encoding: chunked header presents in response. It's possible to
+  Transfer-Encoding: chunked header is present in response. It's possible to
   disable this behaviour using http=array(auto_decode=0) in stream
   context. (Dmitry)
 - Added ability to throw exceptions from SQLite3 instead of warnings. (Scott)



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

Re: [PHP-CVS] cvs: php-src(PHP_5_3) / NEWS

2009-05-04 Thread Jani Taskinen


Matt Wilmas kirjoitti:

mattwil Tue May  5 00:55:27 2009 UTC

  Modified files:  (Branch: PHP_5_3)
/php-src	NEWS 
  Log:

  Changed wording
  
http://cvs.php.net/viewvc.cgi/php-src/NEWS?r1=1.2027.2.547.2.965.2.584r2=1.2027.2.547.2.965.2.585diff_format=u

Index: php-src/NEWS
diff -u php-src/NEWS:1.2027.2.547.2.965.2.584 
php-src/NEWS:1.2027.2.547.2.965.2.585
--- php-src/NEWS:1.2027.2.547.2.965.2.584   Tue May  5 00:39:33 2009
+++ php-src/NEWSTue May  5 00:55:27 2009
@@ -22,7 +22,7 @@
   open(2) system call. (Mikko)
 - Added dechunk filter which can decode HTTP responses with chunked
   transfer-encoding. HTTP streams use this filter automatically in case
-  Transfer-Encoding: chunked header presents in response. It's possible to
+  Transfer-Encoding: chunked header is present in response. It's possible to
   disable this behaviour using http=array(auto_decode=0) in stream
   context. (Dmitry)
 - Added ability to throw exceptions from SQLite3 instead of warnings. (Scott)



The NEWS file is not the right place to document stuff..

--Jani

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

[PHP-CVS] cvs: php-src(PHP_5_3) /ext/imap php_imap.c

2009-05-04 Thread Jani Taskinen

janiTue May  5 01:21:10 2009 UTC

  Modified files:  (Branch: PHP_5_3)
/php-src/ext/imap   php_imap.c 
  Log:
  - sync with HEAD
  
http://cvs.php.net/viewvc.cgi/php-src/ext/imap/php_imap.c?r1=1.208.2.7.2.26.2.45r2=1.208.2.7.2.26.2.46diff_format=u
Index: php-src/ext/imap/php_imap.c
diff -u php-src/ext/imap/php_imap.c:1.208.2.7.2.26.2.45 
php-src/ext/imap/php_imap.c:1.208.2.7.2.26.2.46
--- php-src/ext/imap/php_imap.c:1.208.2.7.2.26.2.45 Sat May  2 17:59:46 2009
+++ php-src/ext/imap/php_imap.c Tue May  5 01:21:10 2009
@@ -26,7 +26,7 @@
| PHP 4.0 updates:  Zeev Suraski z...@zend.com   |
+--+
  */
-/* $Id: php_imap.c,v 1.208.2.7.2.26.2.45 2009/05/02 17:59:46 pajoye Exp $ */
+/* $Id: php_imap.c,v 1.208.2.7.2.26.2.46 2009/05/05 01:21:10 jani Exp $ */
 
 #define IMAP41
 
@@ -860,7 +860,7 @@
REGISTER_LONG_CONSTANT(NIL, NIL, CONST_PERSISTENT | CONST_CS);
 
/* plug in our gets */
-   mail_parameters(NIL, SET_GETS, (void *) NULL);
+   mail_parameters(NIL, SET_GETS, (void *) NIL);
 
/* set default timeout values */
mail_parameters(NIL, SET_OPENTIMEOUT, (void *) 
FG(default_socket_timeout));
@@ -2342,7 +2342,7 @@
IMAPG(gets_stream) = writer;
mail_parameters(NIL, SET_GETS, (void *) php_mail_gets);
mail_fetchbody_full(imap_ptr-imap_stream, msgno, section, NULL, flags);
-   mail_parameters(NIL, SET_GETS, (void *) NULL);
+   mail_parameters(NIL, SET_GETS, (void *) NIL);
IMAPG(gets_stream) = NULL;
 
if (close_stream) {



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

[PHP-CVS] cvs: php-src /ext/imap config.m4 php_imap.c php_imap.h

2009-05-04 Thread Jani Taskinen

janiTue May  5 01:22:31 2009 UTC

  Modified files:  
/php-src/ext/imap   config.m4 php_imap.c php_imap.h 
  Log:
  - Fix build (modified utf7 stuff is rather new..)
  
http://cvs.php.net/viewvc.cgi/php-src/ext/imap/config.m4?r1=1.79r2=1.80diff_format=u
Index: php-src/ext/imap/config.m4
diff -u php-src/ext/imap/config.m4:1.79 php-src/ext/imap/config.m4:1.80
--- php-src/ext/imap/config.m4:1.79 Sat Apr  4 16:58:39 2009
+++ php-src/ext/imap/config.m4  Tue May  5 01:22:31 2009
@@ -1,5 +1,5 @@
 dnl
-dnl $Id: config.m4,v 1.79 2009/04/04 16:58:39 sean Exp $
+dnl $Id: config.m4,v 1.80 2009/05/05 01:22:31 jani Exp $
 dnl
 
 AC_DEFUN([IMAP_INC_CHK],[if test -r $i$1/c-client.h; then
@@ -228,13 +228,10 @@
   AC_DEFINE(HAVE_IMAP_AUTH_GSS, 1, [ ])
 ], [], $TST_LIBS)
 
-AC_MSG_CHECKING(whether build with IMAP works)
-PHP_IMAP_TEST_BUILD(mail_newbody, [
-  AC_MSG_RESULT(yes)
-], [
-  AC_MSG_RESULT(no)
-  AC_MSG_ERROR([build test failed. Please check the config.log for 
details.])
-], $TST_LIBS)
+dnl Check if utf8_to_mutf7 exists
+PHP_IMAP_TEST_BUILD(utf8_to_mutf7, [
+  AC_DEFINE(HAVE_IMAP_MUTF7, 1, [ ])
+], [], $TST_LIBS)
 
 AC_MSG_CHECKING(whether rfc822_output_address_list function present)
 PHP_TEST_BUILD(foobar, [
@@ -271,4 +268,11 @@
   char foobar () {f = rfc822_output_address_list;}
 ])
 
+AC_MSG_CHECKING(whether build with IMAP works)
+PHP_IMAP_TEST_BUILD(mail_newbody, [
+  AC_MSG_RESULT(yes)
+], [
+  AC_MSG_RESULT(no)
+  AC_MSG_ERROR([build test failed. Please check the config.log for 
details.])
+], $TST_LIBS)
 fi
http://cvs.php.net/viewvc.cgi/php-src/ext/imap/php_imap.c?r1=1.286r2=1.287diff_format=u
Index: php-src/ext/imap/php_imap.c
diff -u php-src/ext/imap/php_imap.c:1.286 php-src/ext/imap/php_imap.c:1.287
--- php-src/ext/imap/php_imap.c:1.286   Sat May  2 17:32:35 2009
+++ php-src/ext/imap/php_imap.c Tue May  5 01:22:31 2009
@@ -26,7 +26,7 @@
| PHP 4.0 updates:  Zeev Suraski z...@zend.com   |
+--+
  */
-/* $Id: php_imap.c,v 1.286 2009/05/02 17:32:35 pajoye Exp $ */
+/* $Id: php_imap.c,v 1.287 2009/05/05 01:22:31 jani Exp $ */
 
 #define IMAP41
 
@@ -351,6 +351,7 @@
ZEND_ARG_INFO(0, buf)
 ZEND_END_ARG_INFO()
 
+#ifdef HAVE_IMAP_MUTF7
 ZEND_BEGIN_ARG_INFO_EX(arginfo_imap_utf8_to_mutf7, 0, 0, 1)
ZEND_ARG_INFO(0, in)
 ZEND_END_ARG_INFO()
@@ -358,6 +359,7 @@
 ZEND_BEGIN_ARG_INFO_EX(arginfo_imap_mutf7_to_utf8, 0, 0, 1)
ZEND_ARG_INFO(0, in)
 ZEND_END_ARG_INFO()
+#endif
 
 ZEND_BEGIN_ARG_INFO_EX(arginfo_imap_setflag_full, 0, 0, 3)
ZEND_ARG_INFO(0, stream_id)
@@ -517,8 +519,10 @@
PHP_FE(imap_search, 
arginfo_imap_search)
PHP_FE(imap_utf7_decode,
arginfo_imap_utf7_decode)
PHP_FE(imap_utf7_encode,
arginfo_imap_utf7_encode)
+#ifdef HAVE_IMAP_MUTF7
PHP_FE(imap_utf8_to_mutf7,  
arginfo_imap_utf8_to_mutf7)
PHP_FE(imap_mutf7_to_utf8,  
arginfo_imap_mutf7_to_utf8)
+#endif
PHP_FE(imap_mime_header_decode, 
arginfo_imap_mime_header_decode)
PHP_FE(imap_thread, 
arginfo_imap_thread)
PHP_FE(imap_timeout,
arginfo_imap_timeout)
@@ -2338,7 +2342,7 @@
IMAPG(gets_stream) = writer;
mail_parameters(NIL, SET_GETS, (void *) php_mail_gets);
mail_fetchbody_full(imap_ptr-imap_stream, msgno, section, NULL, flags);
-   mail_parameters(NIL, SET_GETS, (void *) NIL);
+   mail_parameters(NIL, SET_GETS, (void *) NULL);
IMAPG(gets_stream) = NULL;
 
if (close_stream) {
@@ -2891,6 +2895,7 @@
 #undef B64
 #undef UNB64
 
+#ifdef HAVE_IMAP_MUTF7
 static void php_imap_mutf7(INTERNAL_FUNCTION_PARAMETERS, int mode)
 {
char *in;
@@ -2937,6 +2942,7 @@
 {
php_imap_mutf7(INTERNAL_FUNCTION_PARAM_PASSTHRU, 0);
 }
+#endif
 
 /* {{{ proto string imap_mutf7_to_utf8(string in)
Decode a modified UTF-7 string to UTF-8 */
http://cvs.php.net/viewvc.cgi/php-src/ext/imap/php_imap.h?r1=1.40r2=1.41diff_format=u
Index: php-src/ext/imap/php_imap.h
diff -u php-src/ext/imap/php_imap.h:1.40 php-src/ext/imap/php_imap.h:1.41
--- php-src/ext/imap/php_imap.h:1.40Sat May  2 17:32:35 2009
+++ php-src/ext/imap/php_imap.h Tue May  5 01:22:31 2009
@@ -27,7 +27,7 @@
+--+
  */
 
-/* $Id: php_imap.h,v 1.40 2009/05/02 17:32:35 pajoye Exp $ */
+/* $Id: php_imap.h,v 1.41 2009/05/05 01:22:31 jani Exp $ */
 
 #ifndef PHP_IMAP_H
 #define PHP_IMAP_H
@@

[PHP-CVS] cvs: php-src(PHP_5_3) /ext/imap config.m4 php_imap.c php_imap.h

2009-05-04 Thread Jani Taskinen

janiTue May  5 01:22:44 2009 UTC

  Modified files:  (Branch: PHP_5_3)
/php-src/ext/imap   config.m4 php_imap.c php_imap.h 
  Log:
  MFH: fix build
  
http://cvs.php.net/viewvc.cgi/php-src/ext/imap/config.m4?r1=1.69.4.7.2.2r2=1.69.4.7.2.3diff_format=u
Index: php-src/ext/imap/config.m4
diff -u php-src/ext/imap/config.m4:1.69.4.7.2.2 
php-src/ext/imap/config.m4:1.69.4.7.2.3
--- php-src/ext/imap/config.m4:1.69.4.7.2.2 Thu Oct 16 16:21:06 2008
+++ php-src/ext/imap/config.m4  Tue May  5 01:22:44 2009
@@ -1,5 +1,5 @@
 dnl
-dnl $Id: config.m4,v 1.69.4.7.2.2 2008/10/16 16:21:06 dmitry Exp $
+dnl $Id: config.m4,v 1.69.4.7.2.3 2009/05/05 01:22:44 jani Exp $
 dnl
 
 AC_DEFUN([IMAP_INC_CHK],[if test -r $i$1/c-client.h; then
@@ -228,13 +228,10 @@
   AC_DEFINE(HAVE_IMAP_AUTH_GSS, 1, [ ])
 ], [], $TST_LIBS)
 
-AC_MSG_CHECKING(whether build with IMAP works)
-PHP_IMAP_TEST_BUILD(mail_newbody, [
-  AC_MSG_RESULT(yes)
-], [
-  AC_MSG_RESULT(no)
-  AC_MSG_ERROR([build test failed. Please check the config.log for 
details.])
-], $TST_LIBS)
+dnl Check if utf8_to_mutf7 exists
+PHP_IMAP_TEST_BUILD(utf8_to_mutf7, [
+  AC_DEFINE(HAVE_IMAP_MUTF7, 1, [ ])
+], [], $TST_LIBS)
 
 AC_MSG_CHECKING(whether rfc822_output_address_list function present)
 PHP_TEST_BUILD(foobar, [
@@ -271,4 +268,11 @@
   char foobar () {f = rfc822_output_address_list;}
 ])
 
+AC_MSG_CHECKING(whether build with IMAP works)
+PHP_IMAP_TEST_BUILD(mail_newbody, [
+  AC_MSG_RESULT(yes)
+], [
+  AC_MSG_RESULT(no)
+  AC_MSG_ERROR([build test failed. Please check the config.log for 
details.])
+], $TST_LIBS)
 fi
http://cvs.php.net/viewvc.cgi/php-src/ext/imap/php_imap.c?r1=1.208.2.7.2.26.2.46r2=1.208.2.7.2.26.2.47diff_format=u
Index: php-src/ext/imap/php_imap.c
diff -u php-src/ext/imap/php_imap.c:1.208.2.7.2.26.2.46 
php-src/ext/imap/php_imap.c:1.208.2.7.2.26.2.47
--- php-src/ext/imap/php_imap.c:1.208.2.7.2.26.2.46 Tue May  5 01:21:10 2009
+++ php-src/ext/imap/php_imap.c Tue May  5 01:22:44 2009
@@ -26,7 +26,7 @@
| PHP 4.0 updates:  Zeev Suraski z...@zend.com   |
+--+
  */
-/* $Id: php_imap.c,v 1.208.2.7.2.26.2.46 2009/05/05 01:21:10 jani Exp $ */
+/* $Id: php_imap.c,v 1.208.2.7.2.26.2.47 2009/05/05 01:22:44 jani Exp $ */
 
 #define IMAP41
 
@@ -351,6 +351,7 @@
ZEND_ARG_INFO(0, buf)
 ZEND_END_ARG_INFO()
 
+#ifdef HAVE_IMAP_MUTF7
 ZEND_BEGIN_ARG_INFO_EX(arginfo_imap_utf8_to_mutf7, 0, 0, 1)
ZEND_ARG_INFO(0, in)
 ZEND_END_ARG_INFO()
@@ -358,6 +359,7 @@
 ZEND_BEGIN_ARG_INFO_EX(arginfo_imap_mutf7_to_utf8, 0, 0, 1)
ZEND_ARG_INFO(0, in)
 ZEND_END_ARG_INFO()
+#endif
 
 ZEND_BEGIN_ARG_INFO_EX(arginfo_imap_setflag_full, 0, 0, 3)
ZEND_ARG_INFO(0, stream_id)
@@ -517,8 +519,10 @@
PHP_FE(imap_search, 
arginfo_imap_search)
PHP_FE(imap_utf7_decode,
arginfo_imap_utf7_decode)
PHP_FE(imap_utf7_encode,
arginfo_imap_utf7_encode)
+#ifdef HAVE_IMAP_MUTF7
PHP_FE(imap_utf8_to_mutf7,  
arginfo_imap_utf8_to_mutf7)
PHP_FE(imap_mutf7_to_utf8,  
arginfo_imap_mutf7_to_utf8)
+#endif
PHP_FE(imap_mime_header_decode, 
arginfo_imap_mime_header_decode)
PHP_FE(imap_thread, 
arginfo_imap_thread)
PHP_FE(imap_timeout,
arginfo_imap_timeout)
@@ -2342,7 +2346,7 @@
IMAPG(gets_stream) = writer;
mail_parameters(NIL, SET_GETS, (void *) php_mail_gets);
mail_fetchbody_full(imap_ptr-imap_stream, msgno, section, NULL, flags);
-   mail_parameters(NIL, SET_GETS, (void *) NIL);
+   mail_parameters(NIL, SET_GETS, (void *) NULL);
IMAPG(gets_stream) = NULL;
 
if (close_stream) {
@@ -2895,6 +2899,7 @@
 #undef B64
 #undef UNB64
 
+#ifdef HAVE_IMAP_MUTF7
 static void php_imap_mutf7(INTERNAL_FUNCTION_PARAMETERS, int mode)
 {
char *in;
@@ -2935,6 +2940,7 @@
 {
php_imap_mutf7(INTERNAL_FUNCTION_PARAM_PASSTHRU, 1);
 }
+#endif
 
 /* {{{ proto bool imap_setflag_full(resource stream_id, string sequence, 
string flag [, int options])
Sets flags on messages */
http://cvs.php.net/viewvc.cgi/php-src/ext/imap/php_imap.h?r1=1.32.2.2.2.1.2.4r2=1.32.2.2.2.1.2.5diff_format=u
Index: php-src/ext/imap/php_imap.h
diff -u php-src/ext/imap/php_imap.h:1.32.2.2.2.1.2.4 
php-src/ext/imap/php_imap.h:1.32.2.2.2.1.2.5
--- php-src/ext/imap/php_imap.h:1.32.2.2.2.1.2.4Sat May  2 17:59:46 2009
+++ php-src/ext/imap/php_imap.h Tue May  5 01:22:44 2009
@@ -27,7 +27,7 @@

[PHP-CVS] cvs: php-src /ext/imap php_imap.c

2009-05-04 Thread Jani Taskinen

janiTue May  5 01:28:11 2009 UTC

  Modified files:  
/php-src/ext/imap   php_imap.c 
  Log:
  - Fix the patch
  
http://cvs.php.net/viewvc.cgi/php-src/ext/imap/php_imap.c?r1=1.287r2=1.288diff_format=u
Index: php-src/ext/imap/php_imap.c
diff -u php-src/ext/imap/php_imap.c:1.287 php-src/ext/imap/php_imap.c:1.288
--- php-src/ext/imap/php_imap.c:1.287   Tue May  5 01:22:31 2009
+++ php-src/ext/imap/php_imap.c Tue May  5 01:28:10 2009
@@ -26,7 +26,7 @@
| PHP 4.0 updates:  Zeev Suraski z...@zend.com   |
+--+
  */
-/* $Id: php_imap.c,v 1.287 2009/05/05 01:22:31 jani Exp $ */
+/* $Id: php_imap.c,v 1.288 2009/05/05 01:28:10 jani Exp $ */
 
 #define IMAP41
 
@@ -2942,7 +2942,6 @@
 {
php_imap_mutf7(INTERNAL_FUNCTION_PARAM_PASSTHRU, 0);
 }
-#endif
 
 /* {{{ proto string imap_mutf7_to_utf8(string in)
Decode a modified UTF-7 string to UTF-8 */
@@ -2950,7 +2949,7 @@
 {
php_imap_mutf7(INTERNAL_FUNCTION_PARAM_PASSTHRU, 1);
 }
-
+#endif
 
 /* {{{ proto bool imap_setflag_full(resource stream_id, string sequence, 
string flag [, int options])
Sets flags on messages */



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

Re: [PHP-CVS] cvs: php-src /ext/imap config.m4 php_imap.c php_imap.h

2009-05-04 Thread Kalle Sommer Nielsen

2009/5/5 Jani Taskinen j...@php.net:
 jani            Tue May  5 01:22:31 2009 UTC

  Modified files:
    /php-src/ext/imap   config.m4 php_imap.c php_imap.h
  Log:
  - Fix build (modified utf7 stuff is rather new..)


No AC_DEFINE()'s to config.w32? So its no disabled on Windows, in
future please remember such things, as it was the reason for
socket_create_pair() not being available on Windows from 4.3 to 5.3 by
such a change by you.

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





-- 
Kalle Sommer Nielsen
ka...@php.net

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

[PHP-CVS] cvs: php-src /ext/standard/tests/strings highlight_file.phpt ZendEngine2 zend_highlight.c zend_language_scanner.l

2009-05-04 Thread Matt Wilmas

mattwil Tue May  5 01:35:13 2009 UTC

  Modified files:  
/ZendEngine2zend_highlight.c zend_language_scanner.l 
/php-src/ext/standard/tests/strings highlight_file.phpt 
  Log:
  Implemented manual scanning for strings/comments, plus misc. fixes
  For details, see http://news.php.net/php.internals/43808
  http://cvs.php.net/viewvc.cgi/ZendEngine2/zend_highlight.c?r1=1.65r2=1.66diff_format=u
Index: ZendEngine2/zend_highlight.c
diff -u ZendEngine2/zend_highlight.c:1.65 ZendEngine2/zend_highlight.c:1.66
--- ZendEngine2/zend_highlight.c:1.65   Wed Dec 31 11:12:29 2008
+++ ZendEngine2/zend_highlight.cTue May  5 01:35:13 2009
@@ -17,7 +17,7 @@
+--+
 */
 
-/* $Id: zend_highlight.c,v 1.65 2008/12/31 11:12:29 sebastian Exp $ */
+/* $Id: zend_highlight.c,v 1.66 2009/05/05 01:35:13 mattwil Exp $ */
 
 #include zend.h
 #include zend_language_parser.h
@@ -127,14 +127,8 @@
zend_printf(span style=\color: %s\, 
last_color);
}
}
-   switch (token_type) {
-   case T_END_HEREDOC:
-   zend_html_puts(Z_STRVAL(token), Z_STRLEN(token) 
TSRMLS_CC);
-   break;
-   default:
-   zend_html_puts(LANG_SCNG(yy_text), 
LANG_SCNG(yy_leng) TSRMLS_CC);
-   break;
-   }
+
+   zend_html_puts(LANG_SCNG(yy_text), LANG_SCNG(yy_leng) 
TSRMLS_CC);
 
if (Z_TYPE(token) == IS_STRING ||
Z_TYPE(token) == IS_UNICODE) {
@@ -156,19 +150,6 @@
Z_TYPE(token) = 0;
}
 
-   /* handler for trailing comments, see bug #42767 */
-   if (LANG_SCNG(yy_leng)  LANG_SCNG(yy_text)  LANG_SCNG(yy_limit)) {
-   if (last_color != syntax_highlighter_ini-highlight_comment) {
-   if (last_color != 
syntax_highlighter_ini-highlight_html) {
-   zend_printf(/span);
-   }
-   if (syntax_highlighter_ini-highlight_comment != 
syntax_highlighter_ini-highlight_html) {
-   zend_printf(span style=\color: %s\, 
syntax_highlighter_ini-highlight_comment);
-   }
-   }
-   zend_html_puts(LANG_SCNG(yy_text), (LANG_SCNG(yy_limit) - 
LANG_SCNG(yy_text)) TSRMLS_CC);
-   }
-
if (last_color != syntax_highlighter_ini-highlight_html) {
zend_printf(/span\n);
}
http://cvs.php.net/viewvc.cgi/ZendEngine2/zend_language_scanner.l?r1=1.205r2=1.206diff_format=u
Index: ZendEngine2/zend_language_scanner.l
diff -u ZendEngine2/zend_language_scanner.l:1.205 
ZendEngine2/zend_language_scanner.l:1.206
--- ZendEngine2/zend_language_scanner.l:1.205   Thu Mar 26 20:01:38 2009
+++ ZendEngine2/zend_language_scanner.l Tue May  5 01:35:13 2009
@@ -21,7 +21,7 @@
+--+
 */
 
-/* $Id: zend_language_scanner.l,v 1.205 2009/03/26 20:01:38 felipe Exp $ */
+/* $Id: zend_language_scanner.l,v 1.206 2009/05/05 01:35:13 mattwil Exp $ */
 
 #if 0
 # define YYDEBUG(s, c) printf(state: %d char: %c\n, s, c)
@@ -115,13 +115,19 @@
} \
 }
 
+/* To save initial string length after scanning to first variable, 
CG(doc_comment_len) can be reused */
+#define SET_DOUBLE_QUOTES_SCANNED_LENGTH(len) CG(doc_comment_len) = (len)
+#define GET_DOUBLE_QUOTES_SCANNED_LENGTH()CG(doc_comment_len)
+
+#define IS_LABEL_START(c) (((c) = 'a'  (c) = 'z') || ((c) = 'A'  (c) = 
'Z') || (c) == '_' || (c) = 0x7F)
+
 #define ZEND_IS_OCT(c)  ((c)='0'  (c)='7')
 #define ZEND_IS_HEX(c)  (((c)='0'  (c)='9') || ((c)='a'  (c)='f') || 
((c)='A'  (c)='F'))
 
 BEGIN_EXTERN_C()
 
 static void _yy_push_state(int new_state TSRMLS_DC)
- {
+{
zend_stack_push(SCNG(state_stack), (void *) YYGETCONDITION(), 
sizeof(int));
YYSETCONDITION(new_state);
 }
@@ -1324,63 +1330,8 @@
 WHITESPACE [ \n\r\t]+
 TABS_AND_SPACES [ \t]*
 TOKENS [;:,.\[\]()|^+-/*=%!~$?...@]
-ANY_CHAR [^\x00]
+ANY_CHAR [^]
 NEWLINE (\r|\n|\r\n)
-NULL [\x00]{1}
-
-/*
- * LITERAL_DOLLAR matches unescaped $ that aren't followed by a label character
- * or a { and therefore will be taken literally. The case of literal $ before
- * a variable or ${ is handled in a rule for each string type
- */
-DOUBLE_QUOTES_LITERAL_DOLLAR ($+([^a-zA-Z_\x7f-\xff$\\{]|(\\{ANY_CHAR})))
-BACKQUOTE_LITERAL_DOLLAR ($+([^a-zA-Z_\x7f-\xff$`\\{]|(\\{ANY_CHAR})))
-HEREDOC_LITERAL_DOLLAR   ($+([^a-zA-Z_\x7f-\xff$\n\r\\{]|(\\[^\n\r])))
-
-/*
- * Usually, HEREDOC_NEWLINE will just function like a simple NEWLINE, but some
- * special cases need to be handled. HEREDOC_CHARS doesn't allow a line to
- * match when { or $, and/or \ is at the end. (({*|$*)\\?) handles that,
- * along with cases where { or $, and/or

[PHP-CVS] cvs: php-src(PHP_5_3) / NEWS /ext/standard/tests/strings highlight_file.phpt ZendEngine2 zend_highlight.c zend_language_scanner.l

2009-05-04 Thread Matt Wilmas

mattwil Tue May  5 01:35:44 2009 UTC

  Modified files:  (Branch: PHP_5_3)
/php-srcNEWS 
/ZendEngine2zend_highlight.c zend_language_scanner.l 
/php-src/ext/standard/tests/strings highlight_file.phpt 
  Log:
  MFH: Implemented manual scanning for strings/comments, plus misc. fixes
  http://cvs.php.net/viewvc.cgi/php-src/NEWS?r1=1.2027.2.547.2.965.2.585r2=1.2027.2.547.2.965.2.586diff_format=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.2027.2.547.2.965.2.585 
php-src/NEWS:1.2027.2.547.2.965.2.586
--- php-src/NEWS:1.2027.2.547.2.965.2.585   Tue May  5 00:55:27 2009
+++ php-src/NEWSTue May  5 01:35:43 2009
@@ -59,6 +59,8 @@
 - Fixed bug #47038 (Memory leak in include). (Dmitry)
 - Fixed bug #47021 (SoapClient stumbles over WSDL delivered with
   Transfer-Encoding: chunked). (Dmitry)
+- Fixed bug #46817 (tokenizer misses last single-line comment (PHP 5.3+, with
+  re2c lexer)). (Matt, Shire)
 - Fixed bug #46108 (DateTime - Memory leak when unserializing). (Felipe)
 - Fixed bug #44861 (scrollable cursor don't work with pgsql). (Matteo)
 - Fixed bug #44409 (PDO::FETCH_SERIALIZE calls __construct()). (Matteo)
http://cvs.php.net/viewvc.cgi/ZendEngine2/zend_highlight.c?r1=1.49.2.3.2.2.2.6r2=1.49.2.3.2.2.2.7diff_format=u
Index: ZendEngine2/zend_highlight.c
diff -u ZendEngine2/zend_highlight.c:1.49.2.3.2.2.2.6 
ZendEngine2/zend_highlight.c:1.49.2.3.2.2.2.7
--- ZendEngine2/zend_highlight.c:1.49.2.3.2.2.2.6   Wed Dec 31 11:15:32 2008
+++ ZendEngine2/zend_highlight.cTue May  5 01:35:44 2009
@@ -17,7 +17,7 @@
+--+
 */
 
-/* $Id: zend_highlight.c,v 1.49.2.3.2.2.2.6 2008/12/31 11:15:32 sebastian Exp 
$ */
+/* $Id: zend_highlight.c,v 1.49.2.3.2.2.2.7 2009/05/05 01:35:44 mattwil Exp $ 
*/
 
 #include zend.h
 #include zend_language_parser.h
@@ -142,14 +142,8 @@
zend_printf(span style=\color: %s\, 
last_color);
}
}
-   switch (token_type) {
-   case T_END_HEREDOC:
-   zend_html_puts(token.value.str.val, 
token.value.str.len TSRMLS_CC);
-   break;
-   default:
-   zend_html_puts(LANG_SCNG(yy_text), 
LANG_SCNG(yy_leng) TSRMLS_CC);
-   break;
-   }
+
+   zend_html_puts(LANG_SCNG(yy_text), LANG_SCNG(yy_leng) 
TSRMLS_CC);
 
if (token.type == IS_STRING) {
switch (token_type) {
@@ -170,19 +164,6 @@
token.type = 0;
}
 
-   /* handler for trailing comments, see bug #42767 */
-   if (LANG_SCNG(yy_leng)  LANG_SCNG(yy_text)  LANG_SCNG(yy_limit)) {
-   if (last_color != syntax_highlighter_ini-highlight_comment) {
-   if (last_color != 
syntax_highlighter_ini-highlight_html) {
-   zend_printf(/span);
-   }
-   if (syntax_highlighter_ini-highlight_comment != 
syntax_highlighter_ini-highlight_html) {
-   zend_printf(span style=\color: %s\, 
syntax_highlighter_ini-highlight_comment);
-   }
-   }
-   zend_html_puts(LANG_SCNG(yy_text), (LANG_SCNG(yy_limit) - 
LANG_SCNG(yy_text)) TSRMLS_CC);
-   }
-
if (last_color != syntax_highlighter_ini-highlight_html) {
zend_printf(/span\n);
}
http://cvs.php.net/viewvc.cgi/ZendEngine2/zend_language_scanner.l?r1=1.131.2.11.2.13.2.39r2=1.131.2.11.2.13.2.40diff_format=u
Index: ZendEngine2/zend_language_scanner.l
diff -u ZendEngine2/zend_language_scanner.l:1.131.2.11.2.13.2.39 
ZendEngine2/zend_language_scanner.l:1.131.2.11.2.13.2.40
--- ZendEngine2/zend_language_scanner.l:1.131.2.11.2.13.2.39Thu Mar 26 
12:37:17 2009
+++ ZendEngine2/zend_language_scanner.l Tue May  5 01:35:44 2009
@@ -21,7 +21,7 @@
+--+
 */
 
-/* $Id: zend_language_scanner.l,v 1.131.2.11.2.13.2.39 2009/03/26 12:37:17 
dmitry Exp $ */
+/* $Id: zend_language_scanner.l,v 1.131.2.11.2.13.2.40 2009/05/05 01:35:44 
mattwil Exp $ */
 
 #if 0
 # define YYDEBUG(s, c) printf(state: %d char: %c\n, s, c)
@@ -109,6 +109,12 @@
} \
 }
 
+/* To save initial string length after scanning to first variable, 
CG(doc_comment_len) can be reused */
+#define SET_DOUBLE_QUOTES_SCANNED_LENGTH(len) CG(doc_comment_len) = (len)
+#define GET_DOUBLE_QUOTES_SCANNED_LENGTH()CG(doc_comment_len)
+
+#define IS_LABEL_START(c) (((c) = 'a'  (c) = 'z') || ((c) = 'A'  (c) = 
'Z') || (c) == '_' || (c) = 0x7F)
+
 #define ZEND_IS_OCT(c)  ((c)='0'  (c)='7')
 #define ZEND_IS_HEX(c)  (((c)='0'  (c)='9') || ((c)='a'  (c)='f') || 
((c)='A'  (c)='F'))
 
@@ -835,63 +841,8 @@
 WHITESPACE [ \n\r\t]+
 TABS_AND_SPACES [ \t]*
 TOKENS

[PHP-CVS] cvs: php-src(PHP_5_3) /ext/phar phar_object.c

2009-05-04 Thread Greg Beaver

cellog  Tue May  5 01:41:52 2009 UTC

  Modified files:  (Branch: PHP_5_3)
/php-src/ext/phar   phar_object.c 
  Log:
  remove precautionary #ifdef - the problem was fixed by moving the efree 
inside the zend_try block
  
http://cvs.php.net/viewvc.cgi/php-src/ext/phar/phar_object.c?r1=1.266.2.60r2=1.266.2.61diff_format=u
Index: php-src/ext/phar/phar_object.c
diff -u php-src/ext/phar/phar_object.c:1.266.2.60 
php-src/ext/phar/phar_object.c:1.266.2.61
--- php-src/ext/phar/phar_object.c:1.266.2.60   Mon May  4 04:29:25 2009
+++ php-src/ext/phar/phar_object.c  Tue May  5 01:41:51 2009
@@ -17,7 +17,7 @@
   +--+
 */
 
-/* $Id: phar_object.c,v 1.266.2.60 2009/05/04 04:29:25 cellog Exp $ */
+/* $Id: phar_object.c,v 1.266.2.61 2009/05/05 01:41:51 cellog Exp $ */
 
 #include phar_internal.h
 #include func_interceptors.h
@@ -310,11 +310,9 @@
efree(new_op_array);
 
 
-#if PHP_VERSION_ID  50300
if (EG(return_value_ptr_ptr)  
*EG(return_value_ptr_ptr)) {

zval_ptr_dtor(EG(return_value_ptr_ptr));
}
-#endif
} zend_catch {
if (PHAR_G(cwd)) {
efree(PHAR_G(cwd));



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

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

2009-05-04 Thread Jani Taskinen

janiTue May  5 01:51:13 2009 UTC

  Modified files:  (Branch: PHP_5_3)
/php-src/ext/imap   config.w32 
  Log:
  MFH
  
http://cvs.php.net/viewvc.cgi/php-src/ext/imap/config.w32?r1=1.4.6.4r2=1.4.6.5diff_format=u
Index: php-src/ext/imap/config.w32
diff -u php-src/ext/imap/config.w32:1.4.6.4 php-src/ext/imap/config.w32:1.4.6.5
--- php-src/ext/imap/config.w32:1.4.6.4 Thu Apr 23 22:22:51 2009
+++ php-src/ext/imap/config.w32 Tue May  5 01:51:13 2009
@@ -1,4 +1,4 @@
-// $Id: config.w32,v 1.4.6.4 2009/04/23 22:22:51 pajoye Exp $
+// $Id: config.w32,v 1.4.6.5 2009/05/05 01:51:13 jani Exp $
 // vim:ft=javascript
 
 ARG_WITH(imap, IMAP Support, no);
@@ -20,6 +20,7 @@
AC_DEFINE('HAVE_IMAP', 1, 'Have IMAP support', true);
AC_DEFINE('HAVE_NEW_MIME2TEXT', 1, 'Have utf8_mime2text', true);
AC_DEFINE('HAVE_RFC822_OUTPUT_ADDRESS_LIST', 1, 'Have 
rfc822_output_address_list', true);
+   AC_DEFINE('HAVE_IMAP_MUTF7', 1, 'Have modified utf7 support', 
true);
} else {
WARNING(imap not enabled; libraries and headers not found);
}



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

58 matches

Mail list logo