subject:"\[PHP\-CVS\] cvs\: php4 \/ext\/midgard attachment.c"

[PHP-CVS] cvs: php4 /ext/midgard attachment.c

2001-03-15 Thread Emiliano Heyns


emile   Thu Mar 15 13:57:49 2001 EDT

  Modified files:  
/php4/ext/midgard   attachment.c 
  Log:
  closing file after serving it.
  
  
Index: php4/ext/midgard/attachment.c
diff -u php4/ext/midgard/attachment.c:1.10 php4/ext/midgard/attachment.c:1.11
--- php4/ext/midgard/attachment.c:1.10  Sun Mar 11 15:30:36 2001
+++ php4/ext/midgard/attachment.c   Thu Mar 15 13:57:48 2001
@@ -1,4 +1,4 @@
-/* $Id: attachment.c,v 1.10 2001/03/11 23:30:36 davidg Exp $
+/* $Id: attachment.c,v 1.11 2001/03/15 21:57:48 emile Exp $
 Copyright (C) 1999 Jukka Zitting [EMAIL PROTECTED]
 Copyright (C) 2000 The Midgard Project ry
 Copyright (C) 2000 Emile Heyns, Aurora SA [EMAIL PROTECTED]
@@ -434,6 +434,7 @@
if (sapi_send_headers() != SUCCESS) {
mgd_free_pool(pool);
mgd_release(res);
+  fclose(fp);
 
RETURN_FALSE_BECAUSE(MGD_ERR_INTERNAL);
}
@@ -442,6 +443,7 @@
PHPWRITE(buf, b);
}
 
+   fclose(fp);
mgd_free_pool(pool);
mgd_release(res);
RETVAL_TRUE;



-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
To contact the list administrators, e-mail: [EMAIL PROTECTED]

Re: [PHP-CVS] cvs: php4 /ext/midgard attachment.c

2001-03-15 Thread Jon Parise


On Thu, Mar 15, 2001 at 09:57:49PM -, Emiliano Heyns wrote:

 Index: php4/ext/midgard/attachment.c
 diff -u php4/ext/midgard/attachment.c:1.10 php4/ext/midgard/attachment.c:1.11
 --- php4/ext/midgard/attachment.c:1.10Sun Mar 11 15:30:36 2001
 +++ php4/ext/midgard/attachment.c Thu Mar 15 13:57:48 2001
 @@ -1,4 +1,4 @@
 -/* $Id: attachment.c,v 1.10 2001/03/11 23:30:36 davidg Exp $
 +/* $Id: attachment.c,v 1.11 2001/03/15 21:57:48 emile Exp $
  Copyright (C) 1999 Jukka Zitting [EMAIL PROTECTED]
  Copyright (C) 2000 The Midgard Project ry
  Copyright (C) 2000 Emile Heyns, Aurora SA [EMAIL PROTECTED]
 @@ -434,6 +434,7 @@
   if (sapi_send_headers() != SUCCESS) {
   mgd_free_pool(pool);
   mgd_release(res);
 +  fclose(fp);
  
   RETURN_FALSE_BECAUSE(MGD_ERR_INTERNAL);
   }
 @@ -442,6 +443,7 @@
   PHPWRITE(buf, b);
   }
  
 +   fclose(fp);
   mgd_free_pool(pool);
   mgd_release(res);
   RETVAL_TRUE;

Whitespace pollution.

-- 
Jon Parise ([EMAIL PROTECTED])  .  Rochester Inst. of Technology
http://www.csh.rit.edu/~jon/  :  Computer Science House Member

-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
To contact the list administrators, e-mail: [EMAIL PROTECTED]

[PHP-CVS] cvs: php4 /ext/midgard attachment.c

2001-03-11 Thread David Guerizec


davidg  Sun Mar 11 07:40:03 2001 EDT

  Modified files:  
/php4/ext/midgard   attachment.c 
  Log:
  added missing conversion.
  
  
Index: php4/ext/midgard/attachment.c
diff -u php4/ext/midgard/attachment.c:1.8 php4/ext/midgard/attachment.c:1.9
--- php4/ext/midgard/attachment.c:1.8   Sat Mar 10 14:43:10 2001
+++ php4/ext/midgard/attachment.c   Sun Mar 11 07:40:03 2001
@@ -1,4 +1,4 @@
-/* $Id: attachment.c,v 1.8 2001/03/10 22:43:10 emile Exp $
+/* $Id: attachment.c,v 1.9 2001/03/11 15:40:03 davidg Exp $
 Copyright (C) 1999 Jukka Zitting [EMAIL PROTECTED]
 Copyright (C) 2000 The Midgard Project ry
 Copyright (C) 2000 Emile Heyns, Aurora SA [EMAIL PROTECTED]
@@ -37,6 +37,7 @@
 {
 zval **table, **id;
 
+mgd_log_debug(0, "get_blob_id");
if (self == NULL) {
   if (calltype) *calltype = MGD_BLOB_CALL_FUNC;
   if (name == NULL) return MGD_ERR_INVALID_NAME;
@@ -50,6 +51,8 @@
if (!MGD_PROPFIND(self, "id", id)) {
   return MGD_ERR_NOT_OBJECT;
}
+   else
+   convert_to_long_ex(id);
 
if ((*table)-type != IS_STRING) {
   return MGD_ERR_NOT_OBJECT;
@@ -60,10 +63,14 @@
   convert_to_long_ex(id);
   return (*id)-value.lval;
}
+mgd_log_debug(0, "before $s", (*table)-value.str.val);
 
if (calltype) *calltype = MGD_BLOB_CALL_OTHER;
if (name == NULL) return MGD_ERR_INVALID_NAME;
convert_to_string_ex(name);
+mgd_log_debug(0, "before return: ptable=$q AND pid=$d AND name=$q",
+(*table)-value.str.val, (*id)-value.lval,
+(*name)-value.str.val);
return mgd_exists_id(mgd_handle(), "blobs",
 "ptable=$q AND pid=$d AND name=$q",
 (*table)-value.str.val, (*id)-value.lval,



-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
To contact the list administrators, e-mail: [EMAIL PROTECTED]

[PHP-CVS] cvs: php4 /ext/midgard attachment.c config.m4 config.m4.session

2001-03-11 Thread David Guerizec


davidg  Sun Mar 11 15:30:36 2001 EDT

  Modified files:  
/php4/ext/midgard   attachment.c config.m4 config.m4.session 
  Log:
  added PHP_SUBST(MIDGARD_SHARED_LIB) to dynamically link against libmidgard in 
config.m4
  removed debug info in attachments
  
  
Index: php4/ext/midgard/attachment.c
diff -u php4/ext/midgard/attachment.c:1.9 php4/ext/midgard/attachment.c:1.10
--- php4/ext/midgard/attachment.c:1.9   Sun Mar 11 07:40:03 2001
+++ php4/ext/midgard/attachment.c   Sun Mar 11 15:30:36 2001
@@ -1,4 +1,4 @@
-/* $Id: attachment.c,v 1.9 2001/03/11 15:40:03 davidg Exp $
+/* $Id: attachment.c,v 1.10 2001/03/11 23:30:36 davidg Exp $
 Copyright (C) 1999 Jukka Zitting [EMAIL PROTECTED]
 Copyright (C) 2000 The Midgard Project ry
 Copyright (C) 2000 Emile Heyns, Aurora SA [EMAIL PROTECTED]
@@ -37,7 +37,6 @@
 {
 zval **table, **id;
 
-mgd_log_debug(0, "get_blob_id");
if (self == NULL) {
   if (calltype) *calltype = MGD_BLOB_CALL_FUNC;
   if (name == NULL) return MGD_ERR_INVALID_NAME;
@@ -63,14 +62,10 @@
   convert_to_long_ex(id);
   return (*id)-value.lval;
}
-mgd_log_debug(0, "before $s", (*table)-value.str.val);
 
if (calltype) *calltype = MGD_BLOB_CALL_OTHER;
if (name == NULL) return MGD_ERR_INVALID_NAME;
convert_to_string_ex(name);
-mgd_log_debug(0, "before return: ptable=$q AND pid=$d AND name=$q",
-(*table)-value.str.val, (*id)-value.lval,
-(*name)-value.str.val);
return mgd_exists_id(mgd_handle(), "blobs",
 "ptable=$q AND pid=$d AND name=$q",
 (*table)-value.str.val, (*id)-value.lval,
Index: php4/ext/midgard/config.m4
diff -u php4/ext/midgard/config.m4:1.11 php4/ext/midgard/config.m4:1.12
--- php4/ext/midgard/config.m4:1.11 Thu Mar  8 02:49:18 2001
+++ php4/ext/midgard/config.m4  Sun Mar 11 15:30:36 2001
@@ -1,4 +1,4 @@
-dnl $Id: config.m4,v 1.11 2001/03/08 10:49:18 davidg Exp $
+dnl $Id: config.m4,v 1.12 2001/03/11 23:30:36 davidg Exp $
 
 dnl  Copyright (C) 1999 Jukka Zitting [EMAIL PROTECTED]
 dnl  Copyright (C) 2000 The Midgard Project ry
@@ -21,6 +21,8 @@
 AC_PROG_YACC
 AC_DECL_YYTEXT
 AC_PROG_LEX
+
+PHP_SUBST(MIDGARD_SHARED_LIB)
 
 PHP_ARG_WITH(midgard, for midgard support,
 [  --with-midgard  Include midgard 1.4 support])
Index: php4/ext/midgard/config.m4.session
diff -u php4/ext/midgard/config.m4.session:1.1 php4/ext/midgard/config.m4.session:1.2
--- php4/ext/midgard/config.m4.session:1.1  Thu Mar  8 02:39:31 2001
+++ php4/ext/midgard/config.m4.session  Sun Mar 11 15:30:36 2001
@@ -1,4 +1,4 @@
-dnl $Id: config.m4.session,v 1.1 2001/03/08 10:39:31 davidg Exp $
+dnl $Id: config.m4.session,v 1.2 2001/03/11 23:30:36 davidg Exp $
 
 dnl  Copyright (C) 1999 Jukka Zitting [EMAIL PROTECTED]
 dnl  Copyright (C) 2000 The Midgard Project ry
@@ -21,6 +21,8 @@
 AC_PROG_YACC
 AC_DECL_YYTEXT
 AC_PROG_LEX
+
+PHP_SUBST(MIDGARD_SHARED_LIB)
 
 PHP_ARG_WITH(midgard, for midgard support,
 [  --with-midgard  Include midgard 1.4 support])



-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
To contact the list administrators, e-mail: [EMAIL PROTECTED]

[PHP-CVS] cvs: php4 /ext/midgard attachment.c

2001-02-28 Thread David Guerizec


davidg  Wed Feb 28 07:50:06 2001 EDT

  Modified files:  
/php4/ext/midgard   attachment.c 
  Log:
  function reference: attachments
  
  
Index: php4/ext/midgard/attachment.c
diff -u php4/ext/midgard/attachment.c:1.6 php4/ext/midgard/attachment.c:1.7
--- php4/ext/midgard/attachment.c:1.6   Tue Feb 27 17:00:31 2001
+++ php4/ext/midgard/attachment.c   Wed Feb 28 07:50:06 2001
@@ -1,4 +1,4 @@
-/* $Id: attachment.c,v 1.6 2001/02/28 01:00:31 davidg Exp $
+/* $Id: attachment.c,v 1.7 2001/02/28 15:50:06 davidg Exp $
 Copyright (C) 1999 Jukka Zitting [EMAIL PROTECTED]
 Copyright (C) 2000 The Midgard Project ry
 Copyright (C) 2000 Emile Heyns, Aurora SA [EMAIL PROTECTED]
@@ -70,7 +70,7 @@
 (*name)-value.str.val);
 }
 
-MGD_FUNCTION(ret_type, oop_attachment_create, (type param))
+MGD_FUNCTION(int, oop_attachment_create, (string name, string title, string mimetype, 
+[int score]))
 {
zval *self;
zval **zv_table, **zv_id;
@@ -192,7 +192,7 @@
mgd_free_pool(pool);
 }
 
-MGD_FUNCTION(ret_type, oop_attachment_list, (type param))
+MGD_FUNCTION(mixed, oop_attachment_list, ([string sort]))
 {
zval *self, **zv_table, **zv_id, **zv_order;
char *order = NULL;
@@ -229,7 +229,7 @@
   (*zv_table)-value.str.val, (*zv_id)-value.lval);
 }
 
-MGD_FUNCTION(ret_type, open_attachment, (type param))
+MGD_FUNCTION(int, open_attachment, ([int id, [string mode]]))
 {
int pid;
int ptable;
@@ -330,7 +330,7 @@
mgd_release(res);
 }
 
-MGD_FUNCTION(ret_type, get_attachment, (type param))
+MGD_FUNCTION(mixed, get_attachment, (int id))
 {
zval **id;
zval *self;
@@ -338,11 +338,6 @@
CHECK_MGD;
 
switch (ZEND_NUM_ARGS()) {
-  /* EEH/TODO: Why this?
-   case 0:
-   php_midgard_bless(return_value, MidgardAttachment);
-   return;
-  */
case 1:
if (zend_get_parameters_ex(1, id) != SUCCESS) 
WRONG_PARAM_COUNT;
  break;
