[PHP-CVS] com php-src: remove remaining traces of unicode.* ini settings: ext/soap/tests/bugs/bug47273.phpt ext/standard/tests/array/compact.phpt ext/standard/tests/array/locale_sort.phpt run-tests.ph

2012-05-27 Thread Nuno Lopes
Commit:af2d6a63bf6a187a68164a3cc3384539357ac7b8
Author:Nuno Lopes nlop...@php.net Sun, 27 May 2012 19:57:34 -0400
Parents:   61a13773bcbf761ecc03faa99877d3cac90529a0
Branches:  master

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

Log:
remove remaining traces of unicode.* ini settings

Changed paths:
  M  ext/soap/tests/bugs/bug47273.phpt
  M  ext/standard/tests/array/compact.phpt
  M  ext/standard/tests/array/locale_sort.phpt
  M  run-tests.php


Diff:
diff --git a/ext/soap/tests/bugs/bug47273.phpt 
b/ext/soap/tests/bugs/bug47273.phpt
index 174948f..1cfb0f3 100644
--- a/ext/soap/tests/bugs/bug47273.phpt
+++ b/ext/soap/tests/bugs/bug47273.phpt
@@ -2,9 +2,6 @@
 Bug #47273 (Encoding bug in SoapServer-fault)
 --SKIPIF--
 ?php require_once('skipif.inc'); ?
---INI--
-unicode.script_encoding=ISO-8859-1
-unicode.output_encoding=ISO-8859-1
 --FILE--
 ?php
 $request1 = EOF
diff --git a/ext/standard/tests/array/compact.phpt 
b/ext/standard/tests/array/compact.phpt
index 4b4bfbb..02df44e 100644
--- a/ext/standard/tests/array/compact.phpt
+++ b/ext/standard/tests/array/compact.phpt
@@ -1,8 +1,5 @@
 --TEST--
 compact()
---INI--
-unicode.script_encoding=UTF-8
-unicode.output_encoding=UTF-8
 --FILE--
 ?php
 
diff --git a/ext/standard/tests/array/locale_sort.phpt 
b/ext/standard/tests/array/locale_sort.phpt
index 1db9604..c2f66c0 100644
--- a/ext/standard/tests/array/locale_sort.phpt
+++ b/ext/standard/tests/array/locale_sort.phpt
@@ -9,9 +9,6 @@ if (false == setlocale(LC_CTYPE, fr_FR.ISO8859-1, fr_FR)) {
   die(skip setlocale() failed\n);
 }
 ?
---INI--
-unicode.script_encoding=ISO8859-1
-unicode.output_encoding=ISO8859-1
 --FILE--
 ?php
 setlocale(LC_ALL, 'fr_FR.ISO8859-1', 'fr_FR');
diff --git a/run-tests.php b/run-tests.php
index 1fe0deb..929de4a 100755
--- a/run-tests.php
+++ b/run-tests.php
@@ -239,10 +239,6 @@ $ini_overwrites = array(
'magic_quotes_runtime=0',
'ignore_repeated_errors=0',
'precision=14',
-   'unicode.runtime_encoding=ISO-8859-1',
-   'unicode.script_encoding=UTF-8',
-   'unicode.output_encoding=UTF-8',
-   'unicode.from_error_mode=U_INVALID_SUBSTITUTE',
);
 
 function write_information($show_html)


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



[PHP-CVS] com php-src: 128 MB is enough for everyone (TM): run-tests.php

2012-05-27 Thread Nuno Lopes
Commit:77b086f3f0a2207386289b8acf5717d42037ee0d
Author:Nuno Lopes nlop...@php.net Sun, 27 May 2012 20:03:58 -0400
Parents:   c5d054d3a5fc5cb3ec59fe9205e5dcb3ed8ff0ab
Branches:  master

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

Log:
128 MB is enough for everyone (TM)

this is an initial tentative to avoid some testcases go crazy and consume 16 GB 
of memory. Additional measures will have to be taken if the problem persists.
Please patch individual tests that really require more than 128MB of memory

Changed paths:
  M  run-tests.php


Diff:
diff --git a/run-tests.php b/run-tests.php
index 929de4a..2b37ec4 100755
--- a/run-tests.php
+++ b/run-tests.php
@@ -239,6 +239,7 @@ $ini_overwrites = array(
'magic_quotes_runtime=0',
'ignore_repeated_errors=0',
'precision=14',
+   'memory_limit=128M',
);
 
 function write_information($show_html)


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



[PHP-CVS] com php-src: sync with HEAD: run-tests.php

