Re: [PHP-CVS] cvs: php4 /ext/ldap ldap.mak
First of all, the reason we have the line, MODULE_DESC = PHP 4.3 - LDAP Extension is for the need from Novell that every module needs to carry a meaningful description. Now, we decided that we will put the base version here and change it when the next version is released. Meaning, since right now the release version is 4.3 we keep this no, and when the next version is about to be released, we chang the no in MODULE_DESC accordingly and then commit that change. Otherwise we will have to make intermediate commits that corrects only this version no with no other change in the makefile. Do you think this is a fair approach? Please let us know if there is any issue in this kind of approach. Thanks, Ananth. Jon Parise [EMAIL PROTECTED] 01/06/03 09:58PM On Sun, Jan 05, 2003 at 10:41:13PM -0700, Ananth Kesari wrote: # Module details MODULE_NAME = php_ldap -MODULE_DESC = PHP LDAP Extension -VMAJ = 0 -VMIN = 60 -VREV = 1 +MODULE_DESC = PHP 4.3 - LDAP Extension +VMAJ = 3 +VMIN = 0 +VREV = 0 Why is the PHP version being included here? This is not PHP version but the version of the NLM (executable on NetWare). We increment this NLM version dependending on the fixes we make. Sure, but it says PHP 4.3 - LDAP Extension, and this was a commit to the HEAD branch (which is PHP 4.4, at least for the time being). -- Jon Parise ([EMAIL PROTECTED]) :: The PHP Project (http://www.php.net/) -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] Not able to check-in files - Need help!
Hi, I am checking in some additional files and some modifications related to NetWare. I could do so for a couple of files. Now I changed quite a few files (about 10) in the NetWare directory and I am doing a cvs commit for the netware directory. This checked in about 2 files and now it is giving the following error: D:\cvs-4.3\php4\netwarecvs commit cvs commit: Examining . cvs commit: Examining sys ? sysexits.h assertion key != NULL failed: file /usr/src/gnu/usr.bin/cvs/cvs/../../../../c ontrib/cvs/src/hash.c, line 312 cvs [server aborted]: received abort signal cvs commit: saving log message in C:\DOCUME~1\ADMINI~1\LOCALS~1\Temp\18 I am not able to check-in now. Can someone help? Thanks, Ananth. -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs server: cannot lock -- Help requested.
Hi, Since yesterday it was decided that we can have non-commit discussions on this forum itself, I am mailing to this list. Most of the NetWare files are now committed into the CVS 4.2 source code branch. But I am facing one problem while I am trying to commit two batch files: BisonExtStandard.bat and BisonFlexZend.bat. I have added these two files and it went through fine. When I do a commit, I get the below messages: cvs server: cannot lock `/repository/php4/netware/Attic/BisonExtStandard.bat,v'. cvs server: cannot lock `/repository/php4/netware/Attic/BisonFlexZend.bat,v'. cvs commit: saving log message in C:\DOCUME~1\ADMINI~1\LOCALS~1\Temp\12 I have tried a few times and everytime I get the same messages. I looked through the manual and could not find an answer for this. Can anyone help me out on this? Thanks, Ananth. -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] Some NetWare files are not getting committed.
Hi, I am working on porting PHP for NetWare. From the past couple of days I have been committing NetWare related changes back into the 4.2 branch. The changes that I made to those files that were already existing (including the TSRM and ZEND files), I committed and they have been effected into the source code tree. But I need to add a folder by name, netware with some NetWare specific files within it. These are NOT getting committed. If I add it gets added. I once committed on Thursday. Now, if I commit, it verifies and does nothing indicating that it is already committed. But if I check-out the 4.2 project, I do not get the netware folder. Can anyone tell me what's wrong? I am a beginner to this CVS process and so I may be missing something even simple or obvious. Thanks, Ananth. -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
Re: [PHP-CVS] cvs: php4(PHP_4_2_0) /ext/standard image.c
Oh ok. Sorry if this caused any inconvenience, but I saw your mail only now!
Well, I thought I should do it individually since I also had some new files to be
added for NetWare under a few different folders. I had to cvs add ... and then cvs
commit ... for these new files. If I had done a cvs commit on the php4 folder,
would it have taken care of adding and then committing the new files also under
different folders? I know it takes care of the existing files that have changed.
I am now left with files under TSRM and ZEND folders to check-in. There are a couple
of new files for NetWare there also. But I am waiting for write access for me to these
areas.
Thanks,
Ananth.
Derick Rethans [EMAIL PROTECTED] 10/24/02 05:25AM
On Thu, 24 Oct 2002, Anantha Kesari H Y wrote:
hyanantha Thu Oct 24 07:16:57 2002 EDT
Modified files: (Branch: PHP_4_2_0)
/php4/ext/standardimage.c
Log:
NetWare related changes/modifications.
You can also commit all files in one run ... please :)
Derick
Index: php4/ext/standard/image.c
diff -u php4/ext/standard/image.c:1.44.2.2 php4/ext/standard/image.c:1.44.2.3
--- php4/ext/standard/image.c:1.44.2.2Tue Mar 12 00:57:28 2002
+++ php4/ext/standard/image.c Thu Oct 24 07:16:57 2002
@@ -16,7 +16,7 @@
| Marcus Boerger [EMAIL PROTECTED] |
+--+
*/
-/* $Id: image.c,v 1.44.2.2 2002/03/12 05:57:28 helly Exp $ */
+/* $Id: image.c,v 1.44.2.3 2002/10/24 11:16:57 hyanantha Exp $ */
/*
* Based on Daniel Schmitt's imageinfo.c which carried the following
* Copyright notice.
@@ -39,6 +39,11 @@
#include php.h
#include stdio.h
+
+#if defined(NETWARE) !defined(NEW_LIBC)
+#include sys/socket.h
+#endif
+
#if HAVE_FCNTL_H
#include fcntl.h
#endif
@@ -82,10 +87,10 @@
FP_FREAD(temp, 3, socketd, fp, issock); /* fseek(fp, 6L, SEEK_SET); */
- FP_FREAD(a, sizeof(a), socketd, fp, issock); /* fread(a, sizeof(a), 1, fp); */
+ FP_FREAD((char*)a, sizeof(a), socketd, fp, issock); /* fread(a, sizeof(a), 1,
fp); */ /* Type-casting done due to NetWare */
result-width = (unsigned short)a[0] | (((unsigned short)a[1])8);
- FP_FREAD(a, sizeof(a), socketd, fp, issock); /* fread(a, sizeof(a), 1, fp); */
+ FP_FREAD((char *)a, sizeof(a), socketd, fp, issock); /* fread(a, sizeof(a), 1,
fp); */ /* Type-casting done due to NetWare */
result-height = (unsigned short)a[0] | (((unsigned short)a[1])8);
return result;
@@ -104,7 +109,7 @@
result = (struct gfxinfo *) ecalloc(1, sizeof(struct gfxinfo));
FP_FREAD(temp, sizeof(temp), socketd, fp, issock);
- if((FP_FREAD(a, sizeof(a), socketd, fp, issock)) = 0) {
+ if((FP_FREAD((char *)a, sizeof(a), socketd, fp, issock)) = 0) {/*
Type-casting done due to NetWare */
in_height = 0;
in_width = 0;
} else {
@@ -169,7 +174,7 @@
result = (struct gfxinfo *) ecalloc (1, sizeof (struct gfxinfo));
FP_FREAD(temp, 5, socketd, fp, issock); /* fseek(fp, 8L, SEEK_SET); */
- FP_FREAD(a, sizeof(a), socketd, fp, issock); /* fread(a, sizeof(a), 1, fp); */
+ FP_FREAD((char *)a, sizeof(a), socketd, fp, issock); /* fread(a, sizeof(a), 1,
fp); */ /* Type-casting done due to NetWare */
bits = php_swf_get_bits (a, 0, 5);
result-width = (php_swf_get_bits (a, 5 + bits, bits) -
php_swf_get_bits (a, 5, bits)) / 20;
@@ -192,7 +197,7 @@
FP_FREAD(temp, sizeof(temp), socketd, fp, issock); /* fseek(fp, 16L,
SEEK_SET); */
- if((FP_FREAD(a, sizeof(a), socketd, fp, issock)) = 0) {
+ if((FP_FREAD((char *)a, sizeof(a), socketd, fp, issock)) = 0) {/*
Type-casting done due to NetWare */
in_width = 0;
in_height = 0;
} else {
@@ -249,8 +254,7 @@
unsigned char a[2];
/* just return 0 if we hit the end-of-file */
- if((FP_FREAD(a, sizeof(a), socketd, fp, issock)) = 0) return 0;
-
+ if((FP_FREAD((char *)a, sizeof(a), socketd, fp, issock)) = 0) return 0;
/* Type-casting done due to NetWare */
return (((unsigned short) a[ 0 ]) 8) + ((unsigned short) a[ 1 ]);
}
/* }}} */
@@ -316,16 +320,16 @@
buffer = emalloc(length);
if ( !buffer) return;
- if (FP_FREAD(buffer, (long) length, socketd, fp, issock) = 0) {
+ if (FP_FREAD((char *)buffer, (long) length, socketd, fp, issock) = 0) {
/* Type-casting done due to NetWare */
efree(buffer);
return;
}
- sprintf(markername, APP%d, marker - M_APP0);
+ sprintf((char *)markername, APP%d, marker - M_APP0); /* Type-casting done
due to NetWare */
- if (zend_hash_find(Z_ARRVAL_P(info), markername, strlen(markername)+1, (void
**) tmp) == FAILURE) {
+ if
[PHP-CVS] NetWare changes to 4.2 source code branch.
Hi all, I am working on porting PHP onto NetWare. Currently, we are shipping the older version 4.0.8 on NetWare. We are moving to the latest stable version. Zeev Suraski suggested that we move to 4.2 branch since it is significantly more stable than 4.3 branch. So, I would be checking in NetWare patches into the 4.2 source code branch in a few days from now. This is for your information. Thanks, Ananth. -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