@@ -359,7 +354,7 @@
php_midgard_get_object(return_value, MIDGARD_OBJECT_BLOBS, aid);
 }
 
-MGD_FUNCTION(ret_type, serve_attachment, (type param))
+MGD_FUNCTION(bool, serve_attachment, (int id))
 {
midgard_res *res;
const char *location, *mimetype;
@@ -450,7 +445,7 @@
RETVAL_TRUE;
 }
 
-MGD_FUNCTION(ret_type, stat_attachment, (type param))
+MGD_FUNCTION(mixed, stat_attachment, (int id))
 {
midgard_res *res;
const char *location;
@@ -537,7 +532,7 @@
 #endif
 }
 
-MGD_FUNCTION(ret_type, delete_attachment, (type param))
+MGD_FUNCTION(bool, delete_attachment, (int id))
 {
int pid;
int ptable;
@@ -610,7 +605,7 @@
mgd_release(res);
 }
 
-MGD_FUNCTION(ret_type, update_attachment, (type param))
+MGD_FUNCTION(bool, update_attachment, (int id, string name, string title, string 
+mimetype, [int score, [int author]]))
 {
zval **id, **name, **title, **mimetype, **score, **author, *self;
int ptable, pid;



-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
To contact the list administrators, e-mail: [EMAIL PROTECTED]

[PHP-CVS] cvs: php4 /ext/midgard attachment.c

2001-02-19 Thread David Guerizec


davidg  Mon Feb 19 08:39:20 2001 EDT

  Modified files:  
/php4/ext/midgard   attachment.c 
  Log:
  Small typo fixed.
  
  
Index: php4/ext/midgard/attachment.c
diff -u php4/ext/midgard/attachment.c:1.3 php4/ext/midgard/attachment.c:1.4
--- php4/ext/midgard/attachment.c:1.3   Sat Feb 17 15:21:49 2001
+++ php4/ext/midgard/attachment.c   Mon Feb 19 08:39:19 2001
@@ -1,4 +1,4 @@
-/* $Id: attachment.c,v 1.3 2001/02/17 23:21:49 emile Exp $
+/* $Id: attachment.c,v 1.4 2001/02/19 16:39:19 davidg Exp $
 Copyright (C) 1999 Jukka Zitting [EMAIL PROTECTED]
 Copyright (C) 2000 The Midgard Project ry
 Copyright (C) 2000 Emile Heyns, Aurora SA [EMAIL PROTECTED]
@@ -263,7 +263,7 @@
zv_mode = NULL;
break;
case 2:
-   if (zend_get_parameters_ex(1, zv_id, zv_mode) !=
+   if (zend_get_parameters_ex(2, zv_id, zv_mode) !=
SUCCESS) {
WRONG_PARAM_COUNT;
}



-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
To contact the list administrators, e-mail: [EMAIL PROTECTED]

[PHP-CVS] cvs: php4 /ext/midgard attachment.c

Re: [PHP-CVS] cvs: php4 /ext/midgard attachment.c

[PHP-CVS] cvs: php4 /ext/midgard attachment.c

[PHP-CVS] cvs: php4 /ext/midgard attachment.c config.m4 config.m4.session

[PHP-CVS] cvs: php4 /ext/midgard attachment.c

[PHP-CVS] cvs: php4 /ext/midgard attachment.c

6 matches

Site Navigation

Mail list logo

Footer information