12 files changed, 0 insertions, 931 deletions
diff --git a/ext/sysvshm/CREDITS b/ext/sysvshm/CREDITS
deleted file mode 100644
index 65a30ceb0c..0000000000
--- a/ext/sysvshm/CREDITS
+++ /dev/null
@@ -1,2 +0,0 @@
-System V Shared Memory
-Christian Cartus
diff --git a/ext/sysvshm/config.m4 b/ext/sysvshm/config.m4
deleted file mode 100644
index 3827f59541..0000000000
--- a/ext/sysvshm/config.m4
+++ /dev/null
@@ -1,11 +0,0 @@
-dnl
-dnl $Id$
-dnl
-
-PHP_ARG_ENABLE(sysvshm,whether to enable System V shared memory support,
-[  --enable-sysvshm        Enable the System V shared memory support])
-
-if test "$PHP_SYSVSHM" != "no"; then
-  AC_DEFINE(HAVE_SYSVSHM, 1, [ ])
-  PHP_NEW_EXTENSION(sysvshm, sysvshm.c, $ext_shared)
-fi
diff --git a/ext/sysvshm/package.xml b/ext/sysvshm/package.xml
deleted file mode 100644
index 23e38c7ee6..0000000000
--- a/ext/sysvshm/package.xml
+++ /dev/null
@@ -1,40 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1" ?>
-<!DOCTYPE package SYSTEM "../pear/package.dtd">
-<package>
- <name>sysvsem</name>
- <summary>Unix System V IPC Shared Memory</summary>
- <maintainers>
-  <maintainer>
-   <user>???</user>
-   <name>Cristian Cartus</name>
-   <email>cartus@atrior.de</email>
-   <role>lead</role>
-  </maintainer>
- </maintainers>
- <description>
-Unix System V IPC Shared Memory
- </description>
- <license>PHP</license>
- <release>
-  <state>beta</state>
-  <version>5.0.0rc1</version>
-  <date>2004-03-19</date>
-  <notes>
-package.xml added to support intallation using pear installer
-  </notes>
-  <filelist>
-   <file role="doc" name="CREDITS"/>
-   <file role="src" name="config.m4"/>
-   <file role="src" name="sysvsem.c"/>
-   <file role="src" name="php_sysvshm.h"/>
-   <file role="test" name="tests/sysvshm.phpt"/>
-  </filelist>
-  <deps>
-   <dep type="php" rel="ge" version="5" />
-   <!-- doesn't work yet <dep type="os"  rel="has" name="unix"/> -->
-  </deps>
- </release>
-</package>
-<!--
-vim:et:ts=1:sw=1
--->
diff --git a/ext/sysvshm/php_sysvshm.h b/ext/sysvshm/php_sysvshm.h
deleted file mode 100644
index 344d9d0267..0000000000
--- a/ext/sysvshm/php_sysvshm.h
+++ /dev/null
@@ -1,77 +0,0 @@
-/* 
-   +----------------------------------------------------------------------+
-   | PHP Version 5                                                        |
-   +----------------------------------------------------------------------+
-   | Copyright (c) 1997-2006 The PHP Group                                |
-   +----------------------------------------------------------------------+
-   | This source file is subject to version 3.01 of the PHP license,      |
-   | that is bundled with this package in the file LICENSE, and is        |
-   | available through the world-wide-web at the following url:           |
-   | http://www.php.net/license/3_01.txt                                  |
-   | If you did not receive a copy of the PHP license and are unable to   |
-   | obtain it through the world-wide-web, please send a note to          |
-   | license@php.net so we can mail you a copy immediately.               |
-   +----------------------------------------------------------------------+
-   | Author: Christian Cartus <cartus@atrior.de>                          |
-   +----------------------------------------------------------------------+
-*/
-
-/* $Id$ */
-
-#ifndef PHP_SYSVSHM_H
-#define PHP_SYSVSHM_H
-
-#if HAVE_SYSVSHM
-
-extern zend_module_entry sysvshm_module_entry;
-#define sysvshm_module_ptr &sysvshm_module_entry
-
-#include <sys/types.h>
-#include <sys/ipc.h>
-#include <sys/shm.h>
-
-typedef struct {
-	int le_shm;
-	long init_mem;
-} sysvshm_module;
-
-typedef struct {
-	long key;
-	long length;
-	long next;
-	char mem;
-} sysvshm_chunk;
-
-typedef struct {
-	char magic[8];
-	long start;
-	long end;
-	long free;
-	long total;
-} sysvshm_chunk_head;
-
-typedef struct {
-	key_t key;               /* Key set by user */
-	long id;                 /* Returned by shmget. */
-	sysvshm_chunk_head *ptr; /* memoryaddress of shared memory */ 
-} sysvshm_shm;
-
-PHP_MINIT_FUNCTION(sysvshm);
-PHP_FUNCTION(shm_attach);
-PHP_FUNCTION(shm_detach);
-PHP_FUNCTION(shm_remove);
-PHP_FUNCTION(shm_put_var);
-PHP_FUNCTION(shm_get_var);
-PHP_FUNCTION(shm_remove_var);
-
-extern sysvshm_module php_sysvshm;
-
-#else
-
-#define sysvshm_module_ptr NULL
-
-#endif
-
-#define phpext_sysvshm_ptr sysvshm_module_ptr
-
-#endif /* PHP_SYSVSHM_H */
diff --git a/ext/sysvshm/sysvshm.c b/ext/sysvshm/sysvshm.c
deleted file mode 100644
index a445bf27bf..0000000000
--- a/ext/sysvshm/sysvshm.c
+++ /dev/null
@@ -1,449 +0,0 @@
-/*
-   +----------------------------------------------------------------------+
-   | PHP Version 5                                                        |
-   +----------------------------------------------------------------------+
-   | Copyright (c) 1997-2006 The PHP Group                                |
-   +----------------------------------------------------------------------+
-   | This source file is subject to version 3.01 of the PHP license,      |
-   | that is bundled with this package in the file LICENSE, and is        |
-   | available through the world-wide-web at the following url:           |
-   | http://www.php.net/license/3_01.txt                                  |
-   | If you did not receive a copy of the PHP license and are unable to   |
-   | obtain it through the world-wide-web, please send a note to          |
-   | license@php.net so we can mail you a copy immediately.               |
-   +----------------------------------------------------------------------+
-   | Author: Christian Cartus <cartus@atrior.de>                          |
-   +----------------------------------------------------------------------+
- */
- 
-/* $Id$ */
-
-/* This has been built and tested on Linux 2.2.14 
- *
- * This has been built and tested on Solaris 2.6.
- * It may not compile or execute correctly on other systems.
- */
-
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif
-
-#include "php.h"
-
-#if HAVE_SYSVSHM
-
-#include <errno.h>
-
-#include "php_sysvshm.h"
-#include "ext/standard/php_var.h"
-#include "ext/standard/php_smart_str.h"
-
-/* {{{ sysvshm_functions[]
- */
-zend_function_entry sysvshm_functions[] = {
-	PHP_FE(shm_attach, NULL)
-	PHP_FE(shm_remove, NULL)
-	PHP_FE(shm_detach, NULL)
-	PHP_FE(shm_put_var, NULL)
-	PHP_FE(shm_get_var, NULL)
-	PHP_FE(shm_remove_var, NULL)
-	{NULL, NULL, NULL}	
-};
-/* }}} */
-
-/* {{{ sysvshm_module_entry
- */
-zend_module_entry sysvshm_module_entry = {
-	STANDARD_MODULE_HEADER,
-	"sysvshm",
-	sysvshm_functions, 
-	PHP_MINIT(sysvshm),
-	NULL,
-	NULL,
-	NULL,
-	NULL,
-	NO_VERSION_YET,
-	STANDARD_MODULE_PROPERTIES
-};
-/* }}} */
-
-#ifdef COMPILE_DL_SYSVSHM
-ZEND_GET_MODULE(sysvshm)
-#endif
-
-#undef shm_ptr					/* undefine AIX-specific macro */
-
-THREAD_LS sysvshm_module php_sysvshm;
-
-static int php_put_shm_data(sysvshm_chunk_head *ptr, long key, char *data, long len);
-static long php_check_shm_data(sysvshm_chunk_head *ptr, long key);
-static int php_remove_shm_data(sysvshm_chunk_head *ptr, long shm_varpos);
-
-/* {{{ php_release_sysvshm
- */
-static void php_release_sysvshm(zend_rsrc_list_entry *rsrc TSRMLS_DC)
-{
-	sysvshm_shm *shm_ptr = (sysvshm_shm *) rsrc->ptr;
-	shmdt((void *) shm_ptr->ptr);
-	efree(shm_ptr);
-}
-/* }}} */
-
-/* {{{ PHP_MINIT_FUNCTION
- */
-PHP_MINIT_FUNCTION(sysvshm)
-{
-	php_sysvshm.le_shm = zend_register_list_destructors_ex(php_release_sysvshm, NULL, "sysvshm", module_number);
-
-	if (cfg_get_long("sysvshm.init_mem", &php_sysvshm.init_mem) == FAILURE) {
-		php_sysvshm.init_mem=10000;
-	}
-	return SUCCESS;
-}
-/* }}} */
-
-/* {{{ proto int shm_attach(int key [, int memsize [, int perm]])
-   Creates or open a shared memory segment */
-PHP_FUNCTION(shm_attach)
-{
-	zval **arg_key, **arg_size, **arg_flag;
-	long shm_size, shm_flag;
-	sysvshm_shm *shm_list_ptr;
-	char *shm_ptr;
-	sysvshm_chunk_head *chunk_ptr;
-	key_t shm_key = (key_t) 0;
-	long shm_id, list_id;
-	int ac = ZEND_NUM_ARGS();
-
-	shm_flag = 0666;
-	shm_size = php_sysvshm.init_mem;
-	
-	if (ac < 1 || ac > 3 || zend_get_parameters_ex(ac, &arg_key, &arg_size, &arg_flag) == FAILURE) {
-		WRONG_PARAM_COUNT;
-	}
-
-	switch (ac) {
-		case 3:
-			convert_to_long_ex(arg_flag);
-			shm_flag = Z_LVAL_PP(arg_flag);
-		case 2:
-			convert_to_long_ex(arg_size);
-			shm_size= Z_LVAL_PP(arg_size);
-		case 1:
-			convert_to_long_ex(arg_key);
-			shm_key = Z_LVAL_PP(arg_key);
-	}
-
-	shm_list_ptr = (sysvshm_shm *) emalloc(sizeof(sysvshm_shm));
-
-	/* get the id from a specified key or create new shared memory */
-	if ((shm_id = shmget(shm_key, 0, 0)) < 0) {
-		if (shm_size < sizeof(sysvshm_chunk_head)) {
-			php_error_docref(NULL TSRMLS_CC, E_WARNING, "failed for key 0x%x: memorysize too small", shm_key);
-			efree(shm_list_ptr);
-			RETURN_FALSE;
-		}
-		if ((shm_id = shmget(shm_key, shm_size, shm_flag | IPC_CREAT | IPC_EXCL)) < 0) {
-			php_error_docref(NULL TSRMLS_CC, E_WARNING, "failed for key 0x%x: %s", shm_key, strerror(errno));
-			efree(shm_list_ptr);
-			RETURN_FALSE;
-		}
-	}
-
-	if ((shm_ptr = shmat(shm_id, NULL, 0)) == (void *) - 1) {
-		php_error_docref(NULL TSRMLS_CC, E_WARNING, "failed for key 0x%x: %s", shm_key, strerror(errno));
-		efree(shm_list_ptr);
-		RETURN_FALSE;
-	}
-
-	/* check if shm is already initialized */
-	chunk_ptr = (sysvshm_chunk_head *) shm_ptr;
-	if (strcmp((char*) &(chunk_ptr->magic), "PHP_SM") != 0) {
-		strcpy((char*) &(chunk_ptr->magic), "PHP_SM");	
-		chunk_ptr->start = sizeof(sysvshm_chunk_head);
-		chunk_ptr->end = chunk_ptr->start;
-		chunk_ptr->total = shm_size;
-		chunk_ptr->free = shm_size-chunk_ptr->end;
-	}
-
-	shm_list_ptr->key = shm_key;
-	shm_list_ptr->id = shm_id;
-	shm_list_ptr->ptr = chunk_ptr;
-	list_id = zend_list_insert(shm_list_ptr, php_sysvshm.le_shm);
-	RETURN_LONG(list_id);
-}
-/* }}} */
-
-/* {{{ proto bool shm_detach(int shm_identifier)
-   Disconnects from shared memory segment */
-PHP_FUNCTION(shm_detach)
-{
-	zval **arg_id;
-	int type;
-	sysvshm_shm *shm_list_ptr;
-
-	if (ZEND_NUM_ARGS() != 1 || zend_get_parameters_ex(1, &arg_id) == FAILURE) {
-		WRONG_PARAM_COUNT;
-	}
-
-	convert_to_long_ex(arg_id);
-	shm_list_ptr = (sysvshm_shm *) zend_list_find(Z_LVAL_PP(arg_id), &type);
-	if (!shm_list_ptr || type != php_sysvshm.le_shm) {
-		php_error_docref(NULL TSRMLS_CC, E_WARNING, "The parameter is not a valid shm_identifier");
-		RETURN_FALSE;
-	}
-
-	zend_list_delete(Z_LVAL_PP(arg_id));
-
-	RETURN_TRUE;
-}
-/* }}} */
-
-/* {{{ proto bool shm_remove(int shm_identifier)
-   Removes shared memory from Unix systems */
-PHP_FUNCTION(shm_remove)
-{
-	zval **arg_id;
-	long id;
-	int type;
-	sysvshm_shm *shm_list_ptr;
-
-	if (ZEND_NUM_ARGS() != 1 || zend_get_parameters_ex(1, &arg_id) == FAILURE) {
-		WRONG_PARAM_COUNT;
-	}
-
-	convert_to_long_ex(arg_id);
-	id = Z_LVAL_PP(arg_id);
-	shm_list_ptr = (sysvshm_shm *) zend_list_find(id, &type);
-
-	if (!shm_list_ptr) {
-		php_error_docref(NULL TSRMLS_CC, E_WARNING, "The parameter is not a valid shm_identifier");
-		RETURN_FALSE;
-	}
-
-	if (shmctl(shm_list_ptr->id, IPC_RMID,NULL) < 0) {
-		php_error_docref(NULL TSRMLS_CC, E_WARNING, "failed for key 0x%x, id %ld: %s", shm_list_ptr->key, id, strerror(errno));
-		RETURN_FALSE;
-	} 
-
-	RETURN_TRUE;
-}
-/* }}} */
-
-/* {{{ proto bool shm_put_var(int shm_identifier, int variable_key, mixed variable)
-   Inserts or updates a variable in shared memory */
-PHP_FUNCTION(shm_put_var)
-{
-	zval **arg_id, **arg_key, **arg_var;
-	long key, id;
-	sysvshm_shm *shm_list_ptr;
-	int type;
-	smart_str shm_var = {0};
-	int ret;	
-	php_serialize_data_t var_hash;
-
-	if (ZEND_NUM_ARGS() != 3 || zend_get_parameters_ex(3, &arg_id, &arg_key, &arg_var) == FAILURE) {
-		WRONG_PARAM_COUNT;
-	}
-			
-	convert_to_long_ex(arg_id);
-	id = Z_LVAL_PP(arg_id);
-	convert_to_long_ex(arg_key);
-	key = Z_LVAL_PP(arg_key);
-
-	shm_list_ptr = (sysvshm_shm *) zend_list_find(id, &type);
-	if (type != php_sysvshm.le_shm) {
-		php_error_docref(NULL TSRMLS_CC, E_WARNING, "%ld is not a SysV shared memory index", id);
-		RETURN_FALSE;
-	}
-
-	/* setup string-variable and serialize */
-
-	PHP_VAR_SERIALIZE_INIT(var_hash);
-	php_var_serialize(&shm_var, arg_var, &var_hash TSRMLS_CC);
-	PHP_VAR_SERIALIZE_DESTROY(var_hash);
-	/* insert serialized variable into shared memory */
-	ret = php_put_shm_data(shm_list_ptr->ptr, key, shm_var.c, shm_var.len);
-
-	/* free string */
-	smart_str_free(&shm_var);
-	
-	if (ret == -1) {
-		php_error_docref(NULL TSRMLS_CC, E_WARNING, "not enough shared memory left");
-		RETURN_FALSE;
-	}
-	RETURN_TRUE;
-}
-/* }}} */
-
-/* {{{ proto mixed shm_get_var(int id, int variable_key)
-   Returns a variable from shared memory */
-PHP_FUNCTION(shm_get_var)
-{
-	zval **arg_id, **arg_key;
-	long key, id;
-	sysvshm_shm *shm_list_ptr;
-	int type;
-	char *shm_data;	
-	long shm_varpos;
-	sysvshm_chunk *shm_var;
-	php_unserialize_data_t var_hash;
-	
-	if (ZEND_NUM_ARGS() != 2 || zend_get_parameters_ex(2, &arg_id, &arg_key) == FAILURE) {
-		WRONG_PARAM_COUNT;
-	}
-
-	convert_to_long_ex(arg_id);
-	id = Z_LVAL_PP(arg_id);
-	convert_to_long_ex(arg_key);
-	key = Z_LVAL_PP(arg_key);
-
-	shm_list_ptr = (sysvshm_shm *) zend_list_find(id, &type);
-	if (type != php_sysvshm.le_shm) {
-		php_error_docref(NULL TSRMLS_CC, E_WARNING, "%ld is not a SysV shared memory index", id);
-		RETURN_FALSE;
-	}
-
-	/* setup string-variable and serialize */
-	/* get serialized variable from shared memory */
-	shm_varpos = php_check_shm_data((shm_list_ptr->ptr), key);
-
-	if (shm_varpos < 0) {
-		php_error_docref(NULL TSRMLS_CC, E_WARNING, "variable key %ld doesn't exist", key);
-		RETURN_FALSE;
-	}
-	shm_var = (sysvshm_chunk*) ((char *)shm_list_ptr->ptr + shm_varpos);
-	shm_data = &shm_var->mem;
-	
-	PHP_VAR_UNSERIALIZE_INIT(var_hash);
-	if (php_var_unserialize(&return_value, (const unsigned char **) &shm_data, shm_data + shm_var->length, &var_hash TSRMLS_CC) != 1) {
-		PHP_VAR_UNSERIALIZE_DESTROY(var_hash);
-		php_error_docref(NULL TSRMLS_CC, E_WARNING, "variable data in shared memory is corrupted");
-		RETURN_FALSE;
-	}
-	PHP_VAR_UNSERIALIZE_DESTROY(var_hash);
-}
-/* }}} */
-
-/* {{{ proto bool shm_remove_var(int id, int variable_key)
-   Removes variable from shared memory */
-PHP_FUNCTION(shm_remove_var)
-{
-	zval **arg_id, **arg_key;
-	long key, id;
-	sysvshm_shm *shm_list_ptr;
-	int type;
-	long shm_varpos;
-	
-	if (ZEND_NUM_ARGS() != 2 || zend_get_parameters_ex(2, &arg_id, &arg_key) == FAILURE) {
-		WRONG_PARAM_COUNT;
-	}
-
-	convert_to_long_ex(arg_id);
-	id = Z_LVAL_PP(arg_id);
-	convert_to_long_ex(arg_key);
-	key = Z_LVAL_PP(arg_key);
-
-	shm_list_ptr = (sysvshm_shm *) zend_list_find(id, &type);
-	if (type != php_sysvshm.le_shm) {
-		php_error_docref(NULL TSRMLS_CC, E_WARNING, "%ld is not a SysV shared memory index", id);
-		RETURN_FALSE;
-	}
-
-	shm_varpos = php_check_shm_data((shm_list_ptr->ptr), key);
-
-	if (shm_varpos < 0) {
-		php_error_docref(NULL TSRMLS_CC, E_WARNING, "variable key %ld doesn't exist", key);
-		RETURN_FALSE;
-	}
-	php_remove_shm_data((shm_list_ptr->ptr), shm_varpos);	
-	RETURN_TRUE;
-}
-/* }}} */
-
-/* {{{ php_put_shm_data
- * inserts an ascii-string into shared memory */
-static int php_put_shm_data(sysvshm_chunk_head *ptr, long key, char *data, long len)
-{
-	sysvshm_chunk *shm_var;
-	long total_size;
-	long shm_varpos;
-
-	total_size = ((long) (len + sizeof(sysvshm_chunk) - 1) / 4) * 4 + 4; /* 4-byte alligment */
-
-	if ((shm_varpos = php_check_shm_data(ptr, key)) > 0) {
-		php_remove_shm_data(ptr, shm_varpos);
-	}
-	
-	if (ptr->free < total_size) {
-		return -1; /* not enough memeory */
-	}
-
-	shm_var = (sysvshm_chunk *) ((char *) ptr + ptr->end);	
-	shm_var->key = key;
-	shm_var->length = len;
-	shm_var->next = total_size;   
-	memcpy(&(shm_var->mem), data, len);	
-	ptr->end += total_size;
-	ptr->free -= total_size;
-	return 0;
-}
-/* }}} */
-
-/* {{{ php_check_shm_data
- */
-static long php_check_shm_data(sysvshm_chunk_head *ptr, long key)
-{
-	long pos;
-	sysvshm_chunk *shm_var;
-
-	pos = ptr->start;
-			
-	for (;;) {
-		if (pos >= ptr->end) {
-			return -1;
-		}
-		shm_var = (sysvshm_chunk*) ((char *) ptr + pos);
-		if (shm_var->key == key) {
-			return pos;
-		}	
-		pos += shm_var->next;
-
-		if (shm_var->next <= 0 || pos < ptr->start) {
-			return -1;
-		}
-	}
-	return -1;
-}
-/* }}} */
-
-/* {{{ php_remove_shm_data
- */
-static int php_remove_shm_data(sysvshm_chunk_head *ptr, long shm_varpos)
-{
-	sysvshm_chunk *chunk_ptr, *next_chunk_ptr;
-	long memcpy_len;
-	
-	chunk_ptr = (sysvshm_chunk *) ((char *) ptr + shm_varpos);
-	next_chunk_ptr = (sysvshm_chunk *) ((char *) ptr + shm_varpos + chunk_ptr->next);
-	
-	memcpy_len = ptr->end-shm_varpos - chunk_ptr->next;
-	ptr->free += chunk_ptr->next;
-	ptr->end -= chunk_ptr->next;
-	if (memcpy_len > 0) {
-		memcpy(chunk_ptr, next_chunk_ptr, memcpy_len);
-	}
-	return 0;
-}
-/* }}} */
-
-#endif /* HAVE_SYSVSHM */
-
-/*
- * Local variables:
- * tab-width: 4
- * c-basic-offset: 4
- * End:
- * vim600: sw=4 ts=4 fdm=marker
- * vim<600: sw=4 ts=4
- */
diff --git a/ext/sysvshm/tests/001.phpt b/ext/sysvshm/tests/001.phpt
deleted file mode 100644
index 5228265d22..0000000000
--- a/ext/sysvshm/tests/001.phpt
+++ /dev/null
@@ -1,42 +0,0 @@
---TEST--
-ftok() tests
---FILE--
-<?php
-
-var_dump(ftok());
-var_dump(ftok(1));
-var_dump(ftok(1,1,1));
-
-var_dump(ftok("",""));
-var_dump(ftok(-1, -1));
-var_dump(ftok("qwertyu","qwertyu"));
-
-var_dump(ftok("nonexistentfile","q"));
-
-var_dump(ftok(__FILE__,"q"));
-
-echo "Done\n";
-?>
---EXPECTF--	
-Warning: Wrong parameter count for ftok() in %s on line %d
-NULL
-
-Warning: Wrong parameter count for ftok() in %s on line %d
-NULL
-
-Warning: Wrong parameter count for ftok() in %s on line %d
-NULL
-
-Warning: ftok(): Pathname is invalid in %s on line %d
-int(-1)
-
-Warning: ftok(): Project identifier is invalid in %s on line %d
-int(-1)
-
-Warning: ftok(): Project identifier is invalid in %s on line %d
-int(-1)
-
-Warning: ftok(): ftok() failed - No such file or directory in %s on line %d
-int(-1)
-int(%d)
-Done
diff --git a/ext/sysvshm/tests/002.phpt b/ext/sysvshm/tests/002.phpt
deleted file mode 100644
index 81bb0cd495..0000000000
--- a/ext/sysvshm/tests/002.phpt
+++ /dev/null
@@ -1,67 +0,0 @@
---TEST--
-shm_attach() tests
---SKIPIF--
-<?php if (!extension_loaded("sysvshm")) print "skip"; ?>
---FILE--
-<?php
-
-$key = ftok(__FILE__, 't');
-
-var_dump(shm_attach());
-var_dump(shm_attach(1,2,3,4));
-
-var_dump(shm_attach(-1, 0));
-var_dump(shm_attach(0, -1));
-var_dump(shm_attach(123, -1));
-var_dump($s = shm_attach($key, -1));
-shm_remove($s);
-var_dump($s = shm_attach($key, 0));
-shm_remove($s);
-
-var_dump($s = shm_attach($key, 1024));
-shm_remove($key);
-var_dump($s = shm_attach($key, 1024));
-shm_remove($s);
-var_dump(shm_attach($key, 1024, 0666));
-shm_remove($s);
-
-var_dump($s = shm_attach($key, 1024));
-shm_remove($s);
-var_dump($s = shm_attach($key));
-shm_remove($s);
-
-echo "Done\n";
-?>
---EXPECTF--	
-Warning: Wrong parameter count for shm_attach() in %s on line %d
-NULL
-
-Warning: Wrong parameter count for shm_attach() in %s on line %d
-NULL
-
-Warning: shm_attach(): failed for key 0xffffffff: memorysize too small in %s on line %d
-bool(false)
-
-Warning: shm_attach(): failed for key 0x0: Invalid argument in %s on line %d
-bool(false)
-
-Warning: shm_attach(): failed for key 0x7b: Invalid argument in %s on line %d
-bool(false)
-
-Warning: shm_attach(): failed for key %s: Invalid argument in %s on line %d
-bool(false)
-
-Warning: shm_remove(): The parameter is not a valid shm_identifier in %s on line %d
-
-Warning: shm_attach(): failed for key %s: memorysize too small in %s on line %d
-bool(false)
-
-Warning: shm_remove(): The parameter is not a valid shm_identifier in %s on line %d
-int(%d)
-
-Warning: shm_remove(): The parameter is not a valid shm_identifier in %s on line %d
-int(%d)
-int(%d)
-int(%d)
-int(%d)
-Done
diff --git a/ext/sysvshm/tests/003.phpt b/ext/sysvshm/tests/003.phpt
deleted file mode 100644
index 467e46a07e..0000000000
--- a/ext/sysvshm/tests/003.phpt
+++ /dev/null
@@ -1,46 +0,0 @@
---TEST--
-shm_detach() tests
---SKIPIF--
-<?php if (!extension_loaded("sysvshm")) print "skip"; ?>
---FILE--
-<?php
-
-$key = ftok(__FILE__, 'q');
-
-var_dump(shm_detach());
-var_dump(shm_detach(1,1));
-
-$s = shm_attach($key);
-
-var_dump(shm_detach($s));
-var_dump(shm_detach($s));
-shm_remove($s);
-
-var_dump(shm_detach(0));
-var_dump(shm_detach(1));
-var_dump(shm_detach(-1));
-
-echo "Done\n";
-?>
---EXPECTF--	
-Warning: Wrong parameter count for shm_detach() in %s on line %d
-NULL
-
-Warning: Wrong parameter count for shm_detach() in %s on line %d
-NULL
-bool(true)
-
-Warning: shm_detach(): The parameter is not a valid shm_identifier in %s on line %d
-bool(false)
-
-Warning: shm_remove(): The parameter is not a valid shm_identifier in %s on line %d
-
-Warning: shm_detach(): The parameter is not a valid shm_identifier in %s on line %d
-bool(false)
-
-Warning: shm_detach(): The parameter is not a valid shm_identifier in %s on line %d
-bool(false)
-
-Warning: shm_detach(): The parameter is not a valid shm_identifier in %s on line %d
-bool(false)
-Done
diff --git a/ext/sysvshm/tests/004.phpt b/ext/sysvshm/tests/004.phpt
deleted file mode 100644
index ea4d7500aa..0000000000
--- a/ext/sysvshm/tests/004.phpt
+++ /dev/null
@@ -1,40 +0,0 @@
---TEST--
-shm_put_var() tests
---SKIPIF--
-<?php if (!extension_loaded("sysvshm")) print "skip"; ?>
---FILE--
-<?php
-
-$key = ftok(__FILE__, 't');
-$s = shm_attach($key, 1024);
-
-var_dump(shm_put_var());
-var_dump(shm_put_var(-1, -1, -1));
-var_dump(shm_put_var(-1, 10, "qwerty"));
-var_dump(shm_put_var($s, -1, "qwerty"));
-var_dump(shm_put_var($s, 10, "qwerty"));
-var_dump(shm_put_var($s, 10, "qwerty"));
-
-$string = str_repeat("test", 512);
-var_dump(shm_put_var($s, 11, $string));
-
-shm_remove($s);
-
-echo "Done\n";
-?>
---EXPECTF--	
-Warning: Wrong parameter count for shm_put_var() in %s on line %d
-NULL
-
-Warning: shm_put_var(): -1 is not a SysV shared memory index in %s on line %d
-bool(false)
-
-Warning: shm_put_var(): -1 is not a SysV shared memory index in %s on line %d
-bool(false)
-bool(true)
-bool(true)
-bool(true)
-
-Warning: shm_put_var(): not enough shared memory left in %s on line %d
-bool(false)
-Done
diff --git a/ext/sysvshm/tests/005.phpt b/ext/sysvshm/tests/005.phpt
deleted file mode 100644
index 49d158c7b2..0000000000
--- a/ext/sysvshm/tests/005.phpt
+++ /dev/null
@@ -1,68 +0,0 @@
---TEST--
-shm_get_var() tests
---SKIPIF--
-<?php if (!extension_loaded("sysvshm")) print "skip"; ?>
---FILE--
-<?php
-
-$key = ftok(__FILE__, 't');
-$s = shm_attach($key, 1024);
-
-shm_put_var($s, -1, "test string");
-shm_put_var($s, 0, new stdclass);
-shm_put_var($s, 1, array(1,2,3));
-shm_put_var($s, 2, false);
-shm_put_var($s, 3, null);
-
-var_dump(shm_get_var());
-
-var_dump(shm_get_var(-1, -1));
-
-var_dump(shm_get_var($s, 1000));
-var_dump(shm_get_var($s, -10000));
-
-var_dump(shm_get_var($s, array()));
-var_dump(shm_get_var($s, -1));
-var_dump(shm_get_var($s, 0));
-var_dump(shm_get_var($s, 1));
-var_dump(shm_get_var($s, 2));
-var_dump(shm_get_var($s, 3));
-
-shm_put_var($s, 3, "test");
-shm_put_var($s, 3, 1);
-shm_put_var($s, 3, null);
-
-var_dump(shm_get_var($s, 3));
-shm_remove($s);
-
-echo "Done\n";
-?>
---EXPECTF--	
-Warning: Wrong parameter count for shm_get_var() in %s on line %d
-NULL
-
-Warning: shm_get_var(): -1 is not a SysV shared memory index in %s on line %d
-bool(false)
-
-Warning: shm_get_var(): variable key 1000 doesn't exist in %s on line %d
-bool(false)
-
-Warning: shm_get_var(): variable key -10000 doesn't exist in %s on line %d
-bool(false)
-object(stdClass)#%d (0) {
-}
-string(11) "test string"
-object(stdClass)#%d (0) {
-}
-array(3) {
-  [0]=>
-  int(1)
-  [1]=>
-  int(2)
-  [2]=>
-  int(3)
-}
-bool(false)
-NULL
-NULL
-Done
diff --git a/ext/sysvshm/tests/006.phpt b/ext/sysvshm/tests/006.phpt
deleted file mode 100644
index ae0eef445d..0000000000
--- a/ext/sysvshm/tests/006.phpt
+++ /dev/null
@@ -1,48 +0,0 @@
---TEST--
-shm_remove_var() tests
---SKIPIF--
-<?php if (!extension_loaded("sysvshm")) print "skip"; ?>
---FILE--
-<?php
-
-$key = ftok(__FILE__, 't');
-$s = shm_attach($key, 1024);
-
-shm_put_var($s, 1, "test string");
-
-var_dump(shm_remove_var());
-var_dump(shm_remove_var(-1, -1));
-var_dump(shm_remove_var($s, -10));
-
-var_dump(shm_get_var($s, 1));
-
-var_dump(shm_remove_var($s, 1));
-var_dump(shm_get_var($s, 1));
-
-var_dump(shm_remove_var($s, 1));
-var_dump(shm_get_var($s, 1));
-
-shm_remove($s);
-echo "Done\n";
-?>
---EXPECTF--	
-Warning: Wrong parameter count for shm_remove_var() in %s on line %d
-NULL
-
-Warning: shm_remove_var(): -1 is not a SysV shared memory index in %s on line %d
-bool(false)
-
-Warning: shm_remove_var(): variable key -10 doesn't exist in %s on line %d
-bool(false)
-string(11) "test string"
-bool(true)
-
-Warning: shm_get_var(): variable key 1 doesn't exist in %s on line %d
-bool(false)
-
-Warning: shm_remove_var(): variable key 1 doesn't exist in %s on line %d
-bool(false)
-
-Warning: shm_get_var(): variable key 1 doesn't exist in %s on line %d
-bool(false)
-Done
diff --git a/ext/sysvshm/tests/007.phpt b/ext/sysvshm/tests/007.phpt
deleted file mode 100644
index 05ef7ea189..0000000000
--- a/ext/sysvshm/tests/007.phpt
+++ /dev/null
@@ -1,41 +0,0 @@
---TEST--
-shm_remove() tests
---SKIPIF--
-<?php if (!extension_loaded("sysvshm")) print "skip"; ?>
---FILE--
-<?php
-
-$key = ftok(__FILE__, 't');
-$s = shm_attach($key, 1024);
-
-var_dump(shm_remove());
-var_dump(shm_remove(-1));
-var_dump(shm_remove(0));
-var_dump(shm_remove(""));
-
-var_dump(shm_remove($s));
-var_dump(shm_remove($s));
-
-shm_detach($s);
-var_dump(shm_remove($s));
-
-echo "Done\n";
-?>
---EXPECTF--	
-Warning: Wrong parameter count for shm_remove() in %s on line %d
-NULL
-
-Warning: shm_remove(): The parameter is not a valid shm_identifier in %s on line %d
-bool(false)
-
-Warning: shm_remove(): The parameter is not a valid shm_identifier in %s on line %d
-bool(false)
-
-Warning: shm_remove(): The parameter is not a valid shm_identifier in %s on line %d
-bool(false)
-bool(true)
-bool(true)
-
-Warning: shm_remove(): The parameter is not a valid shm_identifier in %s on line %d
-bool(false)
-Done