Re: [PHP-CVS] cvs: php4(PHP_4_3) /main SAPI.h
At 06:42 PM 1/15/2003 +0100, Derick Rethans wrote: On Wed, 15 Jan 2003, Shane Caraveo wrote: Edin Kadribasic wrote: I think that we should relax this contraint a bit on PHP_4_3 due to the fact that head is not likely going to see realeased version for some time to come due to the move to PHP 5. What should realy happen is a PHP4_HEAD branch is made. It would allow for keeping the purity of the 4_3 branch while having a looser branch for work. It may sound like an extra step, but it's still a good thing to do. Right, but we can't make that branch from HEAD now because things were already moved/deleted/updated there, and as we're not going to release 4.4. anyway, why keep it 'pure'? It will only makes things much harder to handle. I'm -1 on creating a seperate branch. I agree with Derick. We should just stick to PHP_4_3. Andi -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
Re: [PHP-CVS] cvs: php4(PHP_4_3) /main SAPI.h
At 11:28 18.01.2003, Andi Gutmans wrote: At 06:42 PM 1/15/2003 +0100, Derick Rethans wrote: On Wed, 15 Jan 2003, Shane Caraveo wrote: Edin Kadribasic wrote: I think that we should relax this contraint a bit on PHP_4_3 due to the fact that head is not likely going to see realeased version for some time to come due to the move to PHP 5. What should realy happen is a PHP4_HEAD branch is made. It would allow for keeping the purity of the 4_3 branch while having a looser branch for work. It may sound like an extra step, but it's still a good thing to do. Right, but we can't make that branch from HEAD now because things were already moved/deleted/updated there, and as we're not going to release 4.4. anyway, why keep it 'pure'? It will only makes things much harder to handle. I'm -1 on creating a seperate branch. I agree with Derick. We should just stick to PHP_4_3. Andi Agre from me too! I will not go and make one more branch for more than one platform andand and -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php4(PHP_4_3) /main SAPI.h
sas Wed Jan 15 06:28:36 2003 EDT
Modified files: (Branch: PHP_4_3)
/php4/main SAPI.h
Log:
MFH
Index: php4/main/SAPI.h
diff -u php4/main/SAPI.h:1.87.2.2 php4/main/SAPI.h:1.87.2.3
--- php4/main/SAPI.h:1.87.2.2 Thu Jan 2 12:58:57 2003
+++ php4/main/SAPI.hWed Jan 15 06:28:36 2003
@@ -84,6 +84,7 @@
zend_bool headers_only;
zend_bool no_headers;
+ zend_bool headers_read;
sapi_post_entry *post_entry;
@@ -117,7 +118,8 @@
char *default_charset;
HashTable *rfc1867_uploaded_files;
long post_max_size;
-int options;
+ int options;
+ zend_bool sapi_started;
} sapi_globals_struct;
@@ -183,6 +185,10 @@
SAPI_API char *sapi_get_default_content_type(TSRMLS_D);
SAPI_API void sapi_get_default_content_type_header(sapi_header_struct *default_header
TSRMLS_DC);
SAPI_API size_t sapi_apply_default_charset(char **mimetype, size_t len TSRMLS_DC);
+SAPI_API void sapi_activate_headers_only(TSRMLS_D);
+
+SAPI_API int sapi_get_fd(int *fd TSRMLS_DC);
+SAPI_API int sapi_force_http_10(TSRMLS_D);
struct _sapi_module_struct {
char *name;
@@ -221,6 +227,10 @@
char *executable_location;
int php_ini_ignore;
+
+ int (*get_fd)(int *fd TSRMLS_DC);
+
+ int (*force_http_10)(TSRMLS_D);
};
@@ -254,7 +264,7 @@
SAPI_API SAPI_POST_READER_FUNC(php_default_post_reader);
SAPI_API SAPI_TREAT_DATA_FUNC(php_default_treat_data);
-#define STANDARD_SAPI_MODULE_PROPERTIES NULL, NULL, 0
+#define STANDARD_SAPI_MODULE_PROPERTIES NULL, NULL, NULL, NULL, NULL, NULL, 0, NULL
#endif /* SAPI_H */
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
Re: [PHP-CVS] cvs: php4(PHP_4_3) /main SAPI.h
Does this mean that SAPI modules in 4.3.1 will not be binary
compatible with the ones from 4.3.0?
Edin
- Original Message -
From: Sascha Schumann [EMAIL PROTECTED]
To: [EMAIL PROTECTED]
Sent: Wednesday, January 15, 2003 12:28 PM
Subject: [PHP-CVS] cvs: php4(PHP_4_3) /main SAPI.h
sas Wed Jan 15 06:28:36 2003 EDT
Modified files: (Branch: PHP_4_3)
/php4/main SAPI.h
Log:
MFH
Index: php4/main/SAPI.h
diff -u php4/main/SAPI.h:1.87.2.2 php4/main/SAPI.h:1.87.2.3
--- php4/main/SAPI.h:1.87.2.2 Thu Jan 2 12:58:57 2003
+++ php4/main/SAPI.h Wed Jan 15 06:28:36 2003
@@ -84,6 +84,7 @@
zend_bool headers_only;
zend_bool no_headers;
+ zend_bool headers_read;
sapi_post_entry *post_entry;
@@ -117,7 +118,8 @@
char *default_charset;
HashTable *rfc1867_uploaded_files;
long post_max_size;
-int options;
+ int options;
+ zend_bool sapi_started;
} sapi_globals_struct;
@@ -183,6 +185,10 @@
SAPI_API char *sapi_get_default_content_type(TSRMLS_D);
SAPI_API void
sapi_get_default_content_type_header(sapi_header_struct
*default_header TSRMLS_DC);
SAPI_API size_t sapi_apply_default_charset(char **mimetype,
size_t len TSRMLS_DC);
+SAPI_API void sapi_activate_headers_only(TSRMLS_D);
+
+SAPI_API int sapi_get_fd(int *fd TSRMLS_DC);
+SAPI_API int sapi_force_http_10(TSRMLS_D);
struct _sapi_module_struct {
char *name;
@@ -221,6 +227,10 @@
char *executable_location;
int php_ini_ignore;
+
+ int (*get_fd)(int *fd TSRMLS_DC);
+
+ int (*force_http_10)(TSRMLS_D);
};
@@ -254,7 +264,7 @@
SAPI_API SAPI_POST_READER_FUNC(php_default_post_reader);
SAPI_API SAPI_TREAT_DATA_FUNC(php_default_treat_data);
-#define STANDARD_SAPI_MODULE_PROPERTIES NULL, NULL, 0
+#define STANDARD_SAPI_MODULE_PROPERTIES NULL, NULL, NULL, NULL,
NULL, NULL, 0, NULL
#endif /* SAPI_H */
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
Re: [PHP-CVS] cvs: php4(PHP_4_3) /main SAPI.h
On Wed, 15 Jan 2003, Edin Kadribasic wrote: Does this mean that SAPI modules in 4.3.1 will not be binary compatible with the ones from 4.3.0? Besides that I'm also not sure if we should introduce new functionality in the branch... Derick -- - Derick Rethans http://derickrethans.nl/ PHP Magazine - PHP Magazine for Professionals http://php-mag.net/ - -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
Re: [PHP-CVS] cvs: php4(PHP_4_3) /main SAPI.h
On Wed, 15 Jan 2003, Edin Kadribasic wrote: Does this mean that SAPI modules in 4.3.1 will not be binary compatible with the ones from 4.3.0? I suppose so. Note that there is nothing like binary compatibility between PHP releases anyway, so we are not losing anything here. - Sascha -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
Re: [PHP-CVS] cvs: php4(PHP_4_3) /main SAPI.h
On Wed, 15 Jan 2003, Derick Rethans wrote: On Wed, 15 Jan 2003, Edin Kadribasic wrote: Does this mean that SAPI modules in 4.3.1 will not be binary compatible with the ones from 4.3.0? Besides that I'm also not sure if we should introduce new functionality in the branch... I think that we should relax this contraint a bit on PHP_4_3 due to the fact that head is not likely going to see realeased version for some time to come due to the move to PHP 5. Edin -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
Re: [PHP-CVS] cvs: php4(PHP_4_3) /main SAPI.h
On Wed, 15 Jan 2003, Derick Rethans wrote: On Wed, 15 Jan 2003, Edin Kadribasic wrote: Does this mean that SAPI modules in 4.3.1 will not be binary compatible with the ones from 4.3.0? Besides that I'm also not sure if we should introduce new functionality in the branch... This is the main PHP 4 development line now (I think we should have a more appropiate branch for that). As it was in the days of PHP 3, new functionality might be ported back to the older tree once in a while. - Sascha -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
Re: [PHP-CVS] cvs: php4(PHP_4_3) /main SAPI.h
On Wed, 15 Jan 2003, Edin Kadribasic wrote: On Wed, 15 Jan 2003, Derick Rethans wrote: On Wed, 15 Jan 2003, Edin Kadribasic wrote: Does this mean that SAPI modules in 4.3.1 will not be binary compatible with the ones from 4.3.0? Besides that I'm also not sure if we should introduce new functionality in the branch... I think that we should relax this contraint a bit on PHP_4_3 due to the fact that head is not likely going to see realeased version for some time to come due to the move to PHP 5. Yup, I think so too... Derick -- - Derick Rethans http://derickrethans.nl/ PHP Magazine - PHP Magazine for Professionals http://php-mag.net/ - -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
Re: [PHP-CVS] cvs: php4(PHP_4_3) /main SAPI.h
Edin Kadribasic wrote: I think that we should relax this contraint a bit on PHP_4_3 due to the fact that head is not likely going to see realeased version for some time to come due to the move to PHP 5. Edin What should realy happen is a PHP4_HEAD branch is made. It would allow for keeping the purity of the 4_3 branch while having a looser branch for work. It may sound like an extra step, but it's still a good thing to do. Shane -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
Re: [PHP-CVS] cvs: php4(PHP_4_3) /main SAPI.h
On Wed, 15 Jan 2003, Shane Caraveo wrote: Edin Kadribasic wrote: I think that we should relax this contraint a bit on PHP_4_3 due to the fact that head is not likely going to see realeased version for some time to come due to the move to PHP 5. What should realy happen is a PHP4_HEAD branch is made. It would allow for keeping the purity of the 4_3 branch while having a looser branch for work. It may sound like an extra step, but it's still a good thing to do. Right, but we can't make that branch from HEAD now because things were already moved/deleted/updated there, and as we're not going to release 4.4. anyway, why keep it 'pure'? It will only makes things much harder to handle. I'm -1 on creating a seperate branch. Derick -- - Derick Rethans http://derickrethans.nl/ PHP Magazine - PHP Magazine for Professionals http://php-mag.net/ - -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
Re: [PHP-CVS] cvs: php4(PHP_4_3) /main SAPI.h
Right, but we can't make that branch from HEAD now because things were The 4.3 branch could be an alternative starting point. already moved/deleted/updated there, and as we're not going to release 4.4. anyway, why keep it 'pure'? It will only makes things much harder to handle. I'm -1 on creating a seperate branch. In the absence of such a branch, developers might be tempted to commit (pollute) the 4.3 branch with code, because there is simply no viable alternative from their POV (hey, I did). And we should not close our eyes from the possibility of a 4.3.1 release (e.g. due to a security issue). In that not-so-remote event, having a 4.3 branch with minimal changes is a simple requirement. - Sascha -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
Re: [PHP-CVS] cvs: php4(PHP_4_3) /main SAPI.h
On Wed, 15 Jan 2003, Sascha Schumann wrote: And we should not close our eyes from the possibility of a 4.3.1 release (e.g. due to a security issue). In that not-so-remote event, having a 4.3 branch with minimal changes is a simple requirement. For this we can do what we did before (for 4.2.2): branch from php_4_3_0 and release php 4.3.1 from there. Derick -- - Derick Rethans http://derickrethans.nl/ PHP Magazine - PHP Magazine for Professionals http://php-mag.net/ - -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
Re: [PHP-CVS] cvs: php4(PHP_4_3) /main SAPI.h
BTW. This commit broke the apache2 build.. http://bugs.php.net/bug.php?id=21667edit=1 --Jani On Wed, 15 Jan 2003, Sascha Schumann wrote: Right, but we can't make that branch from HEAD now because things were The 4.3 branch could be an alternative starting point. already moved/deleted/updated there, and as we're not going to release 4.4. anyway, why keep it 'pure'? It will only makes things much harder to handle. I'm -1 on creating a seperate branch. In the absence of such a branch, developers might be tempted to commit (pollute) the 4.3 branch with code, because there is simply no viable alternative from their POV (hey, I did). And we should not close our eyes from the possibility of a 4.3.1 release (e.g. due to a security issue). In that not-so-remote event, having a 4.3 branch with minimal changes is a simple requirement. - Sascha -- - For Sale! - -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
Re: [PHP-CVS] cvs: php4(PHP_4_3) /main SAPI.h
On Wed, 15 Jan 2003, Jani Taskinen wrote: BTW. This commit broke the apache2 build.. http://bugs.php.net/bug.php?id=21667edit=1 I must be overseeing something here -- the contents of the affected files (SAPI.[ch], sapi_apache2.c) are the same in HEAD and PHP_4_3. This would mean that the error has existed since the end of November when STANDARD_SAPI_MODULE_PROPERTIES changed the last time. I'm removing the latter now.. - Sascha -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php4(PHP_4_3) /main SAPI.h
sas Wed Jan 15 16:20:05 2003 EDT Modified files: (Branch: PHP_4_3) /php4/main SAPI.h Log: MFH Index: php4/main/SAPI.h diff -u php4/main/SAPI.h:1.87.2.3 php4/main/SAPI.h:1.87.2.4 --- php4/main/SAPI.h:1.87.2.3 Wed Jan 15 06:28:36 2003 +++ php4/main/SAPI.hWed Jan 15 16:20:05 2003 @@ -264,7 +264,7 @@ SAPI_API SAPI_POST_READER_FUNC(php_default_post_reader); SAPI_API SAPI_TREAT_DATA_FUNC(php_default_treat_data); -#define STANDARD_SAPI_MODULE_PROPERTIES NULL, NULL, NULL, NULL, NULL, NULL, 0, NULL +#define STANDARD_SAPI_MODULE_PROPERTIES #endif /* SAPI_H */ -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php4(PHP_4_3) /main SAPI.h
derick Thu Jan 2 12:58:58 2003 EDT
Modified files: (Branch: PHP_4_3)
/php4/main SAPI.h
Log:
Index: php4/main/SAPI.h
diff -u php4/main/SAPI.h:1.87.2.1 php4/main/SAPI.h:1.87.2.2
--- php4/main/SAPI.h:1.87.2.1 Tue Dec 31 11:24:58 2002
+++ php4/main/SAPI.hThu Jan 2 12:58:57 2003
@@ -39,6 +39,7 @@
#define SAPI_API
#endif
+#undef shutdown
typedef struct {
char *header;
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