2012-05-27 Thread Nuno Lopes
Commit:72911237b55d9eaaa48a046cbd7cbc4c195c1ee3
Author:Nuno Lopes nlop...@php.net Sun, 27 May 2012 20:13:09 -0400
Parents:   2f7bd57f930bcfdc97b7472fbe6a502cafdc5a59
Branches:  PHP-5.3

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

Log:
sync with HEAD

Changed paths:
  M  run-tests.php


Diff:
diff --git a/run-tests.php b/run-tests.php
index 1fe0deb..2b37ec4 100755
--- a/run-tests.php
+++ b/run-tests.php
@@ -239,10 +239,7 @@ $ini_overwrites = array(
'magic_quotes_runtime=0',
'ignore_repeated_errors=0',
'precision=14',
-   'unicode.runtime_encoding=ISO-8859-1',
-   'unicode.script_encoding=UTF-8',
-   'unicode.output_encoding=UTF-8',
-   'unicode.from_error_mode=U_INVALID_SUBSTITUTE',
+   'memory_limit=128M',
);
 
 function write_information($show_html)


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



[PHP-CVS] com php-src: sync with HEAD: run-tests.php

2012-05-27 Thread Nuno Lopes
Commit:339508d6ace868b022cd59f20630e3218e52732a
Author:Nuno Lopes nlop...@php.net Sun, 27 May 2012 20:14:31 -0400
Parents:   773e85a788de7dc557201d4af2cb10250c049052
Branches:  PHP-5.4

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

Log:
sync with HEAD

Changed paths:
  M  run-tests.php


Diff:
diff --git a/run-tests.php b/run-tests.php
index 1fe0deb..2b37ec4 100755
--- a/run-tests.php
+++ b/run-tests.php
@@ -239,10 +239,7 @@ $ini_overwrites = array(
'magic_quotes_runtime=0',
'ignore_repeated_errors=0',
'precision=14',
-   'unicode.runtime_encoding=ISO-8859-1',
-   'unicode.script_encoding=UTF-8',
-   'unicode.output_encoding=UTF-8',
-   'unicode.from_error_mode=U_INVALID_SUBSTITUTE',
+   'memory_limit=128M',
);
 
 function write_information($show_html)


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



[PHP-CVS] com php-src: Removed syslog.h. That should never have been commited.: ext/curl/interface.c

2012-05-27 Thread Pierrick Charron
Commit:0667da8cb42d7df70175b47a910ae127d5cf6246
Author:Your Name william.be...@gmail.com Sun, 27 May 2012 
01:50:29 -0700
Parents:   d41fb16a52a374b070d35253c9599c8d6f609b7a
Branches:  master

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

Log:
Removed syslog.h. That should never have been commited.

Changed paths:
  M  ext/curl/interface.c


Diff:
diff --git a/ext/curl/interface.c b/ext/curl/interface.c
index f6e0b05..c066d6b 100644
--- a/ext/curl/interface.c
+++ b/ext/curl/interface.c
@@ -18,7 +18,6 @@
 
 /* $Id$ */
 
-#include syslog.h
 #define ZEND_INCLUDE_FULL_WINDOWS_HEADERS
 
 #ifdef HAVE_CONFIG_H


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



[PHP-CVS] com php-src: VIM uses spaces as tabs and that doesn't comply with the coding standard. I think I'd fixed it so it's using real tabs now.: ext/curl/interface.c

2012-05-27 Thread Pierrick Charron
Commit:60c47285941490a5cc91aada4a7f0cfbbc42561d
Author:Your Name william.be...@gmail.com Sun, 27 May 2012 
15:39:45 -0700
Parents:   0667da8cb42d7df70175b47a910ae127d5cf6246
Branches:  master

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

Log:
VIM uses spaces as tabs and that doesn't comply with the coding
standard. I think I'd fixed it so it's using real tabs now.

Changed paths:
  M  ext/curl/interface.c


