[PHP-CVS] cvs: php-src(PHP_5_3) /main network.c
iliaa Mon May 4 13:09:15 2009 UTC
Modified files: (Branch: PHP_5_3)
/php-src/main network.c
Log:
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.118.2.2.2.6.2.14&r2=1.118.2.2.2.6.2.15&diff_format=u
Index: php-src/main/network.c
diff -u php-src/main/network.c:1.118.2.2.2.6.2.14
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.14 Sat Jan 3 00:06:33 2009
+++ php-src/main/network.c Mon May 4 13:09:15 2009
@@ -17,7 +17,7 @@
+--+
*/
-/* $Id: network.c,v 1.118.2.2.2.6.2.14 2009/01/03 00:06:33 felipe Exp $ */
+/* $Id: network.c,v 1.118.2.2.2.6.2.15 2009/05/04 13:09:15 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:
@@ -814,7 +819,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 /ext/imap config.m4 php_imap.c php_imap.h
2009/5/5 Jani Taskinen : > Kalle Sommer Nielsen kirjoitti: >> >> 2009/5/5 Jani Taskinen : >>> >>> 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. > > Whatta hell are you talking about? That's windows. It's controlled build and > I don't know how to add any tests in that crap.. What I was talking about ext/sockets, was that you changed a check to see if it was available on the host system or not which is fair enough, but never added an AC_DEFINE() to config.w32, so it was disabled: http://cvs.php.net/viewvc.cgi/php-src/ext/sockets/sockets.c?r1=1.190&r2=1.191 And you're fix to config.w32 makes the mutf7 <> utf8 functions work again. > > --Jani > > -- 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(PHP_5_3) /ext/imap config.w32
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.4&r2=1.4.6.5&diff_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
[PHP-CVS] cvs: php-src /ext/imap config.w32
janiTue May 5 01:51:04 2009 UTC
Modified files:
/php-src/ext/imap config.w32
Log:
- Maybe this is enough on windows..
http://cvs.php.net/viewvc.cgi/php-src/ext/imap/config.w32?r1=1.8&r2=1.9&diff_format=u
Index: php-src/ext/imap/config.w32
diff -u php-src/ext/imap/config.w32:1.8 php-src/ext/imap/config.w32:1.9
--- php-src/ext/imap/config.w32:1.8 Thu Apr 23 22:22:26 2009
+++ php-src/ext/imap/config.w32 Tue May 5 01:51:04 2009
@@ -1,4 +1,4 @@
-// $Id: config.w32,v 1.8 2009/04/23 22:22:26 pajoye Exp $
+// $Id: config.w32,v 1.9 2009/05/05 01:51:04 jani Exp $
// vim:ft=javascript
ARG_WITH("imap", "IMAP Support", "no");
@@ -17,10 +17,10 @@
EXTENSION("imap", "php_imap.c");
ADD_FLAG("CFLAGS_IMAP", "/D HAVE_IMAP2000=1 /D HAVE_IMAP2004=1
/D HAVE_IMAP2007a=1 /D HAVE_IMAP2007b=1 /D HAVE_IMAP_SSL=1");
- AC_DEFINE('HAVE_RFC822_OUTPUT_ADDRESS_LIST', 1, 'Have
rfc822_output_address_list', true);
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
Re: [PHP-CVS] cvs: php-src /ext/imap config.m4 php_imap.c php_imap.h
Kalle Sommer Nielsen kirjoitti: 2009/5/5 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..) 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. Whatta hell are you talking about? That's windows. It's controlled build and I don't know how to add any tests in that crap.. --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
janiTue May 5 01:44:22 2009 UTC
Modified files: (Branch: PHP_5_3)
/php-src/ext/imap php_imap.c
Log:
MFH: ws fix
http://cvs.php.net/viewvc.cgi/php-src/ext/imap/php_imap.c?r1=1.208.2.7.2.26.2.47&r2=1.208.2.7.2.26.2.48&diff_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.47
php-src/ext/imap/php_imap.c:1.208.2.7.2.26.2.48
--- php-src/ext/imap/php_imap.c:1.208.2.7.2.26.2.47 Tue May 5 01:22:44 2009
+++ php-src/ext/imap/php_imap.c Tue May 5 01:44:22 2009
@@ -21,12 +21,12 @@
| Chuck Hagenbuch|
| Andrew Skalski|
| Hartmut Holzgraefe|
- | Jani Taskinen|
+ | Jani Taskinen |
| Daniel R. Kalowsky|
| PHP 4.0 updates: Zeev Suraski|
+--+
*/
-/* $Id: php_imap.c,v 1.208.2.7.2.26.2.47 2009/05/05 01:22:44 jani Exp $ */
+/* $Id: php_imap.c,v 1.208.2.7.2.26.2.48 2009/05/05 01:44:22 jani Exp $ */
#define IMAP41
@@ -59,7 +59,7 @@
MAILSTREAM DEFAULTPROTO;
#endif
-#define CRLF"\015\012"
+#define CRLF "\015\012"
#define CRLF_LEN sizeof("\015\012") - 1
#define PHP_EXPUNGE 32768
#define PHP_IMAP_ADDRESS_SIZE_BUF 10
@@ -73,7 +73,6 @@
# define PHP_IMAP_EXPORT
#endif
-
static void _php_make_header_object(zval *myzvalue, ENVELOPE *en TSRMLS_DC);
static void _php_imap_add_body(zval *arg, BODY *body TSRMLS_DC);
static char* _php_imap_parse_address(ADDRESS *addresslist, zval *paddress
TSRMLS_DC);
@@ -652,7 +651,7 @@
*/
FOBJECTLIST *mail_newfolderobjectlist(void)
{
- return (FOBJECTLIST *) memset(fs_get(sizeof(FOBJECTLIST)), 0,
sizeof(FOBJECTLIST));
+ return (FOBJECTLIST *) memset(fs_get(sizeof(FOBJECTLIST)), 0,
sizeof(FOBJECTLIST));
}
/* }}} */
@@ -775,7 +774,6 @@
}
/* }}} */
-
/* {{{ mail_getquota
*
* Mail GET_ACL callback
@@ -791,10 +789,8 @@
}
}
/* }}} */
-
#endif
-
/* {{{ PHP_GINIT_FUNCTION
*/
static PHP_GINIT_FUNCTION(imap)
@@ -849,7 +845,7 @@
#ifndef PHP_WIN32
auth_link(&auth_log); /* link in the log authenticator */
- auth_link(&auth_md5); /* link in the cram-md5 authenticator */
+ auth_link(&auth_md5); /* link in the cram-md5 authenticator */
#if HAVE_IMAP_KRB && defined(HAVE_IMAP_AUTH_GSS)
auth_link(&auth_gss); /* link in the gss authenticator */
#endif
@@ -910,7 +906,6 @@
REGISTER_LONG_CONSTANT("CL_EXPUNGE", PHP_EXPUNGE, CONST_PERSISTENT |
CONST_CS);
/* expunge silently */
-
/* Fetch options */
REGISTER_LONG_CONSTANT("FT_UID", FT_UID, CONST_PERSISTENT | CONST_CS);
@@ -924,7 +919,6 @@
REGISTER_LONG_CONSTANT("FT_PREFETCHTEXT", FT_PREFETCHTEXT,
CONST_PERSISTENT | CONST_CS);
/* IMAP prefetch text when fetching header */
-
/* Flagging options */
REGISTER_LONG_CONSTANT("ST_UID", ST_UID, CONST_PERSISTENT | CONST_CS);
@@ -934,7 +928,6 @@
REGISTER_LONG_CONSTANT("ST_SET", ST_SET, CONST_PERSISTENT | CONST_CS);
/* set vs. clear */
-
/* Copy options */
REGISTER_LONG_CONSTANT("CP_UID", CP_UID, CONST_PERSISTENT | CONST_CS);
@@ -942,7 +935,6 @@
REGISTER_LONG_CONSTANT("CP_MOVE", CP_MOVE, CONST_PERSISTENT | CONST_CS);
/* delete from source after copying */
-
/* Search/sort options */
REGISTER_LONG_CONSTANT("SE_UID", SE_UID, CONST_PERSISTENT | CONST_CS);
@@ -956,7 +948,6 @@
REGISTER_LONG_CONSTANT("SO_NOSERVER", SO_NOSERVER, CONST_PERSISTENT |
CONST_CS);
/* don't do server-based sort */
-
/* Status options */
REGISTER_LONG_CONSTANT("SA_MESSAGES", SA_MESSAGES , CONST_PERSISTENT |
CONST_CS);
@@ -972,7 +963,6 @@
REGISTER_LONG_CONSTANT("SA_ALL", sa_all, CONST_PERSISTENT | CONST_CS);
/* get all status information */
-
/* Bits for mm_list() and mm_lsub() */
REGISTER_LONG_CONSTANT("LATT_NOINFERIORS", LATT_NOINFERIORS ,
CONST_PERSISTENT | CONST_CS);
@@ -1446,7 +1436,6 @@
}
/* }}} */
-
/* {{{ proto array imap_getacl(resource stream_id, string mailbox)
Gets the ACL for a given mailbox */
PHP_FUNCTION(imap_getacl)
@@ -1478,10 +1467,8 @@
IMAPG(imap_acl_list) = NIL;
}
/* }}} */
-
#endif /* HAVE_IMAP2000 || HAVE_IMAP2001 */
-
/* {{{ proto bool imap_expunge(resource stream_id)
Permanently delete all messages marked for deletion */
PHP_FUNCTION(imap_expunge)
@@ -1608,7 +1595,7 @@
strlcat(tmp, "} ", sizeof(tmp));
}
mail_fetchsubject(t = tmp + strlen(tmp),
imap_le_struct->imap_stream, msgno, (long)25);
- snprintf(t += strlen(t), sizeof(tmp) - strlen(tmp), " (%ld
chars)", cache->rfc822_size)
[PHP-CVS] cvs: php-src /ext/imap php_imap.c
janiTue May 5 01:44:09 2009 UTC
Modified files:
/php-src/ext/imap php_imap.c
Log:
ws fix + missing folding tags
http://cvs.php.net/viewvc.cgi/php-src/ext/imap/php_imap.c?r1=1.288&r2=1.289&diff_format=u
Index: php-src/ext/imap/php_imap.c
diff -u php-src/ext/imap/php_imap.c:1.288 php-src/ext/imap/php_imap.c:1.289
--- php-src/ext/imap/php_imap.c:1.288 Tue May 5 01:28:10 2009
+++ php-src/ext/imap/php_imap.c Tue May 5 01:44:08 2009
@@ -21,12 +21,12 @@
| Chuck Hagenbuch|
| Andrew Skalski|
| Hartmut Holzgraefe|
- | Jani Taskinen|
+ | Jani Taskinen |
| Daniel R. Kalowsky|
| PHP 4.0 updates: Zeev Suraski|
+--+
*/
-/* $Id: php_imap.c,v 1.288 2009/05/05 01:28:10 jani Exp $ */
+/* $Id: php_imap.c,v 1.289 2009/05/05 01:44:08 jani Exp $ */
#define IMAP41
@@ -59,7 +59,7 @@
MAILSTREAM DEFAULTPROTO;
#endif
-#define CRLF"\015\012"
+#define CRLF "\015\012"
#define CRLF_LEN sizeof("\015\012") - 1
#define PHP_EXPUNGE 32768
#define PHP_IMAP_ADDRESS_SIZE_BUF 10
@@ -73,7 +73,6 @@
# define PHP_IMAP_EXPORT
#endif
-
static void _php_make_header_object(zval *myzvalue, ENVELOPE *en TSRMLS_DC);
static void _php_imap_add_body(zval *arg, BODY *body TSRMLS_DC);
static char* _php_imap_parse_address(ADDRESS *addresslist, zval *paddress
TSRMLS_DC);
@@ -652,7 +651,7 @@
*/
FOBJECTLIST *mail_newfolderobjectlist(void)
{
- return (FOBJECTLIST *) memset(fs_get(sizeof(FOBJECTLIST)), 0,
sizeof(FOBJECTLIST));
+ return (FOBJECTLIST *) memset(fs_get(sizeof(FOBJECTLIST)), 0,
sizeof(FOBJECTLIST));
}
/* }}} */
@@ -775,7 +774,6 @@
}
/* }}} */
-
/* {{{ mail_getquota
*
* Mail GET_ACL callback
@@ -791,10 +789,8 @@
}
}
/* }}} */
-
#endif
-
/* {{{ PHP_GINIT_FUNCTION
*/
static PHP_GINIT_FUNCTION(imap)
@@ -849,7 +845,7 @@
#ifndef PHP_WIN32
auth_link(&auth_log); /* link in the log authenticator */
- auth_link(&auth_md5); /* link in the cram-md5 authenticator */
+ auth_link(&auth_md5); /* link in the cram-md5 authenticator */
#if HAVE_IMAP_KRB && defined(HAVE_IMAP_AUTH_GSS)
auth_link(&auth_gss); /* link in the gss authenticator */
#endif
@@ -910,7 +906,6 @@
REGISTER_LONG_CONSTANT("CL_EXPUNGE", PHP_EXPUNGE, CONST_PERSISTENT |
CONST_CS);
/* expunge silently */
-
/* Fetch options */
REGISTER_LONG_CONSTANT("FT_UID", FT_UID, CONST_PERSISTENT | CONST_CS);
@@ -924,7 +919,6 @@
REGISTER_LONG_CONSTANT("FT_PREFETCHTEXT", FT_PREFETCHTEXT,
CONST_PERSISTENT | CONST_CS);
/* IMAP prefetch text when fetching header */
-
/* Flagging options */
REGISTER_LONG_CONSTANT("ST_UID", ST_UID, CONST_PERSISTENT | CONST_CS);
@@ -934,7 +928,6 @@
REGISTER_LONG_CONSTANT("ST_SET", ST_SET, CONST_PERSISTENT | CONST_CS);
/* set vs. clear */
-
/* Copy options */
REGISTER_LONG_CONSTANT("CP_UID", CP_UID, CONST_PERSISTENT | CONST_CS);
@@ -942,7 +935,6 @@
REGISTER_LONG_CONSTANT("CP_MOVE", CP_MOVE, CONST_PERSISTENT | CONST_CS);
/* delete from source after copying */
-
/* Search/sort options */
REGISTER_LONG_CONSTANT("SE_UID", SE_UID, CONST_PERSISTENT | CONST_CS);
@@ -956,7 +948,6 @@
REGISTER_LONG_CONSTANT("SO_NOSERVER", SO_NOSERVER, CONST_PERSISTENT |
CONST_CS);
/* don't do server-based sort */
-
/* Status options */
REGISTER_LONG_CONSTANT("SA_MESSAGES", SA_MESSAGES , CONST_PERSISTENT |
CONST_CS);
@@ -972,7 +963,6 @@
REGISTER_LONG_CONSTANT("SA_ALL", sa_all, CONST_PERSISTENT | CONST_CS);
/* get all status information */
-
/* Bits for mm_list() and mm_lsub() */
REGISTER_LONG_CONSTANT("LATT_NOINFERIORS", LATT_NOINFERIORS ,
CONST_PERSISTENT | CONST_CS);
@@ -1442,7 +1432,6 @@
}
/* }}} */
-
/* {{{ proto array imap_getacl(resource stream_id, string mailbox)
Gets the ACL for a given mailbox */
PHP_FUNCTION(imap_getacl)
@@ -1474,10 +1463,8 @@
IMAPG(imap_acl_list) = NIL;
}
/* }}} */
-
#endif /* HAVE_IMAP2000 || HAVE_IMAP2001 */
-
/* {{{ proto bool imap_expunge(resource stream_id)
Permanently delete all messages marked for deletion */
PHP_FUNCTION(imap_expunge)
@@ -1604,7 +1591,7 @@
strlcat(tmp, "} ", sizeof(tmp));
}
mail_fetchsubject(t = tmp + strlen(tmp),
imap_le_struct->imap_stream, msgno, (long)25);
- snprintf(t += strlen(t), sizeof(tmp) - strlen(tmp), " (%ld
chars)", cache->rfc822_size);
+ snprintf(t += strlen(t), sizeof(tmp) - strlen(tmp), " (%ld
chars)", cache->rfc822
[PHP-CVS] cvs: php-src /ext/phar phar_object.c
cellog Tue May 5 01:42:06 2009 UTC
Modified files:
/php-src/ext/phar phar_object.c
Log:
MFB: 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.296&r2=1.297&diff_format=u
Index: php-src/ext/phar/phar_object.c
diff -u php-src/ext/phar/phar_object.c:1.296
php-src/ext/phar/phar_object.c:1.297
--- php-src/ext/phar/phar_object.c:1.296Mon May 4 04:30:50 2009
+++ php-src/ext/phar/phar_object.c Tue May 5 01:42:06 2009
@@ -17,7 +17,7 @@
+--+
*/
-/* $Id: phar_object.c,v 1.296 2009/05/04 04:30:50 cellog Exp $ */
+/* $Id: phar_object.c,v 1.297 2009/05/05 01:42:06 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/phar phar_object.c
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.60&r2=1.266.2.61&diff_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) / NEWS /ext/standard/tests/strings highlight_file.phpt ZendEngine2 zend_highlight.c zend_language_scanner.l
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.585&r2=1.2027.2.547.2.965.2.586&diff_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.6&r2=1.49.2.3.2.2.2.7&diff_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
@@ -142,14 +142,8 @@
zend_printf("",
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("");
- }
- if (syntax_highlighter_ini->highlight_comment !=
syntax_highlighter_ini->highlight_html) {
- zend_printf("",
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("\n");
}
http://cvs.php.net/viewvc.cgi/ZendEngine2/zend_language_scanner.l?r1=1.131.2.11.2.13.2.39&r2=1.131.2.11.2.13.2.40&diff_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 [;:,.\[\]()|^&+-/*=%!~$<>?...@]
-ANY_
[PHP-CVS] cvs: php-src /ext/standard/tests/strings highlight_file.phpt ZendEngine2 zend_highlight.c zend_language_scanner.l
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.65&r2=1.66&diff_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
@@ -127,14 +127,8 @@
zend_printf("",
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("");
- }
- if (syntax_highlighter_ini->highlight_comment !=
syntax_highlighter_ini->highlight_html) {
- zend_printf("",
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("\n");
}
http://cvs.php.net/viewvc.cgi/ZendEngine2/zend_language_scanner.l?r1=1.205&r2=1.206&diff_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 $, a
Re: [PHP-CVS] cvs: php-src /ext/imap config.m4 php_imap.c php_imap.h
2009/5/5 Jani Taskinen : > 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/imap php_imap.c
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.287&r2=1.288&diff_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|
+--+
*/
-/* $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
[PHP-CVS] cvs: php-src(PHP_5_3) /ext/imap config.m4 php_imap.c php_imap.h
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.2&r2=1.69.4.7.2.3&diff_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.46&r2=1.208.2.7.2.26.2.47&diff_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|
+--+
*/
-/* $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.4&r2=1.32.2.2.2.1.2.5&diff_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 config.m4 php_imap.c php_imap.h
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.79&r2=1.80&diff_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.286&r2=1.287&diff_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|
+--+
*/
-/* $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.40&r2=1.41&diff_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
@@ -165,8
[PHP-CVS] cvs: php-src(PHP_5_3) /ext/imap php_imap.c
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.45&r2=1.208.2.7.2.26.2.46&diff_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|
+--+
*/
-/* $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
Re: [PHP-CVS] cvs: php-src(PHP_5_3) / NEWS
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.584&r2=1.2027.2.547.2.965.2.585&diff_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) / NEWS
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.584&r2=1.2027.2.547.2.965.2.585&diff_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
[PHP-CVS] cvs: php-src(PHP_5_3) / NEWS
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.583&r2=1.2027.2.547.2.965.2.584&diff_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_2) / NEWS /ext/curl streams.c /ext/standard http_fopen_wrapper.c
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.13&r2=1.14.2.2.2.14&diff_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_t
[PHP-CVS] cvs: php-src(PHP_5_3) /ext/curl streams.c /ext/standard http_fopen_wrapper.c
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.4&r2=1.14.2.2.2.11.2.5&diff_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-CVS] cvs: php-src /ext/curl streams.c /ext/standard http_fopen_wrapper.c
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.32&r2=1.33&diff_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_t
[PHP-CVS] cvs: php-src(PHP_5_2) /ext/standard http_fopen_wrapper.c
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.13&r2=1.99.2.12.2.14&diff_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 |
+--+
*/
-/* $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(PHP_5_3) /ext/standard http_fopen_wrapper.c
janiTue May 5 00:16:21 2009 UTC
Modified files: (Branch: PHP_5_3)
/php-src/ext/standard http_fopen_wrapper.c
Log:
- Sync with HEAD
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/http_fopen_wrapper.c?r1=1.99.2.12.2.9.2.13&r2=1.99.2.12.2.9.2.14&diff_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.9.2.13
php-src/ext/standard/http_fopen_wrapper.c:1.99.2.12.2.9.2.14
--- php-src/ext/standard/http_fopen_wrapper.c:1.99.2.12.2.9.2.13Thu Apr
16 10:16:27 2009
+++ php-src/ext/standard/http_fopen_wrapper.c Tue May 5 00:16:21 2009
@@ -19,7 +19,7 @@
| Sara Golemon |
+--+
*/
-/* $Id: http_fopen_wrapper.c,v 1.99.2.12.2.9.2.13 2009/04/16 10:16:27 dmitry
Exp $ */
+/* $Id: http_fopen_wrapper.c,v 1.99.2.12.2.9.2.14 2009/05/05 00:16:21 jani Exp
$ */
#include "php.h"
#include "php_globals.h"
@@ -84,7 +84,7 @@
#define HTTP_WRAPPER_HEADER_INIT1
#define HTTP_WRAPPER_REDIRECTED 2
-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 flags 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 flags STREAMS_DC TSRMLS_DC) /* {{{ */
{
php_stream *stream = NULL;
php_url *resource = NULL;
@@ -233,9 +233,8 @@
}
}
- if (stream == NULL) {
+ if (stream == NULL)
goto out;
- }
/* avoid buffering issues while reading header */
if (options & STREAM_WILL_CAST)
@@ -327,6 +326,7 @@
strlcat(scratch, " HTTP/1.0\r\n", scratch_len);
}
+
/* send it */
php_stream_write(stream, scratch, strlen(scratch));
@@ -403,7 +403,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));
@@ -705,7 +705,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); \
@@ -769,22 +769,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, HTTP_WRAPPER_HEADER_INIT 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(PHP_5_3) / NEWS /ext/filter/tests bug39763.phpt bug42718-2.phpt /ext/pcre/tests bug33200.phpt /ext/session/tests 001.phpt 003.phpt 004.phpt 005.phpt 006.phpt 007.phpt 008-php
kalle Mon May 4 21:18:22 2009 UTC
Modified files: (Branch: PHP_5_3)
/php-srcNEWS
/php-src/ext/filter/tests bug39763.phpt bug42718-2.phpt
/php-src/ext/pcre/tests bug33200.phpt
/php-src/ext/session/tests 001.phpt 003.phpt 004.phpt 005.phpt
006.phpt 007.phpt 008-php4.2.3.phpt
009.phpt 012.phpt 013.phpt 014.phpt
019.phpt
/php-src/ext/standard/tests/general_functions putenv_error1.phpt
putenv_error2.phpt
/php-src/ext/standard/tests/miscsyslog_vars_variation1.phpt
/php-src/ext/standard/tests/network
define_syslog_variables_variation-win32.phpt
/php-src/main main.c
/php-src/tests/basicbug46313-win.phpt
/php-src/tests/security magic_quotes_gpc.phpt
Log:
Added E_DEPRECATED startup notice (5.3 only)
http://cvs.php.net/viewvc.cgi/php-src/NEWS?r1=1.2027.2.547.2.965.2.582&r2=1.2027.2.547.2.965.2.583&diff_format=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.2027.2.547.2.965.2.582
php-src/NEWS:1.2027.2.547.2.965.2.583
--- php-src/NEWS:1.2027.2.547.2.965.2.582 Mon May 4 21:11:40 2009
+++ php-src/NEWSMon May 4 21:18:21 2009
@@ -1,4 +1,4 @@
-PHPNEWS
+PHP
NEWS
|||
?? ??? 200?, PHP 5.3.0 RC 2
- Upgraded bundled sqlite to version 3.6.13. (Ilia)
@@ -26,6 +26,7 @@
disable this behaviour using "http"=>array("auto_decode"=>0) in stream
context. (Dmitry)
- Added ability to throw exceptions from SQLite3 instead of warnings. (Scott)
+- Added startup notices for deprecated ini settings. (Kalle)
- Fixed bug #48087 (call_user_method() invalid free of arguments). (Felipe)
- Fixed bug #48060 (pdo_pgsql - large objects are returned as empty). (Matteo)
http://cvs.php.net/viewvc.cgi/php-src/ext/filter/tests/bug39763.phpt?r1=1.1.2.3&r2=1.1.2.3.2.1&diff_format=u
Index: php-src/ext/filter/tests/bug39763.phpt
diff -u php-src/ext/filter/tests/bug39763.phpt:1.1.2.3
php-src/ext/filter/tests/bug39763.phpt:1.1.2.3.2.1
--- php-src/ext/filter/tests/bug39763.phpt:1.1.2.3 Mon May 7 18:03:01 2007
+++ php-src/ext/filter/tests/bug39763.phpt Mon May 4 21:18:21 2009
@@ -14,3 +14,4 @@
--EXPECT--
\"probably a bug\"
\"probably a bug\"
+PHP Warning: Directive 'magic_quotes_gpc' is deprecated in PHP 5.3 and
greater in Unknown on line 0
\ No newline at end of file
http://cvs.php.net/viewvc.cgi/php-src/ext/filter/tests/bug42718-2.phpt?r1=1.1.4.2&r2=1.1.4.3&diff_format=u
Index: php-src/ext/filter/tests/bug42718-2.phpt
diff -u php-src/ext/filter/tests/bug42718-2.phpt:1.1.4.2
php-src/ext/filter/tests/bug42718-2.phpt:1.1.4.3
--- php-src/ext/filter/tests/bug42718-2.phpt:1.1.4.2Sun Nov 2 22:22:43 2008
+++ php-src/ext/filter/tests/bug42718-2.phptMon May 4 21:18:21 2009
@@ -18,3 +18,4 @@
unsafe_raw
1\0
+PHP Warning: Directive 'magic_quotes_gpc' is deprecated in PHP 5.3 and
greater in Unknown on line 0
http://cvs.php.net/viewvc.cgi/php-src/ext/pcre/tests/bug33200.phpt?r1=1.1&r2=1.1.10.1&diff_format=u
Index: php-src/ext/pcre/tests/bug33200.phpt
diff -u php-src/ext/pcre/tests/bug33200.phpt:1.1
php-src/ext/pcre/tests/bug33200.phpt:1.1.10.1
--- php-src/ext/pcre/tests/bug33200.phpt:1.1Tue May 31 12:54:56 2005
+++ php-src/ext/pcre/tests/bug33200.phptMon May 4 21:18:21 2009
@@ -6,7 +6,8 @@
--EXPECT--
SOME '$SAMPLE' TEXT
+PHP Warning: Directive 'magic_quotes_sybase' is deprecated in PHP 5.3 and
greater in Unknown on line 0
http://cvs.php.net/viewvc.cgi/php-src/ext/session/tests/001.phpt?r1=1.12.6.1&r2=1.12.6.2&diff_format=u
Index: php-src/ext/session/tests/001.phpt
diff -u php-src/ext/session/tests/001.phpt:1.12.6.1
php-src/ext/session/tests/001.phpt:1.12.6.2
--- php-src/ext/session/tests/001.phpt:1.12.6.1 Tue Dec 9 14:03:58 2008
+++ php-src/ext/session/tests/001.phpt Mon May 4 21:18:21 2009
@@ -35,4 +35,4 @@
Deprecated: Function session_register() is deprecated in %s on line %d
baz|O:3:"foo":2:{s:3:"bar";s:2:"ok";s:3:"yes";s:4:"done";}arr|a:1:{i:3;O:3:"foo":2:{s:3:"bar";s:2:"ok";s:3:"yes";s:4:"done";}}
-
+PHP Warning: Directive 'register_globals' is deprecated in PHP 5.3 and
greater in Unknown on line 0
http://cvs.php.net/viewvc.cgi/php-src/ext/session/tests/003.phpt?r1=1.14&r2=1.14.6.1&diff_format=u
Index: php-src/ext/session/tests/003.phpt
diff -u php-src/ext/session/tests/003.phpt:1.14
php-src/ext/session/tests/003.phpt:1.14.6.1
--- php-src/ext/session/tests/003.phpt:1.14 Mon Jul 4 13:09:14 2005
+++ php-src/ext/session/tests/003.phpt Mon May 4 21:18:21 2009
@@ -43,3 +43,4 @@
int(2)
}
}
+PHP Warning: Directive 'register_globals' i
[PHP-CVS] cvs: php-src(PHP_5_3) / NEWS
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.581&r2=1.2027.2.547.2.965.2.582&diff_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_3) /win32 php_stdint.h
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.6&r2=1.1.2.7&diff_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 /win32 php_stdint.h
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.6&r2=1.7&diff_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) /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
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.14&r2=1.7.2.15&diff_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("<>&
[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
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.21&r2=1.22&diff_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)
+
Re: [PHP-CVS] cvs: php-src /win32 php_stdint.h
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.5&r2=1.6&diff_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 /win32 php_stdint.h
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.5&r2=1.6&diff_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
[PHP-CVS] cvs: php-src(PHP_5_3) /win32 php_stdint.h
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.5&r2=1.1.2.6&diff_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(PHP_5_3) /main main.c
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.50&r2=1.640.2.23.2.57.2.51&diff_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_2) /main main.c
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.69&r2=1.640.2.23.2.70&diff_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 /main main.c
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.798&r2=1.799&diff_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_3) / NEWS
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.580&r2=1.2027.2.547.2.965.2.581&diff_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: phpruntests /src/configuration/settings rtPhpCgiExecutableSetting.php
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.5&r2=1.6&diff_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 /ext/date php_date.c
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.228&r2=1.229&diff_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: php-src(PHP_5_3) /ext/date php_date.c
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.72&r2=1.43.2.45.2.51.2.73&diff_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 /win32 php_stdint.h
pajoye Mon May 4 17:10:26 2009 UTC
Modified files:
/php-src/win32 php_stdint.h
Log:
- add llabs
http://cvs.php.net/viewvc.cgi/php-src/win32/php_stdint.h?r1=1.4&r2=1.5&diff_format=u
Index: php-src/win32/php_stdint.h
diff -u php-src/win32/php_stdint.h:1.4 php-src/win32/php_stdint.h:1.5
--- php-src/win32/php_stdint.h:1.4 Wed Jan 28 10:32:45 2009
+++ php-src/win32/php_stdint.h Mon May 4 17:10:26 2009
@@ -264,6 +264,8 @@
#define INTMAX_C INT64_C
#define UINTMAX_C UINT64_C
+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
pajoye Mon May 4 17:09:33 2009 UTC
Modified files: (Branch: PHP_5_3)
/php-src/win32 php_stdint.h
Log:
- add llabs
http://cvs.php.net/viewvc.cgi/php-src/win32/php_stdint.h?r1=1.1.2.4&r2=1.1.2.5&diff_format=u
Index: php-src/win32/php_stdint.h
diff -u php-src/win32/php_stdint.h:1.1.2.4 php-src/win32/php_stdint.h:1.1.2.5
--- php-src/win32/php_stdint.h:1.1.2.4 Tue Jan 27 21:53:31 2009
+++ php-src/win32/php_stdint.h Mon May 4 17:09:33 2009
@@ -238,6 +238,8 @@
#define INTMAX_C INT64_C
#define UINTMAX_C UINT64_C
+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_2) /ext/date php_date.c
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.65&r2=1.43.2.45.2.66&diff_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
+#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: phpruntests /src/testcase rtTestConfiguration.php /src/testcase/preconditions rtIsSectionImplemented.php /src/testcase/sections rtSection.php /src/testcase/sections/configurationsect
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.6&r2=1.7&diff_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.12&r2=1.13&diff_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)) {
+
[PHP-CVS] cvs: php-src(PHP_5_3) /ext/hash hash.c
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.17&r2=1.18.2.5.2.7.2.18&diff_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 /tests/testcase/sections/configurationsections rtPostRawSectionTest.php
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.1&r2=1.2&diff_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 /ext/date php_date.c
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.227&r2=1.228&diff_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
#include
+#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(PHP_5_3) /ext/date php_date.c
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.71&r2=1.43.2.45.2.51.2.72&diff_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
+#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 /src/testcase/preconditions rtIsSectionImplemented.php
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.5&r2=1.6&diff_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: phpruntests /tests/testcase rtPostRawExecutionTest.php
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=markup&rev=1.1
Index: phpruntests/tests/testcase/rtPostRawExecutionTest.php
+++ phpruntests/tests/testcase/rtPostRawExecutionTest.php
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 rtTestConfiguration.php /src/testcase/sections rtSection.php
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.11&r2=1.12&diff_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.6&r2=1.7&diff_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 /src/testcase/sections/configurationsections rtDeflatePostSection.php rtGzipPostSection.php rtPostRawSection.php rtPostSection.php
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.1&r2=1.2&diff_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.3&r2=1.4&diff_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.1&r2=1.2&diff_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.2&r2=1.3&diff_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: php-src(PHP_5_3) /main network.c
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.15&r2=1.118.2.2.2.6.2.16&diff_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: php-src(PHP_5_3) /ext/curl interface.c
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.36&r2=1.62.2.14.2.27.2.37&diff_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: phpruntests /tests/testcase/sections/configurationsections rtPostRawSectionTest.php
zoe Mon May 4 15:45:55 2009 UTC
Added files:
/phpruntests/tests/testcase/sections/configurationsections
rtPostRawSectionTest.php
Log:
test for post raw section
http://cvs.php.net/viewvc.cgi/phpruntests/tests/testcase/sections/configurationsections/rtPostRawSectionTest.php?view=markup&rev=1.1
Index:
phpruntests/tests/testcase/sections/configurationsections/rtPostRawSectionTest.php
+++
phpruntests/tests/testcase/sections/configurationsections/rtPostRawSectionTest.php
getPostVariables();
$this->assertEquals('POST', $envVars['REQUEST_METHOD']);
$this->assertEquals('the first',$envVars['CONTENT_TYPE']);
$fileName = $postSection->getPostFileName();
$string = file_get_contents($fileName);
$this->assertEquals('fred\njoe\nContent-Type:the second\nmary',
$string);
}
}
?>
--
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
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=markup&rev=1.1
Index:
phpruntests/src/testcase/sections/configurationsections/rtPostRawSection.php
+++ phpruntests/src/testcase/sections/configurationsections/rtPostRawSection.php
* @authorStefan Priebsch
* @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 /main network.c
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.144&r2=1.145&diff_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: php-src(PHP_5_2) /main network.c
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.18&r2=1.118.2.2.2.19&diff_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(PHP_5_3) / php.ini-development php.ini-production
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.8&r2=1.1.2.9&diff_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.8&r2=1.1.2.9&diff_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.ini-development php.ini-production
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.7&r2=1.8&diff_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.7&r2=1.8&diff_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_2) /main network.c
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.19&r2=1.118.2.2.2.20&diff_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_5_3) /main network.c
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.16&r2=1.118.2.2.2.6.2.17&diff_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 /main network.c
tony2001Mon May 4 14:25:04 2009 UTC
Modified files:
/php-src/main network.c
Log:
don't segfault on bindto == NULL
http://cvs.php.net/viewvc.cgi/php-src/main/network.c?r1=1.143&r2=1.144&diff_format=u
Index: php-src/main/network.c
diff -u php-src/main/network.c:1.143 php-src/main/network.c:1.144
--- php-src/main/network.c:1.143Mon May 4 13:12:53 2009
+++ php-src/main/network.c Mon May 4 14:25:04 2009
@@ -17,7 +17,7 @@
+--+
*/
-/* $Id: network.c,v 1.143 2009/05/04 13:12:53 iliaa Exp $ */
+/* $Id: network.c,v 1.144 2009/05/04 14:25:04 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: php-src(PHP_5_3) / NEWS
pajoye Mon May 4 14:15:59 2009 UTC Modified files: (Branch: PHP_5_3) /php-srcNEWS Log: - #39637 http://cvs.php.net/viewvc.cgi/php-src/NEWS?r1=1.2027.2.547.2.965.2.579&r2=1.2027.2.547.2.965.2.580&diff_format=u Index: php-src/NEWS diff -u php-src/NEWS:1.2027.2.547.2.965.2.579 php-src/NEWS:1.2027.2.547.2.965.2.580 --- php-src/NEWS:1.2027.2.547.2.965.2.579 Mon May 4 12:23:56 2009 +++ php-src/NEWSMon May 4 14:15:58 2009 @@ -13,6 +13,8 @@ - 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) - 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(PHP_5_2) /main network.c
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.17&r2=1.118.2.2.2.18&diff_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) /ext/curl interface.c
pajoye Mon May 4 14:11:46 2009 UTC Modified files: (Branch: PHP_5_3) /php-src/ext/curl interface.c Log: - [DOC] a note about the symbol -> version page/doc http://cvs.php.net/viewvc.cgi/php-src/ext/curl/interface.c?r1=1.62.2.14.2.27.2.37&r2=1.62.2.14.2.27.2.38&diff_format=u Index: php-src/ext/curl/interface.c diff -u 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.38 --- php-src/ext/curl/interface.c:1.62.2.14.2.27.2.37Mon May 4 14:09:28 2009 +++ php-src/ext/curl/interface.cMon May 4 14:11:45 2009 @@ -16,7 +16,7 @@ +--+ */ -/* $Id: interface.c,v 1.62.2.14.2.27.2.37 2009/05/04 14:09:28 pajoye Exp $ */ +/* $Id: interface.c,v 1.62.2.14.2.27.2.38 2009/05/04 14:11:45 pajoye Exp $ */ #define ZEND_INCLUDE_FULL_WINDOWS_HEADERS @@ -443,6 +443,11 @@ le_curl = zend_register_list_destructors_ex(_php_curl_close, NULL, "curl", module_number); le_curl_multi_handle = zend_register_list_destructors_ex(_php_curl_multi_close, NULL, "curl", module_number); + + /* See http://curl.haxx.se/lxr/source/docs/libcurl/symbols-in-versions + or curl src/docs/libcurl/symbols-in-versions for a (almost) complete list + of options and which version they were introduced */ + /* Constants for curl_setopt() */ REGISTER_CURL_CONSTANT(CURLOPT_IPRESOLVE); REGISTER_CURL_CONSTANT(CURL_IPRESOLVE_WHATEVER); -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/curl interface.c
pajoye Mon May 4 14:11:34 2009 UTC Modified files: /php-src/ext/curl interface.c Log: - [DOC] a note about the symbol -> version page/doc http://cvs.php.net/viewvc.cgi/php-src/ext/curl/interface.c?r1=1.155&r2=1.156&diff_format=u Index: php-src/ext/curl/interface.c diff -u php-src/ext/curl/interface.c:1.155 php-src/ext/curl/interface.c:1.156 --- php-src/ext/curl/interface.c:1.155 Mon May 4 14:09:12 2009 +++ php-src/ext/curl/interface.cMon May 4 14:11:34 2009 @@ -16,7 +16,7 @@ +--+ */ -/* $Id: interface.c,v 1.155 2009/05/04 14:09:12 pajoye Exp $ */ +/* $Id: interface.c,v 1.156 2009/05/04 14:11:34 pajoye Exp $ */ #define ZEND_INCLUDE_FULL_WINDOWS_HEADERS @@ -442,6 +442,11 @@ le_curl = zend_register_list_destructors_ex(_php_curl_close, NULL, "curl", module_number); le_curl_multi_handle = zend_register_list_destructors_ex(_php_curl_multi_close, NULL, "curl", module_number); + + /* See http://curl.haxx.se/lxr/source/docs/libcurl/symbols-in-versions + or curl src/docs/libcurl/symbols-in-versions for a (almost) complete list + of options and which version they were introduced */ + /* Constants for curl_setopt() */ REGISTER_CURL_CONSTANT(CURLOPT_IPRESOLVE); REGISTER_CURL_CONSTANT(CURL_IPRESOLVE_WHATEVER); -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/curl interface.c
pajoye Mon May 4 14:09:13 2009 UTC
Modified files:
/php-src/ext/curl interface.c
Log:
- [DOC] #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.154&r2=1.155&diff_format=u
Index: php-src/ext/curl/interface.c
diff -u php-src/ext/curl/interface.c:1.154 php-src/ext/curl/interface.c:1.155
--- php-src/ext/curl/interface.c:1.154 Mon May 4 12:12:40 2009
+++ php-src/ext/curl/interface.cMon May 4 14:09:12 2009
@@ -16,7 +16,7 @@
+--+
*/
-/* $Id: interface.c,v 1.154 2009/05/04 12:12:40 pajoye Exp $ */
+/* $Id: interface.c,v 1.155 2009/05/04 14:09:12 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();
@@ -1530,6 +1537,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
Re: [PHP-CVS] cvs: php-src(PHP_5_2) / NEWS /main network.c
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 /main network.c
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.142&r2=1.143&diff_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) / NEWS /main network.c
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.1487&r2=1.2027.2.547.2.1488&diff_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.16&r2=1.118.2.2.2.17&diff_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
[PHP-CVS] cvs: CVSROOT / avail
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.1520&r2=1.1521&diff_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(PHP_5_3) / NEWS
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.578&r2=1.2027.2.547.2.965.2.579&diff_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: php-src(PHP_5_3) /ext/curl interface.c
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.35&r2=1.62.2.14.2.27.2.36&diff_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 /ext/curl interface.c
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.153&r2=1.154&diff_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
