← Back to branch summary

~clint-fewbar/ubuntu/precise/php5/php5-5.4-merge

« back to all changes in this revision

Viewing changes to ext/soap/php_encoding.c

  • Committer: Package Import Robot
  • Author(s): Chuck Short
  • Date: 2011-02-22 09:46:37 UTC
  • mfrom: (1.1.20) (0.3.18 sid)
  • Revision ID: package-import@ubuntu.com-20110222094637-nlu2tvb7oqgaarl0
Tags: 5.3.5-1ubuntu1
* Merge from debian/unstable. Remaining changes:
 - debian/control:
    * Dropped firebird2.1-dev, libc-client-dev, libmcrypt-dev as it is in universe.
    * Dropped libmysqlclient15-dev, build against mysql 5.1.
    * Dropped libcurl-dev not in the archive.
    * Suggest php5-suhosin rather than recommends.
    * Dropped php5-imap, php5-interbase, php5-mcrypt since we have versions 
      already in universe.
    * Dropped libonig-dev and libqgdbm since its in universe. (will be re-added in lucid+1)
    * Dropped locales-all.
  - modulelist: Drop imap, interbase, sybase, and mcrypt.
  - debian/rules:
    * Dropped building of mcrypt, imap, and interbase.
    * Install apport hook for php5.
    * stop mysql instance on clean just in case we failed in tests

Show diffs side-by-side

added added

removed removed

Lines of Context:
ext/soap/php_encoding.c
17
17
  |          Dmitry Stogov <dmitry@zend.com>                             |
18
18
  +----------------------------------------------------------------------+
19
19
*/
20
 
/* $Id: php_encoding.c 300457 2010-06-15 08:22:51Z dmitry $ */
 
20
/* $Id: php_encoding.c 303034 2010-09-03 22:24:08Z rasmus $ */
21
21
 
22
22
#include <time.h>
23
23
 
373
373
                HashTable *ht = Z_OBJPROP_P(data);
374
374
 
375
375
                if (zend_hash_find(ht, "enc_type", sizeof("enc_type"), (void **)&ztype) == FAILURE) {
376
 
                        soap_error0(E_ERROR, "Encoding: SoapVar hasn't 'enc_type' property");
 
376
                        soap_error0(E_ERROR, "Encoding: SoapVar has no 'enc_type' property");
377
377
                }
378
378
 
379
379
                if (zend_hash_find(ht, "enc_stype", sizeof("enc_stype"), (void **)&zstype) == SUCCESS) {
1751
1751
                                return 2;
1752
1752
                        } else {
1753
1753
                                if (strict) {
1754
 
                                        soap_error1(E_ERROR,  "Encoding: object hasn't '%s' property", model->u.element->name);
 
1754
                                        soap_error1(E_ERROR,  "Encoding: object has no '%s' property", model->u.element->name);
1755
1755
                                }
1756
1756
                                return 0;
1757
1757
                        }
1784
1784
                                return 2;
1785
1785
                        } else {
1786
1786
                                if (strict) {
1787
 
                                        soap_error0(E_ERROR,  "Encoding: object hasn't 'any' property");
 
1787
                                        soap_error0(E_ERROR,  "Encoding: object has no 'any' property");
1788
1788
                                }
1789
1789
                                return 0;
1790
1790
                        }
3632
3632
                        zval **ztype;
3633
3633
 
3634
3634
                        if (zend_hash_find(Z_OBJPROP_PP(tmp), "enc_type", sizeof("enc_type"), (void **)&ztype) == FAILURE) {
3635
 
                                soap_error0(E_ERROR,  "Encoding: SoapVar hasn't 'enc_type' property");
 
3635
                                soap_error0(E_ERROR,  "Encoding: SoapVar has no 'enc_type' property");
3636
3636
                        }
3637
3637
                        cur_type = Z_LVAL_PP(ztype);
3638
3638