Diff:
diff --git a/ext/curl/interface.c b/ext/curl/interface.c
index c066d6b..14836cc 100644
--- a/ext/curl/interface.c
+++ b/ext/curl/interface.c
@@ -2219,7 +2219,7 @@ static int _php_curl_setopt(php_curl *ch, long option, 
zval **zvalue, zval *retu
case CURLOPT_DNS_SERVERS:
 #endif 
 #if LIBCURL_VERSION_NUM = 0x071900 /* Available since 7.25.0 */
-case CURLOPT_MAIL_AUTH:
+   case CURLOPT_MAIL_AUTH:
 #endif
{
 #if LIBCURL_VERSION_NUM  0x071100


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



[PHP-CVS] com php-src: Added support for CURLOPT_MAIL_AUTH: ext/curl/interface.c

2012-05-27 Thread Pierrick Charron
Commit:f75c1ed201102aedfe9e04b24c6d74fe2f74b53d
Author:Your Name william.be...@gmail.com Sun, 27 May 2012 
00:02:53 -0700
Parents:   e7a7f533e32813b13255efa236b711f6d1f6325d
Branches:  master

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

Log:
Added support for CURLOPT_MAIL_AUTH

Changed paths:
  M  ext/curl/interface.c


Diff:
diff --git a/ext/curl/interface.c b/ext/curl/interface.c
index 3533991..09f4974 100644
--- a/ext/curl/interface.c
+++ b/ext/curl/interface.c
@@ -18,6 +18,7 @@
 
 /* $Id$ */
 
+#include syslog.h
 #define ZEND_INCLUDE_FULL_WINDOWS_HEADERS
 
 #ifdef HAVE_CONFIG_H
@@ -1035,6 +1036,7 @@ PHP_MINIT_FUNCTION(curl)
REGISTER_CURL_CONSTANT(CURLINFO_RTSP_SERVER_CSEQ);
REGISTER_CURL_CONSTANT(CURLINFO_RTSP_SESSION_ID);
REGISTER_CURL_CONSTANT(CURLOPT_FTP_USE_PRET);
+   REGISTER_CURL_CONSTANT(CURLOPT_MAIL_AUTH);
REGISTER_CURL_CONSTANT(CURLOPT_MAIL_FROM);
REGISTER_CURL_CONSTANT(CURLOPT_MAIL_RCPT);
REGISTER_CURL_CONSTANT(CURLOPT_RTSP_CLIENT_CSEQ);
@@ -2214,6 +2216,9 @@ static int _php_curl_setopt(php_curl *ch, long option, 
zval **zvalue, zval *retu
 #if LIBCURL_VERSION_NUM = 0x071800 /* Available since 7.24.0 */
case CURLOPT_DNS_SERVERS:
 #endif 
+#if LIBCURL_VERSION_NUM = 0x071900 /* Available since 7.25.0 */
+case CURLOPT_MAIL_AUTH:
+#endif
{
 #if LIBCURL_VERSION_NUM  0x071100
char *copystr = NULL;


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



[PHP-CVS] com php-src: Fixed the libcurl version checking for CURLOPT_MAIL_AUTH: ext/curl/interface.c

2012-05-27 Thread Pierrick Charron
Commit:d41fb16a52a374b070d35253c9599c8d6f609b7a
Author:Your Name william.be...@gmail.com Sun, 27 May 2012 
00:21:08 -0700
Parents:   f75c1ed201102aedfe9e04b24c6d74fe2f74b53d
Branches:  master

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

Log:
Fixed the libcurl version checking for CURLOPT_MAIL_AUTH

Changed paths:
  M  ext/curl/interface.c


Diff:
diff --git a/ext/curl/interface.c b/ext/curl/interface.c
index 09f4974..f6e0b05 100644
--- a/ext/curl/interface.c
+++ b/ext/curl/interface.c
@@ -1036,7 +1036,6 @@ PHP_MINIT_FUNCTION(curl)
REGISTER_CURL_CONSTANT(CURLINFO_RTSP_SERVER_CSEQ);
REGISTER_CURL_CONSTANT(CURLINFO_RTSP_SESSION_ID);
REGISTER_CURL_CONSTANT(CURLOPT_FTP_USE_PRET);
-   REGISTER_CURL_CONSTANT(CURLOPT_MAIL_AUTH);
REGISTER_CURL_CONSTANT(CURLOPT_MAIL_FROM);
REGISTER_CURL_CONSTANT(CURLOPT_MAIL_RCPT);
REGISTER_CURL_CONSTANT(CURLOPT_RTSP_CLIENT_CSEQ);
@@ -1107,6 +1106,10 @@ PHP_MINIT_FUNCTION(curl)
REGISTER_CURL_CONSTANT(CURLOPT_DNS_SERVERS);
 #endif
 
+#if LIBCURL_VERSION_NUM = 0x071900 /* Available since 7.25.0 */
+   REGISTER_CURL_CONSTANT(CURLOPT_MAIL_AUTH);
+#endif
+
 #if CURLOPT_FTPASCII != 0
REGISTER_CURL_CONSTANT(CURLOPT_FTPASCII);
 #endif


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