summaryrefslogtreecommitdiff
path: root/sapi/apache2handler/mod_php5.c
diff options
context:
space:
mode:
authorSean Finney <seanius@debian.org>2010-02-07 22:19:53 +0100
committerSean Finney <seanius@debian.org>2010-02-07 22:27:07 +0100
commitc852c28a88fccf6e34a2cb091fdfa72bce2b59c7 (patch)
tree91f01b0d06916c78262404096bfd466b8e95e5b5 /sapi/apache2handler/mod_php5.c
parent176cbd0bc99e20bb21f92f0b72df728eafc1e2ce (diff)
parent0fab6db7cac8d2be99579dd049f812a8ff98e74f (diff)
downloadphp-c852c28a88fccf6e34a2cb091fdfa72bce2b59c7.tar.gz
Merge branch 'upstream-experimental' into upstream-sid
Diffstat (limited to 'sapi/apache2handler/mod_php5.c')
-rw-r--r--sapi/apache2handler/mod_php5.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/sapi/apache2handler/mod_php5.c b/sapi/apache2handler/mod_php5.c
index 8111c8897..038a7122a 100644
--- a/sapi/apache2handler/mod_php5.c
+++ b/sapi/apache2handler/mod_php5.c
@@ -18,7 +18,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: mod_php5.c 272374 2008-12-31 11:17:49Z sebastian $ */
+/* $Id: mod_php5.c 272370 2008-12-31 11:15:49Z sebastian $ */
#define ZEND_INCLUDE_FULL_WINDOWS_HEADERS