diff --git a/configs/ini.c b/configs/ini.c index abab5064..73207ebc 100644 --- a/configs/ini.c +++ b/configs/ini.c @@ -14,7 +14,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: ini.c 327626 2012-09-13 02:57:39Z laruence $ */ +/* $Id: ini.c 329002 2013-01-07 12:55:53Z laruence $ */ zend_class_entry *yaf_config_ini_ce; diff --git a/configs/simple.c b/configs/simple.c index ff8ee6b3..342f2300 100644 --- a/configs/simple.c +++ b/configs/simple.c @@ -14,7 +14,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: simple.c 327626 2012-09-13 02:57:39Z laruence $ */ +/* $Id: simple.c 329002 2013-01-07 12:55:53Z laruence $ */ zend_class_entry *yaf_config_simple_ce; diff --git a/php_yaf.h b/php_yaf.h index 37655ad4..26a0b204 100644 --- a/php_yaf.h +++ b/php_yaf.h @@ -14,7 +14,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: php_yaf.h 328981 2013-01-04 10:53:59Z laruence $ */ +/* $Id: php_yaf.h 329002 2013-01-07 12:55:53Z laruence $ */ #ifndef PHP_YAF_H #define PHP_YAF_H diff --git a/requests/http.c b/requests/http.c index 941e8202..1ac14f0c 100644 --- a/requests/http.c +++ b/requests/http.c @@ -14,7 +14,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: http.c 327549 2012-09-09 03:02:48Z laruence $ */ +/* $Id: http.c 329002 2013-01-07 12:55:53Z laruence $ */ #include "ext/standard/url.h" diff --git a/requests/simple.c b/requests/simple.c index 0e867fe9..cee7e4b2 100644 --- a/requests/simple.c +++ b/requests/simple.c @@ -14,7 +14,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: simple.c 327591 2012-09-10 10:56:13Z laruence $ */ +/* $Id: simple.c 329002 2013-01-07 12:55:53Z laruence $ */ static zend_class_entry *yaf_request_simple_ce; diff --git a/response/cli.c b/response/cli.c index 849618b5..7c19fa35 100644 --- a/response/cli.c +++ b/response/cli.c @@ -14,7 +14,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: cli.c 321289 2011-12-21 02:53:29Z laruence $ */ +/* $Id: cli.c 329002 2013-01-07 12:55:53Z laruence $ */ zend_class_entry * yaf_response_cli_ce; diff --git a/response/http.c b/response/http.c index e63f15e9..c72fd142 100644 --- a/response/http.c +++ b/response/http.c @@ -14,7 +14,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: http.c 321289 2011-12-21 02:53:29Z laruence $ */ +/* $Id: http.c 329002 2013-01-07 12:55:53Z laruence $ */ zend_class_entry *yaf_response_http_ce; diff --git a/routes/interface.c b/routes/interface.c index ffa153cd..db85c38e 100644 --- a/routes/interface.c +++ b/routes/interface.c @@ -14,7 +14,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: interface.c 326042 2012-06-08 10:49:59Z laruence $ */ +/* $Id: interface.c 329002 2013-01-07 12:55:53Z laruence $ */ #include "ext/standard/php_smart_str.h" diff --git a/routes/map.c b/routes/map.c index 99e82298..293520d1 100644 --- a/routes/map.c +++ b/routes/map.c @@ -14,7 +14,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: map.c 327549 2012-09-09 03:02:48Z laruence $*/ +/* $Id: map.c 329002 2013-01-07 12:55:53Z laruence $*/ zend_class_entry *yaf_route_map_ce; diff --git a/routes/regex.c b/routes/regex.c index 00bbdb38..105638ed 100644 --- a/routes/regex.c +++ b/routes/regex.c @@ -14,7 +14,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: regex.c 327549 2012-09-09 03:02:48Z laruence $ */ +/* $Id: regex.c 329133 2013-01-14 07:24:17Z laruence $ */ zend_class_entry *yaf_route_regex_ce; @@ -135,9 +135,9 @@ int yaf_route_regex_route(yaf_route_t *router, yaf_request_t *request TSRMLS_DC) if (base_uri && IS_STRING == Z_TYPE_P(base_uri) && !strncasecmp(Z_STRVAL_P(zuri), Z_STRVAL_P(base_uri), Z_STRLEN_P(base_uri))) { - request_uri = estrdup(Z_STRVAL_P(zuri) + Z_STRLEN_P(base_uri)); + request_uri = estrdup(Z_STRVAL_P(zuri) + Z_STRLEN_P(base_uri)); } else { - request_uri = estrdup(Z_STRVAL_P(zuri)); + request_uri = estrdup(Z_STRVAL_P(zuri)); } if (!(args = yaf_route_regex_match(router, request_uri, strlen(request_uri) TSRMLS_CC))) { @@ -147,16 +147,37 @@ int yaf_route_regex_route(yaf_route_t *router, yaf_request_t *request TSRMLS_DC) zval **module, **controller, **action, *routes; routes = zend_read_property(yaf_route_regex_ce, router, ZEND_STRL(YAF_ROUTE_PROPETY_NAME_ROUTE), 1 TSRMLS_CC); - if (zend_hash_find(Z_ARRVAL_P(routes), ZEND_STRS("module"), (void **)&module) == SUCCESS) { - zend_update_property(yaf_request_ce, request, ZEND_STRL(YAF_REQUEST_PROPERTY_NAME_MODULE), *module TSRMLS_CC); + if (zend_hash_find(Z_ARRVAL_P(routes), ZEND_STRS("module"), (void **)&module) == SUCCESS && IS_STRING == Z_TYPE_PP(module)) { + if (Z_STRVAL_PP(module)[0] != ':') { + zend_update_property(yaf_request_ce, request, ZEND_STRL(YAF_REQUEST_PROPERTY_NAME_MODULE), *module TSRMLS_CC); + } else { + zval **m; + if (zend_hash_find(Z_ARRVAL_P(args), Z_STRVAL_PP(module) + 1, Z_STRLEN_PP(module), (void **)&m) == SUCCESS && IS_STRING == Z_TYPE_PP(m)) { + zend_update_property(yaf_request_ce, request, ZEND_STRL(YAF_REQUEST_PROPERTY_NAME_MODULE), *m TSRMLS_CC); + } + } } - if (zend_hash_find(Z_ARRVAL_P(routes), ZEND_STRS("controller"), (void **)&controller) == SUCCESS) { - zend_update_property(yaf_request_ce, request, ZEND_STRL(YAF_REQUEST_PROPERTY_NAME_CONTROLLER), *controller TSRMLS_CC); + if (zend_hash_find(Z_ARRVAL_P(routes), ZEND_STRS("controller"), (void **)&controller) == SUCCESS && IS_STRING == Z_TYPE_PP(controller)) { + if (Z_STRVAL_PP(controller)[0] != ':') { + zend_update_property(yaf_request_ce, request, ZEND_STRL(YAF_REQUEST_PROPERTY_NAME_CONTROLLER), *controller TSRMLS_CC); + } else { + zval **c; + if (zend_hash_find(Z_ARRVAL_P(args), Z_STRVAL_PP(controller) + 1, Z_STRLEN_PP(controller), (void **)&c) == SUCCESS && IS_STRING == Z_TYPE_PP(c)) { + zend_update_property(yaf_request_ce, request, ZEND_STRL(YAF_REQUEST_PROPERTY_NAME_CONTROLLER), *c TSRMLS_CC); + } + } } - if (zend_hash_find(Z_ARRVAL_P(routes), ZEND_STRS("action"), (void **)&action) == SUCCESS) { - zend_update_property(yaf_request_ce, request, ZEND_STRL(YAF_REQUEST_PROPERTY_NAME_ACTION), *action TSRMLS_CC); + if (zend_hash_find(Z_ARRVAL_P(routes), ZEND_STRS("action"), (void **)&action) == SUCCESS && IS_STRING == Z_TYPE_PP(action)) { + if (Z_STRVAL_PP(action)[0] != ':') { + zend_update_property(yaf_request_ce, request, ZEND_STRL(YAF_REQUEST_PROPERTY_NAME_ACTION), *action TSRMLS_CC); + } else { + zval **a; + if (zend_hash_find(Z_ARRVAL_P(args), Z_STRVAL_PP(action) + 1, Z_STRLEN_PP(action), (void **)&a) == SUCCESS && IS_STRING == Z_TYPE_PP(a)) { + zend_update_property(yaf_request_ce, request, ZEND_STRL(YAF_REQUEST_PROPERTY_NAME_ACTION), *a TSRMLS_CC); + } + } } (void)yaf_request_set_params_multi(request, args TSRMLS_CC); diff --git a/routes/rewrite.c b/routes/rewrite.c index be3c6c9b..6979dd28 100644 --- a/routes/rewrite.c +++ b/routes/rewrite.c @@ -14,7 +14,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: rewrite.c 327549 2012-09-09 03:02:48Z laruence $ */ +/* $Id: rewrite.c 329133 2013-01-14 07:24:17Z laruence $ */ zend_class_entry *yaf_route_rewrite_ce; @@ -188,16 +188,37 @@ int yaf_route_rewrite_route(yaf_route_t *router, yaf_request_t *request TSRMLS_D zval **module, **controller, **action, *routes; routes = zend_read_property(yaf_route_rewrite_ce, router, ZEND_STRL(YAF_ROUTE_PROPETY_NAME_ROUTE), 1 TSRMLS_CC); - if (zend_hash_find(Z_ARRVAL_P(routes), ZEND_STRS("module"), (void **)&module) == SUCCESS) { - zend_update_property(yaf_request_ce, request, ZEND_STRL(YAF_REQUEST_PROPERTY_NAME_MODULE), *module TSRMLS_CC); + if (zend_hash_find(Z_ARRVAL_P(routes), ZEND_STRS("module"), (void **)&module) == SUCCESS && IS_STRING == Z_TYPE_PP(module)) { + if (Z_STRVAL_PP(module)[0] != ':') { + zend_update_property(yaf_request_ce, request, ZEND_STRL(YAF_REQUEST_PROPERTY_NAME_MODULE), *module TSRMLS_CC); + } else { + zval **m; + if (zend_hash_find(Z_ARRVAL_P(args), Z_STRVAL_PP(module) + 1, Z_STRLEN_PP(module), (void **)&m) == SUCCESS && IS_STRING == Z_TYPE_PP(m)) { + zend_update_property(yaf_request_ce, request, ZEND_STRL(YAF_REQUEST_PROPERTY_NAME_MODULE), *m TSRMLS_CC); + } + } } - if (zend_hash_find(Z_ARRVAL_P(routes), ZEND_STRS("controller"), (void **)&controller) == SUCCESS) { - zend_update_property(yaf_request_ce, request, ZEND_STRL(YAF_REQUEST_PROPERTY_NAME_CONTROLLER), *controller TSRMLS_CC); + if (zend_hash_find(Z_ARRVAL_P(routes), ZEND_STRS("controller"), (void **)&controller) == SUCCESS && IS_STRING == Z_TYPE_PP(controller)) { + if (Z_STRVAL_PP(controller)[0] != ':') { + zend_update_property(yaf_request_ce, request, ZEND_STRL(YAF_REQUEST_PROPERTY_NAME_CONTROLLER), *controller TSRMLS_CC); + } else { + zval **c; + if (zend_hash_find(Z_ARRVAL_P(args), Z_STRVAL_PP(controller) + 1, Z_STRLEN_PP(controller), (void **)&c) == SUCCESS && IS_STRING == Z_TYPE_PP(c)) { + zend_update_property(yaf_request_ce, request, ZEND_STRL(YAF_REQUEST_PROPERTY_NAME_CONTROLLER), *c TSRMLS_CC); + } + } } - if (zend_hash_find(Z_ARRVAL_P(routes), ZEND_STRS("action"), (void **)&action) == SUCCESS) { - zend_update_property(yaf_request_ce, request, ZEND_STRL(YAF_REQUEST_PROPERTY_NAME_ACTION), *action TSRMLS_CC); + if (zend_hash_find(Z_ARRVAL_P(routes), ZEND_STRS("action"), (void **)&action) == SUCCESS && IS_STRING == Z_TYPE_PP(action)) { + if (Z_STRVAL_PP(action)[0] != ':') { + zend_update_property(yaf_request_ce, request, ZEND_STRL(YAF_REQUEST_PROPERTY_NAME_ACTION), *action TSRMLS_CC); + } else { + zval **a; + if (zend_hash_find(Z_ARRVAL_P(args), Z_STRVAL_PP(action) + 1, Z_STRLEN_PP(action), (void **)&a) == SUCCESS && IS_STRING == Z_TYPE_PP(a)) { + zend_update_property(yaf_request_ce, request, ZEND_STRL(YAF_REQUEST_PROPERTY_NAME_ACTION), *a TSRMLS_CC); + } + } } (void)yaf_request_set_params_multi(request, args TSRMLS_CC); diff --git a/routes/simple.c b/routes/simple.c index 1c725782..2ebbb344 100644 --- a/routes/simple.c +++ b/routes/simple.c @@ -14,7 +14,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: simple.c 327549 2012-09-09 03:02:48Z laruence $ */ +/* $Id: simple.c 329002 2013-01-07 12:55:53Z laruence $ */ zend_class_entry *yaf_route_simple_ce; diff --git a/routes/static.c b/routes/static.c index 5c3d9d05..db182647 100644 --- a/routes/static.c +++ b/routes/static.c @@ -14,7 +14,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: static.c 327627 2012-09-13 06:12:38Z laruence $ */ +/* $Id: static.c 329002 2013-01-07 12:55:53Z laruence $ */ zend_class_entry * yaf_route_static_ce; diff --git a/routes/supervar.c b/routes/supervar.c index 4a9cc50c..e546f67e 100644 --- a/routes/supervar.c +++ b/routes/supervar.c @@ -14,7 +14,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: supervar.c 327549 2012-09-09 03:02:48Z laruence $ */ +/* $Id: supervar.c 329002 2013-01-07 12:55:53Z laruence $ */ #define YAF_ROUTE_SUPERVAR_PROPETY_NAME_VAR "_var_name" diff --git a/tests/063.phpt b/tests/063.phpt new file mode 100644 index 00000000..23fc1aea --- /dev/null +++ b/tests/063.phpt @@ -0,0 +1,63 @@ +--TEST-- +Check for Yaf_Route_Rewrite with dynamic mvc +--SKIPIF-- + +--FILE-- + "m", + "controller" => ":1", + "action" => ":a", + ) +); + +$router->addRoute("subdir", $route)->addRoute("yaf", new Yaf_Route_Rewrite( + "/yaf/:action/*", + array( + "action" => ':action', + "controller" => "index", + ) +))->route($request); + +var_dump($router->getCurrentRoute()); +print_r($request->getParams()); +var_dump($request->getActionName()); +var_dump($request->getControllerName()); +var_dump($request->getModuleName()); + +$request = new Yaf_Request_Http("/yaf/act/name/value"); +$router->route($request); + +var_dump($router->getCurrentRoute()); +print_r($request->getParams()); +var_dump($request->getActionName()); +var_dump($request->getControllerName()); +var_dump($request->getModuleName()); + +?> +--EXPECTF-- +string(6) "subdir" +Array +( + [con] => ctl + [a] => act + [name] => value +) +string(3) "act" +NULL +string(1) "m" +string(3) "yaf" +Array +( + [action] => act + [name] => value +) +string(3) "act" +string(5) "index" +NULL diff --git a/tests/064.phpt b/tests/064.phpt new file mode 100644 index 00000000..897ebac5 --- /dev/null +++ b/tests/064.phpt @@ -0,0 +1,68 @@ +--TEST-- +Check for Yaf_Route_Regex with dynamic mvc +--SKIPIF-- + +--FILE-- + "m", + "controller" => ":c", + "action" => ":a", + ), + array( + 1 => "c", + 2 => "a", + ) +); + +$router->addRoute("subdir", $route)->addRoute("yaf", new Yaf_Route_Regex( + "#yaf/(.*?)/.*#", + array( + "action" => ':action', + "controller" => "index", + ), + array( + 1 => "action", + ) +))->route($request); + +var_dump($router->getCurrentRoute()); +print_r($request->getParams()); +var_dump($request->getActionName()); +var_dump($request->getControllerName()); +var_dump($request->getModuleName()); + +$request = new Yaf_Request_Http("/yaf/act/name/value"); +$router->route($request); + +var_dump($router->getCurrentRoute()); +print_r($request->getParams()); +var_dump($request->getActionName()); +var_dump($request->getControllerName()); +var_dump($request->getModuleName()); + +?> +--EXPECTF-- +string(6) "subdir" +Array +( + [c] => ctl + [a] => act +) +string(3) "act" +string(3) "ctl" +string(1) "m" +string(3) "yaf" +Array +( + [action] => act +) +string(3) "act" +string(5) "index" +NULL diff --git a/views/interface.c b/views/interface.c index d9cfb2b5..8d4eebd0 100644 --- a/views/interface.c +++ b/views/interface.c @@ -14,7 +14,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: interface.c 327426 2012-09-02 04:01:00Z laruence $ */ +/* $Id: interface.c 329002 2013-01-07 12:55:53Z laruence $ */ zend_class_entry *yaf_view_interface_ce; diff --git a/views/simple.c b/views/simple.c index cd50bfd3..f6945013 100644 --- a/views/simple.c +++ b/views/simple.c @@ -14,7 +14,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: simple.c 328823 2012-12-18 10:10:55Z remi $ */ +/* $Id: simple.c 329002 2013-01-07 12:55:53Z laruence $ */ #include "main/php_output.h" diff --git a/yaf.c b/yaf.c index 1d427079..e3b0414c 100644 --- a/yaf.c +++ b/yaf.c @@ -14,7 +14,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: yaf.c 328262 2012-11-06 10:31:55Z laruence $ */ +/* $Id: yaf.c 329002 2013-01-07 12:55:53Z laruence $ */ #ifdef HAVE_CONFIG_H #include "config.h" diff --git a/yaf_action.c b/yaf_action.c index 68d0461a..9887e02f 100644 --- a/yaf_action.c +++ b/yaf_action.c @@ -14,7 +14,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: yaf_action.c 321289 2011-12-21 02:53:29Z laruence $ */ +/* $Id: yaf_action.c 329002 2013-01-07 12:55:53Z laruence $ */ #ifdef HAVE_CONFIG_H #include "config.h" diff --git a/yaf_action.h b/yaf_action.h index 08623d8b..76850c76 100644 --- a/yaf_action.h +++ b/yaf_action.h @@ -14,7 +14,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: yaf_action.h 321289 2011-12-21 02:53:29Z laruence $ */ +/* $Id: yaf_action.h 329002 2013-01-07 12:55:53Z laruence $ */ #ifndef YAF_ACTION_H #define YAF_ACTION_H diff --git a/yaf_application.c b/yaf_application.c index 7985dce4..7c59606c 100644 --- a/yaf_application.c +++ b/yaf_application.c @@ -14,7 +14,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: yaf_application.c 328604 2012-12-02 05:47:27Z laruence $ */ +/* $Id: yaf_application.c 329002 2013-01-07 12:55:53Z laruence $ */ #ifdef HAVE_CONFIG_H #include "config.h" diff --git a/yaf_application.h b/yaf_application.h index 87bde4f2..4d44981e 100644 --- a/yaf_application.h +++ b/yaf_application.h @@ -14,7 +14,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: yaf_application.h 321289 2011-12-21 02:53:29Z laruence $ */ +/* $Id: yaf_application.h 329002 2013-01-07 12:55:53Z laruence $ */ #ifndef PHP_YAF_APPLICATION_H #define PHP_YAF_APPLICATION_H diff --git a/yaf_bootstrap.c b/yaf_bootstrap.c index 35ea86de..1d547ee0 100644 --- a/yaf_bootstrap.c +++ b/yaf_bootstrap.c @@ -14,7 +14,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: yaf_bootstrap.c 321289 2011-12-21 02:53:29Z laruence $ */ +/* $Id: yaf_bootstrap.c 329002 2013-01-07 12:55:53Z laruence $ */ #ifdef HAVE_CONFIG_H #include "config.h" diff --git a/yaf_bootstrap.h b/yaf_bootstrap.h index afa8921d..92cbd3a5 100644 --- a/yaf_bootstrap.h +++ b/yaf_bootstrap.h @@ -14,7 +14,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: yaf_bootstrap.h 321289 2011-12-21 02:53:29Z laruence $ */ +/* $Id: yaf_bootstrap.h 329002 2013-01-07 12:55:53Z laruence $ */ #ifndef YAF_BOOTSTRAP_H #define YAF_BOOTSTRAP_H diff --git a/yaf_config.c b/yaf_config.c index 3070aba6..3c64a319 100644 --- a/yaf_config.c +++ b/yaf_config.c @@ -14,7 +14,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: yaf_config.c 327559 2012-09-09 06:05:25Z laruence $ */ +/* $Id: yaf_config.c 329002 2013-01-07 12:55:53Z laruence $ */ #ifdef HAVE_CONFIG_H #include "config.h" diff --git a/yaf_config.h b/yaf_config.h index d9d09cf1..de862243 100644 --- a/yaf_config.h +++ b/yaf_config.h @@ -14,7 +14,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: yaf_config.h 321289 2011-12-21 02:53:29Z laruence $ */ +/* $Id: yaf_config.h 329002 2013-01-07 12:55:53Z laruence $ */ #ifndef YAF_CONFIG_H #define YAF_CONFIG_H diff --git a/yaf_controller.c b/yaf_controller.c index 50fec4d8..8c92e1f4 100644 --- a/yaf_controller.c +++ b/yaf_controller.c @@ -14,7 +14,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: yaf_controller.c 328819 2012-12-18 08:06:57Z remi $ */ +/* $Id: yaf_controller.c 329002 2013-01-07 12:55:53Z laruence $ */ #ifdef HAVE_CONFIG_H #include "config.h" diff --git a/yaf_controller.h b/yaf_controller.h index 8d884ff2..a55ce0bb 100644 --- a/yaf_controller.h +++ b/yaf_controller.h @@ -14,7 +14,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: yaf_controller.h 327558 2012-09-09 05:59:24Z laruence $ */ +/* $Id: yaf_controller.h 329002 2013-01-07 12:55:53Z laruence $ */ #ifndef YAF_CONTROLLER_H #define YAF_CONTROLLER_H diff --git a/yaf_dispatcher.c b/yaf_dispatcher.c index 5835ee9c..1a20c52f 100644 --- a/yaf_dispatcher.c +++ b/yaf_dispatcher.c @@ -14,7 +14,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: yaf_dispatcher.c 328978 2013-01-04 10:41:50Z laruence $ */ +/* $Id: yaf_dispatcher.c 329002 2013-01-07 12:55:53Z laruence $ */ #ifdef HAVE_CONFIG_H #include "config.h" diff --git a/yaf_dispatcher.h b/yaf_dispatcher.h index 892b8823..d9e49d1c 100644 --- a/yaf_dispatcher.h +++ b/yaf_dispatcher.h @@ -14,7 +14,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: yaf_dispatcher.h 315725 2011-08-29 16:59:33Z laruence $ */ +/* $Id: yaf_dispatcher.h 329002 2013-01-07 12:55:53Z laruence $ */ #ifndef PHP_YAF_DISPATCHER_H #define PHP_YAF_DISPATCHER_H diff --git a/yaf_exception.c b/yaf_exception.c index a6dc24fc..5e11510a 100644 --- a/yaf_exception.c +++ b/yaf_exception.c @@ -14,7 +14,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: yaf_exception.c 325512 2012-05-03 08:22:37Z laruence $ */ +/* $Id: yaf_exception.c 329002 2013-01-07 12:55:53Z laruence $ */ #ifdef HAVE_CONFIG_H #include "config.h" diff --git a/yaf_exception.h b/yaf_exception.h index 6798a2f4..410ecd53 100644 --- a/yaf_exception.h +++ b/yaf_exception.h @@ -14,7 +14,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: yaf_exception.h 327549 2012-09-09 03:02:48Z laruence $ */ +/* $Id: yaf_exception.h 329002 2013-01-07 12:55:53Z laruence $ */ #ifndef YAF_EXCEPTION_H #define YAF_EXCEPTION_H diff --git a/yaf_loader.c b/yaf_loader.c index 80b0a3cc..d6df1072 100644 --- a/yaf_loader.c +++ b/yaf_loader.c @@ -14,7 +14,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: yaf_loader.c 328824 2012-12-18 10:13:17Z remi $ */ +/* $Id: yaf_loader.c 329002 2013-01-07 12:55:53Z laruence $ */ #ifdef HAVE_CONFIG_H #include "config.h" diff --git a/yaf_loader.h b/yaf_loader.h index fb4277c3..0f15be8e 100644 --- a/yaf_loader.h +++ b/yaf_loader.h @@ -14,7 +14,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: yaf_loader.h 327580 2012-09-10 06:31:34Z laruence $ */ +/* $Id: yaf_loader.h 329002 2013-01-07 12:55:53Z laruence $ */ #ifndef YAF_LOADER_H #define YAF_LOADER_H diff --git a/yaf_logo.h b/yaf_logo.h index ad38c45c..1e00d93a 100644 --- a/yaf_logo.h +++ b/yaf_logo.h @@ -14,7 +14,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: yaf_logo.h 327519 2012-09-07 05:41:25Z laruence $ */ +/* $Id: yaf_logo.h 329002 2013-01-07 12:55:53Z laruence $ */ #ifndef YAF_LOGO_H #define YAF_LOGO_H diff --git a/yaf_namespace.h b/yaf_namespace.h index 40df2c98..387f4a26 100644 --- a/yaf_namespace.h +++ b/yaf_namespace.h @@ -14,7 +14,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: yaf_namespace.h 321289 2011-12-21 02:53:29Z laruence $ */ +/* $Id: yaf_namespace.h 329002 2013-01-07 12:55:53Z laruence $ */ #ifndef YAF_NAMESPACE_H #define YAF_NAMESPACE_H diff --git a/yaf_plugin.c b/yaf_plugin.c index 50aadabe..e72fa344 100644 --- a/yaf_plugin.c +++ b/yaf_plugin.c @@ -14,7 +14,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: yaf_plugin.c 321289 2011-12-21 02:53:29Z laruence $ */ +/* $Id: yaf_plugin.c 329002 2013-01-07 12:55:53Z laruence $ */ #ifdef HAVE_CONFIG_H #include "config.h" diff --git a/yaf_plugin.h b/yaf_plugin.h index f4837116..cb8a8565 100644 --- a/yaf_plugin.h +++ b/yaf_plugin.h @@ -14,7 +14,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: yaf_plugin.h 321289 2011-12-21 02:53:29Z laruence $ */ +/* $Id: yaf_plugin.h 329002 2013-01-07 12:55:53Z laruence $ */ #ifndef YAF_PLUGIN_H #define YAF_PLUGIN_H diff --git a/yaf_registry.c b/yaf_registry.c index 814bf58d..146fad10 100644 --- a/yaf_registry.c +++ b/yaf_registry.c @@ -14,7 +14,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: yaf_registry.c 328268 2012-11-07 14:44:04Z laruence $ */ +/* $Id: yaf_registry.c 329002 2013-01-07 12:55:53Z laruence $ */ #ifdef HAVE_CONFIG_H #include "config.h" diff --git a/yaf_registry.h b/yaf_registry.h index 1f75ef08..31dcf5e9 100644 --- a/yaf_registry.h +++ b/yaf_registry.h @@ -14,7 +14,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: yaf_registry.h 321289 2011-12-21 02:53:29Z laruence $ */ +/* $Id: yaf_registry.h 329002 2013-01-07 12:55:53Z laruence $ */ #ifndef YAF_REGISTRY_H #define YAF_REGISTRY_H diff --git a/yaf_request.c b/yaf_request.c index be26fabf..f8dd328a 100644 --- a/yaf_request.c +++ b/yaf_request.c @@ -14,7 +14,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: yaf_request.c 328820 2012-12-18 08:16:24Z remi $*/ +/* $Id: yaf_request.c 329002 2013-01-07 12:55:53Z laruence $*/ #ifdef HAVE_CONFIG_H #include "config.h" diff --git a/yaf_request.h b/yaf_request.h index 0ed29dba..bb236050 100644 --- a/yaf_request.h +++ b/yaf_request.h @@ -14,7 +14,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: yaf_request.h 327591 2012-09-10 10:56:13Z laruence $ */ +/* $Id: yaf_request.h 329002 2013-01-07 12:55:53Z laruence $ */ #ifndef YAF_REQUEST_H #define YAF_REQUEST_H diff --git a/yaf_response.c b/yaf_response.c index 191f22de..b4a7f8cc 100644 --- a/yaf_response.c +++ b/yaf_response.c @@ -14,7 +14,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: yaf_response.c 327580 2012-09-10 06:31:34Z laruence $ */ +/* $Id: yaf_response.c 329002 2013-01-07 12:55:53Z laruence $ */ #ifdef HAVE_CONFIG_H #include "config.h" diff --git a/yaf_response.h b/yaf_response.h index d493d298..56cfec1e 100644 --- a/yaf_response.h +++ b/yaf_response.h @@ -14,7 +14,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: yaf_response.h 327510 2012-09-07 04:16:31Z laruence $ */ +/* $Id: yaf_response.h 329002 2013-01-07 12:55:53Z laruence $ */ #ifndef PHP_YAF_RESPONSE_H #define PHP_YAF_RESPONSE_H diff --git a/yaf_router.c b/yaf_router.c index 3817b028..92e64699 100644 --- a/yaf_router.c +++ b/yaf_router.c @@ -14,7 +14,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: yaf_router.c 327425 2012-09-02 03:58:49Z laruence $ */ +/* $Id: yaf_router.c 329002 2013-01-07 12:55:53Z laruence $ */ #ifdef HAVE_CONFIG_H #include "config.h" diff --git a/yaf_router.h b/yaf_router.h index e6332731..ae6f5342 100644 --- a/yaf_router.h +++ b/yaf_router.h @@ -14,7 +14,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: yaf_router.h 327580 2012-09-10 06:31:34Z laruence $ */ +/* $Id: yaf_router.h 329002 2013-01-07 12:55:53Z laruence $ */ #ifndef YAF_ROUTER_H #define YAF_ROUTER_H diff --git a/yaf_session.c b/yaf_session.c index 82520620..85a6093a 100644 --- a/yaf_session.c +++ b/yaf_session.c @@ -14,7 +14,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: yaf_session.c 328268 2012-11-07 14:44:04Z laruence $ */ +/* $Id: yaf_session.c 329002 2013-01-07 12:55:53Z laruence $ */ #ifdef HAVE_CONFIG_H #include "config.h" diff --git a/yaf_session.h b/yaf_session.h index 0eabaf85..dc607b04 100644 --- a/yaf_session.h +++ b/yaf_session.h @@ -14,7 +14,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: yaf_session.h 315615 2011-08-27 14:14:48Z laruence $ */ +/* $Id: yaf_session.h 329002 2013-01-07 12:55:53Z laruence $ */ #ifndef YAF_SESSION_H #define YAF_SESSION_H diff --git a/yaf_view.c b/yaf_view.c index 264e6e7f..fc3e8039 100644 --- a/yaf_view.c +++ b/yaf_view.c @@ -14,7 +14,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: yaf_view.c 321289 2011-12-21 02:53:29Z laruence $ */ +/* $Id: yaf_view.c 329002 2013-01-07 12:55:53Z laruence $ */ #ifdef HAVE_CONFIG_H #include "config.h" diff --git a/yaf_view.h b/yaf_view.h index a2e27e13..770121fc 100644 --- a/yaf_view.h +++ b/yaf_view.h @@ -14,7 +14,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: yaf_view.h 328256 2012-11-06 08:44:52Z laruence $ */ +/* $Id: yaf_view.h 329002 2013-01-07 12:55:53Z laruence $ */ #ifndef YAF_VIEW_H #define YAF_VIEW_H