diff options
| author | Mark A. Hershberger <mah@debian.(none)> | 2009-03-25 00:34:59 -0400 |
|---|---|---|
| committer | Mark A. Hershberger <mah@debian.(none)> | 2009-03-25 00:34:59 -0400 |
| commit | ce7edc9b3c7370f32fec0bc7a8ec3e29ed9a5f61 (patch) | |
| tree | acdb9a8816483652a9db1a47db71df5df43707c5 /sapi/embed | |
| parent | 10f5b47dc7c1cf2b9a00991629f43652710322d3 (diff) | |
| download | php-ce7edc9b3c7370f32fec0bc7a8ec3e29ed9a5f61.tar.gz | |
Imported Upstream version 5.1.1upstream/5.1.1
Diffstat (limited to 'sapi/embed')
| -rw-r--r-- | sapi/embed/config.m4 | 3 | ||||
| -rw-r--r-- | sapi/embed/php_embed.c | 5 | ||||
| -rw-r--r-- | sapi/embed/php_embed.h | 4 |
3 files changed, 7 insertions, 5 deletions
diff --git a/sapi/embed/config.m4 b/sapi/embed/config.m4 index f0b7d988d..52740e6e9 100644 --- a/sapi/embed/config.m4 +++ b/sapi/embed/config.m4 @@ -1,5 +1,5 @@ dnl -dnl $Id: config.m4,v 1.8 2003/01/21 02:46:07 edink Exp $ +dnl $Id: config.m4,v 1.9 2005/05/07 02:51:53 sniper Exp $ dnl AC_MSG_CHECKING(for embedded SAPI library support) @@ -29,4 +29,5 @@ AC_MSG_RESULT($PHP_EMBED_TYPE) if test "$PHP_EMBED_TYPE" != "no"; then PHP_SELECT_SAPI(embed, $PHP_EMBED_TYPE, php_embed.c) + PHP_INSTALL_HEADERS([sapi/embed/php_embed.h]) fi diff --git a/sapi/embed/php_embed.c b/sapi/embed/php_embed.c index d814921ca..112d55c30 100644 --- a/sapi/embed/php_embed.c +++ b/sapi/embed/php_embed.c @@ -2,7 +2,7 @@ +----------------------------------------------------------------------+ | PHP Version 5 | +----------------------------------------------------------------------+ - | Copyright (c) 1997-2004 The PHP Group | + | Copyright (c) 1997-2005 The PHP Group | +----------------------------------------------------------------------+ | This source file is subject to version 3.0 of the PHP license, | | that is bundled with this package in the file LICENSE, and is | @@ -15,7 +15,7 @@ | Author: Edin Kadribasic <edink@php.net> | +----------------------------------------------------------------------+ */ -/* $Id: php_embed.c,v 1.8.2.1 2005/01/25 22:00:14 andrei Exp $ */ +/* $Id: php_embed.c,v 1.11 2005/08/03 14:08:49 sniper Exp $ */ #include "php_embed.h" @@ -125,6 +125,7 @@ sapi_module_struct php_embed_module = { php_embed_register_variables, /* register server variables */ php_embed_log_message, /* Log message */ + NULL, /* Get request time */ STANDARD_SAPI_MODULE_PROPERTIES }; diff --git a/sapi/embed/php_embed.h b/sapi/embed/php_embed.h index 12c9d57ac..6338f4fd0 100644 --- a/sapi/embed/php_embed.h +++ b/sapi/embed/php_embed.h @@ -2,7 +2,7 @@ +----------------------------------------------------------------------+ | PHP Version 5 | +----------------------------------------------------------------------+ - | Copyright (c) 1997-2004 The PHP Group | + | Copyright (c) 1997-2005 The PHP Group | +----------------------------------------------------------------------+ | This source file is subject to version 3.0 of the PHP license, | | that is bundled with this package in the file LICENSE, and is | @@ -15,7 +15,7 @@ | Author: Edin Kadribasic <edink@php.net> | +----------------------------------------------------------------------+ */ -/* $Id: php_embed.h,v 1.5 2004/01/08 17:33:24 sniper Exp $ */ +/* $Id: php_embed.h,v 1.6 2005/08/03 14:08:49 sniper Exp $ */ #ifndef _PHP_EMBED_H_ #define _PHP_EMBED_H_ |