iliaa Tue May 29 00:01:14 2007 UTC
Modified files:
/php-src/sapi/cgi cgi_main.c
/php-src/ext/filter logical_filters.c
Log:
MFB
http://cvs.php.net/viewvc.cgi/php-src/sapi/cgi/cgi_main.c?r1=1.323&r2=1.324&diff_format=u
Index: php-src/sapi/cgi/cgi_main.c
diff -u php-src/sapi/cgi/cgi_main.c:1.323 php-src/sapi/cgi/cgi_main.c:1.324
--- php-src/sapi/cgi/cgi_main.c:1.323 Mon May 28 08:12:11 2007
+++ php-src/sapi/cgi/cgi_main.c Tue May 29 00:01:14 2007
@@ -21,7 +21,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: cgi_main.c,v 1.323 2007/05/28 08:12:11 dmitry Exp $ */
+/* $Id: cgi_main.c,v 1.324 2007/05/29 00:01:14 iliaa Exp $ */
#include "php.h"
#include "php_globals.h"
@@ -801,8 +801,8 @@
* out what SCRIPT_NAME should
be
*/
int slen = len - strlen(pt);
- int pilen =
strlen(env_path_info);
- char *path_info = env_path_info
+ pilen - slen;
+ int pilen = env_path_info ?
strlen(env_path_info) : 0;
+ char *path_info = env_path_info
? env_path_info + pilen - slen : NULL;
if (orig_path_info !=
path_info) {
if (orig_path_info) {
@@ -842,10 +842,12 @@
env_script_name = pt +
l;
/* PATH_TRANSATED =
DOCUMENT_ROOT + PATH_INFO */
- path_translated_len = l
+ strlen(env_path_info);
+ path_translated_len = l
+ (env_path_info ? strlen(env_path_info) : 0);
path_translated = (char
*) emalloc(path_translated_len + 1);
memcpy(path_translated,
env_document_root, l);
- memcpy(path_translated
+ l, env_path_info, (path_translated_len - l));
+ if (env_path_info) {
+
memcpy(path_translated + l, env_path_info, (path_translated_len - l));
+ }
path_translated[path_translated_len] = '\0';
if
(orig_path_translated) {
_sapi_cgibin_putenv("ORIG_PATH_TRANSLATED", orig_path_translated TSRMLS_CC);
@@ -857,12 +859,14 @@
) {
/* PATH_TRANSATED =
PATH_TRANSATED - SCRIPT_NAME + PATH_INFO */
int ptlen = strlen(pt)
- strlen(env_script_name);
- int path_translated_len
= ptlen + strlen(env_path_info);
+ int path_translated_len
= ptlen + env_path_info ? strlen(env_path_info) : 0;
char *path_translated =
NULL;
path_translated = (char
*) emalloc(path_translated_len + 1);
memcpy(path_translated,
pt, ptlen);
- memcpy(path_translated
+ ptlen, env_path_info, path_translated_len - ptlen);
+ if (env_path_info) {
+
memcpy(path_translated + ptlen, env_path_info, path_translated_len - ptlen);
+ }
path_translated[path_translated_len] = '\0';
if
(orig_path_translated) {
_sapi_cgibin_putenv("ORIG_PATH_TRANSLATED", orig_path_translated TSRMLS_CC);
http://cvs.php.net/viewvc.cgi/php-src/ext/filter/logical_filters.c?r1=1.25&r2=1.26&diff_format=u
Index: php-src/ext/filter/logical_filters.c
diff -u php-src/ext/filter/logical_filters.c:1.25
php-src/ext/filter/logical_filters.c:1.26
--- php-src/ext/filter/logical_filters.c:1.25 Mon Jan 1 09:29:23 2007
+++ php-src/ext/filter/logical_filters.c Tue May 29 00:01:14 2007
@@ -17,7 +17,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: logical_filters.c,v 1.25 2007/01/01 09:29:23 sebastian Exp $ */
+/* $Id: logical_filters.c,v 1.26 2007/05/29 00:01:14 iliaa Exp $ */
#include "php_filter.h"
#include "filter_private.h"
@@ -473,7 +473,7 @@
void php_filter_validate_email(PHP_INPUT_FILTER_PARAM_DECL) /* {{{ */
{
/* From
http://cvs.php.net/co.php/pear/HTML_QuickForm/QuickForm/Rule/Email.php?r=1.4 */
- const char regexp[] =
"/^((\\\"[^\\\"\\f\\n\\r\\t\\b]+\\\")|([\\w\\!\\#\\$\\%\\&\\'\\*\\+\\-\\~\\/\\^\\`\\|\\{\\}]+(\\.[\\w\\!\\#\\$\\%\\&\\'\\*\\+\\-\\~\\/\\^\\`\\|\\{\\}]+)*))@((\\[(((25[0-5])|(2[0-4][0-9])|([0-1]?[0-9]?[0-9]))\\.((25[0-5])|(2[0-4][0-9])|([0-1]?[0-9]?[0-9]))\\.((25[0-5])|(2[0-4][0-9])|([0-1]?[0-9]?[0-9]))\\.((25[0-5])|(2[0-4][0-9])|([0-1]?[0-9]?[0-9])))\\])|(((25[0-5])|(2[0-4][0-9])|([0-1]?[0-9]?[0-9]))\\.((25[0-5])|(2[0-4][0-9])|([0-1]?[0-9]?[0-9]))\\.((25[0-5])|(2[0-4][0-9])|([0-1]?[0-9]?[0-9]))\\.((25[0-5])|(2[0-4][0-9])|([0-1]?[0-9]?[0-9])))|((([A-Za-z0-9\\-])+\\.)+[A-Za-z\\-]+))$/";
+ const char regexp[] =
"/^((\\\"[^\\\"\\f\\n\\r\\t\\b]+\\\")|([\\w\\!\\#\\$\\%\\&\\'\\*\\+\\-\\~\\/\\^\\`\\|\\{\\}]+(\\.[\\w\\!\\#\\$\\%\\&\\'\\*\\+\\-\\~\\/\\^\\`\\|\\{\\}]+)*))@((\\[(((25[0-5])|(2[0-4][0-9])|([0-1]?[0-9]?[0-9]))\\.((25[0-5])|(2[0-4][0-9])|([0-1]?[0-9]?[0-9]))\\.((25[0-5])|(2[0-4][0-9])|([0-1]?[0-9]?[0-9]))\\.((25[0-5])|(2[0-4][0-9])|([0-1]?[0-9]?[0-9])))\\])|(((25[0-5])|(2[0-4][0-9])|([0-1]?[0-9]?[0-9]))\\.((25[0-5])|(2[0-4][0-9])|([0-1]?[0-9]?[0-9]))\\.((25[0-5])|(2[0-4][0-9])|([0-1]?[0-9]?[0-9]))\\.((25[0-5])|(2[0-4][0-9])|([0-1]?[0-9]?[0-9])))|((([A-Za-z0-9\\-])+\\.)+[A-Za-z\\-]+))$/D";
pcre *re = NULL;
pcre_extra *pcre_extra = NULL;
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
