[PHP-CVS] cvs: php-src(PHP_4_4) /ext/session session.c
stasWed May 16 01:34:14 2007 UTC
Modified files: (Branch: PHP_4_4)
/php-src/ext/sessionsession.c
Log:
do not send cookie when session is passed in URL, same as it happens with
GET/POST
http://cvs.php.net/viewvc.cgi/php-src/ext/session/session.c?r1=1.336.2.53.2.17&r2=1.336.2.53.2.18&diff_format=u
Index: php-src/ext/session/session.c
diff -u php-src/ext/session/session.c:1.336.2.53.2.17
php-src/ext/session/session.c:1.336.2.53.2.18
--- php-src/ext/session/session.c:1.336.2.53.2.17 Wed Apr 4 19:52:26 2007
+++ php-src/ext/session/session.c Wed May 16 01:34:14 2007
@@ -17,7 +17,7 @@
+--+
*/
-/* $Id: session.c,v 1.336.2.53.2.17 2007/04/04 19:52:26 tony2001 Exp $ */
+/* $Id: session.c,v 1.336.2.53.2.18 2007/05/16 01:34:14 stas Exp $ */
#ifdef HAVE_CONFIG_H
#include "config.h"
@@ -1120,8 +1120,10 @@
char *q;
p += lensess + 1;
- if ((q = strpbrk(p, "/?\\")))
+ if ((q = strpbrk(p, "/?\\"))) {
PS(id) = estrndup(p, q - p);
+ PS(send_cookie) = 0;
+ }
}
/* check whether the current request was referred to by
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/session session.c
stasWed May 16 01:32:28 2007 UTC
Modified files:
/php-src/ext/sessionsession.c
Log:
do not send cookie when session is passed in URL, same as it happens with
GET/POST
http://cvs.php.net/viewvc.cgi/php-src/ext/session/session.c?r1=1.469&r2=1.470&diff_format=u
Index: php-src/ext/session/session.c
diff -u php-src/ext/session/session.c:1.469 php-src/ext/session/session.c:1.470
--- php-src/ext/session/session.c:1.469 Wed May 2 10:30:24 2007
+++ php-src/ext/session/session.c Wed May 16 01:32:28 2007
@@ -17,7 +17,7 @@
+--+
*/
-/* $Id: session.c,v 1.469 2007/05/02 10:30:24 tony2001 Exp $ */
+/* $Id: session.c,v 1.470 2007/05/16 01:32:28 stas Exp $ */
#ifdef HAVE_CONFIG_H
#include "config.h"
@@ -1275,6 +1275,7 @@
p += lensess + 1;
if ((q = strpbrk(p, "/?\\"))) {
PS(id) = estrndup(p, q - p);
+ PS(send_cookie) = 0;
}
}
--
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/session session.c
stasWed May 16 01:18:14 2007 UTC
Modified files: (Branch: PHP_5_2)
/php-src/ext/sessionsession.c
Log:
do not send cookie when session is passed in URL, same as it happens with
GET/POST
http://cvs.php.net/viewvc.cgi/php-src/ext/session/session.c?r1=1.417.2.8.2.33&r2=1.417.2.8.2.34&diff_format=u
Index: php-src/ext/session/session.c
diff -u php-src/ext/session/session.c:1.417.2.8.2.33
php-src/ext/session/session.c:1.417.2.8.2.34
--- php-src/ext/session/session.c:1.417.2.8.2.33Wed Apr 4 19:52:19 2007
+++ php-src/ext/session/session.c Wed May 16 01:18:14 2007
@@ -17,7 +17,7 @@
+--+
*/
-/* $Id: session.c,v 1.417.2.8.2.33 2007/04/04 19:52:19 tony2001 Exp $ */
+/* $Id: session.c,v 1.417.2.8.2.34 2007/05/16 01:18:14 stas Exp $ */
#ifdef HAVE_CONFIG_H
#include "config.h"
@@ -1283,8 +1283,11 @@
char *q;
p += lensess + 1;
- if ((q = strpbrk(p, "/?\\")))
+ if ((q = strpbrk(p, "/?\\"))) {
PS(id) = estrndup(p, q - p);
+ PS(send_cookie) = 0;
+ }
+
}
/* check whether the current request was referred to by
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: CVSROOT / avail
helly Tue May 15 20:59:58 2007 UTC Modified files: /CVSROOTavail Log: - Upgrade david http://cvs.php.net/viewvc.cgi/CVSROOT/avail?r1=1.1269&r2=1.1270&diff_format=u Index: CVSROOT/avail diff -u CVSROOT/avail:1.1269 CVSROOT/avail:1.1270 --- CVSROOT/avail:1.1269Tue May 8 12:59:38 2007 +++ CVSROOT/avail Tue May 15 20:59:58 2007 @@ -271,7 +271,7 @@ avail|wharmby|php-src avail|void|pecl/bbcode avail|sankazim|pecl/amf -avail|davidc|phpweb +avail|davidc|phpweb,pecl/phar avail|sankazim|pecl/amfext avail|doury|pecl/ims avail|janisto|pear/Validate,peardoc -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/standard/tests/general_functions debug_zval_dump_v.phpt
tony2001Tue May 15 14:25:50 2007 UTC Modified files: /php-src/ext/standard/tests/general_functions debug_zval_dump_v.phpt Log: fix test http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/general_functions/debug_zval_dump_v.phpt?r1=1.2&r2=1.3&diff_format=u Index: php-src/ext/standard/tests/general_functions/debug_zval_dump_v.phpt diff -u php-src/ext/standard/tests/general_functions/debug_zval_dump_v.phpt:1.2 php-src/ext/standard/tests/general_functions/debug_zval_dump_v.phpt:1.3 --- php-src/ext/standard/tests/general_functions/debug_zval_dump_v.phpt:1.2 Sat May 12 12:18:13 2007 +++ php-src/ext/standard/tests/general_functions/debug_zval_dump_v.phpt Tue May 15 14:25:50 2007 @@ -1,5 +1,7 @@ --TEST-- Test debug_zval_dump() function : usage variations +--INI-- +allow_call_time_pass_reference=1 --FILE-- http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_2) /ext/standard/tests/general_functions debug_zval_dump_b.phpt debug_zval_dump_b_64bit.phpt debug_zval_dump_v.phpt
tony2001Tue May 15 14:25:21 2007 UTC Modified files: (Branch: PHP_5_2) /php-src/ext/standard/tests/general_functions debug_zval_dump_b_64bit.phpt debug_zval_dump_b.phpt debug_zval_dump_v.phpt Log: fix tests http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/general_functions/debug_zval_dump_b_64bit.phpt?r1=1.1.2.1&r2=1.1.2.2&diff_format=u Index: php-src/ext/standard/tests/general_functions/debug_zval_dump_b_64bit.phpt http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/general_functions/debug_zval_dump_b.phpt?r1=1.1.2.2&r2=1.1.2.3&diff_format=u Index: php-src/ext/standard/tests/general_functions/debug_zval_dump_b.phpt http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/general_functions/debug_zval_dump_v.phpt?r1=1.1.2.1&r2=1.1.2.2&diff_format=u Index: php-src/ext/standard/tests/general_functions/debug_zval_dump_v.phpt diff -u php-src/ext/standard/tests/general_functions/debug_zval_dump_v.phpt:1.1.2.1 php-src/ext/standard/tests/general_functions/debug_zval_dump_v.phpt:1.1.2.2 --- php-src/ext/standard/tests/general_functions/debug_zval_dump_v.phpt:1.1.2.1 Sat May 12 10:28:00 2007 +++ php-src/ext/standard/tests/general_functions/debug_zval_dump_v.phpt Tue May 15 14:25:21 2007 @@ -1,5 +1,7 @@ --TEST-- Test debug_zval_dump() function : usage variations +--INI-- +allow_call_time_pass_reference=1 --FILE-- http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/standard/tests/general_functions debug_zval_dump_b.phpt
tony2001Tue May 15 14:24:40 2007 UTC Modified files: /php-src/ext/standard/tests/general_functions debug_zval_dump_b.phpt Log: fix test http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/general_functions/debug_zval_dump_b.phpt?r1=1.3&r2=1.4&diff_format=u Index: php-src/ext/standard/tests/general_functions/debug_zval_dump_b.phpt diff -u php-src/ext/standard/tests/general_functions/debug_zval_dump_b.phpt:1.3 php-src/ext/standard/tests/general_functions/debug_zval_dump_b.phpt:1.4 --- php-src/ext/standard/tests/general_functions/debug_zval_dump_b.phpt:1.3 Mon May 14 13:05:28 2007 +++ php-src/ext/standard/tests/general_functions/debug_zval_dump_b.phpt Tue May 15 14:24:39 2007 @@ -6,6 +6,7 @@ ?> --INI-- precision=14 +allow_call_time_pass_reference=1 --FILE-- http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_2) / NEWS /main/streams userspace.c
scottmacTue May 15 13:04:44 2007 UTC
Modified files: (Branch: PHP_5_2)
/php-srcNEWS
/php-src/main/streams userspace.c
Log:
MFH: Fixed bug #41390 (Clarify error message with invalid protocol scheme)
http://cvs.php.net/viewvc.cgi/php-src/NEWS?r1=1.2027.2.547.2.705&r2=1.2027.2.547.2.706&diff_format=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.2027.2.547.2.705 php-src/NEWS:1.2027.2.547.2.706
--- php-src/NEWS:1.2027.2.547.2.705 Tue May 15 12:39:05 2007
+++ php-src/NEWSTue May 15 13:04:43 2007
@@ -10,6 +10,8 @@
- Fixed altering $this via argument named "this". (Dmitry)
- Fixed PHP CLI to use the php.ini from the binary location. (Hannes)
- Fixed segfault in strripos(). (Tony, Joxean Koret)
+- Fixed bug #41390 (Clarify error message with invalid protocol scheme).
+ (Scott)
- Fixed bug #41378 (fastcgi protocol lacks support for Reason-Phrase in
"Status:" header). (anight at eyelinkmedia dot com, Dmitry)
- Fixed bug #41374 (wholetext concats values of wrong nodes). (Rob)
http://cvs.php.net/viewvc.cgi/php-src/main/streams/userspace.c?r1=1.31.2.3.2.4&r2=1.31.2.3.2.5&diff_format=u
Index: php-src/main/streams/userspace.c
diff -u php-src/main/streams/userspace.c:1.31.2.3.2.4
php-src/main/streams/userspace.c:1.31.2.3.2.5
--- php-src/main/streams/userspace.c:1.31.2.3.2.4 Tue Feb 13 19:50:59 2007
+++ php-src/main/streams/userspace.cTue May 15 13:04:43 2007
@@ -17,7 +17,7 @@
+--+
*/
-/* $Id: userspace.c,v 1.31.2.3.2.4 2007/02/13 19:50:59 tony2001 Exp $ */
+/* $Id: userspace.c,v 1.31.2.3.2.5 2007/05/15 13:04:43 scottmac Exp $ */
#include "php.h"
#include "php_globals.h"
@@ -458,8 +458,8 @@
if
(zend_hash_exists(php_stream_get_url_stream_wrappers_hash(), protocol,
protocol_len + 1)) {
php_error_docref(NULL TSRMLS_CC, E_WARNING,
"Protocol %s:// is already defined.", protocol);
} else {
- /* Should never happen */
- php_error_docref(NULL TSRMLS_CC, E_WARNING,
"Unable to register wrapper class %s to %s://", classname, protocol);
+ /* Hash doesn't exist so it must have been an
invalid protocol scheme */
+ php_error_docref(NULL TSRMLS_CC, E_WARNING,
"Invalid protocol scheme specified. Unable to register wrapper class %s to
%s://", classname, protocol);
}
}
} else {
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /main/streams userspace.c
scottmacTue May 15 13:01:47 2007 UTC
Modified files:
/php-src/main/streams userspace.c
Log:
Fixed bug #41390 (Clarify error message with invalid protocol scheme syntax)
http://cvs.php.net/viewvc.cgi/php-src/main/streams/userspace.c?r1=1.41&r2=1.42&diff_format=u
Index: php-src/main/streams/userspace.c
diff -u php-src/main/streams/userspace.c:1.41
php-src/main/streams/userspace.c:1.42
--- php-src/main/streams/userspace.c:1.41 Tue Feb 13 19:50:13 2007
+++ php-src/main/streams/userspace.cTue May 15 13:01:47 2007
@@ -17,7 +17,7 @@
+--+
*/
-/* $Id: userspace.c,v 1.41 2007/02/13 19:50:13 tony2001 Exp $ */
+/* $Id: userspace.c,v 1.42 2007/05/15 13:01:47 scottmac Exp $ */
#include "php.h"
#include "php_globals.h"
@@ -458,8 +458,8 @@
if
(zend_hash_exists(php_stream_get_url_stream_wrappers_hash(), protocol,
protocol_len)) {
php_error_docref(NULL TSRMLS_CC, E_WARNING,
"Protocol %s:// is already defined", protocol);
} else {
- /* Should never happen */
- php_error_docref(NULL TSRMLS_CC, E_WARNING,
"Unable to register wrapper class %s to %s://", classname, protocol);
+ /* Hash doesn't exist so it must have been an
invalid protocol scheme */
+ php_error_docref(NULL TSRMLS_CC, E_WARNING,
"Invalid protocol scheme specified. Unable to register wrapper class %s to
%s://", classname, protocol);
}
}
} else {
--
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
tony2001Tue May 15 12:39:06 2007 UTC Modified files: (Branch: PHP_5_2) /php-srcNEWS Log: add the original author of the patch http://cvs.php.net/viewvc.cgi/php-src/NEWS?r1=1.2027.2.547.2.704&r2=1.2027.2.547.2.705&diff_format=u Index: php-src/NEWS diff -u php-src/NEWS:1.2027.2.547.2.704 php-src/NEWS:1.2027.2.547.2.705 --- php-src/NEWS:1.2027.2.547.2.704 Tue May 15 08:17:08 2007 +++ php-src/NEWSTue May 15 12:39:05 2007 @@ -11,7 +11,7 @@ - Fixed PHP CLI to use the php.ini from the binary location. (Hannes) - Fixed segfault in strripos(). (Tony, Joxean Koret) - Fixed bug #41378 (fastcgi protocol lacks support for Reason-Phrase in - "Status:" header). (Dmitry) + "Status:" header). (anight at eyelinkmedia dot com, Dmitry) - Fixed bug #41374 (wholetext concats values of wrong nodes). (Rob) - Fixed bug #41353 (crash in openssl_pkcs12_read() on invalid input). (Ilia) - Fixed bug #41351 (Invalid opcode with foreach ($a[] as $b)). (Dmitry, Tony) -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /sapi/cgi cgi_main.c
dmitry Tue May 15 08:17:21 2007 UTC
Modified files:
/php-src/sapi/cgi cgi_main.c
Log:
Fixed bug #41378 (fastcgi protocol lacks support for Reason-Phrase in
"Status:" header)
http://cvs.php.net/viewvc.cgi/php-src/sapi/cgi/cgi_main.c?r1=1.320&r2=1.321&diff_format=u
Index: php-src/sapi/cgi/cgi_main.c
diff -u php-src/sapi/cgi/cgi_main.c:1.320 php-src/sapi/cgi/cgi_main.c:1.321
--- php-src/sapi/cgi/cgi_main.c:1.320 Tue Apr 17 20:01:22 2007
+++ php-src/sapi/cgi/cgi_main.c Tue May 15 08:17:20 2007
@@ -21,7 +21,7 @@
+--+
*/
-/* $Id: cgi_main.c,v 1.320 2007/04/17 20:01:22 sniper Exp $ */
+/* $Id: cgi_main.c,v 1.321 2007/05/15 08:17:20 dmitry Exp $ */
#include "php.h"
#include "php_globals.h"
@@ -320,7 +320,16 @@
}
} else {
- len = sprintf(buf, "Status: %d\r\n",
SG(sapi_headers).http_response_code);
+ char *s;
+
+ if (SG(sapi_headers).http_status_line &&
+ (s = strchr(SG(sapi_headers).http_status_line, '
')) != 0 &&
+ (s - SG(sapi_headers).http_status_line) >= 5 &&
+ strncasecmp(SG(sapi_headers).http_status_line,
"HTTP/", 5) == 0) {
+ len = sprintf(buf, "Status:%s\r\n", s);
+ } else {
+ len = sprintf(buf, "Status: %d\r\n",
SG(sapi_headers).http_response_code);
+ }
}
PHPWRITE_H(buf, len);
--
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 /sapi/cgi cgi_main.c
dmitry Tue May 15 08:17:08 2007 UTC
Modified files: (Branch: PHP_5_2)
/php-srcNEWS
/php-src/sapi/cgi cgi_main.c
Log:
Fixed bug #41378 (fastcgi protocol lacks support for Reason-Phrase in
"Status:" header)
http://cvs.php.net/viewvc.cgi/php-src/NEWS?r1=1.2027.2.547.2.703&r2=1.2027.2.547.2.704&diff_format=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.2027.2.547.2.703 php-src/NEWS:1.2027.2.547.2.704
--- php-src/NEWS:1.2027.2.547.2.703 Mon May 14 18:54:05 2007
+++ php-src/NEWSTue May 15 08:17:08 2007
@@ -10,6 +10,8 @@
- Fixed altering $this via argument named "this". (Dmitry)
- Fixed PHP CLI to use the php.ini from the binary location. (Hannes)
- Fixed segfault in strripos(). (Tony, Joxean Koret)
+- Fixed bug #41378 (fastcgi protocol lacks support for Reason-Phrase in
+ "Status:" header). (Dmitry)
- Fixed bug #41374 (wholetext concats values of wrong nodes). (Rob)
- Fixed bug #41353 (crash in openssl_pkcs12_read() on invalid input). (Ilia)
- Fixed bug #41351 (Invalid opcode with foreach ($a[] as $b)). (Dmitry, Tony)
http://cvs.php.net/viewvc.cgi/php-src/sapi/cgi/cgi_main.c?r1=1.267.2.15.2.36&r2=1.267.2.15.2.37&diff_format=u
Index: php-src/sapi/cgi/cgi_main.c
diff -u php-src/sapi/cgi/cgi_main.c:1.267.2.15.2.36
php-src/sapi/cgi/cgi_main.c:1.267.2.15.2.37
--- php-src/sapi/cgi/cgi_main.c:1.267.2.15.2.36 Tue Apr 17 20:00:53 2007
+++ php-src/sapi/cgi/cgi_main.c Tue May 15 08:17:08 2007
@@ -21,7 +21,7 @@
+--+
*/
-/* $Id: cgi_main.c,v 1.267.2.15.2.36 2007/04/17 20:00:53 sniper Exp $ */
+/* $Id: cgi_main.c,v 1.267.2.15.2.37 2007/05/15 08:17:08 dmitry Exp $ */
#include "php.h"
#include "php_globals.h"
@@ -331,7 +331,16 @@
}
} else {
- len = slprintf(buf, sizeof(buf), "Status: %d\r\n",
SG(sapi_headers).http_response_code);
+ char *s;
+
+ if (SG(sapi_headers).http_status_line &&
+ (s = strchr(SG(sapi_headers).http_status_line, '
')) != 0 &&
+ (s - SG(sapi_headers).http_status_line) >= 5 &&
+ strncasecmp(SG(sapi_headers).http_status_line,
"HTTP/", 5) == 0) {
+ len = slprintf(buf, sizeof(buf),
"Status:%s\r\n", s);
+ } else {
+ len = slprintf(buf, sizeof(buf), "Status:
%d\r\n", SG(sapi_headers).http_response_code);
+ }
}
PHPWRITE_H(buf, len);
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
